tilt 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8eb5c664834658aea7cbcd313c91143dc6cbcf5
-  data.tar.gz: 445aed9e2cdf45b3ac7de7255df71730d82a6ee1
+  metadata.gz: 69824d0f8d59718a45a289673dbbc34b6e083c83
+  data.tar.gz: a655207744e9fa92153589e77587d8593cbbd005
 SHA512:
-  metadata.gz: e5fb808cca6eb518ec297aee474872872ffc38da481a643787c72eb51227f75fea5aa067f6766921ff3cdc16bbdf9ad098ca552da51134b7ee591a330f8318cd
-  data.tar.gz: b61b68cdf6c1fac47c7ef814afe4cc2c4445d345522d94248c54010237a6e439c0c835f64f40fd9412a5b65b9c90f660662c45acba48a868e060aaf74840d852
+  metadata.gz: 7c5c9bfae55c46fb9cb82e0ba9612a649d6a3283fcf8b9a1bcc20b115299f0c34619b751420b8b77c94d65e76ab53a6d88b8f83cb77c5a1abcc87088e3a5bcda
+  data.tar.gz: ef8c85a45a30d284d8fb61b7480cc223bca9254fba2d5a026106aeb52024133f629dcab8bcf6f90606a1c211dcc41a2fa0ff6908b164f70f6325fd34dda2b5f3

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.0.4 (2016-05-16)
+
+* Fix regression in BuilderTemplate (#283, judofyr)
+
 ## 2.0.3 (2016-05-12)
 
 * Add Pandoc support (#276, jmuheim)

data/docs/TEMPLATES.md

@@ -460,7 +460,7 @@ To wrap a Markdown formatted document with a layout:
 ### Options
 
 Every implementation of Markdown *should* support these options, but there are
-some known problems with the Kramdown, Maruku and Pandoc engines.
+some known problems with the Kramdown and Maruku engines.
 
 #### `:smartypants => true|false`
 
@@ -476,7 +476,7 @@ Maruku ignores this option and always applies smart quotes (and nothing else).
 Set `true` disallow raw HTML in Markdown contents. HTML is converted to
 literal text by escaping `<` characters.
 
-Kramdown, Maruku and Pandoc don't support this option.
+Kramdown and Maruku don't support this option.
 
 ### See also
 

data/lib/tilt.rb

@@ -4,7 +4,7 @@ require 'tilt/template'
 # Namespace for Tilt. This module is not intended to be included anywhere.
 module Tilt
   # Current version.
-  VERSION = '2.0.3'
+  VERSION = '2.0.4'
 
   @default_mapping = Mapping.new
 

data/lib/tilt/builder.rb

@@ -12,8 +12,15 @@ module Tilt
     end
 
     def evaluate(scope, locals, &block)
-      xml = (locals[:xml] ||= ::Builder::XmlMarkup.new(options))
-      return super(scope, locals, &block) if data.respond_to?(:to_str)
+      xml = (locals[:xml] || ::Builder::XmlMarkup.new(options))
+
+      if data.respond_to?(:to_str)
+        if !locals[:xml]
+          locals = locals.merge(:xml => xml)
+        end
+        return super(scope, locals, &block)
+      end
+
       data.call(xml)
       xml.target!
     end

data/test/tilt_buildertemplate_test.rb

@@ -49,6 +49,14 @@ begin
       assert_equal "<div><em>Hey</em></div>", template.render
     end
 
+    test "can re-use locals for multiple calls" do
+      locals = { :name => "world" }
+      template = Tilt::BuilderTemplate.new(:indent => 0) { "xml.em name" }
+      3.times do
+        assert_equal "<em>world</em>", template.render(self, locals)
+      end
+    end
+
     test "allows nesting raw XML" do
       subtemplate = Tilt::BuilderTemplate.new { "xml.em 'Hello World!'" }
       template = Tilt::BuilderTemplate.new { "xml.strong { xml << yield }" }

data/tilt.gemspec

@@ -3,8 +3,8 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
 
   s.name = 'tilt'
-  s.version = '2.0.3'
-  s.date = '2016-05-12'
+  s.version = '2.0.4'
+  s.date = '2016-05-16'
 
   s.description = "Generic interface to multiple Ruby template engines"
   s.summary     = s.description

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tilt
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Ryan Tomayko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-12 00:00:00.000000000 Z
+date: 2016-05-16 00:00:00.000000000 Z
 dependencies: []
 description: Generic interface to multiple Ruby template engines
 email: r@tomayko.com