Hello community, here is the log from the commit of package rubygem-haml for openSUSE:Factory checked in at 2015-02-11 16:45:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-haml (Old) and /work/SRC/openSUSE:Factory/.rubygem-haml.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-haml" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-haml/rubygem-haml.changes 2014-10-08 22:14:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rubygem-haml.new/rubygem-haml.changes 2015-02-11 16:45:38.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Feb 9 08:06:34 UTC 2015 - [email protected] + +- updated to version 4.0.6 + * Fix warning on Ruby 1.8.7 "regexp has invalid interval" (thanks [Elia Schito](https://github.com/elia)). + +------------------------------------------------------------------- Old: ---- haml-4.0.5.gem New: ---- gem2rpm.yml haml-4.0.6.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-haml.spec ++++++ --- /var/tmp/diff_new_pack.40dl14/_old 2015-02-11 16:45:38.000000000 +0100 +++ /var/tmp/diff_new_pack.40dl14/_new 2015-02-11 16:45:38.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package rubygem-haml # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -15,18 +15,27 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + +# +# This file was generated with a gem2rpm.yml and not just plain gem2rpm. +# All sections marked as MANUAL, license headers, summaries and descriptions +# can be maintained in that file. Please consult this file before editing any +# of those fields +# + Name: rubygem-haml -Version: 4.0.5 +Version: 4.0.6 Release: 0 %define mod_name haml %define mod_full_name %{mod_name}-%{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: ruby-macros >= 5 -BuildRequires: %{ruby} BuildRequires: %{rubygem gem2rpm} +BuildRequires: %{ruby} +BuildRequires: ruby-macros >= 5 BuildRequires: update-alternatives Url: http://haml.info/ Source: http://rubygems.org/gems/%{mod_full_name}.gem +Source1: gem2rpm.yml Summary: An elegant, structured (X)HTML/XML templating engine License: MIT Group: Development/Languages/Ruby ++++++ gem2rpm.yml ++++++ # --- # ## used by gem2rpm # :summary: this is a custom summary # ## used by gem2rpm # :description: |- # this is a custom description # # it can be multiline # ## used by gem2rpm # :license: MIT or Ruby # ## used by gem2rpm and gem_packages # :version_suffix: -x_y # ## used by gem2rpm and gem_packages # :disable_docs: true # ## used by gem2rpm # :disable_automatic_rdoc_dep: true # ## used by gem2rpm # :preamble: |- # BuildRequires: foobar # Requires: foobar # ## used by gem2rpm # :patches: # foo.patch: -p1 # bar.patch: # ## used by gem2rpm :sources: # - foo.desktop # - bar.desktop # :gem_install_args: '....' # ## used by gem2rpm # :pre_install: |- # %if 0%{?use_system_libev} # export USE_VENDORED_LIBEV="no" # %endif # ## used by gem2rpm # :post_install: |- # # delete custom files here or do other fancy stuff # install -D -m 0644 %{S:1} %{buildroot}%{_bindir}/gem2rpm-opensuse # ## used by gem2rpm # :testsuite_command: |- # (pushd %{buildroot}%{gem_base}/gems/%{mod_full_name} && rake test) # ## used by gem2rpm # :filelist: |- # /usr/bin/gem2rpm-opensuse # ## used by gem2rpm # :scripts: # :post: |- # /bin/echo foo # ## used by gem_packages # :main: # :preamble: |- # Requires: util-linux # Recommends: pwgen # :filelist: |- # /usr/bin/gem2rpm-opensuse # ## used by gem_packages # :custom: # apache: # :preamble: |- # Requires: ..... # :filelist: |- # /etc/apache2/conf.d/passenger.conf # :summary: Custom summary is optional # :description: |- # Custom description is optional # # bar # :post: |- # /bin/echo foo # ++++++ haml-4.0.5.gem -> haml-4.0.6.gem ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CHANGELOG.md new/CHANGELOG.md --- old/CHANGELOG.md 2014-01-07 16:06:40.000000000 +0100 +++ new/CHANGELOG.md 2014-12-01 14:20:18.000000000 +0100 @@ -1,6 +1,12 @@ # Haml Changelog -======= +## 4.0.6 + +Released on Dec 1, 2014 ([diff](https://github.com/haml/haml/compare/4.0.5...4.0.6)). + + +* Fix warning on Ruby 1.8.7 "regexp has invalid interval" (thanks [Elia Schito](https://github.com/elia)). + ## 4.0.5 Released on Jan 7, 2014 ([diff](https://github.com/haml/haml/compare/4.0.4...4.0.5)). Files old/checksums.yaml.gz and new/checksums.yaml.gz differ 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 2014-01-07 16:06:40.000000000 +0100 +++ new/lib/haml/parser.rb 2014-12-01 14:20:18.000000000 +0100 @@ -83,7 +83,7 @@ DOCTYPE_REGEX = /(\d(?:\.\d)?)?[\s]*([a-z]*)\s*([^ ]+)?/i # The Regex that matches a literal string or symbol value - LITERAL_VALUE_REGEX = /:(\w*)|(["'])((?!\\|\#{|\#@|\#\$|\2).|\\.)*\2/ + LITERAL_VALUE_REGEX = /:(\w*)|(["'])((?!\\|\#\{|\#@|\#\$|\2).|\\.)*\2/ def initialize(template, options) # :eod is a special end-of-document marker diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/haml/temple.rb new/lib/haml/temple.rb --- old/lib/haml/temple.rb 2014-01-07 16:06:40.000000000 +0100 +++ new/lib/haml/temple.rb 1970-01-01 01:00:00.000000000 +0100 @@ -1,85 +0,0 @@ -require 'haml' -require 'temple' - -module Haml - - module Temple - - module Expressions - def on_plain - [:static, "\n" + value[:text]] - end - - def on_root - [:multi] - end - - def on_doctype - [:html, :doctype, value[:version] || 5] - end - - def on_tag - exp = [:html, :tag, value[:name], [:html, :attrs]] - if value[:value] && value[:value] != "" - if value[:parse] - exp.push << [:dynamic, value[:value]] - else - exp.push << [:static, value[:value]] - end - end - - if attribs = value[:attributes] - attribs.each do |key, value| - exp.last << [:html, :attr, key, [:static, value]] - end - end - - exp - end - end - - class Parser - def initialize(*args) - @options = Options.new - end - - def call(haml) - parser = ::Haml::Parser.new(haml, @options) - tree = parser.parse.tap {|x| p x; puts '-' * 10} - compile(tree).tap {|x| p x; puts '-' * 10} - end - - private - - def compile(node) - exp = node.to_temple - return exp if node.children.empty? - if node.children.length == 1 - exp.push compile(node.children[0]) - else - exp.push [:multi, *node.children.map {|c| compile(c)}] - end - exp - end - end - - class Engine < ::Temple::Engine - use ::Haml::Temple::Parser - html :Pretty - filter :ControlFlow - generator :ArrayBuffer - end - end - - class Parser::ParseNode - include ::Haml::Temple::Expressions - - def to_temple - begin - send "on_#{type}" - end - end - end -end - -Haml::Temple::Template = Temple::Templates::Tilt(Haml::Temple::Engine, :register_as => :haml) \ No newline at end of file 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 2014-01-07 16:06:40.000000000 +0100 +++ new/lib/haml/version.rb 2014-12-01 14:20:18.000000000 +0100 @@ -1,3 +1,3 @@ module Haml - VERSION = "4.0.5" + VERSION = "4.0.6" end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata --- old/metadata 2014-01-07 16:06:40.000000000 +0100 +++ new/metadata 2014-12-01 14:20:18.000000000 +0100 @@ -1,7 +1,7 @@ --- !ruby/object:Gem::Specification name: haml version: !ruby/object:Gem::Version - version: 4.0.5 + version: 4.0.6 platform: ruby authors: - Nathan Weizenbaum @@ -10,7 +10,7 @@ autorequire: bindir: bin cert_chain: [] -date: 2014-01-07 00:00:00.000000000 Z +date: 2014-12-01 00:00:00.000000000 Z dependencies: - !ruby/object:Gem::Dependency name: tilt @@ -124,7 +124,6 @@ - lib/haml/template.rb - lib/haml/template/options.rb - lib/haml/template/plugin.rb -- lib/haml/temple.rb - lib/haml/util.rb - lib/haml/version.rb - test/engine_test.rb @@ -137,7 +136,6 @@ - test/gemfiles/Gemfile.rails-3.1.x - test/gemfiles/Gemfile.rails-3.2.x - test/gemfiles/Gemfile.rails-4.0.x -- test/gemfiles/Gemfile.rails-4.0.x.lock - test/helper_test.rb - test/markaby/standard.mab - test/mocks/article.rb @@ -230,7 +228,7 @@ version: '0' requirements: [] rubyforge_project: -rubygems_version: 2.2.0 +rubygems_version: 2.4.4 signing_key: specification_version: 4 summary: An elegant, structured (X)HTML/XML templating engine. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/gemfiles/Gemfile.rails-4.0.x.lock new/test/gemfiles/Gemfile.rails-4.0.x.lock --- old/test/gemfiles/Gemfile.rails-4.0.x.lock 2014-01-07 16:06:40.000000000 +0100 +++ new/test/gemfiles/Gemfile.rails-4.0.x.lock 1970-01-01 01:00:00.000000000 +0100 @@ -1,101 +0,0 @@ -PATH - remote: ../../.. - specs: - rails (4.0.0.beta1) - actionmailer (= 4.0.0.beta1) - actionpack (= 4.0.0.beta1) - activerecord (= 4.0.0.beta1) - activesupport (= 4.0.0.beta1) - bundler (>= 1.3.0, < 2.0) - railties (= 4.0.0.beta1) - sprockets-rails (~> 2.0.0.rc4) - -PATH - remote: /Users/norman/work/haml - specs: - haml (4.0.3) - tilt - -GEM - remote: http://rubygems.org/ - specs: - actionmailer (4.0.0.beta1) - actionpack (= 4.0.0.beta1) - mail (~> 2.5.3) - actionpack (4.0.0.beta1) - activesupport (= 4.0.0.beta1) - builder (~> 3.1.0) - erubis (~> 2.7.0) - rack (~> 1.5.2) - rack-test (~> 0.6.2) - activemodel (4.0.0.beta1) - activesupport (= 4.0.0.beta1) - builder (~> 3.1.0) - activerecord (4.0.0.beta1) - activemodel (= 4.0.0.beta1) - activerecord-deprecated_finders (~> 0.0.3) - activesupport (= 4.0.0.beta1) - arel (~> 4.0.0.beta1) - activerecord-deprecated_finders (0.0.3) - activesupport (4.0.0.beta1) - i18n (~> 0.6.2) - minitest (~> 4.2) - multi_json (~> 1.3) - thread_safe (~> 0.1) - tzinfo (~> 0.3.33) - arel (4.0.0) - atomic (1.1.9) - builder (3.1.4) - erubis (2.7.0) - hike (1.2.2) - i18n (0.6.4) - json (1.8.0) - mail (2.5.4) - mime-types (~> 1.16) - treetop (~> 1.4.8) - mime-types (1.23) - minitest (4.7.4) - multi_json (1.7.3) - nokogiri (1.5.9) - polyglot (0.3.3) - rack (1.5.2) - rack-test (0.6.2) - rack (>= 1.0) - railties (4.0.0.beta1) - actionpack (= 4.0.0.beta1) - activesupport (= 4.0.0.beta1) - rake (>= 0.8.7) - rdoc (~> 3.4) - thor (>= 0.17.0, < 2.0) - rake (10.0.4) - rbench (0.2.3) - rdoc (3.12.2) - json (~> 1.4) - sprockets (2.9.3) - hike (~> 1.2) - multi_json (~> 1.0) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.0.0.rc4) - actionpack (>= 3.0) - activesupport (>= 3.0) - sprockets (~> 2.8) - thor (0.18.1) - thread_safe (0.1.0) - atomic - tilt (1.4.1) - treetop (1.4.12) - polyglot - polyglot (>= 0.3.1) - tzinfo (0.3.37) - -PLATFORMS - ruby - -DEPENDENCIES - bundler (~> 1.3.0) - haml! - minitest - nokogiri - rails (~> 4.0.0.beta1)! - rbench diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/helper_test.rb new/test/helper_test.rb --- old/test/helper_test.rb 2014-01-07 16:06:40.000000000 +0100 +++ new/test/helper_test.rb 2014-12-01 14:20:18.000000000 +0100 @@ -140,16 +140,16 @@ def test_form_tag # This is usually provided by ActionController::Base. def @base.protect_against_forgery?; false; end - assert_equal(<<HTML, render(<<HAML, :action_view)) -<form accept-charset="UTF-8" action="foo" method="post">#{rails_form_opener} - <p>bar</p> - <strong>baz</strong> -</form> -HTML + + rendered = render(<<HAML, :action_view) = form_tag 'foo' do %p bar %strong baz HAML + fragment = Nokogiri::HTML.fragment(rendered) + assert_equal 'foo', fragment.css('form').first.attributes['action'].to_s + assert_equal 'bar', fragment.css('form p').first.text.strip + assert_equal 'baz', fragment.css('form strong').first.text.strip end def test_pre @@ -244,11 +244,10 @@ def test_form_tag_in_helper_with_string_block def @base.protect_against_forgery?; false; end - assert_equal(<<HTML, render(<<HAML, :action_view)) -<form accept-charset="UTF-8" action="/foo" method="post">#{rails_form_opener}bar</form> -HTML -= wacky_form -HAML + rendered = render('= wacky_form', :action_view) + fragment = Nokogiri::HTML.fragment(rendered) + assert_equal 'bar', fragment.text.strip + assert_equal '/foo', fragment.css('form').first.attributes['action'].to_s end def test_haml_tag_name_attribute_with_id diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/test_helper.rb new/test/test_helper.rb --- old/test/test_helper.rb 2014-01-07 16:06:40.000000000 +0100 +++ new/test/test_helper.rb 2014-12-01 14:20:18.000000000 +0100 @@ -65,10 +65,6 @@ Haml::Util.silence_warnings(&block) end - def rails_form_opener - '<div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="✓" /></div>' - end - def assert_raises_message(klass, message) yield rescue Exception => e -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
