Hello community, here is the log from the commit of package rubygem-tilt for openSUSE:Factory checked in at 2019-01-21 10:25:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-tilt (Old) and /work/SRC/openSUSE:Factory/.rubygem-tilt.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-tilt" Mon Jan 21 10:25:33 2019 rev:19 rq:656371 version:2.0.9 Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-tilt/rubygem-tilt.changes 2017-07-26 13:05:41.170785860 +0200 +++ /work/SRC/openSUSE:Factory/.rubygem-tilt.new.28833/rubygem-tilt.changes 2019-01-21 10:25:33.721736873 +0100 @@ -1,0 +2,11 @@ +Sat Dec 8 16:32:28 UTC 2018 - Stephan Kulow <[email protected]> + +- updated to version 2.0.9 + see installed CHANGELOG.md + + ## 2.0.9 (2018-11-28) + + * Use new ERB API in Ruby 2.6 (#329, koic) + * Support the new sassc gem (#336, jdickey, judofyr) + +------------------------------------------------------------------- Old: ---- tilt-2.0.8.gem New: ---- tilt-2.0.9.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-tilt.spec ++++++ --- /var/tmp/diff_new_pack.4R2wQ8/_old 2019-01-21 10:25:34.081736477 +0100 +++ /var/tmp/diff_new_pack.4R2wQ8/_new 2019-01-21 10:25:34.085736473 +0100 @@ -1,7 +1,7 @@ # # spec file for package rubygem-tilt # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -24,7 +24,7 @@ # Name: rubygem-tilt -Version: 2.0.8 +Version: 2.0.9 Release: 0 %define mod_name tilt %define mod_full_name %{mod_name}-%{version} @@ -35,7 +35,7 @@ BuildRequires: ruby-macros >= 5 BuildRequires: update-alternatives Url: http://github.com/rtomayko/tilt/ -Source: http://rubygems.org/gems/%{mod_full_name}.gem +Source: https://rubygems.org/gems/%{mod_full_name}.gem Source1: gem2rpm.yml Summary: Generic interface to multiple Ruby template engines License: MIT ++++++ tilt-2.0.8.gem -> tilt-2.0.9.gem ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHANGELOG.md new/CHANGELOG.md --- old/CHANGELOG.md 2017-07-24 09:05:05.000000000 +0200 +++ new/CHANGELOG.md 2018-11-28 14:03:01.000000000 +0100 @@ -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) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Gemfile new/Gemfile --- old/Gemfile 2017-07-24 09:05:05.000000000 +0200 +++ new/Gemfile 2018-11-28 14:03:01.000000000 +0100 @@ -17,7 +17,12 @@ 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' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/README.md new/README.md --- old/README.md 2017-07-24 09:05:05.000000000 +0200 +++ new/README.md 2018-11-28 14:03:01.000000000 +0100 @@ -1,4 +1,4 @@ -Tilt [](http://travis-ci.org/rtomayko/tilt) [](https://gemnasium.com/rtomayko/tilt) [](http://inch-ci.org/github/rtomayko/tilt) [](https://hakiri.io/github/rtomayko/tilt/master) +Tilt [](http://travis-ci.org/rtomayko/tilt) [](http://inch-ci.org/github/rtomayko/tilt) [](https://hakiri.io/github/rtomayko/tilt/master) ==== **NOTE** The following file documents the current release of Tilt (2.0). See diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Rakefile new/Rakefile --- old/Rakefile 2017-07-24 09:05:05.000000000 +0200 +++ new/Rakefile 2018-11-28 14:03:01.000000000 +0100 @@ -10,7 +10,7 @@ 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 Binary files old/checksums.yaml.gz and new/checksums.yaml.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/tilt/commonmarker.rb new/lib/tilt/commonmarker.rb --- old/lib/tilt/commonmarker.rb 2017-07-24 09:05:05.000000000 +0200 +++ new/lib/tilt/commonmarker.rb 2018-11-28 14:03:01.000000000 +0100 @@ -5,13 +5,70 @@ 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? diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/tilt/erb.rb new/lib/tilt/erb.rb --- old/lib/tilt/erb.rb 2017-07-24 09:05:05.000000000 +0200 +++ new/lib/tilt/erb.rb 2018-11-28 14:03:01.000000000 +0100 @@ -7,6 +7,8 @@ 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 @@ 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) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/tilt/haml.rb new/lib/tilt/haml.rb --- old/lib/tilt/haml.rb 2017-07-24 09:05:05.000000000 +0200 +++ new/lib/tilt/haml.rb 2018-11-28 14:03:01.000000000 +0100 @@ -62,7 +62,7 @@ <<-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 @@ <<-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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/tilt/sass.rb new/lib/tilt/sass.rb --- old/lib/tilt/sass.rb 2017-07-24 09:05:05.000000000 +0200 +++ new/lib/tilt/sass.rb 2018-11-28 14:03:01.000000000 +0100 @@ -1,5 +1,4 @@ require 'tilt/template' -require 'sass' module Tilt # Sass template implementation. See: @@ -9,8 +8,20 @@ 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) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/tilt.rb new/lib/tilt.rb --- old/lib/tilt.rb 2017-07-24 09:05:05.000000000 +0200 +++ new/lib/tilt.rb 2018-11-28 14:03:01.000000000 +0100 @@ -4,7 +4,7 @@ # 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata --- old/metadata 2017-07-24 09:05:05.000000000 +0200 +++ new/metadata 2018-11-28 14:03:01.000000000 +0100 @@ -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: [email protected] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/tilt_commonmarkertemplate_test.rb new/test/tilt_commonmarkertemplate_test.rb --- old/test/tilt_commonmarkertemplate_test.rb 2017-07-24 09:05:05.000000000 +0200 +++ new/test/tilt_commonmarkertemplate_test.rb 2018-11-28 14:03:01.000000000 +0100 @@ -14,6 +14,14 @@ 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)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/tilt_sasstemplate_test.rb new/test/tilt_sasstemplate_test.rb --- old/test/tilt_sasstemplate_test.rb 2017-07-24 09:05:05.000000000 +0200 +++ new/test/tilt_sasstemplate_test.rb 2018-11-28 14:03:01.000000000 +0100 @@ -36,6 +36,7 @@ end end -rescue LoadError +rescue LoadError => err + raise err if ENV['FORCE_SASS'] warn "Tilt::SassTemplate (disabled)" end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tilt.gemspec new/tilt.gemspec --- old/tilt.gemspec 2017-07-24 09:05:05.000000000 +0200 +++ new/tilt.gemspec 2018-11-28 14:03:01.000000000 +0100 @@ -3,8 +3,8 @@ 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
