Refactor yield_content method

sinatra · Dec 9, 2018 · 5643293 · 5643293
1 parent bf2cb85
commit 5643293
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/sinatra-contrib/lib/sinatra/capture.rb b/sinatra-contrib/lib/sinatra/capture.rb
@@ -110,6 +110,7 @@ def capture(*args, &block)
         buffer.clear unless buffer.nil?
         result = render(current_engine, dummy, options, &block)
       end
+      result ||= ''
       result.strip.empty? && @capture ? @capture : result
     ensure
       buffer.replace(old_buffer) unless buffer.nil?

diff --git a/sinatra-contrib/lib/sinatra/content_for.rb b/sinatra-contrib/lib/sinatra/content_for.rb
@@ -173,13 +173,13 @@ def clear_content_for(key)
     # for <tt>:head</tt>.
     def yield_content(key, *args, &block)
       if block_given? && !content_for?(key)
-        haml? ? capture_haml(*args, &block) : yield(*args)
+        capture(*args, &block)
       else
-        content = content_blocks[key.to_sym].map { |b| capture(*args, &b) }
-        content.join.tap do |c|
-          if block_given? && (erb? || erubi? || erubis?)
-            @_out_buf << c
-          end
+        content_blocks[key.to_sym].map { |b| capture(*args, &b) }.join
+      end.tap do |content|
+        if block_given? && (erb? || erubi? || erubis?)
+          # Concat to template buffer
+          @_out_buf << content
         end
       end
     end

diff --git a/sinatra-contrib/spec/content_for_spec.rb b/sinatra-contrib/spec/content_for_spec.rb
@@ -33,7 +33,7 @@ def render(engine, template)
     end
 
     it 'renders default content if no block matches the key and a default block is specified' do
-      content_for(:bar) { "bar" }
+      expect(yield_content(:foo) {}).to be_empty
       expect(yield_content(:foo) { "foo" }).to eq("foo")
     end