cutaneous 0.1.2 → 0.1.3

data/cutaneous.gemspec

@@ -14,7 +14,7 @@ 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.2'
+  s.version           = '0.1.3'
   s.date              = '2012-07-25'
   s.rubyforge_project = 'cutaneous'
 
@@ -86,6 +86,8 @@ Gem::Specification.new do |s|
     test/fixtures/included_error.html.cut
     test/fixtures/instance.html.cut
     test/fixtures/instance_include.html.cut
+    test/fixtures/locals/child.html.cut
+    test/fixtures/locals/parent.html.cut
     test/fixtures/missing.html.cut
     test/fixtures/other/different.html.cut
     test/fixtures/other/error.html.cut

data/lib/cutaneous/context.rb

@@ -20,10 +20,16 @@ module Cutaneous
     end
 
     def include(template_name, locals = {})
-      context = self.dup.__update_with_locals(locals)
+      context = self.clone(locals)
       self.__buf  << __loader.template(template_name).render(context)
     end
 
+    def clone(locals = {})
+      context = self.class.new(__target, self)
+      context.__update_with_locals(locals)
+      context
+    end
+
     def respond_to_missing?(name, include_private = false)
       return true if @__locals.key?(name.to_s) || @__locals.key?(name.to_sym)
       super

data/lib/cutaneous.rb

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

data/test/fixtures/locals/child.html.cut

@@ -0,0 +1 @@
+${ title }

data/test/fixtures/locals/parent.html.cut

@@ -0,0 +1,3 @@
+%{ include "locals/child", title: "Child 1" -}
+%{ include "locals/child", title: "Child 2" -}
+${ title }

data/test/test_core.rb

@@ -215,4 +215,10 @@ describe Cutaneous do
     result = engine.render_string("${ monkey } ${ to_s }", context)
     result.must_equal "magic fairy"
   end
+
+  it "Preserves the original context locals after includes" do
+    context = ContextHash({})
+    result = engine.render("locals/parent", context)
+    result.must_equal "Child 1\nChild 2\n\n"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cutaneous
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -50,6 +50,8 @@ files:
 - test/fixtures/included_error.html.cut
 - test/fixtures/instance.html.cut
 - test/fixtures/instance_include.html.cut
+- test/fixtures/locals/child.html.cut
+- test/fixtures/locals/parent.html.cut
 - test/fixtures/missing.html.cut
 - test/fixtures/other/different.html.cut
 - test/fixtures/other/error.html.cut