tadpole 0.1.6 → 0.1.7

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008 Loren Segal
+Copyright (c) 2008, 2009 Loren Segal
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

data/README.markdown

@@ -1,7 +1,7 @@
 Tadpole: A Small but Extensible Templating Engine for Ruby
 ==========================================================
 
-_Created by [Loren Segal](http://www.gnuu.org) in 2008_
+_Created by [Loren Segal](http://www.gnuu.org) in 2008-2009_
 
 Quick How-To's
 --------------

data/lib/tadpole.rb

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

data/lib/tadpole/template.rb

@@ -103,10 +103,7 @@ module Tadpole
     def initialize(opts = {}, &block)
       self.options = opts
       @providers = {}
-      #self.sections(*sections)
       
-      init(&block)
-
       if Tadpole.caching
         @compiled_sections = compile_sections(sections) 
       end
@@ -116,14 +113,18 @@ module Tadpole
 
     def run(opts = {}, &block)
       return '' if run_before_run.is_a?(FalseClass)
-      
-      old_opts = options
-      self.options = options.to_hash.update(opts)
-      out = run_sections(@compiled_sections || sections, &block)
-      self.options = old_opts
-      out
+
+      with_options(opts) do
+        init
+        run_sections(@compiled_sections || sections, &block)
+      end
     rescue => e
-      provider = find_section_provider(current_section)
+      begin
+        provider = find_section_provider(current_section)
+      rescue ArgumentError
+        raise e
+      end
+      
       line = provider.full_path
       line += " (template)" if provider.is_a?(SectionProviders::TemplateProvider)
       line += ":1:in#{@compiled_sections ? ' compiled' : ''} section `#{current_section}'"
@@ -134,27 +135,29 @@ module Tadpole
     alias to_s run
     
     def run_sections(sects, break_first = false, locals = {}, &block)
-      out = ''
-      raise ArgumentError, "Template(#{path}) is missing sections" unless sects
-      sects = sects.first if sects.first.is_a?(Array)
-      sects.each_with_index do |section, i|
-        (break_first ? break : next) if section.is_a?(Array)
-        
-        self.current_section = section_name(section)
-        
-        next if run_before_sections.is_a?(FalseClass)
+      with_options(locals) do
+        out = ''
+        raise ArgumentError, "Template(#{path}) is missing sections" unless sects
+        sects = sects.first if sects.first.is_a?(Array)
+        sects.each_with_index do |section, i|
+          (break_first ? break : next) if section.is_a?(Array)
+      
+          self.current_section = section_name(section)
+      
+          next if run_before_sections.is_a?(FalseClass)
 
-        if sects[i+1].is_a?(Array)
-          old, self.subsections = subsections, sects[i+1]
-          out += run_subsections(section, sects[i+1], locals, &block)
-          self.subsections = old
-        else
-          out += render(section, locals, true, &block)
+          if sects[i+1].is_a?(Array)
+            old, self.subsections = subsections, sects[i+1]
+            out += run_subsections(section, sects[i+1], &block)
+            self.subsections = old
+          else
+            out += render(section, {}, true, &block)
+          end
+      
+          break if break_first
         end
-        
-        break if break_first
+        out
       end
-      out
     end
     
     def run_subsections(section, subsections, locals = {}, &block)
@@ -189,21 +192,23 @@ module Tadpole
     end
     
     def render(section, locals = {}, call_method = false, &block)
-      case section
-      when String, Symbol
-        if call_method && respond_to?(section) 
-          send(section, &block)
+      with_options(locals) do
+        case section
+        when String, Symbol
+          if call_method && respond_to?(section) 
+            send(section, &block)
+          else
+            find_section_provider(section).render(options, &block)
+          end
+        when Template
+          section.run(options, &block)
+        when Module
+          section.new(options).run(&block)
+        when SectionProviders::SectionProvider
+          section.render(options, &block)
         else
-          find_section_provider(section).render(locals, &block)
+          raise MissingSectionError, "missing section #{section.inspect}"
         end
-      when Template
-        section.run(locals, &block)
-      when Module
-        section.new(options).run(locals, &block)
-      when SectionProviders::SectionProvider
-        section.render(locals, &block)
-      else
-        raise MissingSectionError, "missing section #{section.inspect}"
       end
     end
 
@@ -233,6 +238,14 @@ module Tadpole
         [nil, {}]
       end
     end
+    
+    def with_options(locals = {}, &block)
+      old_options = options
+      self.options = options.to_hash.merge(locals)
+      result = yield
+      self.options = old_options
+      result
+    end
 
     def find_section_provider(section)
       section = section.to_s

data/spec/examples/yield/1/setup.rb

@@ -0,0 +1,21 @@
+def init
+  sections :a, [:b, [:c, :d]]
+end
+
+def a
+  '[' + yield(:foo => 'FOO') + ']'
+end
+
+def b
+  foo + yieldall(:foo => 'BAR', :bar => 'BAR')
+end
+
+def c
+  foo
+end
+
+def d
+  bar
+end
+
+# expected [FOOBARBAR]

data/spec/examples/yield/2/2_1/b.erb

@@ -0,0 +1 @@
+<%= foo %><%= yieldall %>

data/spec/examples/yield/2/2_1/setup.rb

@@ -0,0 +1,3 @@
+def init
+  sections :b, ['2_2']
+end

data/spec/examples/yield/2/2_2/c.erb

@@ -0,0 +1 @@
+<%= foo || "FOO" %>

data/spec/examples/yield/2/2_2/setup.rb

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

data/spec/examples/yield/2/a.erb

@@ -0,0 +1 @@
+<%= yieldall :foo => 'BAR' %>

data/spec/examples/yield/2/setup.rb

@@ -0,0 +1,3 @@
+def init
+  sections :a, ['2_1']
+end

data/spec/yield_spec.rb

@@ -0,0 +1,16 @@
+require File.join(File.dirname(__FILE__), '..', 'lib', 'tadpole')
+
+describe Tadpole, '::Template' do
+  before do
+    Tadpole.template_paths.clear
+    Tadpole.register_template_path File.dirname(__FILE__) + '/examples' 
+  end
+  
+  it "should yield to a method with extra values" do
+    Template('yield/1').new.run.should == '[FOOBARBAR]'
+  end
+  
+  it "should yield to external template with extra values" do
+    Template('yield/2').new(:foo => 'FOO').run.should == 'BARBAR'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tadpole
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors: 
 - Loren Segal
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-20 00:00:00 -04:00
+date: 2009-08-14 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -63,9 +63,17 @@ files:
 - spec/examples/T/derived2/test/setup.rb
 - spec/examples/T/setup.rb
 - spec/examples/T/test/setup.rb
+- spec/examples/yield/1/setup.rb
+- spec/examples/yield/2/2_1/b.erb
+- spec/examples/yield/2/2_1/setup.rb
+- spec/examples/yield/2/2_2/c.erb
+- spec/examples/yield/2/2_2/setup.rb
+- spec/examples/yield/2/a.erb
+- spec/examples/yield/2/setup.rb
 - spec/filters_spec.rb
 - spec/local_template_spec.rb
 - spec/render_spec.rb
+- spec/yield_spec.rb
 - benchmarks/eval-vs-non-eval.rb
 - benchmarks/require-vs-none.rb
 - benchmarks/run-caching.rb