sinatra_more 0.3.38 → 0.3.39

data/VERSION

@@ -1 +1 @@
-0.3.38
+0.3.39

data/lib/sinatra_more/markup_plugin/output_helpers.rb

@@ -46,7 +46,9 @@ module SinatraMore
     # yield_content :include
     # yield_content :head, "param1", "param2"
     def yield_content(key, *args)
-      content_blocks[key.to_sym].map { |content|
+      blocks = content_blocks[key.to_sym]
+      return nil if blocks.empty?
+      blocks.map { |content|
         capture_html(*args, &content)
       }.join
     end

data/sinatra_more.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra_more}
-  s.version = "0.3.38"
+  s.version = "0.3.39"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan Esquenazi"]
-  s.date = %q{2010-02-10}
+  s.date = %q{2010-02-16}
   s.default_executable = %q{sinatra_gen}
   s.description = %q{Expands sinatra with standard helpers and tools to allow for complex applications}
   s.email = %q{nesquena@gmail.com}
@@ -124,6 +124,8 @@ Gem::Specification.new do |s|
      "test/fixtures/markup_app/views/mail_to.haml",
      "test/fixtures/markup_app/views/meta_tag.erb",
      "test/fixtures/markup_app/views/meta_tag.haml",
+     "test/fixtures/markup_app/views/yield_content.erb",
+     "test/fixtures/markup_app/views/yield_content.haml",
      "test/fixtures/render_app/app.rb",
      "test/fixtures/render_app/views/erb/test.erb",
      "test/fixtures/render_app/views/haml/test.haml",

data/test/fixtures/markup_app/app.rb

@@ -17,7 +17,7 @@ class MarkupDemo < Sinatra::Base
     # show :erb, :index
     # show :haml, :index
     def show(kind, template)
-      eval("#{kind.to_s} #{template.to_sym.inspect}")
+      send kind.to_sym, template.to_sym
     end
 
     def captured_content(&block)

data/test/fixtures/markup_app/views/content_for.erb

@@ -2,7 +2,7 @@
   <h1>This is content yielded from a content_for</h1>
 <% end %>
   
-<div class='demo'><%= yield_content :demo %></p>
+<div class='demo'><%= yield_content :demo %></div>
   
 <% content_for :demo2 do |fname, lname| %>
   <h1>This is content yielded with name <%= fname + " " + lname %></h1>

data/test/fixtures/markup_app/views/yield_content.erb

@@ -0,0 +1,3 @@
+<div class='demo'>
+  <%= yield_content(:demo) == nil ? 'nil' : 'not nil' %>
+</div>

data/test/fixtures/markup_app/views/yield_content.haml

@@ -0,0 +1 @@
+%div.demo= yield_content(:demo) == nil ? 'nil' : 'not nil'

data/test/markup_plugin/test_output_helpers.rb

@@ -19,6 +19,18 @@ class TestOutputHelpers < Test::Unit::TestCase
       assert_have_selector '.demo2 h1', :content => "This is content yielded with name Johnny Smith"
     end
   end
+  
+  context 'for #yield_content method' do
+    should 'work for erb templates' do
+      visit '/erb/yield_content'
+      assert_have_selector '.demo', :content => "nil"
+    end
+
+    should "work for haml templates" do
+      visit '/haml/yield_content'
+      assert_have_selector '.demo', :content => "nil"
+    end
+  end
 
   context 'for #capture_html method' do
     should "work for erb templates" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra_more
 version: !ruby/object:Gem::Version 
-  version: 0.3.38
+  version: 0.3.39
 platform: ruby
 authors: 
 - Nathan Esquenazi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-10 00:00:00 -08:00
+date: 2010-02-16 00:00:00 -08:00
 default_executable: sinatra_gen
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -227,6 +227,8 @@ files:
 - test/fixtures/markup_app/views/mail_to.haml
 - test/fixtures/markup_app/views/meta_tag.erb
 - test/fixtures/markup_app/views/meta_tag.haml
+- test/fixtures/markup_app/views/yield_content.erb
+- test/fixtures/markup_app/views/yield_content.haml
 - test/fixtures/render_app/app.rb
 - test/fixtures/render_app/views/erb/test.erb
 - test/fixtures/render_app/views/haml/test.haml