sass 3.4.20 → 3.4.21

data/test/sass/script_test.rb

@@ -384,6 +384,17 @@ SASS
     assert_equal "-1", resolve("-1")
   end
 
+  def test_subtraction_vs_minus_vs_identifier
+    assert_equal "0.25em", resolve("1em-.75")
+    assert_equal "0.25em", resolve("1em-0.75")
+    assert_equal "1em -0.75", resolve("1em -.75")
+    assert_equal "1em -0.75", resolve("1em -0.75")
+    assert_equal "1em- 0.75", resolve("1em- .75")
+    assert_equal "1em- 0.75", resolve("1em- 0.75")
+    assert_equal "0.25em", resolve("1em - .75")
+    assert_equal "0.25em", resolve("1em - 0.75")
+  end
+
   def test_string_ops
     assert_equal '"foo" "bar"', resolve('"foo" "bar"')
     assert_equal "true 1", resolve('true 1')
@@ -1306,6 +1317,26 @@ SASS
     assert_equal "-1 2 3", resolve_with_lazy_interp_warning('quote((-#{1} 2 3))', '"-1 #{2 3}"')
   end
 
+  def test_comparison_of_complex_units
+    # Tests for issue #1960
+    assert_warning(<<WARNING) do
+DEPRECATION WARNING on line 1 of test_comparison_of_complex_units_inline.sass:
+The result of `10 == 10px` will be `false` in future releases of Sass.
+Unitless numbers will no longer be equal to the same numbers with units.
+WARNING
+      assert_equal "true", resolve("10 == 2 * 5px")
+    end
+    assert_warning(<<WARNING) do
+DEPRECATION WARNING on line 1 of test_comparison_of_complex_units_inline.sass:
+The result of `10 == 10px*px` will be `false` in future releases of Sass.
+Unitless numbers will no longer be equal to the same numbers with units.
+WARNING
+      assert_equal "true", resolve("10 == 2px * 5px")
+    end
+    assert_equal "true", resolve("10px * 1px == 2px * 5px")
+    assert_equal "true", resolve("5px * 1px < 2px * 5px")
+  end
+
   private
 
   def resolve_with_lazy_interp_warning(str, contents = nil, environment = env)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass
 version: !ruby/object:Gem::Version
-  version: 3.4.20
+  version: 3.4.21
 platform: ruby
 authors:
 - Natalie Weizenbaum
@@ -10,54 +10,55 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-09 00:00:00.000000000 Z
+date: 2016-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.3
 - !ruby/object:Gem::Dependency
   name: maruku
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.9
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '5'
-description: ! "      Sass makes CSS fun again. Sass is an extension of CSS, adding\n
-  \     nested rules, variables, mixins, selector inheritance, and more.\n      It's
-  translated to well-formatted, standard CSS using the\n      command line tool or
-  a web-framework plugin.\n"
+description: |2
+        Sass makes CSS fun again. Sass is an extension of CSS, adding
+        nested rules, variables, mixins, selector inheritance, and more.
+        It's translated to well-formatted, standard CSS using the
+        command line tool or a web-framework plugin.
 email: sass-lang@googlegroups.com
 executables:
 - sass
@@ -66,47 +67,31 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .yardopts
-- CODE_OF_CONDUCT.md
-- CONTRIBUTING.md
-- MIT-LICENSE
-- README.md
-- REVISION
-- Rakefile
-- VERSION
-- VERSION_DATE
-- VERSION_NAME
-- bin/sass
-- bin/sass-convert
-- bin/scss
-- extra/update_watch.rb
-- init.rb
-- lib/sass.rb
-- lib/sass/cache_stores.rb
+- rails/init.rb
 - lib/sass/cache_stores/base.rb
 - lib/sass/cache_stores/chain.rb
 - lib/sass/cache_stores/filesystem.rb
 - lib/sass/cache_stores/memory.rb
 - lib/sass/cache_stores/null.rb
+- lib/sass/cache_stores.rb
 - lib/sass/callbacks.rb
 - lib/sass/css.rb
 - lib/sass/engine.rb
 - lib/sass/environment.rb
 - lib/sass/error.rb
-- lib/sass/exec.rb
 - lib/sass/exec/base.rb
 - lib/sass/exec/sass_convert.rb
 - lib/sass/exec/sass_scss.rb
+- lib/sass/exec.rb
 - lib/sass/features.rb
-- lib/sass/importers.rb
 - lib/sass/importers/base.rb
 - lib/sass/importers/deprecated_path.rb
 - lib/sass/importers/filesystem.rb
-- lib/sass/logger.rb
+- lib/sass/importers.rb
 - lib/sass/logger/base.rb
 - lib/sass/logger/log_level.rb
+- lib/sass/logger.rb
 - lib/sass/media.rb
-- lib/sass/plugin.rb
 - lib/sass/plugin/compiler.rb
 - lib/sass/plugin/configuration.rb
 - lib/sass/plugin/generic.rb
@@ -114,16 +99,15 @@ files:
 - lib/sass/plugin/rack.rb
 - lib/sass/plugin/rails.rb
 - lib/sass/plugin/staleness_checker.rb
+- lib/sass/plugin.rb
 - lib/sass/railtie.rb
 - lib/sass/repl.rb
 - lib/sass/root.rb
-- lib/sass/script.rb
 - lib/sass/script/css_lexer.rb
 - lib/sass/script/css_parser.rb
 - lib/sass/script/functions.rb
 - lib/sass/script/lexer.rb
 - lib/sass/script/parser.rb
-- lib/sass/script/tree.rb
 - lib/sass/script/tree/funcall.rb
 - lib/sass/script/tree/interpolation.rb
 - lib/sass/script/tree/list_literal.rb
@@ -135,7 +119,7 @@ files:
 - lib/sass/script/tree/string_interpolation.rb
 - lib/sass/script/tree/unary_operation.rb
 - lib/sass/script/tree/variable.rb
-- lib/sass/script/value.rb
+- lib/sass/script/tree.rb
 - lib/sass/script/value/arg_list.rb
 - lib/sass/script/value/base.rb
 - lib/sass/script/value/bool.rb
@@ -146,20 +130,22 @@ files:
 - lib/sass/script/value/null.rb
 - lib/sass/script/value/number.rb
 - lib/sass/script/value/string.rb
-- lib/sass/scss.rb
+- lib/sass/script/value.rb
+- lib/sass/script.rb
 - lib/sass/scss/css_parser.rb
 - lib/sass/scss/parser.rb
 - lib/sass/scss/rx.rb
 - lib/sass/scss/script_lexer.rb
 - lib/sass/scss/script_parser.rb
 - lib/sass/scss/static_parser.rb
-- lib/sass/selector.rb
+- lib/sass/scss.rb
 - lib/sass/selector/abstract_sequence.rb
 - lib/sass/selector/comma_sequence.rb
 - lib/sass/selector/pseudo.rb
 - lib/sass/selector/sequence.rb
 - lib/sass/selector/simple.rb
 - lib/sass/selector/simple_sequence.rb
+- lib/sass/selector.rb
 - lib/sass/shared.rb
 - lib/sass/source/map.rb
 - lib/sass/source/position.rb
@@ -203,15 +189,54 @@ files:
 - lib/sass/tree/visitors/to_css.rb
 - lib/sass/tree/warn_node.rb
 - lib/sass/tree/while_node.rb
-- lib/sass/util.rb
 - lib/sass/util/cross_platform_random.rb
 - lib/sass/util/multibyte_string_scanner.rb
 - lib/sass/util/normalized_map.rb
 - lib/sass/util/ordered_hash.rb
 - lib/sass/util/subset_map.rb
 - lib/sass/util/test.rb
+- lib/sass/util.rb
 - lib/sass/version.rb
-- rails/init.rb
+- lib/sass.rb
+- vendor/listen/CHANGELOG.md
+- vendor/listen/CONTRIBUTING.md
+- vendor/listen/Gemfile
+- vendor/listen/Guardfile
+- vendor/listen/lib/listen/adapter.rb
+- vendor/listen/lib/listen/adapters/bsd.rb
+- vendor/listen/lib/listen/adapters/darwin.rb
+- vendor/listen/lib/listen/adapters/linux.rb
+- vendor/listen/lib/listen/adapters/polling.rb
+- vendor/listen/lib/listen/adapters/windows.rb
+- vendor/listen/lib/listen/directory_record.rb
+- vendor/listen/lib/listen/listener.rb
+- vendor/listen/lib/listen/turnstile.rb
+- vendor/listen/lib/listen/version.rb
+- vendor/listen/lib/listen.rb
+- vendor/listen/LICENSE
+- vendor/listen/listen.gemspec
+- vendor/listen/Rakefile
+- vendor/listen/README.md
+- vendor/listen/spec/listen/adapter_spec.rb
+- vendor/listen/spec/listen/adapters/bsd_spec.rb
+- vendor/listen/spec/listen/adapters/darwin_spec.rb
+- vendor/listen/spec/listen/adapters/linux_spec.rb
+- vendor/listen/spec/listen/adapters/polling_spec.rb
+- vendor/listen/spec/listen/adapters/windows_spec.rb
+- vendor/listen/spec/listen/directory_record_spec.rb
+- vendor/listen/spec/listen/listener_spec.rb
+- vendor/listen/spec/listen/turnstile_spec.rb
+- vendor/listen/spec/listen_spec.rb
+- vendor/listen/spec/spec_helper.rb
+- vendor/listen/spec/support/adapter_helper.rb
+- vendor/listen/spec/support/directory_record_helper.rb
+- vendor/listen/spec/support/fixtures_helper.rb
+- vendor/listen/spec/support/listeners_helper.rb
+- vendor/listen/spec/support/platform_helper.rb
+- vendor/listen/Vagrantfile
+- bin/sass
+- bin/sass-convert
+- bin/scss
 - test/sass/cache_test.rb
 - test/sass/callbacks_test.rb
 - test/sass/compiler_test.rb
