sass 3.3.0.alpha.177 → 3.3.0.alpha.181

data/REVISION

@@ -1 +1 @@
-1325a12884dbb483f07f2b8ba3ba0526f8148366
+dca1498acda9d3549cc10e87045f75516e494284

data/VERSION

@@ -1 +1 @@
-3.3.0.alpha.177
+3.3.0.alpha.181

data/VERSION_DATE

@@ -1 +1 @@
-10 June 2013 16:41:26 GMT
+17 June 2013 21:59:02 GMT

data/lib/sass/engine.rb

@@ -352,7 +352,7 @@ ERR
       compressed = @options[:style] == :compressed
       rendered << "\n" if rendered[-1] != ?\n
       rendered << "\n" unless compressed
-      rendered << "/*@ sourceMappingURL="
+      rendered << "/*# sourceMappingURL="
       rendered << Sass::Util.escape_uri(sourcemap_uri)
       rendered << " */"
       rendered = encode_and_set_charset(rendered)

data/lib/sass/script/functions.rb

@@ -1481,28 +1481,30 @@ module Sass::Script
     # Gets the nth item in a list.
     #
     # Note that unlike some languages, the first item in a Sass list is number 1,
-    # the second number 2, and so forth.
+    # the second number 2, and so forth. You can also use negative numbers to
+    # count from the end of the list. So -1 is the last item, -2 is the
+    # second-to-last item, etc.
     #
     # @example
     #   nth(10px 20px 30px, 1) => 10px
     #   nth((Helvetica, Arial, sans-serif), 3) => sans-serif
+    #   nth((red, green, blue), -2) => green
     # @param list [Value] The list
     # @param n [Sass::Script::Value::Number] The index into the list
     # @return [Sass::Script::Value::Base] The nth item in the list
-    # @raise [ArgumentError] If `n` isn't an integer between 1 and the list's length.
+    # @raise [ArgumentError] If `n` isn't an integer whose absolute value is between 1 and the list's length.
     def nth(list, n)
       assert_type n, :Number
-      if !n.int?
-        raise ArgumentError.new("List index #{n} must be an integer")
-      elsif n.to_i < 1
-        raise ArgumentError.new("List index #{n} must be greater than or equal to 1")
+      if !n.int? || n.to_i == 0
+        raise ArgumentError.new("List index #{n} must be a non-zero integer")
       elsif list.to_a.size == 0
         raise ArgumentError.new("List index is #{n} but list has no items")
-      elsif n.to_i > (size = list.to_a.size)
+      elsif n.to_i.abs > (size = list.to_a.size)
         raise ArgumentError.new("List index is #{n} but list is only #{size} item#{'s' if size != 1} long")
       end
 
-      list.to_a[n.to_i - 1]
+      index = n.to_i > 0 ? n.to_i - 1 : n.to_i
+      list.to_a[index]
     end
     declare :nth, [:list, :n]
 

data/lib/sass/selector/sequence.rb

@@ -437,15 +437,21 @@ module Sass
       # @param seqses [Array<Array<Array<SimpleSequence or String>>>]
       # @return [Array<Array<Array<SimpleSequence or String>>>]
       def trim(seqses)
-        # Avoid truly horrific quadratic behavior. TOOD: I think there
+        # Avoid truly horrific quadratic behavior. TODO: I think there
         # may be a way to get perfect trimming without going quadratic.
         return seqses if seqses.size > 100
+
+        # Keep the results in a separate array so we can be sure we aren't
+        # comparing against an already-trimmed selector. This ensures that two
+        # identical selectors don't mutually trim one another.
+        result = seqses.dup
+
         # This is n^2 on the sequences, but only comparing between
         # separate sequences should limit the quadratic behavior.
-        seqses.map do |seqs1|
-          seqs1.reject do |seq1|
+        seqses.each_with_index do |seqs1, i|
+          result[i] = seqs1.reject do |seq1|
             min_spec = _sources(seq1).map {|seq| seq.specificity}.min || 0
-            seqses.any? do |seqs2|
+            result.any? do |seqs2|
               next if seqs1.equal?(seqs2)
               # Second Law of Extend: the specificity of a generated selector
               # should never be less than the specificity of the extending
@@ -456,6 +462,7 @@ module Sass
             end
           end
         end
