sass 3.4.22 → 3.4.24

data/test/sass/extend_test.rb

@@ -167,42 +167,52 @@ SCSS
   end
 
   def test_universal_unification_with_namespaceless_universal_target
+    assert_extend_doesnt_match('ns|*', '.foo', :failed_to_unify, 2) do
+      render_unification '*.foo', 'ns|* {@extend .foo}'
+    end
+
     assert_unification '*.foo', '* {@extend .foo}', '*'
     assert_unification '*.foo', '*|* {@extend .foo}', '*'
     assert_unification '*|*.foo', '* {@extend .foo}', '*|*.foo, *'
     assert_unification '*|*.foo', '*|* {@extend .foo}', '*|*'
-    assert_unification '*.foo', 'ns|* {@extend .foo}', '*.foo, ns|*'
     assert_unification '*|*.foo', 'ns|* {@extend .foo}', '*|*.foo, ns|*'
   end
 
   def test_universal_unification_with_namespaced_universal_target
-    assert_unification 'ns|*.foo', '* {@extend .foo}', 'ns|*'
-    assert_unification 'ns|*.foo', '*|* {@extend .foo}', 'ns|*'
+    assert_extend_doesnt_match('*', '.foo', :failed_to_unify, 2) do
+      render_unification 'ns|*.foo', '* {@extend .foo}'
+    end
 
     assert_extend_doesnt_match('ns2|*', '.foo', :failed_to_unify, 2) do
       render_unification 'ns1|*.foo', 'ns2|* {@extend .foo}'
     end
 
+    assert_unification 'ns|*.foo', '*|* {@extend .foo}', 'ns|*'
     assert_unification 'ns|*.foo', 'ns|* {@extend .foo}', 'ns|*'
   end
 
   def test_universal_unification_with_namespaceless_element_target
+    assert_extend_doesnt_match('ns|*', '.foo', :failed_to_unify, 2) do
+      render_unification 'a.foo', 'ns|* {@extend .foo}'
+    end
+
     assert_unification 'a.foo', '* {@extend .foo}', 'a'
     assert_unification 'a.foo', '*|* {@extend .foo}', 'a'
     assert_unification '*|a.foo', '* {@extend .foo}', '*|a.foo, a'
     assert_unification '*|a.foo', '*|* {@extend .foo}', '*|a'
-    assert_unification 'a.foo', 'ns|* {@extend .foo}', 'a.foo, ns|a'
     assert_unification '*|a.foo', 'ns|* {@extend .foo}', '*|a.foo, ns|a'
   end
 
   def test_universal_unification_with_namespaced_element_target
-    assert_unification 'ns|a.foo', '* {@extend .foo}', 'ns|a'
-    assert_unification 'ns|a.foo', '*|* {@extend .foo}', 'ns|a'
+    assert_extend_doesnt_match('*', '.foo', :failed_to_unify, 2) do
+      render_unification 'ns|a.foo', '* {@extend .foo}'
+    end
 
     assert_extend_doesnt_match('ns2|*', '.foo', :failed_to_unify, 2) do
       render_unification 'ns1|a.foo', 'ns2|* {@extend .foo}'
     end
 
+    assert_unification 'ns|a.foo', '*|* {@extend .foo}', 'ns|a'
     assert_unification 'ns|a.foo', 'ns|* {@extend .foo}', 'ns|a'
   end
 
@@ -214,46 +224,56 @@ SCSS
   end
 
   def test_element_unification_with_namespaceless_universal_target
+    assert_extend_doesnt_match('ns|a', '.foo', :failed_to_unify, 2) do
+      render_unification '*.foo', 'ns|a {@extend .foo}'
+    end
+
     assert_unification '*.foo', 'a {@extend .foo}', '*.foo, a'
     assert_unification '*.foo', '*|a {@extend .foo}', '*.foo, a'
     assert_unification '*|*.foo', 'a {@extend .foo}', '*|*.foo, a'
     assert_unification '*|*.foo', '*|a {@extend .foo}', '*|*.foo, *|a'
-    assert_unification '*.foo', 'ns|a {@extend .foo}', '*.foo, ns|a'
     assert_unification '*|*.foo', 'ns|a {@extend .foo}', '*|*.foo, ns|a'
   end
 
   def test_element_unification_with_namespaced_universal_target
-    assert_unification 'ns|*.foo', 'a {@extend .foo}', 'ns|*.foo, ns|a'
-    assert_unification 'ns|*.foo', '*|a {@extend .foo}', 'ns|*.foo, ns|a'
+    assert_extend_doesnt_match('a', '.foo', :failed_to_unify, 2) do
+      render_unification 'ns|*.foo', 'a {@extend .foo}'
+    end
 
     assert_extend_doesnt_match('ns2|a', '.foo', :failed_to_unify, 2) do
       render_unification 'ns1|*.foo', 'ns2|a {@extend .foo}'
     end
 
+    assert_unification 'ns|*.foo', '*|a {@extend .foo}', 'ns|*.foo, ns|a'
     assert_unification 'ns|*.foo', 'ns|a {@extend .foo}', 'ns|*.foo, ns|a'
   end
 
   def test_element_unification_with_namespaceless_element_target
+    assert_extend_doesnt_match('ns|a', '.foo', :failed_to_unify, 2) do
+      render_unification 'a.foo', 'ns|a {@extend .foo}'
+    end
+
+    assert_extend_doesnt_match('h1', '.foo', :failed_to_unify, 2) do
+      render_unification 'a.foo', 'h1 {@extend .foo}'
+    end
+
     assert_unification 'a.foo', 'a {@extend .foo}', 'a'
     assert_unification 'a.foo', '*|a {@extend .foo}', 'a'
     assert_unification '*|a.foo', 'a {@extend .foo}', '*|a.foo, a'
     assert_unification '*|a.foo', '*|a {@extend .foo}', '*|a'
-    assert_unification 'a.foo', 'ns|a {@extend .foo}', 'a.foo, ns|a'
     assert_unification '*|a.foo', 'ns|a {@extend .foo}', '*|a.foo, ns|a'
-
-    assert_extend_doesnt_match('h1', '.foo', :failed_to_unify, 2) do
-      render_unification 'a.foo', 'h1 {@extend .foo}'
-    end
   end
 
   def test_element_unification_with_namespaced_element_target
-    assert_unification 'ns|a.foo', 'a {@extend .foo}', 'ns|a'
-    assert_unification 'ns|a.foo', '*|a {@extend .foo}', 'ns|a'
+    assert_extend_doesnt_match('a', '.foo', :failed_to_unify, 2) do
+      render_unification 'ns|a.foo', 'a {@extend .foo}'
+    end
 
     assert_extend_doesnt_match('ns2|a', '.foo', :failed_to_unify, 2) do
       render_unification 'ns1|a.foo', 'ns2|a {@extend .foo}'
     end
 
+    assert_unification 'ns|a.foo', '*|a {@extend .foo}', 'ns|a'
     assert_unification 'ns|a.foo', 'ns|a {@extend .foo}', 'ns|a'
   end
 
@@ -567,7 +587,7 @@ SCSS
   end
 
   def test_long_extendee_runs_unification
-    assert_extends 'ns|*.foo.bar', 'a.baz {@extend .foo.bar}', 'ns|*.foo.bar, ns|a.baz'
+    assert_extends 'ns|*.foo.bar', '*|a.baz {@extend .foo.bar}', 'ns|*.foo.bar, ns|a.baz'
   end
 
   ## Long Extenders
@@ -577,7 +597,7 @@ SCSS
   end
 
   def test_long_extender_runs_unification
-    assert_extends 'ns|*.foo.bar', 'a.baz {@extend .foo}', 'ns|*.foo.bar, ns|a.bar.baz'
+    assert_extends 'ns|*.foo.bar', '*|a.baz {@extend .foo}', 'ns|*.foo.bar, ns|a.bar.baz'
   end
 
   def test_long_extender_aborts_unification

data/test/sass/script_test.rb

@@ -558,9 +558,9 @@ WARNING
   end
 
   def test_resolution_units
-    assert_equal "2.54", resolve("(1dpi/1dpcm)")
-    assert_equal "37.79528", resolve("(1dpcm/1dppx)")
-    assert_equal "0.01042", resolve("(1dppx/1dpi)")
+    assert_equal "0.3937", resolve("(1dpi/1dpcm)")
+    assert_equal "0.02646", resolve("(1dpcm/1dppx)")
+    assert_equal "96", resolve("(1dppx/1dpi)")
   end
 
   def test_operations_have_options

data/test/sass/scss/scss_test.rb

@@ -3649,6 +3649,39 @@ SCSS
 
   # Regression
 
+  # Regression test for #2031.
+  def test_no_interpolation_warning_in_nested_selector
+    assert_no_warning {assert_equal(<<CSS, render(<<SCSS))}
+z a:b(n+1) {
+  x: y; }
+CSS
+z {
+  a:b(n+\#{1}) {
+    x: y;
+  }
+}
+SCSS
+  end
+
+  # Ensures that the fix for #2031 doesn't hide legitimate warnings.
+  def test_interpolation_warning_in_selector_like_property
+    assert_warning(<<WARNING) {assert_equal(<<CSS, render(<<SCSS))}
+DEPRECATION WARNING on line 2 of #{filename_for_test :scss}: \#{} interpolation near operators will be simplified
+in a future version of Sass. To preserve the current behavior, use quotes:
+
+  unquote("n+1")
+
+You can use the sass-convert command to automatically fix most cases.
+WARNING
+z {
+  a: b(n+1); }
+CSS
+z {
+  a:b(n+\#{1});
+}
+SCSS
+  end
+
   def test_escape_in_selector
     assert_equal(<<CSS, render(".\\!foo {a: b}"))
 .\\!foo {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass
 version: !ruby/object:Gem::Version
-  version: 3.4.22
+  version: 3.4.24
 platform: ruby
 authors:
 - Natalie Weizenbaum
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-28 00:00:00.000000000 Z
+date: 2017-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.9.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.9.8
 - !ruby/object:Gem::Dependency
-  name: maruku
+  name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.9
+        version: 2.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.9
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,7 @@ files:
 - bin/sass
 - bin/sass-convert
 - bin/scss
+- extra/sass-spec-ref.sh
 - extra/update_watch.rb
 - init.rb
 - lib/sass.rb
@@ -105,6 +106,7 @@ files:
 - lib/sass/importers/filesystem.rb
 - lib/sass/logger.rb
 - lib/sass/logger/base.rb
+- lib/sass/logger/delayed.rb
 - lib/sass/logger/log_level.rb
 - lib/sass/media.rb
 - lib/sass/plugin.rb
@@ -394,34 +396,34 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: sass
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A powerful but elegant CSS compiler that makes CSS fun again.
 test_files:
-- test/sass/cache_test.rb
-- test/sass/callbacks_test.rb
-- test/sass/compiler_test.rb
-- test/sass/conversion_test.rb
-- test/sass/css2sass_test.rb
-- test/sass/css_variable_test.rb
+- test/sass/plugin_test.rb
 - test/sass/encoding_test.rb
-- test/sass/engine_test.rb
-- test/sass/exec_test.rb
-- test/sass/extend_test.rb
-- test/sass/functions_test.rb
 - test/sass/importer_test.rb
-- test/sass/logger_test.rb
-- test/sass/plugin_test.rb
-- test/sass/script_conversion_test.rb
-- test/sass/script_test.rb
+- test/sass/callbacks_test.rb
 - test/sass/scss/css_test.rb
 - test/sass/scss/rx_test.rb
 - test/sass/scss/scss_test.rb
-- test/sass/source_map_test.rb
-- test/sass/superselector_test.rb
 - test/sass/util/multibyte_string_scanner_test.rb
 - test/sass/util/normalized_map_test.rb
 - test/sass/util/subset_map_test.rb
+- test/sass/functions_test.rb
 - test/sass/util_test.rb
+- test/sass/cache_test.rb
+- test/sass/exec_test.rb
 - test/sass/value_helpers_test.rb
+- test/sass/conversion_test.rb
+- test/sass/script_test.rb
+- test/sass/logger_test.rb
+- test/sass/compiler_test.rb
+- test/sass/engine_test.rb
+- test/sass/css2sass_test.rb
+- test/sass/superselector_test.rb
+- test/sass/script_conversion_test.rb
+- test/sass/css_variable_test.rb
+- test/sass/source_map_test.rb
+- test/sass/extend_test.rb