template-inheritance 0.2 → 0.3

data/README.textile

@@ -13,6 +13,16 @@ template = TemplateInheritance::Template.new("site/post.html.haml")
 template.render(post: post)
 </pre>
 
+h2. In Padrino
+
+<pre>
+require "template-inheritance/adapters/padrino"
+
+class Foo &amp; Padrino::Application
+  register TemplateInheritance::Rendering
+end
+</pre>
+
 h1. Haml Extensions
 
 <pre>

data/lib/template-inheritance/adapters/padrino.rb

@@ -0,0 +1,41 @@
+# encoding: utf-8
+
+require "template-inheritance"
+require "padrino-core/application/rendering"
+
+# TODO: It'd be nice to share the logger.
+module TemplateInheritance
+  class Template
+    attr_accessor :padrino_views_directory
+  end
+
+  module TemplateHelpers
+    alias_method :_normalize_template_path, :normalize_template_path
+    def normalize_template_path(path)
+      full_path = File.join(template.padrino_views_directory, path)
+      _normalize_template_path(full_path)
+    end
+  end
+end
+
+module TemplateInheritance::Rendering
+  def self.registered(app)
+    app.helpers(self)
+    app.register(Padrino::Rendering)
+  end
+
+  # TODO: support options for Haml.
+  # NOTE: block does nothing.
+  # FIXME: locals doesn't work because we don't get them from Padrino.
+  include Module.new {
+    def render(_, path, options, locals, &block)
+      base_dir = options[:views] || settings.views || "./views"
+      fullpath = File.join(base_dir, path.to_s)
+      template = TemplateInheritance::Template.new(fullpath, self)
+      template.padrino_views_directory = base_dir
+      options && options.delete(:layout_engine)
+      options && options.delete(:layout)
+      template.render(locals)
+    end
+  }
+end

data/lib/template-inheritance/helpers.rb

@@ -1,8 +1,6 @@
 # encoding: utf-8
 
 module TemplateInheritance
-  SubtemplateNotFound = Class.new(StandardError)
-
   module TemplateHelpers
     def self.extended(scope)
       class << scope
@@ -103,8 +101,6 @@ module TemplateInheritance
       template = TemplateInheritance::Template.new(full_path, self) # self is scope
       self.template = original_template
       return template.render(context)
-    rescue TemplateInheritance::TemplateNotFound.new(path)
-      raise SubtemplateNotFound, "Template #{path} doesn't exist in #{full_path}"
     end
 
     # partial "products/list"

data/lib/template-inheritance.rb

@@ -88,7 +88,7 @@ module TemplateInheritance
 
     # @since 0.0.2
     def render(context = Hash.new)
-      raise TemplateNotFound.new("Template #{self.path} wasn't found in these paths: #{self.class.paths.inspect}") if self.fullpath.nil?
+      raise TemplateNotFound.new(self.path) if self.fullpath.nil?
       TemplateInheritance.logger.info("Rendering template #{self.path} with context keys #{context.keys.inspect}")
       self.scope.context = self.context = context # so we can access context in the scope object as well
       value = self.template.render(self.scope, context)

data/template-inheritance.gemspec

@@ -5,7 +5,7 @@ require "base64"
 
 Gem::Specification.new do |s|
   s.name = "template-inheritance"
-  s.version = "0.2"
+  s.version = "0.3"
   s.authors = ["Jakub Šťastný aka Botanicus"]
   s.homepage = "http://github.com/botanicus/template-inheritance"
   s.summary = ""

metadata

@@ -2,14 +2,14 @@
 name: template-inheritance
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: "0.2"
+  version: "0.3"
 platform: ruby
 authors: 
 - "Jakub \xC5\xA0\xC5\xA5astn\xC3\xBD aka Botanicus"
 autorequire: 
 bindir: bin
 cert_chain: 
-date: 2011-03-17 00:00:00 +00:00
+date: 2011-05-19 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,6 +52,7 @@ files:
 - example/site/base.html.haml
 - example/site/post.html.haml
 - lib/template-inheritance.rb
+- lib/template-inheritance/adapters/padrino.rb
 - lib/template-inheritance/exts/haml.rb
 - lib/template-inheritance/exts/tilt.rb
 - lib/template-inheritance/helpers.rb