markevans-block_helpers 0.2.8 → 0.2.10

data/VERSION

@@ -1 +1 @@
-0.2.8
+0.2.10

data/block_helpers.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{block_helpers}
-  s.version = "0.2.8"
+  s.version = "0.2.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Evans"]
-  s.date = %q{2009-08-19}
+  s.date = %q{2009-08-26}
   s.email = %q{mark@new-bamboo.co.uk}
   s.extra_rdoc_files = [
     "LICENSE",

data/lib/block_helpers.rb

@@ -19,14 +19,16 @@ module BlockHelpers
           renderer = #{klass.name}.new(*args)
           renderer.send(:helper=, self)
           if renderer.public_methods(false).include? 'display'
+            body = block ? capture(renderer, &block) : nil
             if method(:concat).arity == 1
-              concat renderer.display(capture(renderer, &block))
+              concat renderer.display(body)
             else
-              concat renderer.display(capture(renderer, &block)), binding
+              concat renderer.display(body), binding
             end
           else
-            block.call(renderer)
+            block.call(renderer) if block
           end
+          renderer
         end
       )
     end

data/spec/helpers/block_helpers_spec.rb

@@ -32,6 +32,19 @@ describe TestHelperModule do
       )).should match_html("<p>Before</p> Hi there <p>After</p>")
     end
     
+    it "should do nothing if no block given" do
+      eval_erb(%(
+        <% test_helper %>
+      )).should match_html("")
+    end
+    
+    it "should return itself (the renderer object)" do
+      eval_erb(%(
+        <% e = test_helper %>
+        <%= e.hello %>
+      )).should match_html('Hi there')
+    end
+    
   end
   
   describe "access to other methods" do
@@ -131,7 +144,7 @@ describe TestHelperModule do
     it "should work when concat has two args" do
       module TestHelperModule
         def concat(html, binding); super(html); end
-        remove_const(:CompatHelper) if defined?(:CompatHelper)
+        remove_const(:CompatHelper) if defined?(CompatHelper)
         class CompatHelper < BlockHelpers::Base
           def display(body)
             "Before...#{body}...after"
@@ -143,7 +156,7 @@ describe TestHelperModule do
     it "should work when concat has one optional arg" do
       module TestHelperModule
         def concat(html, binding=nil); super(html); end
-        remove_const(:CompatHelper) if defined?(:CompatHelper)
+        remove_const(:CompatHelper) if defined?(CompatHelper)
         class CompatHelper < BlockHelpers::Base
           def display(body)
             "Before...#{body}...after"
@@ -161,11 +174,15 @@ describe TestHelperModule do
         remove_const(:TestHelperSurround) if defined?(TestHelperSurround)
         class TestHelperSurround < BlockHelpers::Base
           def display(body)
-            %(
-              <p>Before</p>
-              #{body}
-              <p>After</p>
-            )
+            if body.nil?
+              "This is nil!"
+            else
+              %(
+                <p>Before</p>
+                #{body}
+                <p>After</p>
+              )
+            end
           end
         end
       end
@@ -178,6 +195,11 @@ describe TestHelperModule do
         <% end %>
       )).should match_html("<p>Before</p> Body here!!! <p>After</p>")
     end
+    it "should pass in the body as nil if no block given" do
+      eval_erb(%(
+        <% test_helper_surround %>
+      )).should match_html("This is nil!")
+    end
   end
   
   describe "block helpers with arguments" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: markevans-block_helpers
 version: !ruby/object:Gem::Version 
-  version: 0.2.8
+  version: 0.2.10
 platform: ruby
 authors: 
 - Mark Evans
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-19 00:00:00 -07:00
+date: 2009-08-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,7 +45,6 @@ files:
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/markevans/block_helpers
-licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -66,7 +65,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: An extension to ActionView for adding block helpers to views