block_helpers 0.2.11 → 0.3.0

data/README.markdown

@@ -166,11 +166,11 @@ Installation
 
 To use in Rails, add to your `environment.rb`:
 
-    config.gem "markevans-block_helpers", :lib => "block_helpers", :source => "http://gems.github.com"
+    config.gem "block_helpers", :lib => "block_helpers", :source => "http://gemcutter.org"
 
 for Merb, in `init.rb`:
 
-    dependency "markevans-block_helpers", :require_as => "block_helpers"
+    dependency "block_helpers"
 
 Compatibility
 =============

data/VERSION

@@ -1 +1 @@
-0.2.11
+0.3.0

data/block_helpers.gemspec

@@ -1,12 +1,15 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{block_helpers}
-  s.version = "0.2.11"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Evans"]
-  s.date = %q{2009-08-28}
+  s.date = %q{2009-10-12}
   s.email = %q{mark@new-bamboo.co.uk}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -25,11 +28,10 @@ Gem::Specification.new do |s|
      "spec/helpers/block_helpers_spec.rb",
      "spec/spec_helper.rb"
   ]
-  s.has_rdoc = true
   s.homepage = %q{http://github.com/markevans/block_helpers}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{An extension to ActionView for adding block helpers to views}
   s.test_files = [
     "spec/for_spec_rails/application.rb",
@@ -39,7 +41,7 @@ Gem::Specification.new do |s|
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 2.0"])

data/lib/block_helpers.rb

@@ -17,22 +17,30 @@ module BlockHelpers
       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'
-            body = block ? capture(renderer, &block) : nil
-            if method(:concat).arity == 2
-              concat renderer.display(body), binding
+          top_level_helper = if self.is_a?(BlockHelpers::Base) 
+            self.helper
+          else
+            self
+          end
+          renderer.send(:helper=, top_level_helper)
+          body = block ? capture(renderer, &block) : nil
+          processed_body = renderer.display(body)
+          if processed_body
+            if top_level_helper.method(:concat).arity == 2
+              concat processed_body, binding
             else
-              concat renderer.display(body)
+              concat processed_body
             end
-          else
-            block.call(renderer) if block
           end
           renderer
         end
       )
     end
 
+    def display(body)
+      body
+    end
+    
     def respond_to?(method)
       super or helper.respond_to?(method)
     end

data/spec/helpers/block_helpers_spec.rb

@@ -120,7 +120,7 @@ describe TestHelperModule do
     end
   end
   
-  describe "accesibility" do
+  describe "accessibility" do
     def run_erb
       eval_erb(%(
         <% compat_helper do |r| %>
@@ -225,4 +225,93 @@ describe TestHelperModule do
     end
   end
   
+  describe "inheritance" do
+    
+    before(:each) do
+      module TestHelperModule
+        remove_const(:ParentTestHelper) if defined?(ParentTestHelper)
+        remove_const(:ChildTestHelper) if defined?(ChildTestHelper)
+        class ParentTestHelper < BlockHelpers::Base
+          def hello
+            "hello"
+          end
+        end
+        class ChildTestHelper < ParentTestHelper
+        end
+      end
+    end
+    
+    it "should inherit normal methods" do
+      eval_erb(%(
+        <% child_test_helper do |r| %>
+          <%= r.hello %>
+        <% end %>
+      )).should match_html("hello")
+    end
+    
+    it "should inherit the 'display' method" do
+      TestHelperModule::ParentTestHelper.class_eval do
+        def display(body)
+          "before...#{body}...after"
+        end
+      end
+      eval_erb(%(
+        <% child_test_helper do %>
+          hello
+        <% end %>
+      )).should match_html("before... hello ...after")
+    end
+    
+  end
+  
+  describe "when display returns 'nil'" do
+    it "should output nothing" do
+      module TestHelperModule
+        remove_const(:NilHelper) if defined?(NilHelper)
+        class NilHelper < BlockHelpers::Base
+          def display(body)
+          end
+        end
+      end
+      eval_erb(%(
+        <% nil_helper do %>
+          hello
+        <% end %>
+      )).should match_html("")
+    end
+  end
+  
+  describe "nested block helpers" do
+    it "should define a nested block helper method" do
+      module TestHelperModule
+        class OuterHelper < BlockHelpers::Base
+          
+          def egg
+            'bad egg'
+          end
+          
+          def display(body)
+            "Outer #{body}"
+          end
+          
+          class InnerHelper < BlockHelpers::Base
+            def egg
+              'EGG'
+            end
+            def display(body)
+              "Inner #{body}"
+            end
+          end
+        end
+      end
+      eval_erb(%(
+        <% outer_helper do |o| %>
+          <% o.inner_helper do |i| %>
+            <%= i.egg %>
+          <% end %>
+        <% end %>
+      )).should match_html("Outer Inner EGG")
+    end
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: block_helpers
 version: !ruby/object:Gem::Version 
-  version: 0.2.11
+  version: 0.3.0
 platform: ruby
 authors: 
 - Mark Evans
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-28 00:00:00 +01:00
+date: 2009-10-12 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -69,7 +69,7 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: An extension to ActionView for adding block helpers to views
 test_files: 
 - spec/for_spec_rails/application.rb