Hello community, here is the log from the commit of package rubygem-sass for openSUSE:Factory checked in at 2015-03-01 14:46:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-sass (Old) and /work/SRC/openSUSE:Factory/.rubygem-sass.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-sass" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-sass/rubygem-sass.changes 2015-02-16 21:14:01.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rubygem-sass.new/rubygem-sass.changes 2015-03-01 14:46:40.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Feb 27 05:31:39 UTC 2015 - co...@suse.com + +- updated to version 3.4.13 + +------------------------------------------------------------------- Old: ---- sass-3.4.12.gem New: ---- sass-3.4.13.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-sass.spec ++++++ --- /var/tmp/diff_new_pack.g9DZi4/_old 2015-03-01 14:46:41.000000000 +0100 +++ /var/tmp/diff_new_pack.g9DZi4/_new 2015-03-01 14:46:41.000000000 +0100 @@ -24,7 +24,7 @@ # Name: rubygem-sass -Version: 3.4.12 +Version: 3.4.13 Release: 0 %define mod_name sass %define mod_full_name %{mod_name}-%{version} ++++++ sass-3.4.12.gem -> sass-3.4.13.gem ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/VERSION new/VERSION --- old/VERSION 2015-02-14 02:18:19.000000000 +0100 +++ new/VERSION 2015-02-27 03:28:59.000000000 +0100 @@ -1 +1 @@ -3.4.12 +3.4.13 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/VERSION_DATE new/VERSION_DATE --- old/VERSION_DATE 2015-02-14 02:18:19.000000000 +0100 +++ new/VERSION_DATE 2015-02-27 03:28:59.000000000 +0100 @@ -1 +1 @@ -14 February 2015 01:18:18 UTC +27 February 2015 02:28:58 UTC Files old/checksums.yaml.gz and new/checksums.yaml.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/sass/scss/css_parser.rb new/lib/sass/scss/css_parser.rb --- old/lib/sass/scss/css_parser.rb 2015-02-14 02:18:19.000000000 +0100 +++ new/lib/sass/scss/css_parser.rb 2015-02-27 03:28:59.000000000 +0100 @@ -14,6 +14,13 @@ def interpolation(warn_for_color = false); nil; end def use_css_import?; true; end + def block_contents(node, context) + if node.is_a?(Sass::Tree::DirectiveNode) && node.normalized_name == '@keyframes' + context = :keyframes + end + super(node, context) + end + def block_child(context) case context when :ruleset @@ -22,6 +29,8 @@ directive || ruleset when :directive directive || declaration_or_ruleset + when :keyframes + keyframes_ruleset end end @@ -35,6 +44,12 @@ block(node(Sass::Tree::RuleNode.new(selector, range(start_pos)), start_pos), :ruleset) end + def keyframes_ruleset + start_pos = source_position + return unless (selector = keyframes_selector) + block(node(Sass::Tree::KeyframeRuleNode.new(selector.strip), start_pos), :ruleset) + end + @sass_script_parser = Class.new(Sass::Script::CssParser) @sass_script_parser.send(:include, ScriptParser) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/sass/selector/sequence.rb new/lib/sass/selector/sequence.rb --- old/lib/sass/selector/sequence.rb 2015-02-14 02:18:20.000000000 +0100 +++ new/lib/sass/selector/sequence.rb 2015-02-27 03:28:59.000000000 +0100 @@ -260,10 +260,22 @@ return [seq1] if seq2.empty? seq1, seq2 = seq1.dup, seq2.dup - init = merge_initial_ops(seq1, seq2) - return unless init - fin = merge_final_ops(seq1, seq2) - return unless fin + return unless (init = merge_initial_ops(seq1, seq2)) + return unless (fin = merge_final_ops(seq1, seq2)) + + # Make sure there's only one root selector in the output. + root1 = has_root?(seq1.first) && seq1.shift + root2 = has_root?(seq2.first) && seq2.shift + if root1 && root2 + return unless (root = root1.unify(root2)) + seq1.unshift root + seq2.unshift root + elsif root1 + seq2.unshift root1 + elsif root2 + seq1.unshift root2 + end + seq1 = group_selectors(seq1) seq2 = group_selectors(seq2) lcs = Sass::Util.lcs(seq2, seq1) do |s1, s2| @@ -274,6 +286,7 @@ end diff = [[init]] + until lcs.empty? diff << chunks(seq1, seq2) {|s| parent_superselector?(s.first, lcs.first)} << [lcs.shift] seq1.shift @@ -613,6 +626,11 @@ "(#{choices.join ', '})" end.join ' ' end + + def has_root?(sseq) + sseq.is_a?(SimpleSequence) && + sseq.members.any? {|sel| sel.is_a?(Pseudo) && sel.normalized_name == "root"} + end end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/sass/selector/simple.rb new/lib/sass/selector/simple.rb --- old/lib/sass/selector/simple.rb 2015-02-14 02:18:20.000000000 +0100 +++ new/lib/sass/selector/simple.rb 2015-02-27 03:28:59.000000000 +0100 @@ -72,12 +72,9 @@ def unify(sels) return sels if sels.any? {|sel2| eql?(sel2)} sels_with_ix = Sass::Util.enum_with_index(sels) - _, i = - if is_a?(Pseudo) - sels_with_ix.find {|sel, _| sel.is_a?(Pseudo) && (sels.last.type == :element)} - else - sels_with_ix.find {|sel, _| sel.is_a?(Pseudo)} - end + if !is_a?(Pseudo) || (sels.last.is_a?(Pseudo) && sels.last.type == :element) + _, i = sels_with_ix.find {|sel, _| sel.is_a?(Pseudo)} + end return sels + [self] unless i sels[0...i] + [self] + sels[i..-1] end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/sass/tree/visitors/convert.rb new/lib/sass/tree/visitors/convert.rb --- old/lib/sass/tree/visitors/convert.rb 2015-02-14 02:18:20.000000000 +0100 +++ new/lib/sass/tree/visitors/convert.rb 2015-02-27 03:28:59.000000000 +0100 @@ -280,6 +280,10 @@ end end + def visit_keyframerule(node) + "#{tab_str}#{node.resolved_value}#{yield}\n" + end + private def interp_to_src(interp) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata --- old/metadata 2015-02-14 02:18:19.000000000 +0100 +++ new/metadata 2015-02-27 03:28:59.000000000 +0100 @@ -1,7 +1,7 @@ --- !ruby/object:Gem::Specification name: sass version: !ruby/object:Gem::Version - version: 3.4.12 + version: 3.4.13 platform: ruby authors: - Natalie Weizenbaum @@ -10,7 +10,7 @@ autorequire: bindir: bin cert_chain: [] -date: 2015-02-14 00:00:00.000000000 Z +date: 2015-02-27 00:00:00.000000000 Z dependencies: - !ruby/object:Gem::Dependency name: yard diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/sass/css2sass_test.rb new/test/sass/css2sass_test.rb --- old/test/sass/css2sass_test.rb 2015-02-14 02:18:20.000000000 +0100 +++ new/test/sass/css2sass_test.rb 2015-02-27 03:28:59.000000000 +0100 @@ -263,6 +263,38 @@ CSS end + def test_keyframes + assert_equal(<<SASS, css2sass(<<CSS)) +@keyframes dash + from + stroke-dasharray: 1,200 + stroke-dashoffset: 0 + + 50% + stroke-dasharray: 89,200 + stroke-dashoffset: -35 + + to + stroke-dasharray: 89,200 + stroke-dashoffset: -124 +SASS +@keyframes dash { + from { + stroke-dasharray: 1,200; + stroke-dashoffset: 0; + } + 50% { + stroke-dasharray: 89,200; + stroke-dashoffset: -35; + } + to { + stroke-dasharray: 89,200; + stroke-dashoffset: -124; + } +} +CSS + end + # Regressions def test_nesting_with_matching_property diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/sass/extend_test.rb new/test/sass/extend_test.rb --- old/test/sass/extend_test.rb 2015-02-14 02:18:20.000000000 +0100 +++ new/test/sass/extend_test.rb 2015-02-27 03:28:59.000000000 +0100 @@ -503,6 +503,16 @@ SCSS end + def test_root_only_allowed_at_root + assert_extends(':root .foo', '.bar .baz {@extend .foo}', + ':root .foo, :root .bar .baz') + assert_extends('.foo:root .bar', '.baz:root .bang {@extend .bar}', + '.foo:root .bar, .baz.foo:root .bang') + assert_extends('html:root .bar', 'xml:root .bang {@extend .bar}', 'html:root .bar') + assert_extends('.foo:root > .bar .x', '.baz:root .bang .y {@extend .x}', + '.foo:root > .bar .x, .baz.foo:root > .bar .bang .y') + end + def test_comma_extendee assert_equal <<CSS, render(<<SCSS) .foo, .baz { @@ -1338,6 +1348,16 @@ # Regression Tests + def test_extend_with_middle_pseudo + assert_equal(<<CSS, render(<<SCSS)) +.btn:active.focus, :active.focus:before { + a: b; } +CSS +.btn:active.focus {a: b} +:before {@extend .btn} +SCSS + end + def test_extend_parent_selector_suffix assert_equal <<CSS, render(<<SCSS) .a-b, .c { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/sass/scss/css_test.rb new/test/sass/scss/css_test.rb --- old/test/sass/scss/css_test.rb 2015-02-14 02:18:20.000000000 +0100 +++ new/test/sass/scss/css_test.rb 2015-02-27 03:29:00.000000000 +0100 @@ -1243,7 +1243,7 @@ def assert_directive_parses(param) assert_parses <<SCSS -@keyframes #{param} { +@unknown #{param} { a: b; } SCSS end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/test/sass/scss/scss_test.rb new/test/sass/scss/scss_test.rb --- old/test/sass/scss/scss_test.rb 2015-02-14 02:18:20.000000000 +0100 +++ new/test/sass/scss/scss_test.rb 2015-02-27 03:29:00.000000000 +0100 @@ -3925,6 +3925,22 @@ SCSS end + def test_keyword_arg_scope + assert_equal <<CSS, render(<<SCSS) +.mixed { + arg1: default; + arg2: non-default; } +CSS +$arg1: default; +$arg2: default; +@mixin a-mixin($arg1: $arg1, $arg2: $arg2) { + arg1: $arg1; + arg2: $arg2; +} +.mixed { @include a-mixin($arg2: non-default); } +SCSS + end + def test_passing_required_args_as_a_keyword_arg assert_equal <<CSS, render(<<SCSS) .mixed { -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org