templette 0.5.1 → 0.5.2

data/lib/templette/data_accessors.rb

@@ -19,14 +19,22 @@ module Templette
     end
     
     def partial(filename) # :nodoc:
-      raise PageError.new(page, "Rendering #{filename} failed.  File not found.") unless File.exists?(filename)
-      Engineer.engine_for(Engineer.determine_type(filename)).render(File.read(filename), page._binding)
+      raise PageError.new(page, "Rendering #{partial_path(filename)} failed.  File not found.") unless File.exists?(partial_path(filename))
+      Engineer.engine_for(Engineer.determine_type(filename)).render(File.read(partial_path(filename)), page._binding)
     rescue RenderError => e
       raise PageError.new(page, e.message)      
     end
     
     private
     
+      def partial_path(filename)
+        if filename =~ Regexp.new(Page::pages_dir)
+          filename
+        else
+          Page::pages_dir + filename
+        end
+      end
+    
       def generate_accessor(k, v)
         raise TempletteError.new(page, "Method already defined: #{k}.  Change your config file and stop using it!") if self.methods.include?(k.to_s)
         if v.kind_of?(Hash)

data/lib/templette/engines/haml.rb

@@ -5,9 +5,21 @@ module Templette
     class Haml
     
       def render(html, the_binding)
-        ::Haml::Engine.new(html).render(the_binding)
+        with_no_warnings { ::Haml::Engine.new(html).render(the_binding) }
       end
-    
+      
+      
+      def with_no_warnings
+        save = $-w
+        $-w = false
+
+        begin
+          yield
+        ensure
+          $-w = save
+        end
+      end
+      
     end
   end
 end

data/lib/templette/page.rb

@@ -24,9 +24,11 @@ module Templette
     include Templette::DataAccessors
     attr_reader :name, :template
     
+    PAGES_DEFAULT = 'pages/'
+    
     class <<self
       def pages_dir
-        @@pages_dir ||= 'pages'
+        @@pages_dir ||= PAGES_DEFAULT
       end
       
       def pages_dir=(path)
@@ -36,7 +38,7 @@ module Templette
       # Grabs all of the yaml files found in /pages, and loads them as
       # Page objects.
       def find_all
-        Dir["#{pages_dir}/**/*.yml"].map {|f| new f }
+        Dir["#{pages_dir}**/*.yml"].map {|f| new f }
       end
     end
   
@@ -45,7 +47,7 @@ module Templette
 
       data = YAML::load_file(page_config)
       @name = page_config.dup
-      @name.slice!(self.class.pages_dir + '/')
+      @name.slice!(self.class.pages_dir)
       @name.chomp!('.yml')
       raise PageError.new(self, "missing required section \"template_name\" for page config #{page_config}") unless data['template_name']
       @template = Template.new(data['template_name'])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: templette
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors: 
 - Jacob Dunphy and Steve Holder
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-27 00:00:00 -08:00
+date: 2009-03-05 00:00:00 -08:00
 default_executable: templette
 dependencies: []