sass 3.4.10 → 3.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 858f856d5dae7313a376b36544bd8362b7c35a1e
-  data.tar.gz: 5b3ba1f7bea6c1c1cbb4be0edf313089013ffdf5
+  metadata.gz: 5b356808a261bfc58ed1ea2a65e975f5b64d8048
+  data.tar.gz: c2f0bc6dbd4e8332eed0e0f6e60dad6a79d47797
 SHA512:
-  metadata.gz: cac4a3b38ad8bfc7eb89c2f8c31e3dc48004a9758efdca37166e9b38368eb44e84f9427812934dc92d40b53e163163d40821495b2607e915f46b583b8e79fb57
-  data.tar.gz: 41314e4a85cff7ce94850c0644cfde46eafa329042803fb5e5c4c9b042adf5f06bdbb0597a4406bcd0f2eac398610dfa57af9ad1818482aea8add131ff471704
+  metadata.gz: c0631122d887b7d410c5fd38dcedd9487ae78e1d22e2f7a5a4be4557d9c1ad40ab55643e590eff2b23a3b3dfecac61057086cfe926015d09e60ee8d1e7abbadb
+  data.tar.gz: 8208ef88dc5a7a6b13493c8a00542587419525fdf980fcd616ff19ec83b39388e1322c5f21f61147eb9f2cd059f5659acf3476ae552abcc5d290cc9563d6caf3

data/VERSION

@@ -1 +1 @@
-3.4.10
+3.4.11

data/VERSION_DATE

@@ -1 +1 @@
-17 January 2015 03:54:27 UTC
+31 January 2015 02:49:50 UTC

data/lib/sass/exec/sass_scss.rb

@@ -42,6 +42,7 @@ END
         if @args.size == 1
           @args = split_colon_path(@args.first)
         else
+          @fake_update = true
           @options[:update] = true
         end
       end
@@ -312,6 +313,16 @@ MSG
 
       dirs, files = @args.map {|name| split_colon_path(name)}.
         partition {|i, _| File.directory? i}
+
+      if @fake_update && !dirs.empty?
+        # Issue 1602.
+        Sass::Util.sass_warn <<WARNING.strip
+DEPRECATION WARNING: Compiling directories without --update or --watch is
+deprecated and won't work in future versions of Sass. Instead use:
+  #{@default_syntax} --update #{@args}
+WARNING
+      end
+
       files.map! do |from, to|
         to ||= from.gsub(/\.[^.]*?$/, '.css')
         sourcemap = Sass::Util.sourcemap_name(to) if @options[:sourcemap]

data/lib/sass/script/functions.rb

@@ -1398,9 +1398,10 @@ module Sass::Script
     # @raise [ArgumentError] if `$string` isn't a string
     def unquote(string)
       unless string.is_a?(Sass::Script::Value::String)
-        Sass::Util.sass_warn(<<MESSAGE)
+        Sass::Util.sass_warn(<<MESSAGE.strip)
 DEPRECATION WARNING: Passing #{string.to_sass}, a non-string value, to unquote()
 will be an error in future versions of Sass.
+#{environment.stack.to_s.gsub(/^/, ' ' * 8)}
 MESSAGE
         return string
       end

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

@@ -32,7 +32,8 @@ module Sass::Script::Tree
       members = elements.map do |v|
         if v.is_a?(ListLiteral) && Sass::Script::Parser.precedence_of(v.separator) <= precedence ||
             separator == :space && v.is_a?(UnaryOperation) &&
-            (v.operator == :minus || v.operator == :plus)
+              (v.operator == :minus || v.operator == :plus) ||
+            separator == :space && v.is_a?(Operation)
           "(#{v.to_sass(opts)})"
         else
           v.to_sass(opts)

data/lib/sass/selector/simple_sequence.rb

@@ -133,9 +133,9 @@ module Sass
           end
 
           Sequence.new(members[0...-1] +
-            [SimpleSequence.new(parent_sub + @members[1..-1], subject?)] +
+            [SimpleSequence.new(parent_sub + resolved_members[1..-1], subject?)] +
             [newline].compact)
-        end)
+          end)
       end
 
       # Non-destructively extends this selector with the extensions specified in a hash

data/lib/sass/tree/rule_node.rb

@@ -132,14 +132,15 @@ module Sass::Tree
     private
 
     def try_to_parse_non_interpolated_rules
-      if @rule.all? {|t| t.kind_of?(String)}
-        # We don't use real filename/line info because we don't have it yet.
-        # When we get it, we'll set it on the parsed rules if possible.
-        parser = Sass::SCSS::StaticParser.new(@rule.join.strip, nil, nil, 1)
-        # rubocop:disable RescueModifier
-        @parsed_rules = parser.parse_selector rescue nil
-        # rubocop:enable RescueModifier
-      end
+      @parsed_rules = nil
+      return unless @rule.all? {|t| t.kind_of?(String)}
+
+      # We don't use real filename/line info because we don't have it yet.
+      # When we get it, we'll set it on the parsed rules if possible.
+      parser = Sass::SCSS::StaticParser.new(@rule.join.strip, nil, nil, 1)
+      # rubocop:disable RescueModifier
+      @parsed_rules = parser.parse_selector rescue nil
+      # rubocop:enable RescueModifier
     end
   end
 end

data/test/sass/conversion_test.rb

@@ -1990,13 +1990,11 @@ foo
     ok: -$foo
     comma: 10px, -$foo
     needs-parens: 10px (-$foo)
-    no-parens: a 50px + 60px b
 SASS
 foo {
     ok: -$foo;
     comma: 10px, -$foo;
     needs-parens: 10px (-$foo);
-    no-parens: a 50px + 60px b;
 }
 SCSS
   end

data/test/sass/engine_test.rb

@@ -2059,20 +2059,21 @@ SASS
   end
 
   def test_warn_with_imports
+    prefix = Sass::Util.cleanpath(File.dirname(__FILE__)).to_s
     expected_warning = <<WARN
 WARNING: In the main file
-         on line 1 of #{File.dirname(__FILE__)}/templates/warn.sass
+         on line 1 of #{prefix}/templates/warn.sass
 
 WARNING: Imported
-         on line 1 of #{File.dirname(__FILE__)}/templates/warn_imported.sass
-         from line 2 of #{File.dirname(__FILE__)}/templates/warn.sass
+         on line 1 of #{prefix}/templates/warn_imported.sass
+         from line 2 of #{prefix}/templates/warn.sass
 
 WARNING: In an imported mixin
-         on line 4 of #{File.dirname(__FILE__)}/templates/warn_imported.sass, in `emits-a-warning'
-         from line 3 of #{File.dirname(__FILE__)}/templates/warn.sass
+         on line 4 of #{prefix}/templates/warn_imported.sass, in `emits-a-warning'
+         from line 3 of #{prefix}/templates/warn.sass
 WARN
     assert_warning expected_warning do
-      renders_correctly "warn", :style => :compact, :load_paths => [File.dirname(__FILE__) + "/templates"]
+      renders_correctly "warn", :style => :compact, :load_paths => ["#{prefix}/templates"]
     end
   end
 
@@ -2457,6 +2458,18 @@ SASS
 
   # Regression tests
 
+  def test_interpolation_in_multiline_selector
+    assert_equal(<<CSS, render(<<SASS))
+.foo,
+.bar {
+  a: b; }
+CSS
+.foo,
+\#{".bar"}
+  a: b
+SASS
+  end
+
   def test_list_separator_with_arg_list
     assert_equal(<<CSS, render(<<SASS))
 .test {
@@ -3287,7 +3300,8 @@ SASS
   end
 
   def filename(name, type)
-    File.dirname(__FILE__) + "/#{type == 'sass' ? 'templates' : 'results'}/#{name}.#{type}"
+    path = File.dirname(__FILE__) + "/#{type == 'sass' ? 'templates' : 'results'}/#{name}.#{type}"
+    Sass::Util.cleanpath(path).to_s
   end
 
   def sassc_path(template)

data/test/sass/script_conversion_test.rb

@@ -76,6 +76,26 @@ class SassScriptConversionTest < MiniTest::Test
     assert_renders "null"
   end
 
+  def test_space_list
+    assert_renders "foo bar baz"
+    assert_renders "foo (bar baz) bip"
+    assert_renders "foo (bar, baz) bip"
+  end
+
+  def test_comma_list
+    assert_renders "foo, bar, baz"
+    assert_renders "foo, (bar, baz), bip"
+    assert_renders "foo, bar baz, bip"
+  end
+
+  def test_space_list_adds_parens_for_clarity
+    assert_renders "(1 + 1) (2 / 4) (3 * 5)"
+  end
+
+  def test_comma_list_doesnt_add_parens
+    assert_renders "1 + 1, 2 / 4, 3 * 5"
+  end
+
   def test_empty_list
     assert_renders "()"
   end
@@ -221,8 +241,8 @@ RUBY
     assert_renders "$foo or ($bar $baz)"
     assert_renders "($foo $bar) or $baz"
 
-    assert_equal "$foo $bar or $baz", render("$foo ($bar or $baz)")
-    assert_equal "$foo or $bar $baz", render("($foo or $bar) $baz")
+    assert_renders "$foo ($bar or $baz)"
+    assert_renders "($foo or $bar) $baz"
 
     assert_equal "$foo ($bar $baz)", render("$foo ($bar $baz)")
     assert_equal "($foo $bar) $baz", render("($foo $bar) $baz")

data/test/sass/scss/scss_test.rb

@@ -3693,6 +3693,31 @@ CSS
 SCSS
   end
 
+  def test_parent_selector_in_and_out_of_function_pseudo_selector
+    # Regression test for https://github.com/sass/sass/issues/1464#issuecomment-70352288
+    assert_equal(<<CSS, render(<<SCSS))
+.a:not(.a-b) {
+  x: y; }
+CSS
+.a {
+  &:not(&-b) {
+    x: y;
+  }
+}
+SCSS
+
+    assert_equal(<<CSS, render(<<SCSS))
+.a:nth-child(2n of .a-b) {
+  x: y; }
+CSS
+.a {
+  &:nth-child(2n of &-b) {
+    x: y;
+  }
+}
+SCSS
+  end
+
   def test_attribute_selector_in_selector_pseudoclass
     # Even though this is plain CSS, it only failed when given to the SCSS
     # parser.

metadata

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