tilt 1.4.0 → 1.4.1

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## master
 
+## 1.4.1 (2013-05-08)
+
+* Support Arrays in pre/postambles (#193, jbwiv)
+
 ## 1.4.0 (2013-05-01)
 
 * Better encoding support

data/TEMPLATES.md

@@ -305,9 +305,9 @@ time when using this template engine within a threaded environment.
 
 ### See also
 
-  * [Liquid for Programmers](http://wiki.github.com/tobi/liquid/liquid-for-programmers)
+  * [Liquid for Programmers](https://wiki.github.com/Shopify/liquid/liquid-for-programmers)
   * [Liquid Docs](http://liquid.rubyforge.org/)
-  * GitHub: [tobi/liquid](http://github.com/tobi/liquid/)
+  * GitHub: [Shopify/liquid](https://github.com/Shopify/liquid/)
 
 
 <a name='radius'></a>

data/lib/tilt.rb

@@ -1,5 +1,5 @@
 module Tilt
-  VERSION = '1.4.0'
+  VERSION = '1.4.1'
 
   @preferred_mappings = Hash.new
   @template_mappings = Hash.new { |h, k| h[k] = [] }

data/lib/tilt/template.rb

@@ -194,7 +194,10 @@ module Tilt
         template.force_encoding(template_encoding)
       end
 
-      source << preamble << "\n" << template << "\n" << postamble
+      # https://github.com/rtomayko/tilt/issues/193
+      warn "precompiled_preamble should return String (not Array)" if preamble.is_a?(Array)
+      warn "precompiled_postamble should return String (not Array)" if postamble.is_a?(Array)
+      source << [preamble, template, postamble].join("\n")
 
       [source, preamble.count("\n")+1]
     end

data/test/tilt_template_test.rb

@@ -153,6 +153,53 @@ class TiltTemplateTest < Test::Unit::TestCase
     assert_equal "1 + 2 = 3", inst.render(Object.new, '_answer' => 3)
   end
 
+  class CustomGeneratingMockTemplate < PreparingMockTemplate
+    def precompiled_template(locals)
+      data
+    end
+
+    def precompiled_preamble(locals)
+      options.fetch(:preamble)
+    end
+
+    def precompiled_postamble(locals)
+      options.fetch(:postamble)
+    end
+  end
+
+  test "supports pre/postamble" do
+    inst = CustomGeneratingMockTemplate.new(
+      :preamble => 'buf = []',
+      :postamble => 'buf.join'
+    ) { 'buf << 1' }
+
+    assert_equal "1", inst.render
+  end
+
+  # Special-case for Haml
+  # https://github.com/rtomayko/tilt/issues/193
+  test "supports Array pre/postambles" do
+    inst = CustomGeneratingMockTemplate.new(
+      :preamble => ['buf = ', '[]'],
+      :postamble => ['buf.', 'join']
+    ) { 'buf << 1' }
+
+    # TODO: Use assert_output when we swicth to MiniTest
+    warns = <<-EOF
+precompiled_preamble should return String (not Array)
+precompiled_postamble should return String (not Array)
+EOF
+
+    begin
+      require 'stringio'
+      $stderr = StringIO.new
+      assert_equal "1", inst.render
+      assert_equal warns, $stderr.string
+    ensure
+      $stderr = STDERR
+    end
+  end
+
   class Person
     CONSTANT = "Bob"
 

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 = '1.4.0'
-  s.date = '2013-05-01'
+  s.version = '1.4.1'
+  s.date = '2013-05-08'
 
   s.description = "Generic interface to multiple Ruby template engines"
   s.summary     = s.description

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tilt
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-01 00:00:00.000000000 Z
+date: 2013-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -518,3 +518,4 @@ test_files:
 - test/tilt_test.rb
 - test/tilt_wikiclothtemplate_test.rb
 - test/tilt_yajltemplate_test.rb
+has_rdoc: