template-inheritance 0.3 → 0.3.1

data/README.textile

@@ -23,6 +23,8 @@ class Foo & Padrino::Application
 end
 </pre>
 
+Also if you are on Padrino Git HEAD or Padrino 0.9.29, you have to set @SKIP_PADRINO_RENDERING@ to @true@ _before Padrino is loaded_. It's because of a "bug in Padrino":https://github.com/padrino/padrino-framework/issues/541.
+
 h1. Haml Extensions
 
 <pre>

data/lib/template-inheritance.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 
+require "haml"
 require "template-inheritance/exts/tilt"
 require "template-inheritance/helpers"
 
@@ -93,13 +94,7 @@ module TemplateInheritance
       self.scope.context = self.context = context # so we can access context in the scope object as well
       value = self.template.render(self.scope, context)
       TemplateInheritance.logger.debug("Available blocks: #{self.blocks.keys.inspect}")
-      if self.supertemplate
-        TemplateInheritance.logger.debug("Extends call: #{self.supertemplate}")
-        supertemplate = self.class.new(self.supertemplate, self.scope)
-        supertemplate.blocks = self.blocks
-        return supertemplate.render(context)
-      end
-      value
+      self.supertemplate ? render_supertemplate : value
     end
 
     protected
@@ -114,6 +109,18 @@ module TemplateInheritance
       end
     end
 
+    def instantiate_supertemplate
+      supertemplate = self.class.new(self.supertemplate, self.scope)
+      supertemplate.blocks = self.blocks
+      supertemplate
+    end
+
+    def render_supertemplate
+      TemplateInheritance.logger.debug("Extends call: #{self.supertemplate}")
+      supertemplate = instantiate_supertemplate
+      return supertemplate.render(context)
+    end
+
     def find_file(one, other)
       alternatives = Dir[one, other]
       alternatives.find { |file| File.file?(file) }

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

@@ -7,6 +7,13 @@ require "padrino-core/application/rendering"
 module TemplateInheritance
   class Template
     attr_accessor :padrino_views_directory
+
+    def instantiate_supertemplate
+      supertemplate = self.class.new(self.supertemplate, self.scope)
+      supertemplate.padrino_views_directory = self.padrino_views_directory
+      supertemplate.blocks = self.blocks
+      supertemplate
+    end
   end
 
   module TemplateHelpers
@@ -25,8 +32,9 @@ module TemplateInheritance::Rendering
   end
 
   # TODO: support options for Haml.
-  # NOTE: block does nothing.
+  # NOTE: block does nothing, it's for builder etc, not useful for Haml.
   # FIXME: locals doesn't work because we don't get them from Padrino.
+  # TODO: no support for render(_, data) i. e. render { :a => 1, :b => 2, :c => 3 }
   include Module.new {
     def render(_, path, options, locals, &block)
       base_dir = options[:views] || settings.views || "./views"

data/template-inheritance.gemspec

@@ -5,12 +5,11 @@ require "base64"
 
 Gem::Specification.new do |s|
   s.name = "template-inheritance"
-  s.version = "0.3"
+  s.version = "0.3.1"
   s.authors = ["Jakub Šťastný aka Botanicus"]
   s.homepage = "http://github.com/botanicus/template-inheritance"
   s.summary = ""
   s.description = "" # TODO: long description
-  s.cert_chain = nil
   s.email = Base64.decode64("c3Rhc3RueUAxMDFpZGVhcy5jeg==\n")
   s.has_rdoc = true
 
@@ -19,12 +18,6 @@ Gem::Specification.new do |s|
 
   s.require_paths = ["lib"]
 
-  # Ruby version
-  # Current JRuby with --1.9 switch has RUBY_VERSION set to "1.9.2dev"
-  # and RubyGems don't play well with it, so we have to set minimal
-  # Ruby version to 1.9, even if it actually is 1.9.1
-  s.required_ruby_version = ::Gem::Requirement.new("~> 1.9")
-
   # dependencies
   s.add_dependency "tilt"
   s.add_dependency "haml"

metadata

@@ -1,48 +1,55 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: template-inheritance
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.3.1
   prerelease: 
-  version: "0.3"
 platform: ruby
-authors: 
-- "Jakub \xC5\xA0\xC5\xA5astn\xC3\xBD aka Botanicus"
+authors:
+- Jakub Šťastný aka Botanicus
 autorequire: 
 bindir: bin
-cert_chain: 
-date: 2011-05-19 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+cert_chain: []
+date: 2013-04-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: tilt
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: haml
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-description: ""
-email: stastny@101ideas.cz
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ''
+email: !binary |-
+  c3Rhc3RueUAxMDFpZGVhcy5jeg==
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - README.textile
 - example/base.html.haml
@@ -92,33 +99,28 @@ files:
 - spec/templates/helpers_spec.rb
 - spec/templates/template_spec.rb
 - template-inheritance.gemspec
-has_rdoc: true
 homepage: http://github.com/botanicus/template-inheritance
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ~>
-    - !ruby/object:Gem::Version 
-      version: "1.9"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: template-inheritance
-rubygems_version: 1.5.3
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: ""
+summary: ''
 test_files: []
-