+        result
       end
 
       def _hash

data/test/sass/extend_test.rb

@@ -1116,6 +1116,43 @@ SCSS
 
   # Regression Tests
 
+  def test_nested_sibling_extend
+    assert_equal <<CSS, render(<<SCSS)
+.parent .bar, .parent .foo {
+  width: 2000px; }
+CSS
+.foo {@extend .bar}
+
+.parent {
+  .bar {
+    width: 2000px;
+  }
+  .foo {
+    @extend .bar
+  }
+}
+SCSS
+  end
+
+  def test_parent_and_sibling_extend
+    assert_equal <<CSS, render(<<SCSS)
+.parent1 .parent2 .child1.child2, .parent2 .parent1 .child1.child2 {
+  c: d; }
+CSS
+%foo %bar%baz {c: d}
+
+.parent1 {
+  @extend %foo;
+  .child1 {@extend %bar}
+}
+
+.parent2 {
+  @extend %foo;
+  .child2 {@extend %baz}
+}
+SCSS
+  end
+
   def test_nested_extend_specificity
     assert_equal <<CSS, render(<<SCSS)
 a :b, a :b:c {

data/test/sass/functions_test.rb

@@ -1017,12 +1017,14 @@ MSG
   def test_nth
     assert_equal("1", evaluate("nth(1 2 3, 1)"))
     assert_equal("2", evaluate("nth(1 2 3, 2)"))
+    assert_equal("3", evaluate("nth(1 2 3, -1)"))
+    assert_equal("1", evaluate("nth(1 2 3, -3)"))
     assert_equal("3", evaluate("nth((1, 2, 3), 3)"))
     assert_equal("foo", evaluate("nth(foo, 1)"))
     assert_equal("bar baz", evaluate("nth(foo (bar baz) bang, 2)"))
-    assert_error_message("List index 0 must be greater than or equal to 1 for `nth'", "nth(foo, 0)")
-    assert_error_message("List index -10 must be greater than or equal to 1 for `nth'", "nth(foo, -10)")
-    assert_error_message("List index 1.5 must be an integer for `nth'", "nth(foo, 1.5)")
+    assert_error_message("List index 0 must be a non-zero integer for `nth'", "nth(foo, 0)")
+    assert_error_message("List index is -10 but list is only 1 item long for `nth'", "nth(foo, -10)")
+    assert_error_message("List index 1.5 must be a non-zero integer for `nth'", "nth(foo, 1.5)")
     assert_error_message("List index is 5 but list is only 4 items long for `nth'", "nth(1 2 3 4, 5)")
     assert_error_message("List index is 2 but list is only 1 item long for `nth'", "nth(foo, 2)")
     assert_error_message("List index is 1 but list has no items for `nth'", "nth((), 1)")

data/test/sass/source_map_test.rb

@@ -24,7 +24,7 @@ a {
   /* SOME COMMENT */
   font-size: 12px; }
 
-/*@ sourceMappingURL=test.css.map */
+/*# sourceMappingURL=test.css.map */
 CSS
 {
 "version": "3",
@@ -47,7 +47,7 @@ a {
   /* SOME COMMENT */
   font-size: 12px; }
 
-/*@ sourceMappingURL=test.css.map */
+/*# sourceMappingURL=test.css.map */
 CSS
 {
 "version": "3",
@@ -72,7 +72,7 @@ a {
   /* SOME COMMENT */
   font-size: 12px; }
 
-/*@ sourceMappingURL=style.css.map */
+/*# sourceMappingURL=style.css.map */
 CSS
 {
 "version": "3",
@@ -96,7 +96,7 @@ a {
   /* SOME COMMENT */
   font-size: 12px; }
 
-/*@ sourceMappingURL=style.css.map */
+/*# sourceMappingURL=style.css.map */
 CSS
 {
 "version": "3",
@@ -118,7 +118,7 @@ SCSS
 a {
   fóó: bár; }
 
-/*@ sourceMappingURL=test.css.map */
+/*# sourceMappingURL=test.css.map */
 CSS
 {
 "version": "3",
@@ -138,7 +138,7 @@ SASS
 a {
   fóó: bár; }
 
-/*@ sourceMappingURL=test.css.map */
+/*# sourceMappingURL=test.css.map */
 CSS
 {
 "version": "3",
@@ -160,7 +160,7 @@ SCSS
 f\x86\x86 {
   \x86: b; }
 
-/*@ sourceMappingURL=test.css.map */
+/*# sourceMappingURL=test.css.map */
 CSS
 {
 "version": "3",
@@ -181,7 +181,7 @@ SASS
 f\x86\x86 {
   \x86: b; }
 
-/*@ sourceMappingURL=test.css.map */
+/*# sourceMappingURL=test.css.map */
 CSS
 {
 "version": "3",
@@ -203,7 +203,7 @@ SCSS
 {{3}}@import url(bar){{/3}};
 {{4}}@import url(baz) screen print{{/4}};
 
-/*@ sourceMappingURL=test.css.map */
+/*# sourceMappingURL=test.css.map */
 CSS
   end
 
@@ -219,7 +219,7 @@ SASS
 {{4}}@import url(baz.css){{/4}};
 {{5}}@import url(qux.css) screen print{{/5}};
 
-/*@ sourceMappingURL=test.css.map */
+/*# sourceMappingURL=test.css.map */
 CSS
   end
 
@@ -235,7 +235,7 @@ SCSS
   {{2}}body{{/2}} {
     {{3}}max-width{{/3}}: {{4}}1070px{{/4}}; } }
 
-/*@ sourceMappingURL=test.css.map */
+/*# sourceMappingURL=test.css.map */
 CSS
   end
 
@@ -249,7 +249,7 @@ SASS
   {{2}}body{{/2}} {
     {{3}}max-width{{/3}}: {{4}}1070px{{/4}}; } }
 
-/*@ sourceMappingURL=test.css.map */
+/*# sourceMappingURL=test.css.map */
 CSS
   end
 
@@ -279,7 +279,7 @@ SCSS
   {{7}}border-color{{/7}}: {{8}}blue{{/8}};
   {{9}}font{{/9}}: {{10}}12px/30px{{/10}}; }
 
-/*@ sourceMappingURL=test.css.map */
+/*# sourceMappingURL=test.css.map */
 CSS
   end
 
@@ -307,7 +307,7 @@ SASS
   {{7}}border-color{{/7}}: {{8}}blue{{/8}};
   {{9}}font{{/9}}: {{10}}12px/30px{{/10}}; }
 
-/*@ sourceMappingURL=test.css.map */
+/*# sourceMappingURL=test.css.map */
 CSS
   end
 
@@ -355,7 +355,7 @@ SCSS
     {{22}}color{{/22}}: {{23}}#050709{{/23}};
     {{24}}border{{/24}}: {{25}}2px solid black{{/25}}; }
 
-/*@ sourceMappingURL=test.css.map */
+/*# sourceMappingURL=test.css.map */
 CSS
   end
 
@@ -398,7 +398,7 @@ SASS
     {{22}}color{{/22}}: {{23}}#050709{{/23}};
     {{24}}border{{/24}}: {{25}}2px solid black{{/25}}; }
 
-/*@ sourceMappingURL=test.css.map */
+/*# sourceMappingURL=test.css.map */
 CSS
   end
 
@@ -420,7 +420,7 @@ SCSS
 {{6}}.seriousError{{/6}} {
   {{7}}border-width{{/7}}: {{8}}3px{{/8}}; }
 
-/*@ sourceMappingURL=test.css.map */
+/*# sourceMappingURL=test.css.map */
 CSS
   end
 
@@ -441,7 +441,7 @@ SASS
 {{6}}.seriousError{{/6}} {
   {{7}}border-width{{/7}}: {{8}}3px{{/8}}; }
 
-/*@ sourceMappingURL=test.css.map */
+/*# sourceMappingURL=test.css.map */
 CSS
   end
 
@@ -460,7 +460,7 @@ SCSS
 {{7}}.item-3{{/7}} {
   {{8}}width{{/8}}: {{9}}6em{{/9}}; }
 
-/*@ sourceMappingURL=test.css.map */
+/*# sourceMappingURL=test.css.map */
 CSS
   end
 
@@ -479,7 +479,7 @@ SASS
 {{7}}.item-3{{/7}} {
   {{8}}width{{/8}}: {{9}}6em{{/9}}; }
 
-/*@ sourceMappingURL=test.css.map */
+/*# sourceMappingURL=test.css.map */
 CSS
   end
 
@@ -500,7 +500,7 @@ SCSS
 {{7}}.item-2{{/7}} {
   {{8}}width{{/8}}: {{9}}4em{{/9}}; }
 
-/*@ sourceMappingURL=test.css.map */
+/*# sourceMappingURL=test.css.map */
 CSS
   end
 
@@ -521,7 +521,7 @@ SASS
 {{7}}.item-2{{/7}} {
   {{8}}width{{/8}}: {{9}}4em{{/9}}; }
 
-/*@ sourceMappingURL=test.css.map */
+/*# sourceMappingURL=test.css.map */
 CSS
   end
 
@@ -545,7 +545,7 @@ SCSS
 {{10}}.salamander-icon{{/10}} {
   {{11}}background-image{{/11}}: {{12}}url("/images/salamander.png"){{/12}}; }
 
-/*@ sourceMappingURL=test.css.map */
+/*# sourceMappingURL=test.css.map */
 CSS
   end
 
@@ -567,7 +567,7 @@ SASS
 {{10}}.salamander-icon{{/10}} {
   {{11}}background-image{{/11}}: {{12}}url("/images/salamander.png"){{/12}}; }
 
-/*@ sourceMappingURL=test.css.map */
+/*# sourceMappingURL=test.css.map */
 CSS
   end
 
@@ -628,7 +628,7 @@ SCSS
   {{27}}-webkit-box-shadow{{/27}}: {{28}}0px 4px 5px #666666, 2px 6px 10px #999999{{/28}};
   {{29}}box-shadow{{/29}}: {{30}}0px 4px 5px #666666, 2px 6px 10px #999999{{/30}}; }
 
-/*@ sourceMappingURL=test.css.map */
+/*# sourceMappingURL=test.css.map */
 CSS
   end
 
@@ -685,7 +685,7 @@ SASS
   {{27}}-webkit-box-shadow{{/27}}: {{28}}0px 4px 5px #666666, 2px 6px 10px #999999{{/28}};
   {{29}}box-shadow{{/29}}: {{30}}0px 4px 5px #666666, 2px 6px 10px #999999{{/30}}; }
 
-/*@ sourceMappingURL=test.css.map */
+/*# sourceMappingURL=test.css.map */
 CSS
 end
 
@@ -702,7 +702,7 @@ SCSS
 {{1}}sidebar{{/1}} {
   {{2}}width{{/2}}: {{3}}120px{{/3}}; }
 
-/*@ sourceMappingURL=test.css.map */
+/*# sourceMappingURL=test.css.map */
 CSS
   end
 
@@ -720,7 +720,7 @@ SASS
 {{1}}sidebar{{/1}} {
   {{2}}width{{/2}}: {{3}}120px{{/3}}; }
 
-/*@ sourceMappingURL=test.css.map */
+/*# sourceMappingURL=test.css.map */
 CSS
   end
 
@@ -740,7 +740,7 @@ SASS
   {{6}}name{{/6}}: {{7}}value{{/7}};
   {{8}}name{{/8}}: {{9}}value{{/9}}; }
 
-/*@ sourceMappingURL=test.css.map */
+/*# sourceMappingURL=test.css.map */
 CSS
   end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 592302703
+  hash: 592302695
   prerelease: 6
   segments: 
   - 3
   - 3
   - 0
   - alpha
-  - 177
-  version: 3.3.0.alpha.177
+  - 181
+  version: 3.3.0.alpha.181
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-10 00:00:00 -04:00
+date: 2013-06-17 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -267,6 +267,7 @@ files:
 - test/sass/templates/bork2.sass
 - test/sass/templates/bork3.sass
 - test/sass/templates/bork4.sass
+- test/sass/templates/bork5.sass
 - test/sass/templates/cached_import_option.scss
 - test/sass/templates/compact.sass
 - test/sass/templates/complex.sass
@@ -308,7 +309,6 @@ files:
 - test/sass/templates/units.sass
 - test/sass/templates/warn.sass
 - test/sass/templates/warn_imported.sass
-- test/sass/templates/bork5.sass
 - test/sass/test_helper.rb
 - test/sass/util/multibyte_string_scanner_test.rb
 - test/sass/util/subset_map_test.rb