sass 3.4.7 → 3.4.8

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 6ce3a34b6410945928265cb2994c16ff2ba8fe8e
-  data.tar.gz: a298709397821b949d06896b2265ea6557fe402e
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OTMwOWU4MTI1ZGY3NGJkZmRhNGQ1Yjc3YWM0NGZhZTBhNDhkYTI1MQ==
+  data.tar.gz: !binary |-
+    MDVmYTBlMDc2MTE4M2U2NmEwNDFjYjlmMTQzMTUzYzk5MjA3NGEwZg==
 SHA512:
-  metadata.gz: e4326c4cef81a6972653a0fb2371c6d0d09225b3f52fcb2aaeb3e9c897ccdde23217dc10200e34afc3343fd5629404a71669bbe7aea7662be0bb2487d5718186
-  data.tar.gz: 1aaa2849ef7c65e26ce841d83453b5d31a99c1f44e6f74441b663f70ca5f9194cd5150bce442e0d4656c8d83e5d4ae4d25c85a861ad9118956f82fbbaad81c04
+  metadata.gz: !binary |-
+    MzlmZDNjMjg0NTJlMjZmOTk4YTU3Y2YwNjlhMTk0Njc0OGEwM2RhYjdjYTZh
+    MzdhMjg5OTg1ZjVmZmY2OGY2OWVlN2E5MjcwZmU3OGQxMmU0ZWIwZjE0NDhk
+    MGQ1OWUwNGQ2NDU1OTIzMDA0YjAzZjhiMGNmM2JjZTZlMzUyYzU=
+  data.tar.gz: !binary |-
+    ZjNmNDJmYTBkOWUxMmU3ZDQzMDc0NzRhMWU1ZWZiMWY1MjM1YmEwZDkwMGZi
+    Nzg5MDFiZWY3NTFmMmU4M2ViY2M2NjUwZGQxNGZkZGI3ODlhNjRlYWE5NTRh
+    MjAwMzYzODkzZDA0NmIyM2EzMjVmNzA5M2Y5YzFkZTg1YTY4ZmM=

data/VERSION

@@ -1 +1 @@
-3.4.7
+3.4.8

data/VERSION_DATE

@@ -1 +1 @@
-31 October 2014 21:28:44 UTC
+15 November 2014 00:58:58 UTC

data/lib/sass/script/functions.rb

@@ -482,8 +482,7 @@ module Sass::Script
       include Value::Helpers
 
       # The human-readable names for [Sass::Script::Value::Base]. The default is
-      # just the downcased name of the type. The default is the downcased type
-      # name.
+      # just the downcased name of the type.
       TYPE_NAMES = {:ArgList => 'variable argument list'}
 
       # The environment for this function. This environment's
@@ -652,11 +651,11 @@ module Sass::Script
     #
     # @overload rgba($red, $green, $blue, $alpha)
     #   @param $red [Sass::Script::Value::Number] The amount of red in the
-    #     color. Must be between 0 and 255 inclusive
+    #     color. Must be between 0 and 255 inclusive or 0% and 100% inclusive
     #   @param $green [Sass::Script::Value::Number] The amount of green in the
-    #     color. Must be between 0 and 255 inclusive
+    #     color. Must be between 0 and 255 inclusive or 0% and 100% inclusive
     #   @param $blue [Sass::Script::Value::Number] The amount of blue in the
-    #     color. Must be between 0 and 255 inclusive
+    #     color. Must be between 0 and 255 inclusive or 0% and 100% inclusive
     #   @param $alpha [Sass::Script::Value::Number] The opacity of the color.
     #     Must be between 0 and 1 inclusive
     #   @return [Sass::Script::Value::Color]
@@ -684,6 +683,7 @@ module Sass::Script
 
         assert_type color, :Color, :color
         assert_type alpha, :Number, :alpha
+        check_alpha_unit alpha, 'rgba'
 
         color.with(:alpha => alpha.value)
       when 4
@@ -741,6 +741,7 @@ module Sass::Script
       assert_type saturation, :Number, :saturation
       assert_type lightness, :Number, :lightness
       assert_type alpha, :Number, :alpha
