cutaneous 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e398300a8b3fdc0ed8a26b9b0864006c792a8f6
-  data.tar.gz: 7d6d810c48e137af8b4b5c9cc2b479bdb3d299f1
+  metadata.gz: 012024660b2cd0de6db4295f59f2dd7f627280a4
+  data.tar.gz: ae08e8b3fcdc18c3060104beb02acb4f7e77b3f6
 SHA512:
-  metadata.gz: 5c5f8cfd091d40a3a5a126d7ebf13843f0ed82aa314799bc5a53d6dfcab89f10e8f7620d2749414a88623cee28b33cf85e27ac7e3cbe042d9db8e3fe08979f98
-  data.tar.gz: a51d2b7c1f921f5e794b4532693644932039c1429e84c853b99969a54eb59f321cd1b5e3ee52b18b2beeab76bb913ff52477037249d22ac41692a9e228350367
+  metadata.gz: 034dc2af99470678f14e0e687c09d946cd52545fc1b515a59c53b379b90d5a01920572db4d28c1bd1d3ae169840b8a9d0aa04ac75e6b94a119c27e6a749ebeaf
+  data.tar.gz: 0e083ff19ecab0be7f48e40a23a2166c188ab41521c0b0c784584369b2a098457f69b34e32bc69fd9733660952d79c5236766b3818823449188a978928df1099

data/cutaneous.gemspec

@@ -14,8 +14,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'cutaneous'
-  s.version           = '0.1.6'
-  s.date              = '2013-09-14'
+  s.version           = '0.1.7'
+  s.date              = '2013-11-14'
   s.rubyforge_project = 'cutaneous'
 
   ## Make sure your summary is short. The description may be as long

data/lib/cutaneous/context.rb

@@ -5,10 +5,10 @@ module Cutaneous
   class Context < Delegator
     attr_accessor :__buf, :__loader, :__target, :__locals
 
-    def initialize(target, locals_or_context = {})
+    def initialize(target, locals = {}, parent_context = nil)
       super(target)
       @__target, @__locals = target, {}
-      __update_context(locals_or_context)
+      __update_context(locals, parent_context)
     end
 
     def __decode_params(params)
@@ -25,8 +25,7 @@ module Cutaneous
     end
 
     def clone(locals = {})
-      context = self.class.new(__target, self)
-      context.__update_with_locals(locals)
+      context = self.class.new(__target, locals, self)
       context
     end
 
@@ -52,16 +51,14 @@ module Cutaneous
       # Default behaviour is to silently discard errors
     end
 
-    def __update_context(parent)
-      case parent
-      when Hash
-        __update_with_locals(parent)
-      when Cutaneous::Context
+    def __update_context(locals, parent)
+      unless parent.nil?
         parent.instance_variables.reject { |var| /^@__/o === var.to_s }.each do |variable|
           instance_variable_set(variable, parent.instance_variable_get(variable))
         end
         __update_with_locals(parent.__locals) if parent.respond_to?(:__locals)
       end
+      __update_with_locals(locals)
     end
 
     # Sets up the local variables and also creates singleton methods on this

data/lib/cutaneous/engine.rb

@@ -7,7 +7,7 @@ module Cutaneous
 
     def initialize(template_roots, syntax = Cutaneous::FirstPassSyntax, default_format = "html")
       @roots          = Array(template_roots)
-      @syntax    = syntax
+      @syntax         = syntax
       @loader_class   = FileLoader
       @default_format = default_format
     end
@@ -24,7 +24,7 @@ module Cutaneous
 
     # Create and cache a file loader on a per-format basis
     def file_loader(format)
-      file_loader_instance(format.to_s).tap do |loader|
+      file_loader_instance(format.to_sym).tap do |loader|
         loader.syntax = @syntax
       end
     end

data/lib/cutaneous.rb

@@ -7,7 +7,7 @@ require 'cutaneous/lexer'
 require 'cutaneous/compiler'
 
 module Cutaneous
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 
   class CompilationError < Exception; end
 

data/test/helper.rb

@@ -9,7 +9,7 @@ class TestContext < Cutaneous::Context
 end
 
 class MiniTest::Spec
-  def ContextHash(params = {})
-    TestContext.new(Object.new, params)
+  def ContextHash(params = {}, parent = nil)
+    TestContext.new(Object.new, params, parent)
   end
 end

data/test/test_core.rb

@@ -217,7 +217,7 @@ describe Cutaneous do
   it "Passes any instance variables & locals between contexts" do
     context = ContextHash(right: "left")
     result1 = engine.render("instance", context)
-    context = ContextHash(context)
+    context = ContextHash({}, context)
     result2 = engine.render("instance", context)
     result2.must_equal result1
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cutaneous
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Garry Hill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-14 00:00:00.000000000 Z
+date: 2013-11-14 00:00:00.000000000 Z
 dependencies: []
 description: Cutaneous is the Ruby templating language designed for use with Spontaneous
   CMS. It has a simple syntax but powerful features such as Djano style template inheritance