@@ -336,42 +361,18 @@ files:
 - test/sass/util_test.rb
 - test/sass/value_helpers_test.rb
 - test/test_helper.rb
-- vendor/listen/CHANGELOG.md
-- vendor/listen/CONTRIBUTING.md
-- vendor/listen/Gemfile
-- vendor/listen/Guardfile
-- vendor/listen/LICENSE
-- vendor/listen/README.md
-- vendor/listen/Rakefile
-- vendor/listen/Vagrantfile
-- vendor/listen/lib/listen.rb
-- vendor/listen/lib/listen/adapter.rb
-- vendor/listen/lib/listen/adapters/bsd.rb
-- vendor/listen/lib/listen/adapters/darwin.rb
-- vendor/listen/lib/listen/adapters/linux.rb
-- vendor/listen/lib/listen/adapters/polling.rb
-- vendor/listen/lib/listen/adapters/windows.rb
-- vendor/listen/lib/listen/directory_record.rb
-- vendor/listen/lib/listen/listener.rb
-- vendor/listen/lib/listen/turnstile.rb
-- vendor/listen/lib/listen/version.rb
-- vendor/listen/listen.gemspec
-- vendor/listen/spec/listen/adapter_spec.rb
-- vendor/listen/spec/listen/adapters/bsd_spec.rb
-- vendor/listen/spec/listen/adapters/darwin_spec.rb
-- vendor/listen/spec/listen/adapters/linux_spec.rb
-- vendor/listen/spec/listen/adapters/polling_spec.rb
-- vendor/listen/spec/listen/adapters/windows_spec.rb
-- vendor/listen/spec/listen/directory_record_spec.rb
-- vendor/listen/spec/listen/listener_spec.rb
-- vendor/listen/spec/listen/turnstile_spec.rb
-- vendor/listen/spec/listen_spec.rb
-- vendor/listen/spec/spec_helper.rb
-- vendor/listen/spec/support/adapter_helper.rb
-- vendor/listen/spec/support/directory_record_helper.rb
-- vendor/listen/spec/support/fixtures_helper.rb
-- vendor/listen/spec/support/listeners_helper.rb
-- vendor/listen/spec/support/platform_helper.rb
+- extra/update_watch.rb
+- Rakefile
+- init.rb
+- .yardopts
+- CODE_OF_CONDUCT.md
+- CONTRIBUTING.md
+- MIT-LICENSE
+- README.md
+- REVISION
+- VERSION
+- VERSION_DATE
+- VERSION_NAME
 homepage: http://sass-lang.com/
 licenses:
 - MIT
@@ -382,43 +383,43 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: sass
-rubygems_version: 2.4.3
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: A powerful but elegant CSS compiler that makes CSS fun again.
 test_files:
-- test/sass/importer_test.rb
-- test/sass/engine_test.rb
-- test/sass/value_helpers_test.rb
-- test/sass/superselector_test.rb
-- test/sass/logger_test.rb
-- test/sass/util_test.rb
 - test/sass/cache_test.rb
-- test/sass/encoding_test.rb
-- test/sass/source_map_test.rb
-- test/sass/css2sass_test.rb
-- test/sass/plugin_test.rb
+- test/sass/callbacks_test.rb
+- test/sass/compiler_test.rb
 - test/sass/conversion_test.rb
-- test/sass/util/subset_map_test.rb
-- test/sass/util/multibyte_string_scanner_test.rb
-- test/sass/util/normalized_map_test.rb
+- test/sass/css2sass_test.rb
+- test/sass/encoding_test.rb
+- test/sass/engine_test.rb
 - test/sass/exec_test.rb
-- test/sass/scss/rx_test.rb
-- test/sass/scss/scss_test.rb
-- test/sass/scss/css_test.rb
-- test/sass/callbacks_test.rb
-- test/sass/functions_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/compiler_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/util_test.rb
+- test/sass/value_helpers_test.rb