sass 3.4.12 → 3.4.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4b73da7dd6f9103e68b1edcb10a59411db18295
-  data.tar.gz: ac1d03b3da377814ef33bc5ef9e8f58f318571f9
+  metadata.gz: 8d20c295937040233d2c011ca20001285180ba16
+  data.tar.gz: 6335a222a12384382336d048635bcd0e0b3b473f
 SHA512:
-  metadata.gz: 4da9bdb240ed324d5e7ffd69c3f84d78d811060f19949c4c1d534bf71fbce21b87b96e976f80c6f21fe5636d31e2472f9132fc12b9cb82370bd251e1c3f3e8ec
-  data.tar.gz: 6adddaf3a218472b3eaf4f8a23c6a909dab474f8265088aedee06cbdc6505d948a50d6f29aca9464f9d6786c7f6db3f6f89eaa435a329cddf1bec407a516027f
+  metadata.gz: 36072d55532236efa0e689550fddd097ae58e3bfa1e889e609d91fabf31f05b12c02cf04fa2803c0dce1b42ae0f460e110efb55b3614f1205da0daf848b7fee7
+  data.tar.gz: 7fd86b668d23751664fb507def2a7dec79ccbb311b756abcded9963a3a5422d4177798e3af9a0db17c8ec5858943bef8302ae6f92cdbe0f12d57b9013431692c

data/VERSION

@@ -1 +1 @@
-3.4.12
+3.4.13

data/VERSION_DATE

@@ -1 +1 @@
-14 February 2015 01:18:18 UTC
+27 February 2015 02:28:58 UTC

data/lib/sass/scss/css_parser.rb

@@ -14,6 +14,13 @@ module Sass
       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 @@ module Sass
           directive || ruleset
         when :directive
           directive || declaration_or_ruleset
+        when :keyframes
+          keyframes_ruleset
         end
       end
 
@@ -35,6 +44,12 @@ module Sass
         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

data/lib/sass/selector/sequence.rb

@@ -260,10 +260,22 @@ module Sass
         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 @@ module Sass
         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 @@ module Sass
           "(#{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

data/lib/sass/selector/simple.rb

@@ -72,12 +72,9 @@ module Sass
       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

data/lib/sass/tree/visitors/convert.rb

@@ -280,6 +280,10 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
     end
   end
 
+  def visit_keyframerule(node)
+    "#{tab_str}#{node.resolved_value}#{yield}\n"
+  end
+
   private
 
   def interp_to_src(interp)

data/test/sass/css2sass_test.rb

@@ -263,6 +263,38 @@ SASS
 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

data/test/sass/extend_test.rb

@@ -503,6 +503,16 @@ CSS
 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 @@ SCSS
 
   # 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 {

data/test/sass/scss/css_test.rb

@@ -1243,7 +1243,7 @@ SCSS
 
   def assert_directive_parses(param)
     assert_parses <<SCSS
-@keyframes #{param} {
+@unknown #{param} {
   a: b; }
 SCSS
   end

data/test/sass/scss/scss_test.rb

@@ -3925,6 +3925,22 @@ CSS
 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 {

metadata

@@ -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 @@ authors:
 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