markevans-block_helpers 0.2.2 → 0.2.3

data/README.markdown

@@ -51,7 +51,35 @@ This will generate the following:
 Accessing other helper methods
 ------------------------------
 
-Methods available in the parent helper are available to the block helper class via the protected object `helper` (see use of `content_tag` below).
+Methods available in the parent helper are available to the block helper class.
+In case of name clashes, you can also access those methods via the protected object `helper`.
+In the helper:
+
+    module MyHelper
+
+      def angry
+        "I'm very angry"
+      end
+
+      class MyBlockHelper < ActionView::BlockHelper
+  
+        def angry
+          content_tag :div, helper.angry
+        end
+  
+      end
+
+    end
+
+In the view:
+
+    <% my_block_helper do |h| %>
+      <%= h.angry %>
+    <% end %>
+
+This generates:
+
+    <div>I'm very angry</div>
 
 Using arguments
 ---------------
@@ -68,7 +96,7 @@ In the helper:
         end
   
         def hello(name)
-          helper.content_tag @tag_type, "Hi there #{name}!"
+          content_tag @tag_type, "Hi there #{name}!"
         end
   
       end
@@ -88,14 +116,14 @@ This generates:
 Surrounding markup
 ------------------
 
-Use the `render` method to surround the block with markup, e.g.
+Use the `display` method to surround the block with markup, e.g.
 In the helper:
 
     module MyHelper
 
       class RoundedBox < ActionView::BlockHelper
 
-        def render(body)
+        def display(body)
           %(
             <div class="tl">
               <div class="tr">
@@ -131,7 +159,7 @@ This generates:
       </div>
     </div>
 
-Of course, you could use `render` for more than just surrounding markup.
+Of course, you could use `display` for more than just surrounding markup.
 
 Installation
 ============

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/block_helpers.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{block_helpers}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Evans"]

data/lib/block_helpers.rb

@@ -18,8 +18,8 @@ module ActionView
       klass.parent.class_eval %(      
         def #{method_name}(*args, &block)
           renderer = #{klass.name}.new(*args)
-          if renderer.public_methods(false).include? 'render'
-            concat renderer.render(capture(renderer, &block))
+          if renderer.public_methods(false).include? 'display'
+            concat renderer.display(capture(renderer, &block))
           else
             block.call(renderer)
           end
@@ -27,9 +27,13 @@ module ActionView
       )
       
       # Make a 'helper' object available, for calling
-      # other helper methods / action view helpers
+      # other helper methods / action view helpers,
+      # in case of name clashes
       klass.class_eval do
         
+        include klass.parent
+        include ActionView::Helpers
+        
         protected
         define_method :helper do
           if @helper.nil?

data/spec/helpers/block_helpers_spec.rb

@@ -31,18 +31,33 @@ describe TestHelperModule do
     
   end
   
-  describe "access to other methods via 'helper'" do
+  describe "access to other methods" do
     before(:each) do
       module TestHelperModule
-        def yoghurt; 'Yoghurt'; end
+        
+        def yoghurt
+          'Yoghurt'
+        end
+        
         class TestHelper
           def yog
-            helper.yoghurt[0..2]
+            yoghurt[0..2]
           end
           def jelly_in_div
-            helper.content_tag :div, 'jelly'
+            content_tag :div, 'jelly'
+          end
+          def cheese
+            helper.cheese[0..3]
+          end
+          def label_tag(text)
+            helper.label_tag(text[0..1])
           end
         end
+        
+        def cheese
+          'Cheese'
+        end
+        
       end
     end
     it "should give the yielded renderer access to other methods" do
@@ -59,13 +74,27 @@ describe TestHelperModule do
         <% end %>
       )).should match_html("<div>jelly</div>")
     end
+    it "should give the yielded renderer access to other methods via 'helper'" do
+      eval_erb(%(
+        <% test_helper do |r| %>
+          <%= r.cheese %>
+        <% end %>
+      )).should match_html("Chee")
+    end
+    it "should give the yielded renderer access to normal actionview helper methods via 'helper'" do
+      eval_erb(%(
+        <% test_helper do |r| %>
+          <%= r.label_tag 'hide' %>
+        <% end %>
+      )).should match_html('<label for="hi">Hi</label>')
+    end
   end
   
   describe "surrounding the block" do
 
     before(:each) do
       class TestHelperModule::TestHelperSurround < ActionView::BlockHelper
-        def render(body)
+        def display(body)
           %(
             <p>Before</p>
             #{body}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: markevans-block_helpers
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Mark Evans