Hello community, here is the log from the commit of package rubygem-haml for openSUSE:Factory checked in at 2020-03-07 21:38:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-haml (Old) and /work/SRC/openSUSE:Factory/.rubygem-haml.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-haml" Sat Mar 7 21:38:16 2020 rev:31 rq:773768 version:5.1.2 Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-haml/rubygem-haml.changes 2019-08-06 15:09:39.623798109 +0200 +++ /work/SRC/openSUSE:Factory/.rubygem-haml.new.26092/rubygem-haml.changes 2020-03-07 21:38:22.280277529 +0100 @@ -1,0 +2,13 @@ +Mon Feb 10 14:49:06 UTC 2020 - Stephan Kulow <co...@suse.com> + +- updated to version 5.1.2 + see installed CHANGELOG.md + + ## 5.1.2 + + Released on August 6, 2019 + ([diff](https://github.com/haml/haml/compare/v5.1.1...v5.1.2)). + + * Fix crash in some environments such as New Relic by unfreezing string literals for ParseNode#inspect. [#1016](https://github.com/haml/haml/pull/1016) (thanks [Jalyna](https://github.com/jalyna)) + +------------------------------------------------------------------- Old: ---- haml-5.1.1.gem New: ---- haml-5.1.2.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-haml.spec ++++++ --- /var/tmp/diff_new_pack.hFwjGP/_old 2020-03-07 21:38:22.728277831 +0100 +++ /var/tmp/diff_new_pack.hFwjGP/_new 2020-03-07 21:38:22.732277834 +0100 @@ -1,7 +1,7 @@ # # spec file for package rubygem-haml # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,7 +24,7 @@ # Name: rubygem-haml -Version: 5.1.1 +Version: 5.1.2 Release: 0 %define mod_name haml %define mod_full_name %{mod_name}-%{version} @@ -33,7 +33,7 @@ BuildRequires: %{rubygem gem2rpm} BuildRequires: ruby-macros >= 5 BuildRequires: update-alternatives -Url: http://haml.info/ +URL: http://haml.info/ Source: https://rubygems.org/gems/%{mod_full_name}.gem Source1: gem2rpm.yml Summary: An elegant, structured (X)HTML/XML templating engine ++++++ haml-5.1.1.gem -> haml-5.1.2.gem ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/.travis.yml new/.travis.yml --- old/.travis.yml 2019-05-25 04:04:40.000000000 +0200 +++ new/.travis.yml 2019-08-06 14:35:39.000000000 +0200 @@ -68,10 +68,6 @@ gemfile: test/gemfiles/Gemfile.rails-4.1.x - rvm: 2.6.3 gemfile: test/gemfiles/Gemfile.rails-4.2.x - - rvm: 2.6.3 - gemfile: test/gemfiles/Gemfile.rails-5.0.x - - rvm: 2.6.3 - gemfile: test/gemfiles/Gemfile.rails-5.0.x.erubi - rvm: ruby-head gemfile: test/gemfiles/Gemfile.rails-4.0.x - rvm: ruby-head @@ -94,6 +90,8 @@ - rvm: jruby-9.2.7.0 gemfile: test/gemfiles/Gemfile.rails-5.0.x.erubi fast_finish: true -before_install: gem i rubygems-update -v '<3' && update_rubygems # https://github.com/travis-ci/travis-ci/issues/8974 -before_install: gem i bundler -v '<2' +before_install: + - gem i rubygems-update -v '<3' && update_rubygems # https://github.com/travis-ci/travis-ci/issues/8974 + - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true + - gem i bundler -v '<2' script: "bundle exec rake submodules test" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHANGELOG.md new/CHANGELOG.md --- old/CHANGELOG.md 2019-05-25 04:04:40.000000000 +0200 +++ new/CHANGELOG.md 2019-08-06 14:35:39.000000000 +0200 @@ -1,11 +1,18 @@ # Haml Changelog +## 5.1.2 + +Released on August 6, 2019 +([diff](https://github.com/haml/haml/compare/v5.1.1...v5.1.2)). + +* Fix crash in some environments such as New Relic by unfreezing string literals for ParseNode#inspect. [#1016](https://github.com/haml/haml/pull/1016) (thanks [Jalyna](https://github.com/jalyna)) + ## 5.1.1 Released on May 25, 2019 ([diff](https://github.com/haml/haml/compare/v5.1.0...v5.1.1)). -* Fix NameError bug for that happens on ruby 2.6.1-2.6.3 + haml 5.1.0 + rails 4.2.x + erubi. (Akira Matsuda) +* Fix NameError bug that happens on ruby 2.6.1-2.6.3 + haml 5.1.0 + rails < 5.1 + erubi. (Akira Matsuda) ## 5.1.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Rakefile new/Rakefile --- old/Rakefile 2019-05-25 04:04:40.000000000 +0200 +++ new/Rakefile 2019-08-06 14:35:39.000000000 +0200 @@ -88,11 +88,7 @@ end def gemfiles - @gemfiles ||= begin - Dir[File.dirname(__FILE__) + '/test/gemfiles/Gemfile.*']. - reject {|f| f =~ /\.lock$/}. - reject {|f| RUBY_VERSION < '1.9.3' && f =~ /Gemfile.rails-(\d+).\d+.x/ && $1.to_i > 3} - end + @gemfiles ||= Dir[File.dirname(__FILE__) + '/test/gemfiles/Gemfile.*'].reject {|f| f =~ /\.lock$/} end def with_each_gemfile Binary files old/checksums.yaml.gz and new/checksums.yaml.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/haml/attribute_parser.rb new/lib/haml/attribute_parser.rb --- old/lib/haml/attribute_parser.rb 2019-05-25 04:04:40.000000000 +0200 +++ new/lib/haml/attribute_parser.rb 2019-08-06 14:35:39.000000000 +0200 @@ -16,7 +16,7 @@ TYPE = 1 TEXT = 2 - IGNORED_TYPES = %i[on_sp on_ignored_nl] + IGNORED_TYPES = %i[on_sp on_ignored_nl].freeze class << self # @return [Boolean] - return true if AttributeParser.parse can be used. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/haml/compiler.rb new/lib/haml/compiler.rb --- old/lib/haml/compiler.rb 2019-05-25 04:04:40.000000000 +0200 +++ new/lib/haml/compiler.rb 2019-08-06 14:35:39.000000000 +0200 @@ -188,30 +188,28 @@ if @options.html5? '<!DOCTYPE html>' - else - if @options.xhtml? - if @node.value[:version] == "1.1" - '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd";>' - elsif @node.value[:version] == "5" - '<!DOCTYPE html>' - else - case @node.value[:type] - when "strict"; '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>' - when "frameset"; '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd";>' - when "mobile"; '<!DOCTYPE html PUBLIC "-//WAPFORUM//DTD XHTML Mobile 1.2//EN" "http://www.openmobilealliance.org/tech/DTD/xhtml-mobile12.dtd";>' - when "rdfa"; '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd";>' - when "basic"; '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.1//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic11.dtd";>' - else '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>' - end - end - - elsif @options.html4? + elsif @options.xhtml? + if @node.value[:version] == "1.1" + '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd";>' + elsif @node.value[:version] == "5" + '<!DOCTYPE html>' + else case @node.value[:type] - when "strict"; '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd";>' - when "frameset"; '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd";>' - else '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";>' + when "strict"; '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>' + when "frameset"; '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd";>' + when "mobile"; '<!DOCTYPE html PUBLIC "-//WAPFORUM//DTD XHTML Mobile 1.2//EN" "http://www.openmobilealliance.org/tech/DTD/xhtml-mobile12.dtd";>' + when "rdfa"; '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd";>' + when "basic"; '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.1//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic11.dtd";>' + else '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>' end end + + elsif @options.html4? + case @node.value[:type] + when "strict"; '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd";>' + when "frameset"; '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd";>' + else '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";>' + end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/haml/error.rb new/lib/haml/error.rb --- old/lib/haml/error.rb 2019-05-25 04:04:40.000000000 +0200 +++ new/lib/haml/error.rb 2019-08-06 14:35:39.000000000 +0200 @@ -5,29 +5,29 @@ class Error < StandardError MESSAGES = { - :bad_script_indent => '"%s" is indented at wrong level: expected %d, but was at %d.', - :cant_run_filter => 'Can\'t run "%s" filter; you must require its dependencies first', - :cant_use_tabs_and_spaces => "Indentation can't use both tabs and spaces.", - :deeper_indenting => "The line was indented %d levels deeper than the previous line.", - :filter_not_defined => 'Filter "%s" is not defined.', - :gem_install_filter_deps => '"%s" filter\'s %s dependency missing: try installing it or adding it to your Gemfile', - :illegal_element => "Illegal element: classes and ids must have values.", - :illegal_nesting_content => "Illegal nesting: nesting within a tag that already has content is illegal.", - :illegal_nesting_header => "Illegal nesting: nesting within a header command is illegal.", - :illegal_nesting_line => "Illegal nesting: content can't be both given on the same line as %%%s and nested within it.", - :illegal_nesting_plain => "Illegal nesting: nesting within plain text is illegal.", - :illegal_nesting_self_closing => "Illegal nesting: nesting within a self-closing tag is illegal.", - :inconsistent_indentation => "Inconsistent indentation: %s used for indentation, but the rest of the document was indented using %s.", - :indenting_at_start => "Indenting at the beginning of the document is illegal.", - :install_haml_contrib => 'To use the "%s" filter, please install the haml-contrib gem.', - :invalid_attribute_list => 'Invalid attribute list: %s.', - :invalid_filter_name => 'Invalid filter name ":%s".', - :invalid_tag => 'Invalid tag: "%s".', - :missing_if => 'Got "%s" with no preceding "if"', - :no_ruby_code => "There's no Ruby code for %s to evaluate.", - :self_closing_content => "Self-closing tags can't have content.", - :unbalanced_brackets => 'Unbalanced brackets.', - :no_end => <<-END + bad_script_indent: '"%s" is indented at wrong level: expected %d, but was at %d.', + cant_run_filter: 'Can\'t run "%s" filter; you must require its dependencies first', + cant_use_tabs_and_spaces: "Indentation can't use both tabs and spaces.", + deeper_indenting: "The line was indented %d levels deeper than the previous line.", + filter_not_defined: 'Filter "%s" is not defined.', + gem_install_filter_deps: '"%s" filter\'s %s dependency missing: try installing it or adding it to your Gemfile', + illegal_element: "Illegal element: classes and ids must have values.", + illegal_nesting_content: "Illegal nesting: nesting within a tag that already has content is illegal.", + illegal_nesting_header: "Illegal nesting: nesting within a header command is illegal.", + illegal_nesting_line: "Illegal nesting: content can't be both given on the same line as %%%s and nested within it.", + illegal_nesting_plain: "Illegal nesting: nesting within plain text is illegal.", + illegal_nesting_self_closing: "Illegal nesting: nesting within a self-closing tag is illegal.", + inconsistent_indentation: "Inconsistent indentation: %s used for indentation, but the rest of the document was indented using %s.", + indenting_at_start: "Indenting at the beginning of the document is illegal.", + install_haml_contrib: 'To use the "%s" filter, please install the haml-contrib gem.', + invalid_attribute_list: 'Invalid attribute list: %s.', + invalid_filter_name: 'Invalid filter name ":%s".', + invalid_tag: 'Invalid tag: "%s".', + missing_if: 'Got "%s" with no preceding "if"', + no_ruby_code: "There's no Ruby code for %s to evaluate.", + self_closing_content: "Self-closing tags can't have content.", + unbalanced_brackets: 'Unbalanced brackets.', + no_end: <<-END You don't need to use "- end" in Haml. Un-indent to close a block: - if foo? %strong Foo! @@ -35,7 +35,7 @@ Not foo. %p This line is un-indented, so it isn't part of the "if" block END - } + }.freeze def self.message(key, *args) string = MESSAGES[key] or raise "[HAML BUG] No error messages for #{key}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/haml/exec.rb new/lib/haml/exec.rb --- old/lib/haml/exec.rb 2019-05-25 04:04:40.000000000 +0200 +++ new/lib/haml/exec.rb 2019-08-06 14:35:39.000000000 +0200 @@ -121,7 +121,7 @@ @options[:input], @options[:output] = input, output end - COLORS = { :red => 31, :green => 32, :yellow => 33 } + COLORS = {red: 31, green: 32, yellow: 33}.freeze # Prints a status message about performing the given action, # colored using the given color (via terminal escapes) if possible. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/haml/helpers.rb new/lib/haml/helpers.rb --- old/lib/haml/helpers.rb 2019-05-25 04:04:40.000000000 +0200 +++ new/lib/haml/helpers.rb 2019-08-06 14:35:39.000000000 +0200 @@ -593,7 +593,7 @@ end # Characters that need to be escaped to HTML entities from user input - HTML_ESCAPE = { '&' => '&', '<' => '<', '>' => '>', '"' => '"', "'" => ''' } + HTML_ESCAPE = {'&' => '&', '<' => '<', '>' => '>', '"' => '"', "'" => '''}.freeze HTML_ESCAPE_REGEX = /['"><&]/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/haml/options.rb new/lib/haml/options.rb --- old/lib/haml/options.rb 2019-05-25 04:04:40.000000000 +0200 +++ new/lib/haml/options.rb 2019-08-06 14:35:39.000000000 +0200 @@ -5,44 +5,40 @@ # understands. Please see the {file:REFERENCE.md#options Haml Reference} to # learn how to set the options. class Options - @valid_formats = [:html4, :html5, :xhtml] - @buffer_option_keys = [:autoclose, :preserve, :attr_wrapper, :format, :encoding, :escape_html, :escape_filter_interpolations, :escape_attrs, :hyphenate_data_attrs, :cdata] - # The default option values. - # @return Hash - def self.defaults - @defaults ||= Haml::TempleEngine.options.to_hash.merge(encoding: 'UTF-8') - end - - # An array of valid values for the `:format` option. - # @return Array - def self.valid_formats - @valid_formats - end - - # An array of keys that will be used to provide a hash of options to - # {Haml::Buffer}. - # @return Hash - def self.buffer_option_keys - @buffer_option_keys - end - - # Returns a subset of defaults: those that {Haml::Buffer} cares about. - # @return [{Symbol => Object}] The options hash - def self.buffer_defaults - @buffer_defaults ||= buffer_option_keys.inject({}) do |hash, key| - hash.merge(key => defaults[key]) + class << self + # The default option values. + # @return Hash + def defaults + @defaults ||= Haml::TempleEngine.options.to_hash.merge(encoding: 'UTF-8') end - end - def self.wrap(options) - if options.is_a?(Options) - options - else - Options.new(options) + # An array of valid values for the `:format` option. + # @return Array + attr_reader :valid_formats + + # An array of keys that will be used to provide a hash of options to + # {Haml::Buffer}. + # @return Hash + attr_reader :buffer_option_keys + + # Returns a subset of defaults: those that {Haml::Buffer} cares about. + # @return [{Symbol => Object}] The options hash + def buffer_defaults + @buffer_defaults ||= buffer_option_keys.inject({}) do |hash, key| + hash.merge(key => defaults[key]) + end + end + + def wrap(options) + if options.is_a?(Options) + options + else + Options.new(options) + end end end @@ -139,7 +135,7 @@ # formatting errors. # # Defaults to `false`. - attr_reader :remove_whitespace + attr_accessor :remove_whitespace # Whether or not attribute hashes and Ruby scripts designated by `=` or `~` # should be evaluated. If this is `true`, said scripts are rendered as empty @@ -175,7 +171,7 @@ # Key is filter name in String and value is Class to use. Defaults to {}. attr_accessor :filters - def initialize(values = {}, &block) + def initialize(values = {}) defaults.each {|k, v| instance_variable_set :"@#{k}", v} values.each {|k, v| send("#{k}=", v) if defaults.has_key?(k) && !v.nil?} yield if block_given? @@ -245,10 +241,6 @@ xhtml? || @cdata end - def remove_whitespace=(value) - @remove_whitespace = value - end - def encoding=(value) return unless value @encoding = value.is_a?(Encoding) ? value.name : value.to_s diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/haml/parser.rb new/lib/haml/parser.rb --- old/lib/haml/parser.rb 2019-05-25 04:04:40.000000000 +0200 +++ new/lib/haml/parser.rb 2019-08-06 14:35:39.000000000 +0200 @@ -61,7 +61,7 @@ SILENT_SCRIPT, ESCAPE, FILTER - ] + ].freeze # The value of the character that designates that a line is part # of a multiline string. @@ -75,8 +75,8 @@ # BLOCK_WITH_SPACES = /do\s*\|\s*[^\|]*\s+\|\z/ - MID_BLOCK_KEYWORDS = %w[else elsif rescue ensure end when] - START_BLOCK_KEYWORDS = %w[if begin case unless] + MID_BLOCK_KEYWORDS = %w[else elsif rescue ensure end when].freeze + START_BLOCK_KEYWORDS = %w[if begin case unless].freeze # Try to parse assignments to block starters as best as possible START_BLOCK_KEYWORD_REGEX = /(?:\w+(?:,\s*\w+)*\s*=\s*)?(#{START_BLOCK_KEYWORDS.join('|')})/ BLOCK_KEYWORD_REGEX = /^-?\s*(?:(#{MID_BLOCK_KEYWORDS.join('|')})|#{START_BLOCK_KEYWORD_REGEX.source})\b/ @@ -202,7 +202,7 @@ end def inspect - %Q[(#{type} #{value.inspect}#{children.each_with_object('') {|c, s| s << "\n#{c.inspect.gsub!(/^/, ' ')}"}})] + %Q[(#{type} #{value.inspect}#{children.each_with_object(''.dup) {|c, s| s << "\n#{c.inspect.gsub!(/^/, ' ')}"}})].dup end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/haml/version.rb new/lib/haml/version.rb --- old/lib/haml/version.rb 2019-05-25 04:04:40.000000000 +0200 +++ new/lib/haml/version.rb 2019-08-06 14:35:39.000000000 +0200 @@ -1,5 +1,5 @@ # frozen_string_literal: true module Haml - VERSION = "5.1.1" + VERSION = "5.1.2" end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata --- old/metadata 2019-05-25 04:04:40.000000000 +0200 +++ new/metadata 2019-08-06 14:35:39.000000000 +0200 @@ -1,7 +1,7 @@ --- !ruby/object:Gem::Specification name: haml version: !ruby/object:Gem::Version - version: 5.1.1 + version: 5.1.2 platform: ruby authors: - Natalie Weizenbaum @@ -11,7 +11,7 @@ autorequire: bindir: bin cert_chain: [] -date: 2019-05-25 00:00:00.000000000 Z +date: 2019-08-06 00:00:00.000000000 Z dependencies: - !ruby/object:Gem::Dependency name: temple
