sass 3.4.6 → 3.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25939bfbe2548dc0bc9ce36e84b69cb2097defab
-  data.tar.gz: 70b91642e6e2f72c388d664ab4a322de692d70a6
+  metadata.gz: 6ce3a34b6410945928265cb2994c16ff2ba8fe8e
+  data.tar.gz: a298709397821b949d06896b2265ea6557fe402e
 SHA512:
-  metadata.gz: 0ccbfbd420d684612d1826af5744004b728f480161f4fa241f417fd5edc78177c05de259520e26a4c4cab01779ee4e423043d6d2060c8cc1fec765bf6389acfc
-  data.tar.gz: 11e59d8d04b67c8272533ec4081e2119c5ffe3cd0f652507cbf80ee400d2465bfe7aa4380bdde2225f6eea9d7112487871fc31016e96a0002d41990ff7ab919f
+  metadata.gz: e4326c4cef81a6972653a0fb2371c6d0d09225b3f52fcb2aaeb3e9c897ccdde23217dc10200e34afc3343fd5629404a71669bbe7aea7662be0bb2487d5718186
+  data.tar.gz: 1aaa2849ef7c65e26ce841d83453b5d31a99c1f44e6f74441b663f70ca5f9194cd5150bce442e0d4656c8d83e5d4ae4d25c85a861ad9118956f82fbbaad81c04

data/VERSION

@@ -1 +1 @@
-3.4.6
+3.4.7

data/VERSION_DATE

@@ -1 +1 @@
-17 October 2014 01:32:48 UTC
+31 October 2014 21:28:44 UTC

data/lib/sass/script/functions.rb

@@ -170,6 +170,9 @@ module Sass::Script
   # \{#nth nth($list, $n)}
   # : Returns a specific item in a list.
   #
+  # \{#set-nth set-nth($list, $n, $value)}
+  # : Replaces the nth item in a list.
+  #
   # \{#join join($list1, $list2, \[$separator\])}
   # : Joins together two lists into one.
   #
@@ -1287,7 +1290,7 @@ module Sass::Script
     #   @param $color1 [Sass::Script::Value::Color]
     #   @param $color2 [Sass::Script::Value::Color]
     #   @param $weight [Sass::Script::Value::Number] The relative weight of each
-    #     color. Closer to `0%` gives more weight to `$color`, closer to `100%`
+    #     color. Closer to `0%` gives more weight to `$color1`, closer to `100%`
     #     gives more weight to `$color2`
     # @return [Sass::Script::Value::Color]
     # @raise [ArgumentError] if `$weight` is out of bounds or any parameter is

data/lib/sass/script/tree/operation.rb

@@ -79,11 +79,23 @@ module Sass::Script::Tree
       end
 
       begin
-        opts(value1.send(@operator, value2))
+        result = opts(value1.send(@operator, value2))
       rescue NoMethodError => e
         raise e unless e.name.to_s == @operator.to_s
         raise Sass::SyntaxError.new("Undefined operation: \"#{value1} #{@operator} #{value2}\".")
       end
+
+      if @operator == :eq && value1.is_a?(Sass::Script::Value::Number) &&
+          value2.is_a?(Sass::Script::Value::Number) && result == Sass::Script::Value::Bool::TRUE &&
+          value1.unitless? != value2.unitless?
+        Sass::Util.sass_warn <<WARNING
+DEPRECATION WARNING on line #{line}#{" of #{filename}" if filename}:
+The result of `#{value1} == #{value2}` will be `false` in future releases of Sass.
+Unitless numbers will no longer be equal to the same numbers with units.
+WARNING
+      end
+
+      result
     end
 
     private

data/lib/sass/selector/sequence.rb

@@ -490,8 +490,15 @@ module Sass
 
         if seq1[1].is_a?(String)
           return unless seq2[si + 1].is_a?(String)
