tadpole 0.1.2 → 0.1.3

data/lib/tadpole.rb

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

data/lib/tadpole/main.rb

@@ -33,21 +33,24 @@ module Tadpole
     end
     
     def template(*path)
+      path = absolutize_path(*path)
+      exists = find_matching_template_paths(path)
+      raise ArgumentError, "no such template `#{path}'" if exists.empty?
+
+      create_template(*path)
+    end
+    
+    def create_template(*path)
       path = absolutize_path(*path)
       name = template_mod_name(path)
 
       remove_const(name) unless caching rescue NameError
       return const_get(name) rescue NameError
-      
-      exists = find_matching_template_paths(path)
-      if exists.empty?
-        raise ArgumentError, "no such template `#{path}'"
-      end
-      
-      mod = create_template(path)
+
+      mod = create_template_mod(path)
       const_set(name, mod) 
     end
-    
+
     private
 
     def absolutize_path(*path)
@@ -57,39 +60,45 @@ module Tadpole
       File.expand_path(File.join(path))[(Dir.pwd.length+1)..-1]
     end
     
-    def create_template(path)
-      mod = Module.new
-      mod.send(:include, Template)
-      mod.path = path
-      mod.template_paths = []
+    def add_template_filters(mod)
       mod.before_run_filters = LocalTemplate.before_run_filters.dup
       mod.before_section_filters = LocalTemplate.before_section_filters.dup
-      
+    end
+    
+    def add_inherited_templates(mod, path)
       inherited = []
       path.split(File::SEPARATOR).inject([]) do |list, el|
         list << el
         total_list = File.join(list)
         find_matching_template_paths(total_list).each do |subpath|
-          submod = create_template_mod(subpath, total_list)
+          submod = create_local_template_mod(subpath, total_list)
           mod.send :include, submod
-          #if total_list == path
-            mod.template_paths.unshift(*submod.template_paths)
-            mod.before_run_filters.push(*submod.before_run_filters)
-            mod.before_section_filters.push(*submod.before_section_filters)
-            inherited.push(*submod.inherited_paths)
-            #mod.sections = submod.sections
-          #end
+          mod.template_paths.unshift(*submod.template_paths)
+          mod.before_run_filters.push(*submod.before_run_filters)
+          mod.before_section_filters.push(*submod.before_section_filters)
+          inherited.push(*submod.inherited_paths)
         end
         list
       end
       
       mod.template_paths.push(*inherited)
       mod.template_paths.uniq!
+    end
+    
+    def create_template_mod(path)
+      mod = Module.new
+      mod.send(:include, Template)
+      mod.path = path
+      mod.template_paths = []
+
+      add_template_filters(mod)
+      add_inherited_templates(mod, path)
+
       mod
     end
     
-    def create_template_mod(full_path, path)
-      name = 'Local'+template_mod_name(full_path)
+    def create_local_template_mod(full_path, path)
+      name = 'Local' + template_mod_name(full_path)
       
       remove_const(name) unless caching rescue NameError
       return const_get(name) rescue NameError 

data/spec/basic_spec.rb

@@ -9,6 +9,37 @@ describe Tadpole do
     Tadpole.should_receive(:template).with(:x, :y, :z)
     Tadpole(:x, :y, :z) 
   end
+  
+  describe '.create_template' do
+    it "should create a template that does not exist on disk" do
+      template = Tadpole.create_template('x/y/z')
+      template.ancestors.should include(Tadpole::Template)
+      template.path.should == 'x/y/z'
+    end
+    
+    it "should inherit templates with same path" do
+      module Tadpole::LocalTemplate_x_y; end
+      File.should_receive(:directory?).with('./x').and_return(true)
+      File.should_receive(:directory?).with('./x/y').and_return(false)
+      Tadpole.register_template_path '.'
+      template = Tadpole.create_template('x/y')
+      template.ancestors.should_not include(Tadpole::LocalTemplate_x_y)
+      template.ancestors.should include(Tadpole::LocalTemplate_x)
+    end
+    
+    it "should allow sections to be set programmatically" do
+      mod = Tadpole.create_template('mine')
+      template = mod.new
+      template.class.should == Tadpole::Template_mine
+      class << template
+        def a; 'a' end
+        def b; 'b' end
+        def c; 'c' end
+      end
+      template.sections :a, :b, :c
+      template.run.should == 'abc'
+    end
+  end
 
   describe '.template' do
     it "should raise ArgumentError if path does not exist in template_paths" do
@@ -51,8 +82,17 @@ describe Tadpole::Template do
   end
 
   it "should act as a class (have a .new, #inspect, etc.)" do
-    Tadpole(:default, :html).should respond_to(:new)
-    Tadpole::Template.should === Tadpole(:default, :html).new
+    File.should_receive(:directory?).with('./default/html').and_return(true)
+    mod = Tadpole(:default, :html)
+    mod.should respond_to(:new)
+    template = mod.new
+    Tadpole::Template.should === template
+    template.inspect.should =~ /#<Template:(\S+) path='default\/html' sections=nil>/
+    template.class.should == Tadpole::Template_default_html
+  end
+  
+  it "should create two template modules for the same template in separate template paths" do
+    
   end
 
   it "should #run with Symbol sections as methods" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tadpole
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Loren Segal