tadpole 0.1.3 → 0.1.4

data/lib/tadpole/local_template.rb

@@ -12,7 +12,7 @@ module Tadpole
           include mod
           before_run_filters.push(*mod.before_run_filters)
           before_section_filters.push(*mod.before_section_filters)
-          inherited_paths.push(*mod.template_paths)
+          inherited_paths.unshift(*mod.template_paths)
         end
       end
     end
@@ -24,7 +24,18 @@ module Tadpole
     
     def T(extra_path, extra_opts = {})
       opts = options.to_hash.update(extra_opts)
-      Template(path, extra_path).new(opts)
+      dirname = File.dirname(caller.first[/^(.+?):/, 1])
+      begin
+        Template(path, extra_path).new(opts)
+      rescue MissingTemplateError => e
+        Tadpole.template_paths.each do |template_path|
+          if dirname.index(template_path) == 0
+            path = dirname[template_path.length..-1]
+            return Template(path, extra_path).new(opts)
+          end
+        end
+        raise e
+      end
     end
     
     included(self)

data/lib/tadpole/main.rb

@@ -19,6 +19,8 @@ class Insertion
 end
 
 module Tadpole
+  class MissingTemplateError < ArgumentError; end
+  
   class << self
     attr_accessor :caching
     
@@ -35,7 +37,7 @@ module Tadpole
     def template(*path)
       path = absolutize_path(*path)
       exists = find_matching_template_paths(path)
-      raise ArgumentError, "no such template `#{path}'" if exists.empty?
+      raise MissingTemplateError, "no such template `#{path}'" if exists.empty?
 
       create_template(*path)
     end
@@ -73,15 +75,17 @@ module Tadpole
         find_matching_template_paths(total_list).each do |subpath|
           submod = create_local_template_mod(subpath, total_list)
           mod.send :include, submod
+
+          inherited = submod.inherited_paths
+          inherited.reject! {|path| mod.template_paths.include?(path) }
+          mod.template_paths.unshift(*inherited)
           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
     
@@ -122,7 +126,7 @@ module Tadpole
     def load_setup_rb(full_path, mod)
       setup_file = File.join(full_path, 'setup.rb')
       if File.file? setup_file
-        mod.module_eval(File.read(setup_file).taint, setup_file)
+        mod.module_eval(File.read(setup_file).taint, setup_file, 1)
       end
       mod
     end

data/lib/tadpole/providers/erb.rb

@@ -9,13 +9,13 @@ module Tadpole
         super
 
         erb = ERB.new(content, nil, '<>')
-        instance_eval(<<-eof, full_path, -2)
+        instance_eval(<<-eof, full_path, 1)
           def render(locals = nil, &block)
             if locals
               opts = owner.options
               owner.options = owner.options.to_hash.update(locals)
             end
-            out = owner.instance_eval #{erb.src.inspect}
+            out = owner.instance_eval(#{erb.src.inspect}, __FILE__, __LINE__)
             owner.options = opts if locals
             out
           end

data/lib/tadpole/providers/section_provider.rb

@@ -21,7 +21,7 @@ module Tadpole
       # extensions.
       # 
       # @return [String, nil] The full pathname
-      def self.provides?(basename) 
+      def self.provides?(object, basename) 
         self.const_get("EXTENSIONS").any? do |ext|
           path = basename + ext
           return path if path_suitable?(path) 

data/lib/tadpole/template.rb

@@ -242,13 +242,13 @@ module Tadpole
       filename, provider = nil, nil
       template_paths.each do |template_path|
         SectionProviders.providers.each do |prov|
-          filename = prov.provides?(File.join(template_path, section))
+          filename = prov.provides?(self, File.join(template_path, section))
           break provider = prov if filename
         end
         break if provider && filename
       end
       
-      raise ArgumentError, "missing section `#{section}'" if !provider 
+      raise ArgumentError, "Template(#{path}) is missing section `#{section}'" if !provider 
       @providers[section] = provider.new(filename, self)
     end
     
@@ -264,7 +264,7 @@ module Tadpole
       if file = find_template(filename)
         File.read(file)
       else
-        raise ArgumentError, "missing template file `#{filename}' in #{self.inspect}"
+        raise ArgumentError, "Template(#{path}) is missing template file `#{filename}'"
       end
     end
   end

data/lib/tadpole.rb

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

data/spec/erb_spec.rb

@@ -0,0 +1,18 @@
+require File.join(File.dirname(__FILE__), '..', 'lib', 'tadpole')
+
+describe Tadpole::SectionProviders::ERBProvider do
+  before do
+    Tadpole.template_paths.clear
+    Tadpole.register_template_path(File.dirname(__FILE__) + '/examples')
+  end
+
+  describe '#render' do
+    it "should setup locals through run" do
+      Tadpole('erb').run(:a_variable => 1).should == '1'
+    end
+    
+    it "should setup locals through #render" do
+      Tadpole('erb2').run.should == '2'
+    end
+  end
+end

data/spec/examples/T/derived/setup.rb

@@ -0,0 +1,3 @@
+def init
+  super
+end

data/spec/examples/T/derived2/setup.rb

@@ -0,0 +1,3 @@
+def init
+  super
+end

data/spec/examples/T/derived2/test/setup.rb

@@ -0,0 +1,5 @@
+def init
+  sections :a
+end
+
+def a; 'notinfo' end

data/spec/examples/T/setup.rb

@@ -0,0 +1,3 @@
+def init
+  sections T(:test, :extra => 'info')
+end

data/spec/examples/T/test/setup.rb

@@ -0,0 +1,5 @@
+def init
+  sections :a
+end
+
+def a; extra end

data/spec/examples/erb/a.erb

@@ -0,0 +1 @@
+<%= a_variable %>

data/spec/examples/erb/setup.rb

@@ -0,0 +1,3 @@
+def init
+  sections :a
+end

data/spec/examples/erb2/_a.erb

@@ -0,0 +1 @@
+<%= a_variable %>

data/spec/examples/erb2/setup.rb

@@ -0,0 +1,7 @@
+def init
+  sections :a
+end
+
+def a
+  render('_a', :a_variable => 2)
+end

data/spec/examples/inherits/inherits_a/setup.rb

@@ -0,0 +1,7 @@
+def init
+  super
+  sections :a, :b
+end
+
+def a; "a" end
+def b; "b" end

data/spec/examples/inherits/inherits_b/inherits_c/setup.rb

@@ -0,0 +1,6 @@
+def init
+  super
+  sections.push :d
+end
+
+def d; "d" end

data/spec/examples/inherits/inherits_b/setup.rb

@@ -0,0 +1,8 @@
+inherits '../inherits_a'
+
+def init
+  super
+  sections.push :c
+end
+
+def c; "c" end

data/spec/examples/inherits/inherits_d/setup.rb

@@ -0,0 +1 @@
+inherits '/inherits/inherits_a'

data/spec/examples/inherits/inherits_e/setup.rb

@@ -0,0 +1,2 @@
+inherits '../inherits_a'
+inherits '../inherits_b'

data/spec/local_template_spec.rb

@@ -0,0 +1,48 @@
+require File.join(File.dirname(__FILE__), '..', 'lib', 'tadpole')
+
+describe Tadpole::LocalTemplate do
+  before do
+    Tadpole.template_paths.clear
+    Tadpole.register_template_path(File.dirname(__FILE__) + '/examples')
+  end
+  
+  describe '.inherits' do
+    it "should inherit from a relative path" do
+      Tadpole('inherits/inherits_b').run.should == "abc"
+    end
+    
+    it "should automatically inherit parent directories" do
+      Tadpole('inherits/inherits_b/inherits_c').run.should == "abcd"
+    end
+    
+    it "should inherit absolute paths from top of registered template paths" do
+      Tadpole('inherits/inherits_d').run.should == "ab"
+    end
+    
+    it "should order template_paths properly" do
+      paths = Tadpole('inherits/inherits_b/inherits_c').template_paths
+      paths.map! {|p| p.gsub(Tadpole.template_paths.first + '/', '') }
+      paths.should == ["inherits/inherits_b/inherits_c", "inherits/inherits_b", "inherits/inherits_a", "inherits"]
+    end
+    
+    it "should accept multiple inheritances" do
+      paths = Tadpole('inherits/inherits_e').template_paths
+      paths.map! {|p| p.gsub(Tadpole.template_paths.first + '/', '') }
+      paths.should == ["inherits/inherits_e", "inherits/inherits_b", "inherits/inherits_a", "inherits"]
+    end
+  end
+  
+  describe '.T' do
+    it "should refer to a template" do
+      Tadpole('T').run.should == 'info'
+    end
+    
+    it "should refer to the same template path even in a subclass" do
+      Tadpole('T/derived').run.should == 'info'
+    end
+    
+    it "should refer to the subclassed path if the section exists in the subclass" do
+      Tadpole('T/derived2').run.should == 'notinfo'
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tadpole
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Loren Segal
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-10 00:00:00 -04:00
+date: 2009-07-12 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -35,9 +35,19 @@ files:
 - lib/tadpole.rb
 - spec/array_spec.rb
 - spec/basic_spec.rb
+- spec/erb_spec.rb
+- spec/examples/erb/a.erb
+- spec/examples/erb/setup.rb
+- spec/examples/erb2/_a.erb
+- spec/examples/erb2/setup.rb
 - spec/examples/filters/a.txt
 - spec/examples/filters/b.txt
 - spec/examples/filters/setup.rb
+- spec/examples/inherits/inherits_a/setup.rb
+- spec/examples/inherits/inherits_b/inherits_c/setup.rb
+- spec/examples/inherits/inherits_b/setup.rb
+- spec/examples/inherits/inherits_d/setup.rb
+- spec/examples/inherits/inherits_e/setup.rb
 - spec/examples/render/1/a.txt
 - spec/examples/render/1/b.txt
 - spec/examples/render/1/d.erb
@@ -48,7 +58,13 @@ files:
 - spec/examples/render/4/setup.rb
 - spec/examples/render/5/setup.rb
 - spec/examples/render/6/setup.rb
+- spec/examples/T/derived/setup.rb
+- spec/examples/T/derived2/setup.rb
+- spec/examples/T/derived2/test/setup.rb
+- spec/examples/T/setup.rb
+- spec/examples/T/test/setup.rb
 - spec/filters_spec.rb
+- spec/local_template_spec.rb
 - spec/render_spec.rb
 - benchmarks/eval-vs-non-eval.rb
 - benchmarks/require-vs-none.rb