tilt 1.3.3 → 1.4.0

data/test/tilt_template_test.rb

@@ -1,5 +1,7 @@
+# coding: utf-8
 require 'contest'
 require 'tilt'
+require 'tempfile'
 
 class TiltTemplateTest < Test::Unit::TestCase
 
@@ -23,6 +25,23 @@ class TiltTemplateTest < Test::Unit::TestCase
     assert_equal 55, inst.line
   end
 
+  test "initializing with a tempfile" do
+    tempfile = Tempfile.new('tilt_template_test')
+    inst = MockTemplate.new(tempfile)
+    assert_equal File.basename(tempfile.path), inst.basename
+  end
+
+  class SillyHash < Hash
+    def path(arg)
+    end
+  end
+
+  test "initialize with hash that implements #path" do
+    options = SillyHash[:key => :value]
+    inst = MockTemplate.new(options) {}
+    assert_equal :value, inst.options[:key]
+  end
+
   test "uses correct eval_file" do
     inst = MockTemplate.new('foo.erb', 55) {}
     assert_equal 'foo.erb', inst.eval_file
@@ -127,6 +146,13 @@ class TiltTemplateTest < Test::Unit::TestCase
     assert inst.prepared?
   end
 
+  test "template_source with locals having non-variable keys raises error" do
+    inst = SourceGeneratingMockTemplate.new { |t| '1 + 2 = #{_answer}' }
+    err = assert_raise(RuntimeError) { inst.render(Object.new, 'ANSWER' => 3) }
+    assert_equal "invalid locals key: \"ANSWER\" (keys must be variable names)", err.message
+    assert_equal "1 + 2 = 3", inst.render(Object.new, '_answer' => 3)
+  end
+
   class Person
     CONSTANT = "Bob"
 
@@ -151,4 +177,100 @@ class TiltTemplateTest < Test::Unit::TestCase
     inst = SourceGeneratingMockTemplate.new { |t| 'Hey #{CONSTANT}!' }
     assert_equal "Hey Bob!", inst.render(Person.new("Joe"))
   end
+
+  ##
+  # Encodings
+
+  class DynamicMockTemplate < MockTemplate
+    def precompiled_template(locals)
+      options[:code]
+    end
+  end
+
+  class UTF8Template < MockTemplate
+    def default_encoding
+      Encoding::UTF_8
+    end
+  end
+
+  if ''.respond_to?(:encoding)
+    original_encoding = Encoding.default_external
+
+    setup do
+      @file = Tempfile.open('template')
+      @file.puts "stuff"
+      @file.close
+      @template = @file.path
+    end
+
+    teardown do
+      Encoding.default_external = original_encoding
+      Encoding.default_internal = nil
+      @file.delete
+    end
+
+    test "reading from file assumes default external encoding" do
+      Encoding.default_external = 'Big5'
+      inst = MockTemplate.new(@template)
+      assert_equal 'Big5', inst.data.encoding.to_s
+    end
+
+    test "reading from file with a :default_encoding overrides default external" do
+      Encoding.default_external = 'Big5'
+      inst = MockTemplate.new(@template, :default_encoding => 'GBK')
+      assert_equal 'GBK', inst.data.encoding.to_s
+    end
+
+    test "reading from file with default_internal set does no transcoding" do
+      Encoding.default_internal = 'utf-8'
+      Encoding.default_external = 'Big5'
+      inst = MockTemplate.new(@template)
+      assert_equal 'Big5', inst.data.encoding.to_s
+    end
+
+    test "using provided template data verbatim when given as string" do
+      Encoding.default_internal = 'Big5'
+      inst = MockTemplate.new(@template) { "blah".force_encoding('GBK') }
+      assert_equal 'GBK', inst.data.encoding.to_s
+    end
+
+    test "uses the template from the generated source code" do
+      tmpl = "ふが"
+      code = tmpl.inspect.encode('Shift_JIS')
+      inst = DynamicMockTemplate.new(:code => code) { '' }
+      res = inst.render
+      assert_equal 'Shift_JIS', res.encoding.to_s
+      assert_equal tmpl, res.encode(tmpl.encoding)
+    end
+
+    test "uses the magic comment from the generated source code" do
+      tmpl = "ふが"
+      code = ("# coding: Shift_JIS\n" + tmpl.inspect).encode('Shift_JIS')
+      # Set it to an incorrect encoding
+      code.force_encoding('UTF-8')
+
+      inst = DynamicMockTemplate.new(:code => code) { '' }
+      res = inst.render
+      assert_equal 'Shift_JIS', res.encoding.to_s
+      assert_equal tmpl, res.encode(tmpl.encoding)
+    end
+
+    test "uses #default_encoding instead of default_external" do
+      Encoding.default_external = 'Big5'
+      inst = UTF8Template.new(@template)
+      assert_equal 'UTF-8', inst.data.encoding.to_s
+    end
+
+    test "uses #default_encoding instead of current encoding" do
+      tmpl = "".force_encoding('Big5')
+      inst = UTF8Template.new(@template) { tmpl }
+      assert_equal 'UTF-8', inst.data.encoding.to_s
+    end
+
+    test "raises error if the encoding is not valid" do
+      assert_raises(Encoding::InvalidByteSequenceError) do
+        UTF8Template.new(@template) { "\xe4" }
+      end
+    end
+  end
 end

data/test/tilt_wikiclothtemplate_test.rb

@@ -28,5 +28,5 @@ begin
     end
   end
 rescue LoadError => boom
-  warn "Tilt::WikiClothTemplate (disabled)\n"
+  warn "Tilt::WikiClothTemplate (disabled)"
 end

data/test/tilt_yajltemplate_test.rb

@@ -11,12 +11,20 @@ begin
 
     test "compiles and evaluates the template on #render" do
       template = Tilt::YajlTemplate.new { "json = { :integer => 3, :string => 'hello' }" }
-      assert_equal '{"integer":3,"string":"hello"}', template.render
+      output = template.render
+      result = Yajl::Parser.parse(output)
+      expect = {"integer" => 3,"string" => "hello"}
+      assert_equal expect, result
     end
 
     test "can be rendered more than once" do
       template = Tilt::YajlTemplate.new { "json = { :integer => 3, :string => 'hello' }" }
-      3.times { assert_equal '{"integer":3,"string":"hello"}', template.render }
+      expect = {"integer" => 3,"string" => "hello"}
+      3.times do
+        output = template.render
+        result = Yajl::Parser.parse(output)
+        assert_equal expect, result
+      end
     end
 
     test "evaluating ruby code" do
@@ -65,7 +73,8 @@ begin
         json[:integer] = four
         nil
       } }
-      assert_equal '{"string":"hello","integer":4}', template.render
+      result = template.render
+      assert( (result == '{"string":"hello","integer":4}') || (result == '{"integer":4,"string":"hello"}') )
     end
 
     test "option callback" do
@@ -88,5 +97,5 @@ begin
 
   end
 rescue LoadError
-  warn "Tilt::YajlTemplateTest (disabled)\n"
+  warn "Tilt::YajlTemplateTest (disabled)"
 end

data/tilt.gemspec

@@ -3,33 +3,40 @@ 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.3.3'
-  s.date = '2011-08-25'
+  s.version = '1.4.0'
+  s.date = '2013-05-01'
 
   s.description = "Generic interface to multiple Ruby template engines"
   s.summary     = s.description
+  s.license     = "MIT"
 
   s.authors = ["Ryan Tomayko"]
   s.email = "r@tomayko.com"
 
   # = MANIFEST =
   s.files = %w[
+    CHANGELOG.md
     COPYING
     Gemfile
+    HACKING
     README.md
     Rakefile
     TEMPLATES.md
     bin/tilt
     lib/tilt.rb
+    lib/tilt/asciidoc.rb
     lib/tilt/builder.rb
     lib/tilt/coffee.rb
     lib/tilt/css.rb
+    lib/tilt/csv.rb
     lib/tilt/erb.rb
+    lib/tilt/etanni.rb
     lib/tilt/haml.rb
     lib/tilt/liquid.rb
     lib/tilt/markaby.rb
     lib/tilt/markdown.rb
     lib/tilt/nokogiri.rb
+    lib/tilt/plain.rb
     lib/tilt/radius.rb
     lib/tilt/rdoc.rb
     lib/tilt/string.rb
@@ -44,17 +51,21 @@ Gem::Specification.new do |s|
     test/markaby/render_twice.mab
     test/markaby/scope.mab
     test/markaby/yielding.mab
+    test/tilt_asciidoctor_test.rb
     test/tilt_blueclothtemplate_test.rb
     test/tilt_buildertemplate_test.rb
     test/tilt_cache_test.rb
     test/tilt_coffeescripttemplate_test.rb
     test/tilt_compilesite_test.rb
     test/tilt_creoletemplate_test.rb
+    test/tilt_csv_test.rb
     test/tilt_erbtemplate_test.rb
     test/tilt_erubistemplate_test.rb
+    test/tilt_etannitemplate_test.rb
     test/tilt_fallback_test.rb
     test/tilt_hamltemplate_test.rb
     test/tilt_kramdown_test.rb
+    test/tilt_lesstemplate_test.less
     test/tilt_lesstemplate_test.rb
     test/tilt_liquidtemplate_test.rb
     test/tilt_markaby_test.rb
@@ -78,29 +89,29 @@ Gem::Specification.new do |s|
 
   s.executables = ['tilt']
   s.test_files = s.files.select {|path| path =~ /^test\/.*_test.rb/}
-  s.add_development_dependency 'contest'
+  s.add_development_dependency 'asciidoctor', '>= 0.1.0'
+  s.add_development_dependency 'RedCloth'
+  s.add_development_dependency 'bluecloth'
   s.add_development_dependency 'builder'
+  s.add_development_dependency 'coffee-script'
+  s.add_development_dependency 'contest'
+  s.add_development_dependency 'creole'
   s.add_development_dependency 'erubis'
   s.add_development_dependency 'haml', '>= 2.2.11'
-  s.add_development_dependency 'sass'
-  s.add_development_dependency 'rdiscount'
-  s.add_development_dependency 'liquid'
+  s.add_development_dependency 'kramdown'
   s.add_development_dependency 'less'
-  s.add_development_dependency 'radius'
-  s.add_development_dependency 'nokogiri'
+  s.add_development_dependency 'liquid'
   s.add_development_dependency 'markaby'
-  s.add_development_dependency 'coffee-script'
-  s.add_development_dependency 'bluecloth'
-  s.add_development_dependency 'RedCloth'
   s.add_development_dependency 'maruku'
-  s.add_development_dependency 'creole'
-  s.add_development_dependency 'kramdown'
+  s.add_development_dependency 'nokogiri'
+  s.add_development_dependency 'radius'
+  s.add_development_dependency 'rdiscount'
+  s.add_development_dependency 'rdoc'
   s.add_development_dependency 'redcarpet'
-  s.add_development_dependency 'creole'
-  s.add_development_dependency 'yajl-ruby'
+  s.add_development_dependency 'sass'
   s.add_development_dependency 'wikicloth'
-  s.add_development_dependency 'redcarpet'
-  s.add_development_dependency 'kramdown'
+  s.add_development_dependency 'yajl-ruby'
+  s.add_development_dependency 'rdoc'
 
   s.homepage = "http://github.com/rtomayko/tilt/"
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Tilt", "--main", "Tilt"]