+
           # .foo ~ .bar is a superselector of .foo + .bar
           return unless seq1[1] == "~" ? seq2[si + 1] != ">" : seq1[1] == seq2[si + 1]
+
+          # .foo > .baz is not a superselector of .foo > .bar > .baz or .foo >
+          # .bar .baz, despite the fact that .baz is a superselector of .bar >
+          # .baz and .bar .baz. Same goes for + and ~.
+          return if seq1.length == 3 && seq2.length > 3
+
           return _superselector?(seq1[2..-1], seq2[si + 2..-1])
         elsif seq2[si + 1].is_a?(String)
           return unless seq2[si + 1] == ">"

data/lib/sass/selector/simple_sequence.rb

@@ -89,7 +89,7 @@ module Sass
         resolved_members = @members.map do |sel|
           next sel unless sel.is_a?(Pseudo) && sel.selector
           sel.with_selector(sel.selector.resolve_parent_refs(super_cseq, !:implicit_parent))
-        end
+        end.flatten
 
         # Parent selector only appears as the first selector in the sequence
         unless (parent = resolved_members.first).is_a?(Parent)

data/test/sass/extend_test.rb

@@ -514,6 +514,18 @@ CSS
 SCSS
   end
 
+  def test_nested_pseudo_selectors
+    assert_equal <<CSS, render(<<SCSS)
+.foo .bar:not(.baz), .bang .bar:not(.baz) {
+  a: b; }
+CSS
+.foo {
+  .bar:not(.baz) {a: b}
+}
+.bang {@extend .foo}
+SCSS
+  end
+
   ## Long Extendees
 
   def test_long_extendee

data/test/sass/script_test.rb

@@ -458,8 +458,13 @@ SASS
     assert_equal "2in", resolve("1in + 96px")
     assert_equal "true", resolve("2mm < 1cm")
     assert_equal "true", resolve("10mm == 1cm")
-    assert_equal "true", resolve("1 == 1cm")
     assert_equal "true", resolve("1.1cm == 11mm")
+
+    assert_warning(<<WARNING) {assert_equal "true", resolve("1 == 1cm")}
+DEPRECATION WARNING on line 1 of test_operator_unit_conversion_inline.sass:
+The result of `1 == 1cm` will be `false` in future releases of Sass.
+Unitless numbers will no longer be equal to the same numbers with units.
+WARNING
   end
 
   def test_length_units

data/test/sass/superselector_test.rb

@@ -55,6 +55,25 @@ class SuperselectorTest < MiniTest::Test
   def test_descendant_is_superselector_of_child
     assert_strict_superselector '.foo .bar', '.foo > .bar.baz'
     assert_strict_superselector '.foo .bar', '.foo.baz > .bar'
+    assert_strict_superselector '.foo .baz', '.foo > .bar > .baz'
+  end
+
+  def test_child_isnt_superselector_of_longer_child
+    refute_superselector '.foo > .baz', '.foo > .bar > .baz'
+    refute_superselector '.foo > .baz', '.foo > .bar .baz'
+  end
+
+  def test_following_sibling_isnt_superselector_of_longer_following_sibling
+    refute_superselector '.foo + .baz', '.foo + .bar + .baz'
+    refute_superselector '.foo + .baz', '.foo + .bar .baz'
+  end
+
+  def test_sibling_isnt_superselector_of_longer_sibling
+    # This actually is a superselector, but it's a very narrow edge case and
+    # detecting it is very difficult and may be exponential in the worst case.
+    refute_superselector '.foo ~ .baz', '.foo ~ .bar ~ .baz'
+
+    refute_superselector '.foo ~ .baz', '.foo ~ .bar .baz'
   end
 
   def test_matches_is_superselector_of_constituent_selectors

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass
 version: !ruby/object:Gem::Version
-  version: 3.4.6
+  version: 3.4.7
 platform: ruby
 authors:
 - Natalie Weizenbaum
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-17 00:00:00.000000000 Z
+date: 2014-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard