sass 3.5.5 → 3.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 156f6a86b72d2df83e67cb687eb8c2ce986ee242
-  data.tar.gz: eadb5e80b5ab509cda145d3843715f0ca55a8fca
+  metadata.gz: 2a0be81d849341f77d658cfb6a44988a273038b3
+  data.tar.gz: e2d3106b331b62359df2b422d4d7142af4cf215e
 SHA512:
-  metadata.gz: 6cc1352915b32f8cad9138f7f6eed0e1efe4c1f5f519d10d1efea311c57b755cbcf651daa5d24211f785ee58d0a410d2bce17ac21d874448cdc611ab62515fd8
-  data.tar.gz: fbdf035e2c5ed04de78592f64b9a1d163bb7bc1533e63c4c479e7d494847745b2ea0ceb52f720818e4586fa994a665653f16de93f61d6f503e09d8a90b42ffea
+  metadata.gz: fd05bc99a4719679bcdfde4d7d2e755080ecb93ba1b48ebab9d43a0ed24a03b2ea5ca190efd3dcace28c9b0bfdf56cb469d7efddc39a8ab70f1e0996769feb65
+  data.tar.gz: db99debfdb3863aa2d04fa105e1be80403ba82e94f9f76f40cd26e5072b56a13215f78c6cf02bb901a96565c6224efef4acfe3903ea02ffb90301915ddf7427f

data/VERSION

@@ -1 +1 @@
-3.5.5
+3.5.6

data/VERSION_DATE

@@ -1 +1 @@
-05 January 2018 01:22:10 UTC
+23 March 2018 00:44:24 UTC

data/lib/sass/exec/sass_scss.rb

@@ -92,7 +92,7 @@ END
       end
 
       opts.on("-v", "--version", "Print the Sass version.") do
-        puts("Sass #{Sass.version[:string]}")
+        puts("Ruby Sass #{Sass.version[:string]}")
         exit
       end
     end

data/lib/sass/script/functions.rb

@@ -653,7 +653,15 @@ module Sass::Script
     #     inclusive
     # @return [Sass::Script::Value::Color]
     # @raise [ArgumentError] if any parameter is the wrong type or out of bounds
-    def rgb(red, green, blue)
+    def rgb(red, green = nil, blue = nil)
+      if green.nil?
+        return unquoted_string("rgb(#{red})") if var?(red)
+        raise ArgumentError.new("wrong number of arguments (1 for 3)")
+      elsif blue.nil?
+        return unquoted_string("rgb(#{red}, #{green})") if var?(red) || var?(green)
+        raise ArgumentError.new("wrong number of arguments (2 for 3)")
+      end
+
       if special_number?(red) || special_number?(green) || special_number?(blue)
         return unquoted_string("rgb(#{red}, #{green}, #{blue})")
       end
@@ -677,6 +685,8 @@ module Sass::Script
       Sass::Script::Value::Color.new(color_attrs)
     end
     declare :rgb, [:red, :green, :blue]
+    declare :rgb, [:red, :green]
+    declare :rgb, [:red]
 
     # Creates a {Sass::Script::Value::Color Color} from red, green, blue, and
     # alpha values.
@@ -711,9 +721,22 @@ module Sass::Script
     #     is the wrong type
     def rgba(*args)
       case args.size
+      when 1
+        return unquoted_string("rgba(#{args.first})") if var?(args.first)
+        raise ArgumentError.new("wrong number of arguments (1 for 4)")
       when 2
         color, alpha = args
 
+        if var?(color)
+          return unquoted_string("rgba(#{color}, #{alpha})")
+        elsif var?(alpha)
+          if color.is_a?(Sass::Script::Value::Color)
+            return unquoted_string("rgba(#{color.red}, #{color.green}, #{color.blue}, #{alpha})")
+          else
+            return unquoted_string("rgba(#{color}, #{alpha})")
+          end
+        end
+
         assert_type color, :Color, :color
         if special_number?(alpha)
           unquoted_string("rgba(#{color.red}, #{color.green}, #{color.blue}, #{alpha})")
@@ -722,6 +745,12 @@ module Sass::Script
           check_alpha_unit alpha, 'rgba'
           color.with(:alpha => alpha.value)
         end
+      when 3
+        if var?(args[0]) || var?(args[1]) || var?(args[2])
+          unquoted_string("rgba(#{args.join(', ')})")
+        else
+          raise ArgumentError.new("wrong number of arguments (3 for 4)")
+        end
       when 4
         red, green, blue, alpha = args
         if special_number?(red) || special_number?(green) ||
@@ -735,7 +764,9 @@ module Sass::Script
       end
     end
     declare :rgba, [:red, :green, :blue, :alpha]
+    declare :rgba, [:red, :green, :blue]
     declare :rgba, [:color, :alpha]
+    declare :rgba, [:red]
 
     # Creates a {Sass::Script::Value::Color Color} from hue, saturation, and
     # lightness values. Uses the algorithm from the [CSS3 spec][].
@@ -753,7 +784,15 @@ module Sass::Script
     # @return [Sass::Script::Value::Color]
     # @raise [ArgumentError] if `$saturation` or `$lightness` are out of bounds
     #   or any parameter is the wrong type
-    def hsl(hue, saturation, lightness)
+    def hsl(hue, saturation = nil, lightness = nil)
+      if saturation.nil?
+        return unquoted_string("hsl(#{hue})") if var?(hue)
+        raise ArgumentError.new("wrong number of arguments (1 for 3)")
+      elsif lightness.nil?
+        return unquoted_string("hsl(#{hue}, #{saturation})") if var?(hue) || var?(saturation)
+        raise ArgumentError.new("wrong number of arguments (2 for 3)")
+      end
+
       if special_number?(hue) || special_number?(saturation) || special_number?(lightness)
         unquoted_string("hsl(#{hue}, #{saturation}, #{lightness})")
       else
@@ -761,6 +800,8 @@ module Sass::Script
       end
     end
     declare :hsl, [:hue, :saturation, :lightness]
+    declare :hsl, [:hue, :saturation]
+    declare :hsl, [:hue]
 
     # Creates a {Sass::Script::Value::Color Color} from hue,
     # saturation, lightness, and alpha values. Uses the algorithm from
@@ -781,7 +822,21 @@ module Sass::Script
     # @return [Sass::Script::Value::Color]
     # @raise [ArgumentError] if `$saturation`, `$lightness`, or `$alpha` are out
     #   of bounds or any parameter is the wrong type
-    def hsla(hue, saturation, lightness, alpha)
+    def hsla(hue, saturation = nil, lightness = nil, alpha = nil)
+      if saturation.nil?
+        return unquoted_string("hsla(#{hue})") if var?(hue)
+        raise ArgumentError.new("wrong number of arguments (1 for 4)")
+      elsif lightness.nil?
+        return unquoted_string("hsla(#{hue}, #{saturation})") if var?(hue) || var?(saturation)
+        raise ArgumentError.new("wrong number of arguments (2 for 4)")
+      elsif alpha.nil?
+        if var?(hue) || var?(saturation) || var?(lightness)
+          return unquoted_string("hsla(#{hue}, #{saturation}, #{lightness})")
+        else
+          raise ArgumentError.new("wrong number of arguments (2 for 4)")
+        end
+      end
+
       if special_number?(hue) || special_number?(saturation) ||
          special_number?(lightness) || special_number?(alpha)
         return unquoted_string("hsla(#{hue}, #{saturation}, #{lightness}, #{alpha})")
@@ -803,6 +858,9 @@ module Sass::Script
         :hue => h, :saturation => s, :lightness => l, :alpha => alpha.value)
     end
     declare :hsla, [:hue, :saturation, :lightness, :alpha]
+    declare :hsla, [:hue, :saturation, :lightness]
+    declare :hsla, [:hue, :saturation]
+    declare :hsla, [:hue]
 
     # Gets the red component of a color. Calculated from HSL where necessary via
     # [this algorithm][hsl-to-rgb].

data/lib/sass/script/value/helpers.rb

