tilt 1.3.5 → 1.3.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTRjMjJiNzI3ZDRkYTY1N2QxMDE2NDFjODFmODc5MDc0NzQ5MDM1YQ==
+    MTA1ZmRhM2QwODJjZDM1YTAzMzM2ZTZlMGIwNmI3MzMxOTZlYjA2ZQ==
   data.tar.gz: !binary |-
-    YjJiMDBkZjQwMDlhNDhiMWI1MmU2MTJmMmEyZDY1NjJjOTJkZjFiMQ==
+    ZmNmOTUwNTQyNzg2MTViMDkzMzU0YTAwMTVhZjJjM2JlMjhlMDAzZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OTJkN2NiNjhiM2FmN2E0NTY3YTg2ZGUwMzM2MDZiOWJiMDNkNjEyMTVmODQ5
-    NzJhMDhkNTgxMzdkZDRmYTg4YWE5MTAxODNjMDhmYjNlYjNjYjUxMjI2NWY2
-    MDhhMTg4NTQ2Njk0MTI3OTU2NmFlYTk4MGZjODkzMzdhOThlOWE=
+    NGFmMDlkYjgxY2ExMjJkYjZkZDg3ZjliMjk4MmFiNjUyOTlkYjYwOGUwOTUz
+    OGIwYWRjOTFmNjhmMDYwNjU3NDhiMTM0MmViN2NjZmNlMDVlYjkzODFhMzI4
+    MThjZDJkY2QwODM2OTU3NGFhZDQ4MGRjYTQ4NDUwZTIyNGE2ZWM=
   data.tar.gz: !binary |-
-    NzgxM2UyNTM2N2NkZDY4YmYyNDMxZTI2NGEyNWM5NDIwZGZkNDU4ZDdkZTYx
-    ODgzMDkzZjM4ZGRhYzI5Y2FjNWQxMzVlMzk5ZjIwNzBiODcxNTlkOTc4YWFl
-    YjNlNzViNWNjYzI2MGYxYTVmOGNkZmIzZDljMTNmNTY4ZjM2MWM=
+    OTE3OTkzYWQzZTEyODUxNzk5NDcyNDUxN2NjZWE0NTA4ZTIzYjM1MWI0NmE4
+    MTJjMjYxYjdiNTk3YTEwNWRjNWQzZWM4M2ExZDIzNmIxMjUyYWUzZmFmYzQz
+    ODJhNjNmNzY2MDkxODcxMGE0NDhkOWVhOGIzYmMwYzFiZjQ3Y2E=

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## master
 
+## 1.3.6 (2013-03-17)
+
+* Accept Hash that implements #path as options (#180, lawso017)
+* Changed extension for CsvTemplate from '.csv' to '.rcsv' (#177, alexgb)
+
 ## 1.3.5 (2013-03-06)
 
 * Fixed extension for PlainTemplate (judofyr)

data/README.md

@@ -47,7 +47,7 @@ Support for these template engines is included with the package:
     Creole (Wiki markup)       .wiki, .creole          creole
     WikiCloth (Wiki markup)    .wiki, .mediawiki, .mw  wikicloth
     Yajl                       .yajl                   yajl-ruby
-    CSV                        .csv                    none (Ruby >= 1.9), fastercsv (Ruby < 1.9)
+    CSV                        .rcsv                   none (Ruby >= 1.9), fastercsv (Ruby < 1.9)
 
 These template engines ship with their own Tilt integration:
 

data/lib/tilt.rb

@@ -1,5 +1,5 @@
 module Tilt
-  VERSION = '1.3.5'
+  VERSION = '1.3.6'
 
   @preferred_mappings = Hash.new
   @template_mappings = Hash.new { |h, k| h[k] = [] }
@@ -154,7 +154,7 @@ module Tilt
   register LessTemplate, 'less'
 
   require 'tilt/csv'
-  register CSVTemplate, 'csv'
+  register CSVTemplate, 'rcsv'
 
   require 'tilt/coffee'
   register CoffeeScriptTemplate, 'coffee'

data/lib/tilt/template.rb

@@ -41,9 +41,9 @@ module Tilt
       [options, line, file].compact.each do |arg|
         case
         when arg.respond_to?(:to_str)  ; @file = arg.to_str
-        when arg.respond_to?(:path)    ; @file = arg.path
         when arg.respond_to?(:to_int)  ; @line = arg.to_int
         when arg.respond_to?(:to_hash) ; @options = arg.to_hash.dup
+        when arg.respond_to?(:path)    ; @file = arg.path
         else raise TypeError
         end
       end

data/test/tilt_csv_test.rb

@@ -10,12 +10,8 @@ begin
 
   class CSVTemplateTest < Test::Unit::TestCase
 
-    test "is registered for '.csv' files" do
-      assert_equal Tilt::CSVTemplate, Tilt['test.csv']
-    end
-
-    test "registered for '.csv' files" do
-      assert Tilt.mappings['csv'].include?(Tilt::CSVTemplate)
+    test "registered for '.rcsv' files" do
+      assert Tilt.mappings['rcsv'].include?(Tilt::CSVTemplate)
     end
 
     test "compiles and evaluates the template on #render" do

data/test/tilt_template_test.rb

@@ -30,6 +30,17 @@ class TiltTemplateTest < Test::Unit::TestCase
     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

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.3.5'
-  s.date = '2013-03-06'
+  s.version = '1.3.6'
+  s.date = '2013-03-17'
 
   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: 1.3.5
+  version: 1.3.6
 platform: ruby
 authors:
 - Ryan Tomayko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-06 00:00:00.000000000 Z
+date: 2013-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor