tilt 2.0.8 → 2.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d73cf811e4d1767fcb602eef69ec1d957eb72919
-  data.tar.gz: 30723694d8d6d8f45d1b073d3cd1403358636414
+  metadata.gz: 628b7587af284142a071a75dec94e684b6972d16
+  data.tar.gz: a686e34c2f8d764a74e2760fe5af2fc22c27b66d
 SHA512:
-  metadata.gz: 1b94f99935c3135724349c3f6ff87f22b4dea1569b0be12624c5f7728721b10587c924030d176d3b53ad54a087acc683556ab47983ed0eb1ba3ab960c4ea1898
-  data.tar.gz: 84ea12c485ab60ad8255dfb2a5b26ac4879353290219346de4ac3351b9049ef79bdba3e00380009d9ca0e513edc3c9abf5437b17c0a22d051c4c5946b06db5ab
+  metadata.gz: b802450ebc32e4d50d65af2bf827bf8e6b92d85787ea9507701d70e6c0e8df911fce4402e53e99e95029d11daa4bcbca6ed99f5c90fa0235d0051d7a290a6446
+  data.tar.gz: a2db67256a1c846deabd6520d943e101645ea25cb610d022e60f2755dbddddfd8197275c6783ed663f569538647553714a1151d6d660887caf8ae6662b008159

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## master
 
+## 2.0.9 (2018-11-28)
+
+* Use new ERB API in Ruby 2.6 (#329, koic)
+* Support the new sassc gem (#336, jdickey, judofyr)
+
 ## 2.0.8 (2017-07-24)
 
 * Register .tsx for TypeScript (#315, backus)

data/Gemfile

@@ -17,7 +17,12 @@ group :primary do
   gem 'haml', '>= 4' if RUBY_VERSION >= '2.0.0'
   gem 'erubis'
   gem 'markaby'
-  gem 'sass'
+
+  if ENV['OLD_SASS']
+    gem 'sass'
+  else
+    gem 'sassc'
+  end
 
   if can_execjs
     gem 'less'

data/README.md

@@ -1,4 +1,4 @@
-Tilt [![Build Status](https://secure.travis-ci.org/rtomayko/tilt.svg)](http://travis-ci.org/rtomayko/tilt) [![Dependency Status](https://gemnasium.com/rtomayko/tilt.svg)](https://gemnasium.com/rtomayko/tilt) [![Inline docs](http://inch-ci.org/github/rtomayko/tilt.svg)](http://inch-ci.org/github/rtomayko/tilt) [![Security](https://hakiri.io/github/rtomayko/tilt/master.svg)](https://hakiri.io/github/rtomayko/tilt/master)
+Tilt [![Build Status](https://secure.travis-ci.org/rtomayko/tilt.svg)](http://travis-ci.org/rtomayko/tilt) [![Inline docs](http://inch-ci.org/github/rtomayko/tilt.svg)](http://inch-ci.org/github/rtomayko/tilt) [![Security](https://hakiri.io/github/rtomayko/tilt/master.svg)](https://hakiri.io/github/rtomayko/tilt/master)
 ====
 
 **NOTE** The following file documents the current release of Tilt (2.0). See

data/Rakefile

@@ -10,7 +10,7 @@ desc 'Run tests (default)'
 Rake::TestTask.new(:test) do |t|
   t.test_files = FileList['test/*_test.rb']
   t.ruby_opts = ['-Itest']
-  t.ruby_opts << '-rubygems' if defined? Gem
+  t.ruby_opts << '-rrubygems' if defined? Gem
   t.warning = false
 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.8'
+  VERSION = '2.0.9'
 
   @default_mapping = Mapping.new
 

data/lib/tilt/commonmarker.rb

@@ -5,13 +5,70 @@ module Tilt
   class CommonMarkerTemplate < Template
     self.default_mime_type = 'text/html'
 
+    OPTION_ALIAS = {
+      :smartypants => :SMART
+    }
+    PARSE_OPTIONS = [
+      :SMART,
+      :smartypants,
+    ].freeze
+    RENDER_OPTIONS = [
+      :GITHUB_PRE_LANG,
+      :HARDBREAKS,
+      :NOBREAKS,
+      :SAFE,
+      :SOURCEPOS,
+    ].freeze
+    EXTENSIONS = [
+      :autolink,
+      :strikethrough,
+      :table,
+      :tagfilter,
+    ].freeze
+
+    def extensions
+      EXTENSIONS.select do |extension|
+        options[extension]
+      end
+    end
+
+    def parse_options
+      raw_options = PARSE_OPTIONS.select do |option|
+        options[option]
+      end
+      actual_options = raw_options.map do |option|
+        OPTION_ALIAS[option] || option
+      end
+
+      if actual_options.any?
+        actual_options
+      else
+        :DEFAULT
+      end
+    end
+
+    def render_options
+      raw_options = RENDER_OPTIONS.select do |option|
+        options[option]
+      end
+      actual_options = raw_options.map do |option|
+        OPTION_ALIAS[option] || option
+      end
+      if actual_options.any?
+        actual_options
+      else
+        :DEFAULT
+      end
+    end
+
     def prepare
       @engine = nil
       @output = nil
     end
 
     def evaluate(scope, locals, &block)
-      CommonMarker.render_html(data, :DEFAULT)
+      doc = CommonMarker.render_doc(data, parse_options, extensions)
+      doc.to_html(render_options, extensions)
     end
 
     def allows_script?

data/lib/tilt/erb.rb

@@ -7,6 +7,8 @@ module Tilt
   class ERBTemplate < Template
     @@default_output_variable = '_erbout'
 
+    SUPPORTS_KVARGS = ::ERB.instance_method(:initialize).parameters.assoc(:key) rescue false
+
     def self.default_output_variable
       @@default_output_variable
     end
@@ -19,7 +21,11 @@ module Tilt
     def prepare
       @outvar = options[:outvar] || self.class.default_output_variable
       options[:trim] = '<>' if !(options[:trim] == false) && (options[:trim].nil? || options[:trim] == true)
-      @engine = ::ERB.new(data, options[:safe], options[:trim], @outvar)
+      @engine = if SUPPORTS_KVARGS
+        ::ERB.new(data, trim_mode: options[:trim], eoutvar: @outvar)
+      else
+        ::ERB.new(data, options[:safe], options[:trim], @outvar)
+      end
     end
 
     def precompiled_template(locals)

data/lib/tilt/haml.rb

@@ -62,7 +62,7 @@ module Tilt
           <<-RUBY
             begin
               extend Haml::Helpers
-              _hamlout = @haml_buffer = Haml::Buffer.new(@haml_buffer, #{options_for_buffer.inspect})
+              _hamlout = @haml_buffer = Haml::Buffer.new(haml_buffer, #{options_for_buffer.inspect})
               _erbout = _hamlout.buffer
               __in_erb_template = true
               _haml_locals = locals
@@ -76,7 +76,7 @@ module Tilt
           <<-RUBY
               #{precompiled_method_return_value}
             ensure
-              @haml_buffer = @haml_buffer.upper if @haml_buffer
+              @haml_buffer = @haml_buffer.upper if haml_buffer
             end
           RUBY
         end

data/lib/tilt/sass.rb

@@ -1,5 +1,4 @@
 require 'tilt/template'
-require 'sass'
 
 module Tilt
   # Sass template implementation. See:
@@ -9,8 +8,20 @@ module Tilt
   class SassTemplate < Template
     self.default_mime_type = 'text/css'
 
+    begin
+      require 'sassc'
+      Sass = ::SassC
+    rescue LoadError => err
+      begin
+        require 'sass'
+        Sass = ::Sass
+      rescue LoadError
+        raise err
+      end
+    end
+
     def prepare
-      @engine = ::Sass::Engine.new(data, sass_options)
+      @engine = Sass::Engine.new(data, sass_options)
     end
 
     def evaluate(scope, locals, &block)

data/test/tilt_commonmarkertemplate_test.rb

@@ -14,6 +14,14 @@ begin
       template = Tilt::CommonMarkerTemplate.new { |t| "# Hello World!" }
       3.times { assert_equal "<h1>Hello World!</h1>\n", template.render }
     end
+
+    test "smartypants when :smartypants is set" do
+      template = Tilt::CommonMarkerTemplate.new(:smartypants => true) do |t|
+        "OKAY -- 'Smarty Pants'"
+      end
+      assert_match('<p>OKAY – ‘Smarty Pants’</p>', template.render)
+    end
+
   end
 rescue LoadError
   warn "Tilt::CommonMarkerTemplate (disabled)"

data/test/tilt_sasstemplate_test.rb

@@ -36,6 +36,7 @@ begin
     end
   end
 
-rescue LoadError
+rescue LoadError => err
+  raise err if ENV['FORCE_SASS']
   warn "Tilt::SassTemplate (disabled)"
 end

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.8'
-  s.date = '2017-07-24'
+  s.version = '2.0.9'
+  s.date = '2018-11-28'
 
   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.8
+  version: 2.0.9
 platform: ruby
 authors:
 - Ryan Tomayko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-24 00:00:00.000000000 Z
+date: 2018-11-28 00:00:00.000000000 Z
 dependencies: []
 description: Generic interface to multiple Ruby template engines
 email: r@tomayko.com