+      check_alpha_unit alpha, 'hsla'
 
       h = hue.value
       s = saturation.value
@@ -2625,5 +2626,21 @@ module Sass::Script
 
       color.with(attr => color.send(attr).send(op, amount.value))
     end
+
+    def check_alpha_unit(alpha, function)
+      return if alpha.unitless?
+
+      if alpha.is_unit?("%")
+        Sass::Util.sass_warn(<<WARNING)
+DEPRECATION WARNING: Passing a percentage as the alpha value to #{function}() will be
+interpreted differently in future versions of Sass. For now, use #{alpha.value} instead.
+WARNING
+      else
+        Sass::Util.sass_warn(<<WARNING)
+DEPRECATION WARNING: Passing a number with units as the alpha value to #{function}() is
+deprecated and will be an error in future versions of Sass. Use #{alpha.value} instead.
+WARNING
+      end
+    end
   end
 end

data/lib/sass/selector/simple_sequence.rb

@@ -164,6 +164,20 @@ module Sass
           extended = sel.selector.do_extend(extends, parent_directives, replace, seen, !:original)
           next sel if extended == sel.selector
           extended.members.reject! {|seq| seq.has_placeholder?}
+
+          # For `:not()`, we usually want to get rid of any complex
+          # selectors becuase that will cause the selector to fail to
+          # parse on all browsers at time of writing. We can keep them
+          # if either the original selector had a complex selector, or
+          # the result of extending has only complex selectors,
+          # because either way we aren't breaking anything that isn't
+          # already broken.
+          if sel.normalized_name == 'not' &&
+              (sel.selector.members.none? {|seq| seq.members.length > 1} &&
+               extended.members.any? {|seq| seq.members.length == 1})
+            extended.members.reject! {|seq| seq.members.length > 1}
+          end
+
           modified_original = true
           result = sel.with_selector(extended)
           result.each {|new_sel| seen_with_pseudo_selectors << [new_sel]}

data/test/foo.scss

@@ -0,0 +1 @@
+foo {a: x}

data/test/sass/extend_test.rb

@@ -362,7 +362,21 @@ SCSS
   end
 
   def test_complex_extend_into_pseudoclass
-    assert_extends(':not(.bar)', '.x .y {@extend .bar}', ':not(.bar):not(.x .y)')
+    # Unlike other selectors, we don't allow complex selectors to be
+    # added to `:not` if they weren't there before. At time of
+    # writing, most browsers don't support that and will throw away
+    # the entire selector if it exists.
+    #assert_extends(':not(.bar)', '.x .y {@extend .bar}', ':not(.bar)')
+
+    # If the `:not()` already has a complex selector, we won't break
+    # anything by adding a new one.
+    assert_extends(':not(.baz .bar)', '.x .y {@extend .bar}',
+      ':not(.baz .bar):not(.baz .x .y):not(.x .baz .y)')
+
+    # If the `:not()` would only contain complex selectors, there's no
+    # harm in letting it continue to exist.
+    assert_extends(':not(%bar)', '.x .y {@extend %bar}', ':not(.x .y)')
+
     assert_extends(':matches(.bar)', '.x .y {@extend .bar}', ':matches(.bar, .x .y)')
     assert_extends(':current(.bar)', '.x .y {@extend .bar}', ':current(.bar, .x .y)')
     assert_extends(':has(.bar)', '.x .y {@extend .bar}', ':has(.bar, .x .y)')

data/test/sass/functions_test.rb

@@ -122,6 +122,20 @@ class SassFunctionTest < MiniTest::Test
     assert_error_message("$alpha: \"foo\" is not a number for `hsla'", "hsla(10, 10, 10, \"foo\")");
   end
 
