tilt 1.3 → 1.3.1

data/lib/tilt.rb

@@ -1,5 +1,5 @@
 module Tilt
-  VERSION = '1.3'
+  VERSION = '1.3.1'
 
   @preferred_mappings = Hash.new
   @template_mappings = Hash.new { |h, k| h[k] = [] }
@@ -17,9 +17,7 @@ module Tilt
   def self.register(template_class, *extensions)
     if template_class.respond_to?(:to_str)
       # Support register(ext, template_class) too
-      ext = template_class
-      template_class = extensions[0]
-      extensions = [ext]
+      extensions, template_class = [template_class], extensions[0]
     end
 
     extensions.each do |ext|
@@ -76,8 +74,8 @@ module Tilt
     end
 
     # Try to find a preferred engine.
-    klass = @preferred_mappings[pattern]
-    return klass if klass
+    preferred_klass = @preferred_mappings[pattern]
+    return preferred_klass if preferred_klass
 
     # Fall back to the general list of mappings.
     klasses = @template_mappings[pattern]

data/lib/tilt/coffee.rb

@@ -8,7 +8,7 @@ module Tilt
   class CoffeeScriptTemplate < Template
     self.default_mime_type = 'application/javascript'
 
-    @@default_bare = true
+    @@default_bare = false
 
     def self.default_bare
       @@default_bare

data/lib/tilt/css.rb

@@ -9,15 +9,16 @@ module Tilt
     self.default_mime_type = 'text/css'
 
     def self.engine_initialized?
-      defined? ::Sass::Engine
+      defined?(::Sass::Engine) && defined?(::Sass::Plugin)
     end
 
     def initialize_engine
       require_template_library 'sass'
+      require_template_library 'sass/plugin'
     end
 
     def prepare
-      @engine = ::Sass::Engine.new(data, sass_options)
+      @engine = ::Sass::Engine.new(data, ::Sass::Plugin.engine_options(sass_options))
     end
 
     def evaluate(scope, locals, &block)

data/test/tilt_coffeescripttemplate_test.rb

@@ -40,7 +40,8 @@ begin
 
       test "no options" do
         template = Tilt::CoffeeScriptTemplate.new { |t| "puts 'Hello, World!'\n" }
-        assert_equal "puts('Hello, World!');", template.render
+        assert_match "puts('Hello, World!');", template.render
+        assert_match "(function() {", template.render
       end
 
       test "overridden by :bare" do

data/test/tilt_sasstemplate_test.rb

@@ -19,6 +19,17 @@ begin
       template = Tilt::SassTemplate.new { |t| "#main\n  :background-color #0000f1" }
       3.times { assert_equal "#main {\n  background-color: #0000f1; }\n", template.render }
     end
+
+    test "uses configuration from Sass::Plugin.engine_options" do
+      begin
+        orig_style = Sass::Plugin.options[:style]
+        Sass::Plugin.options[:style] = :compressed
+        template = Tilt::SassTemplate.new { |t| "#main\n  :background-color #0000f1" }
+        assert_equal "#main{background-color:#0000f1}\n", template.render
+      ensure
+        Sass::Plugin.options[:style] = orig_style
+      end
+    end
   end
 
   class ScssTemplateTest < Test::Unit::TestCase

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'
-  s.date = '2011-04-26'
+  s.version = '1.3.1'
+  s.date = '2011-05-21'
 
   s.description = "Generic interface to multiple Ruby template engines"
   s.summary     = s.description
@@ -72,9 +72,7 @@ Gem::Specification.new do |s|
   ]
   # = MANIFEST =
 
-  s.default_executable = 'tilt'
   s.executables = ['tilt']
-
   s.test_files = s.files.select {|path| path =~ /^test\/.*_test.rb/}
   s.add_development_dependency 'contest'
   s.add_development_dependency 'builder'
@@ -93,9 +91,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'creole'
   s.add_development_dependency 'kramdown'
 
-  s.extra_rdoc_files = %w[COPYING]
-
-  s.has_rdoc = true
   s.homepage = "http://github.com/rtomayko/tilt/"
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Tilt", "--main", "Tilt"]
   s.require_paths = %w[lib]

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tilt
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: "1.3"
+  hash: 25
+  prerelease: false
+  segments: 
+  - 1
+  - 3
+  - 1
+  version: 1.3.1
 platform: ruby
 authors: 
 - Ryan Tomayko
@@ -10,8 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-26 00:00:00 -07:00
-default_executable: tilt
+date: 2011-05-21 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: contest
@@ -21,6 +26,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id001
@@ -32,6 +40,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id002
@@ -43,6 +54,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id003
@@ -54,6 +68,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 2
+        - 2
+        - 11
         version: 2.2.11
   type: :development
   version_requirements: *id004
@@ -65,6 +84,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id005
@@ -76,6 +98,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id006
@@ -87,6 +112,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id007
@@ -98,6 +126,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id008
@@ -109,6 +140,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id009
@@ -120,6 +154,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id010
@@ -131,6 +168,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id011
@@ -142,6 +182,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id012
@@ -153,6 +196,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id013
@@ -164,6 +210,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id014
@@ -175,6 +224,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id015
@@ -186,6 +238,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id016
@@ -195,8 +250,8 @@ executables:
 - tilt
 extensions: []
 
-extra_rdoc_files: 
-- COPYING
+extra_rdoc_files: []
+
 files: 
 - COPYING
 - README.md
@@ -272,17 +327,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: wink
-rubygems_version: 1.6.0
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 2
 summary: Generic interface to multiple Ruby template engines