tilt 2.0.7 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 979b58759b26a174d4d8bd50a44a1c597e92f382
-  data.tar.gz: 5debdcfa427c042650217d5596f7e3b8bb4ec5aa
+  metadata.gz: d73cf811e4d1767fcb602eef69ec1d957eb72919
+  data.tar.gz: 30723694d8d6d8f45d1b073d3cd1403358636414
 SHA512:
-  metadata.gz: ec0b3d559111342335705860143350f0e20d004cc7ee680b2ef5a77c3e93ee57f2ddca4487946b52ad753882d2d96aafe0182a91c0b4d1eecf0f823829319448
-  data.tar.gz: b4ea47644310701876f05cf06950a0e264d04581f5316c3b6b23d076a0dd3c22550928fa863bce89afa88b8b18219b6820cfda21745778a86bb3d4235b2197e3
+  metadata.gz: 1b94f99935c3135724349c3f6ff87f22b4dea1569b0be12624c5f7728721b10587c924030d176d3b53ad54a087acc683556ab47983ed0eb1ba3ab960c4ea1898
+  data.tar.gz: 84ea12c485ab60ad8255dfb2a5b26ac4879353290219346de4ac3351b9049ef79bdba3e00380009d9ca0e513edc3c9abf5437b17c0a22d051c4c5946b06db5ab

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## master
+
+## 2.0.8 (2017-07-24)
+
+* Register .tsx for TypeScript (#315, backus)
+* Use Haml 5's new API (#312, k0kubun)
+* Use correct parser options for CommonMarker (#320, rewritten)
+* Suppress warnings when no locals are used (#304, amatsuda)
+* Haml: Accept `outvar` (#317, k0kubun)
+
 ## 2.0.7 (2017-03-19)
 
 * Do not modify BasicObject during template compilation on ruby 2.0+ (#309, jeremyevans)

data/Gemfile

@@ -1,5 +1,7 @@
 source 'https://rubygems.org'
 
+gemspec
+
 gem 'rake'
 gem 'minitest', '~> 5.0'
 
@@ -12,7 +14,7 @@ can_execjs = (RUBY_VERSION >= '1.9.3')
 
 group :primary do
   gem 'builder'
-  gem 'haml', '>= 2.2.11', '< 4'
+  gem 'haml', '>= 4' if RUBY_VERSION >= '2.0.0'
   gem 'erubis'
   gem 'markaby'
   gem 'sass'
@@ -61,7 +63,3 @@ group :secondary do
   end
 end
 
-## WHY do I have to do this?!?
-platform :rbx do
-  gem 'rubysl'
-end

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.7'
+  VERSION = '2.0.8'
 
   @default_mapping = Mapping.new
 
@@ -153,7 +153,7 @@ module Tilt
   register_lazy :ScssTemplate,         'tilt/sass',      'scss'
   register_lazy :SigilTemplate,        'tilt/sigil',     'sigil'
   register_lazy :StringTemplate,       'tilt/string',    'str'
-  register_lazy :TypeScriptTemplate,   'tilt/typescript', 'ts'
+  register_lazy :TypeScriptTemplate,   'tilt/typescript', 'ts', 'tsx'
   register_lazy :WikiClothTemplate,    'tilt/wikicloth', 'wiki', 'mediawiki', 'mw'
   register_lazy :YajlTemplate,         'tilt/yajl',      'yajl'
 

data/lib/tilt/commonmarker.rb

@@ -11,7 +11,7 @@ module Tilt
     end
 
     def evaluate(scope, locals, &block)
-      CommonMarker.render_html(data, :default)
+      CommonMarker.render_html(data, :DEFAULT)
     end
 
     def allows_script?

data/lib/tilt/haml.rb

@@ -7,51 +7,79 @@ module Tilt
   class HamlTemplate < Template
     self.default_mime_type = 'text/html'
 
-    def prepare
-      options = @options.merge(:filename => eval_file, :line => line)
-      @engine = ::Haml::Engine.new(data, options)
-    end
-
-    def evaluate(scope, locals, &block)
-      raise ArgumentError, 'invalid scope: must not be frozen' if scope.frozen?
+    # `Gem::Version.correct?` may return false because of Haml::VERSION #=> "3.1.8 (Separated Sally)". After Haml 4, it's always correct.
+    if Gem::Version.correct?(Haml::VERSION) && Gem::Version.new(Haml::VERSION) >= Gem::Version.new('5.0.0.beta.2')
+      def prepare
+        options = {}.update(@options).update(filename: eval_file, line: line)
+        if options.include?(:outvar)
+          options[:buffer] = options.delete(:outvar)
+          options[:save_buffer] = true
+        end
+        @engine = ::Haml::TempleEngine.new(options)
+        @engine.compile(data)
+      end
 
-      if @engine.respond_to?(:precompiled_method_return_value, true)
+      def evaluate(scope, locals, &block)
+        raise ArgumentError, 'invalid scope: must not be frozen' if scope.frozen?
         super
-      else
-        @engine.render(scope, locals, &block)
       end
-    end
 
-    # Precompiled Haml source. Taken from the precompiled_with_ambles
-    # method in Haml::Precompiler:
-    # http://github.com/nex3/haml/blob/master/lib/haml/precompiler.rb#L111-126
-    def precompiled_template(locals)
-      @engine.precompiled
-    end
-
-    def precompiled_preamble(locals)
-      local_assigns = super
-      @engine.instance_eval do
-        <<-RUBY
-          begin
-            extend Haml::Helpers
-            _hamlout = @haml_buffer = Haml::Buffer.new(@haml_buffer, #{options_for_buffer.inspect})
-            _erbout = _hamlout.buffer
+      def precompiled_template(locals)
+        @engine.precompiled_with_ambles(
+          [],
+          after_preamble: <<-RUBY
             __in_erb_template = true
             _haml_locals = locals
-            #{local_assigns}
-        RUBY
+          RUBY
+        )
+      end
+    else # Following definitions are for Haml <= 4 and deprecated.
+      def prepare
+        options = @options.merge(:filename => eval_file, :line => line)
+        @engine = ::Haml::Engine.new(data, options)
+      end
+
+      def evaluate(scope, locals, &block)
+        raise ArgumentError, 'invalid scope: must not be frozen' if scope.frozen?
+
+        if @engine.respond_to?(:precompiled_method_return_value, true)
+          super
+        else
+          @engine.render(scope, locals, &block)
+        end
+      end
+
+      # Precompiled Haml source. Taken from the precompiled_with_ambles
+      # method in Haml::Precompiler:
+      # http://github.com/nex3/haml/blob/master/lib/haml/precompiler.rb#L111-126
+      def precompiled_template(locals)
+        @engine.precompiled
+      end
+
+      def precompiled_preamble(locals)
+        local_assigns = super
+        @engine.instance_eval do
+          <<-RUBY
+            begin
+              extend Haml::Helpers
+              _hamlout = @haml_buffer = Haml::Buffer.new(@haml_buffer, #{options_for_buffer.inspect})
+              _erbout = _hamlout.buffer
+              __in_erb_template = true
+              _haml_locals = locals
+              #{local_assigns}
+          RUBY
+        end
       end
-    end
 
-    def precompiled_postamble(locals)
-      @engine.instance_eval do
-        <<-RUBY
-            #{precompiled_method_return_value}
-          ensure
-            @haml_buffer = @haml_buffer.upper if @haml_buffer
-          end
-        RUBY
+      def precompiled_postamble(locals)
+        @engine.instance_eval do
+          <<-RUBY
+              #{precompiled_method_return_value}
+            ensure
+              @haml_buffer = @haml_buffer.upper if @haml_buffer
+            end
+          RUBY
+        end
       end
     end
   end

data/lib/tilt/template.rb

@@ -264,6 +264,7 @@ module Tilt
             Thread.current[:tilt_vars] = [self, locals]
             class << self
               this, locals = Thread.current[:tilt_vars]
+              locals = locals
               this.instance_eval do
                 #{local_code}
       RUBY

data/test/tilt_typescript_test.rb

@@ -14,6 +14,10 @@ begin
       assert_equal Tilt::TypeScriptTemplate, Tilt['test.ts']
     end
 
+    test "is registered for '.tsx' files" do
+      assert_equal Tilt::TypeScriptTemplate, Tilt['test.tsx']
+    end
+
     test "compiles and evaluates the template on #render" do
       template = Tilt::TypeScriptTemplate.new { @ts }
       assert_match @js, template.render

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.7'
-  s.date = '2017-03-19'
+  s.version = '2.0.8'
+  s.date = '2017-07-24'
 
   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.7
+  version: 2.0.8
 platform: ruby
 authors:
 - Ryan Tomayko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-19 00:00:00.000000000 Z
+date: 2017-07-24 00:00:00.000000000 Z
 dependencies: []
 description: Generic interface to multiple Ruby template engines
 email: r@tomayko.com
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 2
 summary: Generic interface to multiple Ruby template engines