+  def test_hsla_percent_warning
+    assert_warning(<<WARNING) {evaluate("hsla(180, 60%, 50%, 40%)")}
+DEPRECATION WARNING: Passing a percentage as the alpha value to hsla() will be
+interpreted differently in future versions of Sass. For now, use 40 instead.
+WARNING
+  end
+
+  def test_hsla_unit_warning
+    assert_warning(<<WARNING) {evaluate("hsla(180, 60%, 50%, 40em)")}
+DEPRECATION WARNING: Passing a number with units as the alpha value to hsla() is
+deprecated and will be an error in future versions of Sass. Use 40 instead.
+WARNING
+  end
+
   def test_percentage
     assert_equal("50%",  evaluate("percentage(.5)"))
     assert_equal("100%", evaluate("percentage(1)"))
@@ -274,6 +288,20 @@ class SassFunctionTest < MiniTest::Test
     assert_error_message("wrong number of arguments (5 for 4) for `rgba'", "rgba(1, 2, 3, 0.4, 5)");
   end
 
+  def test_rgba_percent_warning
+    assert_warning(<<WARNING) {evaluate("rgba(1, 2, 3, 40%)")}
+DEPRECATION WARNING: Passing a percentage as the alpha value to rgba() will be
+interpreted differently in future versions of Sass. For now, use 40 instead.
+WARNING
+  end
+
+  def test_rgba_unit_warning
+    assert_warning(<<WARNING) {evaluate("rgba(1, 2, 3, 40em)")}
+DEPRECATION WARNING: Passing a number with units as the alpha value to rgba() is
+deprecated and will be an error in future versions of Sass. Use 40 instead.
+WARNING
+  end
+
   def test_red
     assert_equal("18", evaluate("red(#123456)"))
     assert_equal("18", evaluate("red($color: #123456)"))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass
 version: !ruby/object:Gem::Version
-  version: 3.4.7
+  version: 3.4.8
 platform: ruby
 authors:
 - Natalie Weizenbaum
@@ -10,55 +10,54 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-31 00:00:00.000000000 Z
+date: 2014-11-15 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: |2
-        Sass makes CSS fun again. Sass is an extension of CSS3, 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.
+description: ! "      Sass makes CSS fun again. Sass is an extension of CSS3, 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"
 email: sass-lang@googlegroups.com
 executables:
 - sass
@@ -211,6 +210,7 @@ files:
 - lib/sass/util/test.rb
 - lib/sass/version.rb
 - rails/init.rb
+- test/foo.scss
 - test/sass/cache_test.rb
 - test/sass/callbacks_test.rb
 - test/sass/compiler_test.rb
@@ -381,43 +381,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.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: A powerful but elegant CSS compiler that makes CSS fun again.
 test_files:
+- test/sass/engine_test.rb
+- test/sass/functions_test.rb
 - test/sass/value_helpers_test.rb
+- test/sass/extend_test.rb
+- test/sass/logger_test.rb
+- test/sass/compiler_test.rb
+- test/sass/css2sass_test.rb
 - test/sass/conversion_test.rb
-- test/sass/cache_test.rb
 - test/sass/script_test.rb
-- test/sass/superselector_test.rb
+- test/sass/exec_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/callbacks_test.rb
-- test/sass/source_map_test.rb
-- test/sass/script_conversion_test.rb
-- test/sass/util_test.rb
-- test/sass/plugin_test.rb
-- test/sass/extend_test.rb
-- test/sass/scss/rx_test.rb
+- test/sass/importer_test.rb
 - test/sass/scss/css_test.rb
 - test/sass/scss/scss_test.rb
-- test/sass/logger_test.rb
-- test/sass/importer_test.rb
+- test/sass/scss/rx_test.rb
+- test/sass/util_test.rb
+- test/sass/script_conversion_test.rb
+- test/sass/superselector_test.rb
 - test/sass/encoding_test.rb
-- test/sass/engine_test.rb
-- test/sass/exec_test.rb
-- test/sass/util/normalized_map_test.rb
-- test/sass/util/subset_map_test.rb
-- test/sass/util/multibyte_string_scanner_test.rb
-- test/sass/functions_test.rb
-- test/sass/compiler_test.rb
-- test/sass/css2sass_test.rb
+- test/sass/cache_test.rb
+- test/sass/source_map_test.rb
+- test/sass/plugin_test.rb