@@ -215,6 +215,14 @@ module Sass::Script::Value
       literal.is_a?(Sass::Script::Value::String) && literal.value =~ /calc\(/
     end
 
+    # Returns true when the literal is a string containing a var().
+    #
+    # @param literal [Sass::Script::Value::Base] The value to check
+    # @return Boolean
+    def var?(literal)
+      literal.is_a?(Sass::Script::Value::String) && literal.value =~ /var\(/
+    end
+
     # Returns whether the literal is a special CSS value that may evaluate to a
     # number, such as `calc()` or `var()`.
     #

data/lib/sass/script/value/number.rb

@@ -189,6 +189,7 @@ module Sass::Script::Value
     # @raise [Sass::UnitConversionError] if `other` has incompatible units
     def mod(other)
       if other.is_a?(Number)
+        return Number.new(Float::NAN) if other.value == 0
         operate(other, :%)
       else
         raise NoMethodError.new(nil, :mod)
@@ -472,7 +473,7 @@ module Sass::Script::Value
         sans_common_units(@numerator_units, @denominator_units)
 
       @denominator_units.each_with_index do |d, i|
-        next unless convertable?(d) && (u = @numerator_units.find(&method(:convertable?)))
+        next unless convertable?(d) && (u = @numerator_units.find {|n| convertable?([n, d])})
         @value /= conversion_factor(d, u)
         @denominator_units.delete_at(i)
         @numerator_units.delete_at(@numerator_units.index(u))

data/lib/sass/scss/parser.rb

@@ -898,7 +898,7 @@ module Sass
             (?!
               url\(
             )
-            [^()\[\]{}"'#/ \t\r\n\f#{top_level ? ";!" : ""}]
+            [^()\[\]{}"'#/ \t\r\n\f#{top_level ? ";" : ""}]
           |
             \#(?!\{)
           |

data/lib/sass/tree/visitors/to_css.rb

@@ -392,7 +392,8 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
   # @param node [Sass::Script::Tree::PropNode] A custom property node.
   # @return [String]
   def format_custom_property_value(node)
-    if node.style == :compact || node.style == :compressed || !node.resolved_value.include?("\n")
+    value = node.resolved_value.sub(/\n[ \t\r\f\n]*\Z/, ' ')
+    if node.style == :compact || node.style == :compressed || !value.include?("\n")
       # Folding not involving newlines was done in the parser. We can safely
       # fold newlines here because tokens like strings can't contain literal
       # newlines, so we know any adjacent whitespace is tokenized as whitespace.
@@ -401,7 +402,7 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
 
     # Find the smallest amount of indentation in the custom property and use
     # that as the base indentation level.
-    lines = node.resolved_value.split("\n")
+    lines = value.split("\n")
     indented_lines = lines[1..-1]
     min_indentation = indented_lines.
       map {|line| line[/^[ \t]*/]}.

data/lib/sass/version.rb

@@ -76,7 +76,6 @@ module Sass
         end
       end
 
-      @@version[:string] << " (#{name})"
       @@version
     end
 

data/test/sass/functions_test.rb

@@ -1318,7 +1318,7 @@ SCSS
     evaluate("rgb($red: 255, $green: 255)")
     flunk("Expected exception")
   rescue Sass::SyntaxError => e
-    assert_equal("Function rgb requires an argument named $blue", e.message)
+    assert_equal("wrong number of arguments (2 for 3) for `rgb'", e.message)
   end
 
   def test_keyword_args_with_extra_argument

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass
 version: !ruby/object:Gem::Version
-  version: 3.5.5
+  version: 3.5.6
 platform: ruby
 authors:
 - Natalie Weizenbaum
@@ -10,76 +10,76 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-05 00:00:00.000000000 Z
+date: 2018-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass-listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.7.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.7.6
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.3'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.0
 - !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
@@ -95,7 +95,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .yardopts
+- ".yardopts"
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - MIT-LICENSE
@@ -376,17 +376,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: sass
-rubygems_version: 2.4.8
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: A powerful but elegant CSS compiler that makes CSS fun again.