tadpole 0.1.4 → 0.1.5

data/lib/tadpole/filters.rb

@@ -29,8 +29,7 @@ module Tadpole
     module InstanceMethods
       def run_before_run
         self.class.before_run_filters.each do |meth|
-          meth = method(meth) if meth.is_a?(Symbol)
-          result = meth.call 
+          result = call_before_method(meth, false)
           return result if result.is_a?(FalseClass)
         end
       end
@@ -39,14 +38,22 @@ module Tadpole
         self.class.before_section_filters.each do |info|
           result, sec, meth = nil, *info
           if sec.nil? || sec.to_s == current_section.to_s
-            meth = method(meth) if meth.is_a?(Symbol)
-            args = meth.arity == 0 ? [] : [current_section]
-            result = meth.call(*args)
+            result = call_before_method(meth)
           end
 
           return result if result.is_a?(FalseClass)
         end
       end
+      
+      def call_before_method(meth, pass_args = true)
+        if meth.is_a?(Symbol)
+          meth = method(meth)
+          args = meth.arity == 0 ? [] : [current_section]
+          meth.call(*args)
+        else
+          instance_eval(&meth)
+        end
+      end
     end
   end
 end

data/lib/tadpole.rb

@@ -1,5 +1,5 @@
 module Tadpole
-  Version = '0.1.4'
+  Version = '0.1.5'
   Root = File.dirname(__FILE__) 
   
   module SectionProviders

data/spec/filters_spec.rb

@@ -28,6 +28,26 @@ describe Tadpole::Filters do
     it "should take a block" do
       Template(:filters).before_run_filters.last.should be_kind_of(Proc)
     end
+    
+    it "should execute block in instance context" do
+      module Tadpole::LocalTemplate
+        before_run do
+          @xyz = self
+          false
+        end
+      end
+      t = Tadpole.create_template('block_run')
+      module Tadpole::Template_block_run
+        def sections
+          ['x']
+        end
+        def x; "x" end
+      end
+      obj = t.new 
+      obj.run.should == ""
+      obj.instance_variable_get("@xyz").should == obj
+      Tadpole::LocalTemplate.before_run_filters.clear
+    end
   end
   
   describe '#before_section' do
@@ -54,6 +74,26 @@ describe Tadpole::Filters do
       filter[0].should == nil
       filter[1].should be_kind_of(Proc)
     end
+
+    it "should execute block in instance context" do
+      module Tadpole::LocalTemplate
+        before_section(:x) do
+          @xyz = options
+          false
+        end
+      end
+      t = Tadpole.create_template('block_sections')
+      module Tadpole::Template_block_sections
+        def init; sections :x end
+        def x; 'x' end
+      end
+      obj = t.new 
+      obj.run(:foo => 1).should == ""
+      opts = obj.instance_variable_get("@xyz")
+      opts.should be_instance_of(OpenHashStruct)
+      opts.foo.should == 1
+      Tadpole::LocalTemplate.before_run_filters.clear
+    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tadpole
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Loren Segal
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-12 00:00:00 -04:00
+date: 2009-07-15 00:00:00 -04:00
 default_executable: 
 dependencies: []