tadpole 0.1.1 → 0.1.2

data/lib/tadpole/providers/erb.rb

@@ -9,7 +9,7 @@ module Tadpole
         super
 
         erb = ERB.new(content, nil, '<>')
-        instance_eval(<<-eof, full_path, -4)
+        instance_eval(<<-eof, full_path, -2)
           def render(locals = nil, &block)
             if locals
               opts = owner.options

data/lib/tadpole/providers/section_provider.rb

@@ -11,7 +11,7 @@ module Tadpole
     end
     
     class SectionProvider
-      attr_accessor :owner, :content
+      attr_accessor :owner, :content, :full_path
       
       EXTENSIONS = []
       
@@ -42,6 +42,7 @@ module Tadpole
       end
         
       def initialize(full_path, owner = nil)
+        self.full_path = full_path
         self.owner = owner
         self.content = File.read(full_path)
       end

data/lib/tadpole/providers/template.rb

@@ -7,6 +7,7 @@ module Tadpole
       
       def initialize(full_path, owner)
         self.owner = owner
+        self.full_path = full_path
         Tadpole.template_paths.each do |template_path|
           if full_path.index(template_path) == 0
             path = full_path[template_path.length..-1]

data/lib/tadpole/template.rb

@@ -123,14 +123,19 @@ module Tadpole
       self.options = old_opts
       out
     rescue => e
-      me = NoMethodError.new("In #{self.inspect}: #{e.message}")
-      me.set_backtrace(e.backtrace)
+      provider = find_section_provider(current_section)
+      line = provider.full_path
+      line += " (template)" if provider.is_a?(SectionProviders::TemplateProvider)
+      line += ":1:in#{@compiled_sections ? ' compiled' : ''} section `#{current_section}'"
+      me = NoMethodError.new(e.message)
+      me.set_backtrace([line] + e.backtrace)
       raise me
     end
     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)

data/lib/tadpole.rb

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

metadata

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