markevans-block_helpers 0.2.4 → 0.2.5

data/README.markdown

@@ -84,14 +84,14 @@ This generates:
 Using arguments
 ---------------
 
-You can pass in arguments to the helper, and these will be passed through to the class's `initialize` method.
+You can pass in arguments to the helper, and these will be passed through to the class's `options` method.
 In the helper:
 
     module MyHelper
 
       class MyBlockHelper < ActionView::BlockHelper
   
-        def initialize(tag_type)
+        def options(tag_type)
           @tag_type = tag_type
         end
   
@@ -168,6 +168,12 @@ To use in Rails, add to your `environment.rb`:
 
     config.gem "markevans-block_helpers", :lib => "block_helpers", :source => "http://gems.github.com"
 
+Credits
+=======
+- <a href="http://github.com/markevans">Mark Evans</a> (author)
+- <a href="http://github.com/nesquena">Nathan Esquenazi</a> and <a href="http://github.com/2collegebums">2collegebums</a> (contributor)
+
+
 Copyright
 ========
 

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.2.5

data/block_helpers.gemspec

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

data/lib/block_helpers.rb

@@ -2,9 +2,9 @@ require 'activesupport'
 require 'action_view'
 
 module ActionView
-  
+
   class BlockHelper
-    
+
     def self.inherited(klass)
       # Define the helper method
       # e.g. for a class:
@@ -15,9 +15,10 @@ module ActionView
       # then we define a helper method 'hello_helper'
       #
       method_name = klass.name.split('::').last.underscore
-      klass.parent.class_eval %(      
+      klass.parent.class_eval %(
         def #{method_name}(*args, &block)
           renderer = #{klass.name}.new(*args)
+          renderer.send(:helper=, self)
           if renderer.public_methods(false).include? 'display'
             concat renderer.display(capture(renderer, &block))
           else
@@ -25,32 +26,25 @@ module ActionView
           end
         end
       )
-      
-      # Make a 'helper' object available, for calling
-      # 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?
-            @helper = Object.new
-            # Open the singleton class of @helper, while
-            # keeping 'klass' visible
-            class << @helper; self; end.class_eval do
-              include klass.parent
-              include ActionView::Helpers
-            end
-          end
-          @helper
-        end
+    end
 
+    def respond_to?(method)
+      super or helper.respond_to?(method)
+    end
+
+    protected
+
+    attr_accessor :helper
+
+    def method_missing(method, *args, &block)
+      if helper.respond_to?(method)
+        self.class_eval "def #{method}(*args, &block); helper.send('#{method}', *args, &block); end"
+        self.send(method, *args, &block)
+      else
+        super
       end
     end
     
   end
-  
-end
+
+end

data/spec/helpers/block_helpers_spec.rb

@@ -52,6 +52,10 @@ describe TestHelperModule do
           def label_tag(text)
             helper.label_tag(text[0..1])
           end
+          def check_capture(&block)
+            string = capture(&block)
+            2.times{ concat(string) }
+          end
         end
         
         def cheese
@@ -88,6 +92,15 @@ describe TestHelperModule do
         <% end %>
       )).should match_html('<label for="hi">Hi</label>')
     end
+    it "should work with methods like 'concat'" do
+      eval_erb(%(
+        <% test_helper do |r| %>
+          <% r.check_capture do %>
+            HELLO
+          <% end %>
+        <% end %>
+      )).should match_html('HELLO HELLO')
+    end
   end
   
   describe "surrounding the block" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: markevans-block_helpers
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors: 
 - Mark Evans
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-13 00:00:00 -07:00
+date: 2009-08-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency