tadpole 0.1.0 → 0.1.1

data/README.markdown

@@ -68,7 +68,7 @@ And to run this file all we need to do is:
     # Running our template will now add our 'header' file to the output
     Tadpole('mytemplate').run
     
-### Heirarchical Sections
+### Hierarchical Sections
 
 Sometimes you may need to encapsulate the output of some sections inside another one. An HTML
 template, for example, will usually contain the page body inside the body tag of a more general

data/lib/tadpole/filters.rb

@@ -1,7 +1,8 @@
 module Tadpole
   module Filters
     module ClassMethods
-      def before_section(*args)
+      def before_section(*args, &block)
+        args.push(block) if block
         if args.size == 1
           before_section_filters.push [nil, args.first] 
         elsif args.size == 2
@@ -10,13 +11,14 @@ module Tadpole
           raise ArgumentError, "before_section takes a section followed by a Proc/lambda or Symbol referencing the method name"
         end
       end
+      alias before before_section
       
       def before_section_filters
         @before_section_filters ||= []
       end
       
-      def before_run(meth)
-        before_run_filters.push(meth)
+      def before_run(meth = nil, &block)
+        before_run_filters.push(meth ? meth : block)
       end
       
       def before_run_filters

data/lib/tadpole/main.rb

@@ -5,10 +5,13 @@ end
 class Insertion
   def initialize(list, value) @list, @value = list, value end
   def before(val) insertion(val, 0) end
-  def after(val) insertion(val, 1) end
+  def after(val, ignore_subsections = true) insertion(val, 1, ignore_subsections) end
   private
-  def insertion(val, rel) 
+  def insertion(val, rel, ignore_subsections = true) 
     if index = @list.index(val)
+      if ignore_subsections && rel == 1 && @list[index + 1].is_a?(Array)
+        rel += 1
+      end
       @list[index+rel,0] = @value 
     end
     @list

data/lib/tadpole/template.rb

@@ -7,6 +7,14 @@ class OpenHashStruct < OpenStruct
   alias has_key? respond_to?
 end
 
+if RUBY_VERSION < "1.9"
+  class Hash
+    def key(value)
+      each {|k, v| return k if v == value }
+    end
+  end
+end
+
 module Tadpole
   module Template
     class MissingSectionError < Exception; end
@@ -204,7 +212,7 @@ module Tadpole
     def section_name(section)
       case section
       when SectionProviders::SectionProvider
-        @providers.index(section) || section
+        @providers.key(section) || section
       else
         section.respond_to?(:path) ? section.path : section
       end.to_s

data/lib/tadpole.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 
 module Tadpole
-  Version = '0.1.0'
+  Version = '0.1.1'
   Root = File.dirname(__FILE__) 
   
   module SectionProviders

data/spec/array_spec.rb

@@ -0,0 +1,33 @@
+require File.join(File.dirname(__FILE__), '..', 'lib', 'tadpole')
+
+describe Array do
+  describe '#place' do
+    it "should create an Insertion object" do
+      [].place('x').should be_kind_of(Insertion)
+    end
+  end
+end
+
+describe Insertion do
+  describe '#before' do
+    it "should place an object before another" do
+      [1, 2].place(3).before(2).should == [1, 3, 2]
+      [1, 2].place(3).before(1).should == [3, 1, 2]
+      [1, [4], 2].place(3).before(2).should == [1, [4], 3, 2]
+    end
+  end
+  
+  describe '#after' do
+    it "should place an object after another" do
+      [1, 2].place(3).after(2).should == [1, 2, 3]
+    end
+
+    it "should place an object after another and its subsections" do
+      [1, [2]].place(3).after(1).should == [1, [2], 3]
+    end
+
+    it "should not not ignore subsections if ignore_subections=false" do
+      [1, [2]].place(3).after(1, false).should == [1, 3, [2]]
+    end
+  end
+end

data/spec/basic_spec.rb

@@ -2,59 +2,59 @@ require File.join(File.dirname(__FILE__), '..', 'lib', 'tadpole')
 
 Tadpole.caching = false
 
-describe 'Tadpole' do
+describe Tadpole do
   before { Tadpole.template_paths.clear }
 
   it "should be an alias to Tadpole.template" do
     Tadpole.should_receive(:template).with(:x, :y, :z)
     Tadpole(:x, :y, :z) 
   end
-end
 
-describe Tadpole, '.template' do
-  before { Tadpole.template_paths.clear }
+  describe '.template' do
+    it "should raise ArgumentError if path does not exist in template_paths" do
+      lambda { Tadpole(:x, :y, :z) }.should raise_error(ArgumentError)
+    end
   
-  it "should raise ArgumentError if path does not exist in template_paths" do
-    lambda { Tadpole(:x, :y, :z) }.should raise_error(ArgumentError)
-  end
-  
-  it "should create the module with the path name" do
-    Tadpole.register_template_path ''
-    File.should_receive(:directory?).exactly(3).times.and_return(true)
-    Tadpole('default/html')
-    Tadpole.constants.should include("Template_default_html")
-    Tadpole.constants.should include("LocalTemplate_default_html")
-    Tadpole.constants.should include("LocalTemplate_default")
-  end
+    it "should create the module with the path name" do
+      Tadpole.register_template_path ''
+      File.should_receive(:directory?).exactly(3).times.and_return(true)
+      Tadpole('default/html')
+      symbolized_consts = Tadpole.constants.map {|c| c.to_sym }
+      symbolized_consts.should include(:Template_default_html)
+      symbolized_consts.should include(:LocalTemplate_default_html)
+      symbolized_consts.should include(:LocalTemplate_default)
+    end
   
-  it "should override templates from other template paths" do
-    Tadpole.register_template_path 'a'
-    Tadpole.register_template_path 'b'
-    File.should_receive(:directory?).exactly(6).times.and_return(true)
-    Tadpole(:new, :template)
-    Tadpole.constants.should include("Template_new_template")
-    Tadpole.constants.should include("LocalTemplate_a_new_template")
-    Tadpole.constants.should include("LocalTemplate_a_new")
-    Tadpole.constants.should include("LocalTemplate_b_new_template")
-    Tadpole.constants.should include("LocalTemplate_b_new")
-    Tadpole::Template_new_template.ancestors.should == [Tadpole::Template_new_template, 
-      Tadpole::LocalTemplate_b_new_template, Tadpole::LocalTemplate_a_new_template, 
-      Tadpole::LocalTemplate_b_new, Tadpole::LocalTemplate_a_new, Tadpole::LocalTemplate,
-      Tadpole::Template]
+    it "should override templates from other template paths" do
+      Tadpole.register_template_path 'a'
+      Tadpole.register_template_path 'b'
+      File.should_receive(:directory?).exactly(6).times.and_return(true)
+      Tadpole(:new, :template)
+      symbolized_consts = Tadpole.constants.map {|c| c.to_sym }
+      symbolized_consts.should include(:Template_new_template)
+      symbolized_consts.should include(:LocalTemplate_a_new_template)
+      symbolized_consts.should include(:LocalTemplate_a_new)
+      symbolized_consts.should include(:LocalTemplate_b_new_template)
+      symbolized_consts.should include(:LocalTemplate_b_new)
+      Tadpole::Template_new_template.ancestors.should == [Tadpole::Template_new_template, 
+        Tadpole::LocalTemplate_b_new_template, Tadpole::LocalTemplate_a_new_template, 
+        Tadpole::LocalTemplate_b_new, Tadpole::LocalTemplate_a_new, Tadpole::LocalTemplate,
+        Tadpole::Template]
+    end
   end
 end
 
-describe Tadpole, "::Template" do
-  before { Tadpole.template_paths.clear; Tadpole.register_template_path '.' }
+describe Tadpole::Template do
+  before do
+    Tadpole.template_paths.clear
+    Tadpole.register_template_path '.'
+  end
 
   it "should act as a class (have a .new, #inspect, etc.)" do
-    #File.should_receive(:directory?).and_return(true)
-    #Tadpole.caching = false
     Tadpole(:default, :html).should respond_to(:new)
     Tadpole::Template.should === Tadpole(:default, :html).new
-    #Tadpole.caching = false
   end
-  
+
   it "should #run with Symbol sections as methods" do
     File.should_receive(:directory?).at_least(1).times.and_return(true)
     obj = Tadpole(:x, :q).new
@@ -77,7 +77,7 @@ describe Tadpole, "::Template" do
     qs.should_receive(:run).and_return('Z')
     obj.run.should == 'XYZ'
   end
-  
+
   it "should alias .run as new.run" do
     File.should_receive(:directory?).at_least(1).times.and_return(true)
     obj = mock(:obj)

data/spec/examples/filters/setup.rb

@@ -1,6 +1,9 @@
 before_run :test
+before_run { 2 + 2 }
 before_section :a, :run_a
 before_section :all
+before { 2 + 2 }
+before(:b) { 2 + 2 }
 
 def test; end
 def run_a; end

data/spec/filters_spec.rb

@@ -6,24 +6,6 @@ describe Tadpole::Filters do
     Tadpole.register_template_path File.dirname(__FILE__) + '/examples' 
   end
   
-  it "should call before_run filter" do
-    obj = Template(:filters).new
-    obj.should_receive(:test)
-    obj.run
-  end
-
-  it "should call before_section filter for specific section" do
-    obj = Template(:filters).new
-    obj.should_receive(:run_a).with('a')
-    obj.run
-  end
-
-  it "should call before_section filter for all sections" do
-    obj = Template(:filters).new
-    obj.should_receive(:all).exactly(2).times
-    obj.run
-  end
-  
   it "should allow filters specified directly in LocalTemplate" do
     eval "module Tadpole::LocalTemplate; before_run :xyz end"
     
@@ -34,4 +16,44 @@ describe Tadpole::Filters do
     obj.run
     Tadpole::LocalTemplate.before_run_filters.clear
   end
+  
+  describe '#before_run' do
+    it "should call filter" do
+      Template(:filters).before_run_filters.size.should == 2
+      obj = Template(:filters).new
+      obj.should_receive(:test)
+      obj.run
+    end
+    
+    it "should take a block" do
+      Template(:filters).before_run_filters.last.should be_kind_of(Proc)
+    end
+  end
+  
+  describe '#before_section' do
+    it "should call filter for specific section" do
+      obj = Template(:filters).new
+      obj.should_receive(:run_a).with('a')
+      obj.run
+    end
+
+    it "should call filter for all sections" do
+      obj = Template(:filters).new
+      obj.should_receive(:all).exactly(2).times
+      obj.run
+    end
+  
+    it "should take a block for a specific section" do
+      filter = Template(:filters).before_section_filters[3]
+      filter[0].should == :b
+      filter[1].should be_kind_of(Proc)
+    end
+
+    it "should take a block for a all sections" do
+      filter = Template(:filters).before_section_filters[2]
+      filter[0].should == nil
+      filter[1].should be_kind_of(Proc)
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tadpole
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Loren Segal
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-13 00:00:00 -04:00
+date: 2009-07-09 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -22,11 +22,9 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/tadpole
 - lib/tadpole/filters.rb
 - lib/tadpole/local_template.rb
 - lib/tadpole/main.rb
-- lib/tadpole/providers
 - lib/tadpole/providers/erb.rb
 - lib/tadpole/providers/file.rb
 - lib/tadpole/providers/haml.rb
@@ -35,68 +33,46 @@ files:
 - lib/tadpole/providers/template.rb
 - lib/tadpole/template.rb
 - lib/tadpole.rb
+- spec/array_spec.rb
 - spec/basic_spec.rb
-- spec/examples
-- spec/examples/filters
 - spec/examples/filters/a.txt
 - spec/examples/filters/b.txt
 - spec/examples/filters/setup.rb
-- spec/examples/render
-- spec/examples/render/1
 - spec/examples/render/1/a.txt
 - spec/examples/render/1/b.txt
 - spec/examples/render/1/d.erb
 - spec/examples/render/1/setup.rb
-- spec/examples/render/2
 - spec/examples/render/2/setup.rb
-- spec/examples/render/3
 - spec/examples/render/3/setup.rb
-- spec/examples/render/4
 - spec/examples/render/4/a.erb
 - spec/examples/render/4/setup.rb
-- spec/examples/render/5
 - spec/examples/render/5/setup.rb
-- spec/examples/render/6
 - spec/examples/render/6/setup.rb
 - spec/filters_spec.rb
 - spec/render_spec.rb
 - benchmarks/eval-vs-non-eval.rb
 - benchmarks/require-vs-none.rb
 - benchmarks/run-caching.rb
-- examples/example1
-- examples/example1/custom
-- examples/example1/custom/html
-- examples/example1/custom/html/body
 - examples/example1/custom/html/body/important.html
 - examples/example1/custom/html/body/setup.rb
 - examples/example1/custom/html/setup.rb
-- examples/example1/default
-- examples/example1/default/html
-- examples/example1/default/html/body
 - examples/example1/default/html/body/info.erb
 - examples/example1/default/html/body/setup.rb
 - examples/example1/default/html/main.haml
 - examples/example1/default/html/setup.rb
 - examples/example1/run.rb
-- examples/example2
 - examples/example2/run.rb
-- examples/example2/tadpole
-- examples/example2/tadpole/html
 - examples/example2/tadpole/html/content.haml
 - examples/example2/tadpole/html/main.haml
-- examples/example2/tadpole/html/readme
 - examples/example2/tadpole/html/readme/setup.rb
 - examples/example2/tadpole/html/setup.rb
-- examples/example2/tadpole/markdown
 - examples/example2/tadpole/markdown/copyright.md
 - examples/example2/tadpole/markdown/examples.md
-- examples/example2/tadpole/markdown/quick
 - examples/example2/tadpole/markdown/quick/create.md
 - examples/example2/tadpole/markdown/quick/heirarchical.md
 - examples/example2/tadpole/markdown/quick/override.md
 - examples/example2/tadpole/markdown/quick/quick.erb
 - examples/example2/tadpole/markdown/quick/setup.rb
-- examples/example2/tadpole/markdown/readme
 - examples/example2/tadpole/markdown/readme/readme_notice.txt
 - examples/example2/tadpole/markdown/readme/setup.rb
 - examples/example2/tadpole/markdown/setup.rb
@@ -108,6 +84,8 @@ files:
 - README.markdown
 has_rdoc: false
 homepage: http://www.soen.ca
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -128,9 +106,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: tadpole
-rubygems_version: 1.1.1
+rubygems_version: 1.3.4
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A Small but Extensible Templating Engine for Ruby
 test_files: []