Update yield_content to append default to ERB template buffer

sinatra-contrib/lib/sinatra/content_for.rb

@@ -32,7 +32,7 @@ module Sinatra
   # to yield_content.
   #
   #     # layout.erb
-  #     <%= yield_content :some_key_with_no_content do %>
+  #     <% yield_content :some_key_with_no_content do %>
   #       <chunk of="default html">...</chunk>
   #     <% end %>
   #
@@ -171,16 +171,31 @@ def clear_content_for(key)
     #
     # Would pass <tt>1</tt> and <tt>2</tt> to all the blocks registered
     # for <tt>:head</tt>.
-    def yield_content(key, *args)
-      return yield(*args) if block_given? && content_blocks[key.to_sym].empty?
-      content_blocks[key.to_sym].map { |b| capture(*args, &b) }.join
+    def yield_content(key, *args, &block)
+      if block_given? && !content_for?(key)
+        haml? ? capture_haml(*args, &block) : yield(*args)
+      else
+        content = content_blocks[key.to_sym].map { |b| capture(*args, &b) }
+        content.join.tap do |c|
+          template_buffer << c if block_given? && erb?
+        end
+      end
     end
 
     private
 
     def content_blocks
       @content_blocks ||= Hash.new { |h, k| h[k] = [] }
     end
+
+    def template_buffer
+      @template_buffer ||= begin
+        if t = Tilt.current_template
+          v = t.options[:outvar]
+          instance_variable_get(v) if v
+        end
+      end
+    end
   end
 
   helpers ContentFor

sinatra-contrib/spec/content_for/layout.erb

@@ -1 +1,2 @@
-<%= yield_content :foo %>
+<%= yield if block_given? %>
+<%= yield_content :foo %>

sinatra-contrib/spec/content_for/layout.erubis

@@ -1 +1,2 @@
-<%= yield_content :foo %>
+<%= yield if block_given? %>
+<%= yield_content :foo %>

sinatra-contrib/spec/content_for/layout.haml

@@ -1 +1,2 @@
+= yield if block_given?
 = yield_content :foo

sinatra-contrib/spec/content_for/layout.slim

@@ -1 +1,2 @@
+== yield if block_given?
 = yield_content :foo

sinatra-contrib/spec/content_for/yield_block.erb

@@ -0,0 +1 @@
+<% yield_content :bar do %>bar<% end %>

sinatra-contrib/spec/content_for/yield_block.erubis

@@ -0,0 +1 @@
+<% yield_content :bar do %>bar<% end %>

sinatra-contrib/spec/content_for/yield_block.haml

@@ -0,0 +1,2 @@
+= yield_content :bar  do
+  bar

sinatra-contrib/spec/content_for/yield_block.slim

@@ -0,0 +1,2 @@
+= yield_content :bar  do
+  | bar

sinatra-contrib/spec/content_for_spec.rb

@@ -205,6 +205,11 @@ def body
             end
           end
 
+          it 'renders default content' do
+            expect(get('/yield_block')).to be_ok
+            expect(body).to eq("bar")
+          end
+
           it 'renders blocks declared with the same key you use when rendering' do
             expect(get('/same_key')).to be_ok
             expect(body).to eq("foo")