sinatra_more 0.3.7 → 0.3.8

data/README.rdoc

@@ -93,6 +93,16 @@ methods should be very familiar to anyone who has used rails view helpers.
 
 ==== Output Helpers
 
+* <tt>content_for(key, &block)</tt>
+  * Capture a block of content to be rendered at a later time.
+  * content_for(:head) { ...content... }
+  * Also supports arguments passed to the content block
+  * content_for(:head) { |param1, param2| ...content... }
+* <tt>yield_content(key, *args)</tt>
+  * Render the captured content blocks for a given key.
+  * yield_content :head
+  * Also supports arguments yielded to the content block
+  * yield_content :head, param1, param2
 * <tt>capture_html(*args, &block)</tt>
   * Captures the html from a block of template code for erb or haml
   * <tt>capture_html(&block)</tt> => "...html..."
@@ -603,6 +613,7 @@ See the wiki article for additional information: <http://wiki.github.com/nesquen
 * Thanks to kelredd (http://github.com/kelredd) for the <tt>sinatra_helpers</tt> code that helped me to create erb capture and concat methods.
 * Thanks to sbfaulkner for the <tt>sinatra-helpers</tt> code that I browsed through many times while starting this library.
 * Thanks to vestel for the excellent modified <tt>pony</tt> fork which in part powers the mailer_plugin (http://github.com/vestel/pony)
+* Thanks to focat and sinatra-content-for library (http://github.com/focat/sinatra-content-for) for a good content_for starting point
 * Thanks to wycats and all for the awesome Thor gem which made creating the sinatra generator relatively painless
 
 == Contributors

data/TODO

@@ -10,6 +10,7 @@
 
 = COMPLETED
 
+* Add content_for / yield tags similar to rails
 * Created application generator using thor
 * Add support for a MailerPlugin which will make sending emails a breeze (http://github.com/hiroshi/pony)
 * Add support for missing formbuilder fields (select, and standard_form_builder methods i.e check_box_group)

data/VERSION

@@ -1 +1 @@
-0.3.7
+0.3.8

data/lib/sinatra_more/markup_plugin/output_helpers.rb

@@ -4,7 +4,7 @@ module SinatraMore
     # capture_html(&block) => "...html..."
     def capture_html(*args, &block)
       if self.respond_to?(:is_haml?) && is_haml?
-         block_is_haml?(block) ? capture_haml(*args, &block) : block.call
+        block_is_haml?(block) ? capture_haml(*args, &block) : block.call
       elsif has_erb_buffer?
         result_text = capture_erb(*args, &block)
         result_text.present? ? result_text : (block_given? && block.call(*args))
@@ -12,7 +12,7 @@ module SinatraMore
         block.call(*args)
       end
     end
-    
+
     # Outputs the given text to the templates buffer directly
     # concat_content("This will be output to the template buffer in erb or haml")
     def concat_content(text="")
@@ -24,36 +24,61 @@ module SinatraMore
         text
       end
     end
-    
+
     # Returns true if the block is from an ERB or HAML template; false otherwise.
     # Used to determine if html should be returned or concatted to view
     # block_is_template?(block)
     def block_is_template?(block)
-       block && (block_is_erb?(block) || (self.respond_to?(:block_is_haml?) && block_is_haml?(block)))
+      block && (block_is_erb?(block) || (self.respond_to?(:block_is_haml?) && block_is_haml?(block)))
+    end
+
+    # Capture a block of content to be rendered at a later time.
+    # Your blocks can also receive values, which are passed to them by <tt>yield_content</tt>
+    # content_for(:name) { ...content... }
+    # content_for(:name) { |name| ...content... }
+    def content_for(key, &block)
+      content_blocks[key.to_sym] << block
     end
-    
+
+    # Render the captured content blocks for a given key.
+    # You can also pass values to the content blocks by passing them
+    # as arguments after the key.
+    # yield_content :include
+    # yield_content :head, "param1", "param2"
+    def yield_content(key, *args)
+      content_blocks[key.to_sym].map { |content|
+        capture_html(*args, &content)
+      }.join
+    end
+
     protected
-  
+
+    # Retrieves content_blocks stored by content_for or within yield_content
+    # content_blocks[:name] => ['...', '...']
+    def content_blocks
+      @content_blocks ||= Hash.new {|h,k| h[k] = [] }
+    end
+
     # Used to capture the html from a block of erb code
     # capture_erb(&block) => '...html...'
     def capture_erb(*args, &block)
       erb_with_output_buffer { block_given? && block.call(*args) }
     end
-    
+
     # Concats directly to an erb template
     # erb_concat("Direct to buffer")
     def erb_concat(text)
       @_out_buf << text if has_erb_buffer?
     end
-    
+
     # Returns true if an erb buffer is detected
     # has_erb_buffer? => true
     def has_erb_buffer?
       !@_out_buf.nil?
     end
-    
+
     # Used to determine if a block is called from ERB.
-    # NOTE: This doesn't actually work yet because the variable __in_erb_template 
+    # NOTE: This doesn't actually work yet because the variable __in_erb_template
     # hasn't been defined in ERB. We need to find a way to fix this.
     def block_is_erb?(block)
       has_erb_buffer? || block && eval('defined? __in_erb_template', block)

data/sinatra_more.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra_more}
-  s.version = "0.3.7"
+  s.version = "0.3.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan Esquenazi"]
@@ -94,6 +94,8 @@ Gem::Specification.new do |s|
      "test/fixtures/markup_app/app.rb",
      "test/fixtures/markup_app/views/capture_concat.erb",
      "test/fixtures/markup_app/views/capture_concat.haml",
+     "test/fixtures/markup_app/views/content_for.erb",
+     "test/fixtures/markup_app/views/content_for.haml",
      "test/fixtures/markup_app/views/content_tag.erb",
      "test/fixtures/markup_app/views/content_tag.haml",
      "test/fixtures/markup_app/views/form_for.erb",

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

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

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

@@ -0,0 +1,9 @@
+- content_for :demo do
+  %h1 This is content yielded from a content_for
+  
+.demo= yield_content :demo
+
+- content_for :demo2 do |fname, lname|
+  %h1 This is content yielded with name #{fname + " " + lname}
+  
+.demo2= yield_content :demo2, "Johnny", "Smith"

data/test/generators/test_skeleton_generator.rb

@@ -146,7 +146,7 @@ class TestSkeletonGenerator < Test::Unit::TestCase
       buffer = silence_logger { SinatraMore::SkeletonGenerator.start(['sample_app', '/tmp', '--test=riot', '--script=none']) }
       assert_match /Applying.*?riot.*?test/, buffer
       assert_match_in_file(/require 'riot'/, '/tmp/sample_app/test/test_config.rb')
-      assert_match_in_file(/Riot::Context/, '/tmp/sample_app/test/test_config.rb')
+      assert_match_in_file(/Riot::Situation/, '/tmp/sample_app/test/test_config.rb')
     end
 
     should "properly generate for rspec" do

data/test/markup_plugin/test_output_helpers.rb

@@ -6,6 +6,20 @@ class TestOutputHelpers < Test::Unit::TestCase
     MarkupDemo.tap { |app| app.set :environment, :test }
   end
 
+  context 'for #content_for method' do
+    should 'work for erb templates' do
+      visit '/erb/content_for'
+      assert_have_selector '.demo h1', :content => "This is content yielded from a content_for"
+      assert_have_selector '.demo2 h1', :content => "This is content yielded with name Johnny Smith"
+    end
+
+    should "work for haml templates" do
+      visit '/haml/content_for'
+      assert_have_selector '.demo h1', :content => "This is content yielded from a content_for"
+      assert_have_selector '.demo2 h1', :content => "This is content yielded with name Johnny Smith"
+    end
+  end
+
   context 'for #capture_html method' do
     should "work for erb templates" do
       visit '/erb/capture_concat'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra_more
 version: !ruby/object:Gem::Version 
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors: 
 - Nathan Esquenazi
@@ -187,6 +187,8 @@ files:
 - test/fixtures/markup_app/app.rb
 - test/fixtures/markup_app/views/capture_concat.erb
 - test/fixtures/markup_app/views/capture_concat.haml
+- test/fixtures/markup_app/views/content_for.erb
+- test/fixtures/markup_app/views/content_for.haml
 - test/fixtures/markup_app/views/content_tag.erb
 - test/fixtures/markup_app/views/content_tag.haml
 - test/fixtures/markup_app/views/form_for.erb