markevans-block_helpers 0.2.7 → 0.2.8

data/README.markdown

@@ -168,6 +168,16 @@ To use in Rails, add to your `environment.rb`:
 
     config.gem "markevans-block_helpers", :lib => "block_helpers", :source => "http://gems.github.com"
 
+for Merb, in `init.rb`:
+
+    dependency "markevans-block_helpers", :require_as => "block_helpers"
+
+Compatibility
+=============
+Currently it depends on activesupport, and requires that the helper already has the methods `concat` and `capture` available (which is the case in Rails and Merb).
+
+It works with both the one and two argument versions of `concat`, so should work with all recent versions of Rails and Merb.
+
 Credits
 =======
 - <a href="http://github.com/markevans">Mark Evans</a> (author)

data/Rakefile

@@ -10,7 +10,6 @@ begin
     gem.homepage = "http://github.com/markevans/block_helpers"
     gem.authors = ["Mark Evans"]
     gem.add_dependency('activesupport', '>= 2.0')
-    gem.add_dependency('actionpack', '>= 2.0')
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
 

data/VERSION

@@ -1 +1 @@
-0.2.7
+0.2.8

data/block_helpers.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{block_helpers}
-  s.version = "0.2.7"
+  s.version = "0.2.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Evans"]
-  s.date = %q{2009-08-14}
+  s.date = %q{2009-08-19}
   s.email = %q{mark@new-bamboo.co.uk}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -43,13 +43,10 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 2.0"])
-      s.add_runtime_dependency(%q<actionpack>, [">= 2.0"])
     else
       s.add_dependency(%q<activesupport>, [">= 2.0"])
-      s.add_dependency(%q<actionpack>, [">= 2.0"])
     end
   else
     s.add_dependency(%q<activesupport>, [">= 2.0"])
-    s.add_dependency(%q<actionpack>, [">= 2.0"])
   end
 end

data/lib/block_helpers.rb

@@ -1,5 +1,4 @@
 require 'activesupport'
-require 'action_view'
 
 module BlockHelpers
 
@@ -20,7 +19,11 @@ module BlockHelpers
           renderer = #{klass.name}.new(*args)
           renderer.send(:helper=, self)
           if renderer.public_methods(false).include? 'display'
-            concat renderer.display(capture(renderer, &block))
+            if method(:concat).arity == 1
+              concat renderer.display(capture(renderer, &block))
+            else
+              concat renderer.display(capture(renderer, &block)), binding
+            end
           else
             block.call(renderer)
           end

data/spec/helpers/block_helpers_spec.rb

@@ -8,9 +8,12 @@ describe TestHelperModule do
   describe "simple block_helper" do
     
     before(:each) do
-      class TestHelperModule::TestHelper < BlockHelpers::Base
-        def hello
-          'Hi there'
+      module TestHelperModule
+        remove_const(:TestHelper) if defined?(TestHelper)
+        class TestHelper < BlockHelpers::Base
+          def hello
+            'Hi there'
+          end
         end
       end
     end
@@ -34,12 +37,13 @@ describe TestHelperModule do
   describe "access to other methods" do
     before(:each) do
       module TestHelperModule
-        
+
         def yoghurt
           'Yoghurt'
         end
         
-        class TestHelper
+        remove_const(:TestHelper) if defined?(TestHelper)
+        class TestHelper < BlockHelpers::Base
           def yog
             yoghurt[0..2]
           end
@@ -92,7 +96,7 @@ describe TestHelperModule do
         <% end %>
       )).should match_html('<label for="hi">Hi</label>')
     end
-    it "should work with methods like 'concat'" do
+    it "should work with methods like 'capture'" do
       eval_erb(%(
         <% test_helper do |r| %>
           <% r.check_capture do %>
@@ -103,16 +107,66 @@ describe TestHelperModule do
     end
   end
   
+  describe "accesibility" do
+    def run_erb
+      eval_erb(%(
+        <% compat_helper do |r| %>
+          HELLO
+        <% end %>
+      ))
+    end
+
+    it "should work when concat has one arg" do
+      module TestHelperModule
+        def concat(html); super(html); end
+        remove_const(:CompatHelper) if defined?(CompatHelper)
+        class CompatHelper < BlockHelpers::Base
+          def display(body)
+            "Before...#{body}...after"
+          end
+        end
+      end
+      run_erb.should match_html("Before... HELLO ...after")
+    end
+    it "should work when concat has two args" do
+      module TestHelperModule
+        def concat(html, binding); super(html); end
+        remove_const(:CompatHelper) if defined?(:CompatHelper)
+        class CompatHelper < BlockHelpers::Base
+          def display(body)
+            "Before...#{body}...after"
+          end
+        end
+      end
+      run_erb.should match_html("Before... HELLO ...after")
+    end
+    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)
+        class CompatHelper < BlockHelpers::Base
+          def display(body)
+            "Before...#{body}...after"
+          end
+        end
+      end
+      run_erb.should match_html("Before... HELLO ...after")
+    end
+  end
+  
   describe "surrounding the block" do
 
     before(:each) do
-      class TestHelperModule::TestHelperSurround < BlockHelpers::Base
-        def display(body)
-          %(
-            <p>Before</p>
-            #{body}
-            <p>After</p>
-          )
+      module TestHelperModule
+        remove_const(:TestHelperSurround) if defined?(TestHelperSurround)
+        class TestHelperSurround < BlockHelpers::Base
+          def display(body)
+            %(
+              <p>Before</p>
+              #{body}
+              <p>After</p>
+            )
+          end
         end
       end
     end
@@ -128,12 +182,15 @@ describe TestHelperModule do
   
   describe "block helpers with arguments" do
     before(:each) do
-      class TestHelperModule::TestHelperWithArgs < BlockHelpers::Base
-        def initialize(id, klass)
-          @id, @klass = id, klass
-        end
-        def hello
-          %(<p class="#{@klass}" id="#{@id}">Hello</p>)
+      module TestHelperModule
+        remove_const(:TestHelperWithArgs) if defined?(TestHelperWithArgs)
+        class TestHelperWithArgs < BlockHelpers::Base
+          def initialize(id, klass)
+            @id, @klass = id, klass
+          end
+          def hello
+            %(<p class="#{@klass}" id="#{@id}">Hello</p>)
+          end
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: markevans-block_helpers
 version: !ruby/object:Gem::Version 
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors: 
 - Mark Evans
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-14 00:00:00 -07:00
+date: 2009-08-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,16 +22,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "2.0"
     version: 
-- !ruby/object:Gem::Dependency 
-  name: actionpack
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "2.0"
-    version: 
 description: 
 email: mark@new-bamboo.co.uk
 executables: []