armadillo 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 076e70fe3bf56b1ff58d780add8495daec39c332
-  data.tar.gz: 3a0c4f3c77fa0d215c622647d7ce99506a9d2228
+  metadata.gz: 803ab702bb0ecc685d7197c02f3d25589e2cd0fd
+  data.tar.gz: e2de66ea90d89b6fa52d6304c4936027ea89f151
 SHA512:
-  metadata.gz: 6abcaa901422e65f838fafe28ebd2c39c29f65d089157fa5b7bb38df037581fe8f9c294fa0456dc501aca27b418cbf7364dcaeec3e97f31e470ef824f6e00267
-  data.tar.gz: 058695378b0a9f846a1081f929b57ad832b267b1bc3eec8f79f3740d175d90ff74a58f378074c6d2e8d9d4c8b8b9afbaee6fb37221711c3fdbdc71cbb95c343d
+  metadata.gz: b698b6d91589250f691ae6f0e956da0307633e7b3aac6a333d4a9bbf2a02091ad7894cd04d0c0df64a7c50f994d4e44c93477eb470c8cb75412a17fd4d228019
+  data.tar.gz: 52d57126647cb0dda2332de5ef9e5b8fc8812af2ec9f45af72bfdc7b5a75cea7bc1facff0492194efec5420d0b5b09dcafe7d3fa76031283e0099b2f3bc033ed

data/README.md

@@ -58,7 +58,8 @@ module View
   def render_view(template_name, locals = {})
     content = Armadillo.render(template_name, locals, {
       :base_path => File.join(APP_PATH, "views"),
-      :scope => self
+      :scope => self,
+      :escape_html => true
     })
     res.write(content)
     halt(res.finish)

data/armadillo.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "armadillo"
-  s.version = "0.0.1"
+  s.version = "0.0.2"
   s.summary = "Template inheritance with ERB templates"
   s.description = "A small library for Django-like template inheritance adapted for ERB"
   s.authors = ["Sebastian Borrazas"]

data/lib/armadillo.rb

@@ -3,7 +3,7 @@ require "delegate"
 
 module Armadillo
 
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 
   DEFAULT_OPTIONS = {
     :default_encoding => Encoding.default_external,
@@ -13,6 +13,15 @@ module Armadillo
   # @api private
   class TemplateContext < SimpleDelegator
 
+    # Initialize the TemplateContext.
+    #
+    # @param source [Object]
+    # @param template_options [Hash] ({})
+    def initialize(source, template_options = {})
+      @template_options = template_options
+      super(source)
+    end
+
     # Extend the specified template in which the inner view blocks will be
     # rendered.
     #
@@ -57,6 +66,16 @@ module Armadillo
       }
     end
 
+    # Render another template with the same options as the current one.
+    #
+    # @param template_path [String]
+    # @param locals [Hash] ({})
+    #
+    # @return [String]
+    def render(template_path, locals = {})
+      Armadillo.render(template_path, locals, @template_options)
+    end
+
     # Determine if the current template should extend from a new template.
     #
     # @return [Boolean]
@@ -121,8 +140,8 @@ module Armadillo
   # @return [String]
   # @api public
   def self.render(template_path, locals = {}, options = {})
-    scope = options.fetch(:scope) { Object.new }
-    context = TemplateContext.new(scope)
+    scope = options.delete(:scope) { Object.new }
+    context = TemplateContext.new(scope, options)
     _render(template_path, locals, context, options)
   end
 

data/spec/template_spec.rb

@@ -76,6 +76,19 @@ describe Armadillo do
         assert_lines_match(content, ["Sanitized &", "Not sanitized &"])
       end
     end
+
+    describe "when the template renders another template" do
+      it "renders it with the same options" do
+        content = Armadillo.render("with_sub_template.html", {}, {
+          :base_path => TEMPLATES_PATH,
+          :escape_html => true
+        })
+        assert_lines_match(content, [
+          "<h1>Title</h1>",
+          "<h2>Subtitle</h2>"
+        ])
+      end
+    end
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: armadillo
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Sebastian Borrazas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-10 00:00:00.000000000 Z
+date: 2014-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt