sass 3.4.0 → 3.4.25

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

@@ -17,15 +17,16 @@ module Sass::Script::Value
     # @private
     #
     # Convert a ruby integer to a rgba components
-    # @param color [Fixnum]
-    # @return [Array<Fixnum>] Array of 4 numbers representing r,g,b and alpha
+    # @param color [Integer]
+    # @return [Array<Integer>] Array of 4 numbers representing r,g,b and alpha
     def self.int_to_rgba(color)
       rgba = (0..3).map {|n| color >> (n << 3) & 0xff}.reverse
       rgba[-1] = rgba[-1] / 255.0
       rgba
     end
 
-    ALTERNATE_COLOR_NAMES = Sass::Util.map_vals({
+    ALTERNATE_COLOR_NAMES = Sass::Util.map_vals(
+      {
         'aqua'                 => 0x00FFFFFF,
         'darkgrey'             => 0xA9A9A9FF,
         'darkslategrey'        => 0x2F4F4FFF,
@@ -35,10 +36,11 @@ module Sass::Script::Value
         'lightgrey'            => 0xD3D3D3FF,
         'lightslategrey'       => 0x778899FF,
         'slategrey'            => 0x708090FF,
-    }, &method(:int_to_rgba))
+      }, &method(:int_to_rgba))
 
     # A hash from color names to `[red, green, blue]` value arrays.
-    COLOR_NAMES = Sass::Util.map_vals({
+    COLOR_NAMES = Sass::Util.map_vals(
+      {
         'aliceblue'            => 0xF0F8FFFF,
         'antiquewhite'         => 0xFAEBD7FF,
         'aquamarine'           => 0x7FFFD4FF,
@@ -179,7 +181,7 @@ module Sass::Script::Value
         'whitesmoke'           => 0xF5F5F5FF,
         'yellow'               => 0xFFFF00FF,
         'yellowgreen'          => 0x9ACD32FF
-     }, &method(:int_to_rgba))
+      }, &method(:int_to_rgba))
 
     # A hash from `[red, green, blue, alpha]` value arrays to color names.
     COLOR_NAMES_REVERSE = COLOR_NAMES.invert.freeze
@@ -204,7 +206,7 @@ module Sass::Script::Value
     #
     # @overload initialize(attrs)
     #   The attributes are specified as a hash. This hash must contain either
-    #   `:hue`, `:saturation`, and `:value` keys, or `:red`, `:green`, and
+    #   `:hue`, `:saturation`, and `:lightness` keys, or `:red`, `:green`, and
     #   `:blue` keys. It cannot contain both HSL and RGB keys. It may also
     #   optionally contain an `:alpha` key, and a `:representation` key
     #   indicating the original representation of the color that the user wrote
@@ -232,12 +234,12 @@ module Sass::Script::Value
           raise ArgumentError.new("Color.new(array) expects a three- or four-element array")
         end
 
-        red, green, blue = attrs[0...3].map {|c| c.to_i}
+        red, green, blue = attrs[0...3].map {|c| Sass::Util.round(c)}
         @attrs = {:red => red, :green => green, :blue => blue}
         @attrs[:alpha] = attrs[3] ? attrs[3].to_f : 1
         @representation = representation
       else
-        attrs = attrs.reject {|k, v| v.nil?}
+        attrs = attrs.reject {|_k, v| v.nil?}
         hsl = [:hue, :saturation, :lightness] & attrs.keys
         rgb = [:red, :green, :blue] & attrs.keys
         if !allow_both_rgb_and_hsl && !hsl.empty? && !rgb.empty?
@@ -258,7 +260,7 @@ module Sass::Script::Value
 
       [:red, :green, :blue].each do |k|
         next if @attrs[k].nil?
-        @attrs[k] = Sass::Util.restrict(@attrs[k].to_i, 0..255)
+        @attrs[k] = Sass::Util.restrict(Sass::Util.round(@attrs[k]), 0..255)
       end
 
       [:saturation, :lightness].each do |k|
@@ -283,7 +285,7 @@ module Sass::Script::Value
       green = $2.ljust(2, $2).to_i(16)
       blue  = $3.ljust(2, $3).to_i(16)
 
-      hex_string = '##{hex_string}' unless hex_string[0] == ?#
+      hex_string = "##{hex_string}" unless hex_string[0] == ?#
       attrs = {:red => red, :green => green, :blue => blue, :representation => hex_string}
       attrs[:alpha] = alpha if alpha
       new(attrs)
@@ -291,7 +293,7 @@ module Sass::Script::Value
 
     # The red component of the color.
     #
-    # @return [Fixnum]
+    # @return [Integer]
     def red
       hsl_to_rgb!
       @attrs[:red]
@@ -299,7 +301,7 @@ module Sass::Script::Value
 
     # The green component of the color.
     #
-    # @return [Fixnum]
+    # @return [Integer]
     def green
       hsl_to_rgb!
       @attrs[:green]
@@ -307,7 +309,7 @@ module Sass::Script::Value
 
     # The blue component of the color.
     #
-    # @return [Fixnum]
+    # @return [Integer]
     def blue
       hsl_to_rgb!
       @attrs[:blue]
@@ -340,7 +342,7 @@ module Sass::Script::Value
     # The alpha channel (opacity) of the color.
     # This is 1 unless otherwise defined.
     #
-    # @return [Fixnum]
+    # @return [Integer]
     def alpha
       @attrs[:alpha].to_f
     end
@@ -355,7 +357,7 @@ module Sass::Script::Value
 
     # Returns the red, green, and blue components of the color.
     #
-    # @return [Array<Fixnum>] A frozen three-element array of the red, green, and blue
+    # @return [Array<Integer>] A frozen three-element array of the red, green, and blue
     #   values (respectively) of the color
     def rgb
       [red, green, blue].freeze
@@ -363,7 +365,7 @@ module Sass::Script::Value
 
     # Returns the red, green, blue, and alpha components of the color.
     #
-    # @return [Array<Fixnum>] A frozen four-element array of the red, green,
+    # @return [Array<Integer>] A frozen four-element array of the red, green,
     #   blue, and alpha values (respectively) of the color
     def rgba
       [red, green, blue, alpha].freeze
@@ -371,7 +373,7 @@ module Sass::Script::Value
 
     # Returns the hue, saturation, and lightness components of the color.
     #
-    # @return [Array<Fixnum>] A frozen three-element array of the
+    # @return [Array<Integer>] A frozen three-element array of the
     #   hue, saturation, and lightness values (respectively) of the color
     def hsl
       [hue, saturation, lightness].freeze
@@ -379,10 +381,10 @@ module Sass::Script::Value
 
     # Returns the hue, saturation, lightness, and alpha components of the color.
     #
-    # @return [Array<Fixnum>] A frozen four-element array of the hue,
+    # @return [Array<Integer>] A frozen four-element array of the hue,
     #   saturation, lightness, and alpha values (respectively) of the color
     def hsla
-      [hue, saturation, lightness].freeze
+      [hue, saturation, lightness, alpha].freeze
     end
 
     # The SassScript `==` operation.
@@ -421,7 +423,7 @@ module Sass::Script::Value
     # @return [Color] The new Color object
     # @raise [ArgumentError] if both RGB and HSL keys are specified
     def with(attrs)
-      attrs = attrs.reject {|k, v| v.nil?}
+      attrs = attrs.reject {|_k, v| v.nil?}
       hsl = !([:hue, :saturation, :lightness] & attrs.keys).empty?
       rgb = !([:red, :green, :blue] & attrs.keys).empty?
       if hsl && rgb
@@ -598,16 +600,32 @@ module Sass::Script::Value
       "##{red}#{green}#{blue}"
     end
 
+    def operation_name(operation)
+      case operation
+      when :+
+        "add"
+      when :-
+        "subtract"
+      when :*
+        "multiply"
+      when :/
+        "divide"
+      when :%
+        "modulo"
+      end
+    end
+
     def piecewise(other, operation)
       other_num = other.is_a? Number
       if other_num && !other.unitless?
         raise Sass::SyntaxError.new(
-          "Cannot add a number with units (#{other}) to a color (#{self}).")
+          "Cannot #{operation_name(operation)} a number with units (#{other}) to a color (#{self})."
+        )
       end
 
       result = []
       (0...3).each do |i|
-        res = rgb[i].send(operation, other_num ? other.value : other.rgb[i])
+        res = rgb[i].to_f.send(operation, other_num ? other.value : other.rgb[i])
         result[i] = [[res, 255].min, 0].max
       end
 
@@ -632,7 +650,7 @@ module Sass::Script::Value
         hue_to_rgb(m1, m2, h + 1.0 / 3),
         hue_to_rgb(m1, m2, h),
         hue_to_rgb(m1, m2, h - 1.0 / 3)
-      ].map {|c| (c * 0xff).round}
+      ].map {|c| Sass::Util.round(c * 0xff)}
     end
 
     def hue_to_rgb(m1, m2, h)

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

@@ -1,6 +1,8 @@
 module Sass::Script::Value
   # Provides helper functions for creating sass values from within ruby methods.
   # @since `3.3.0`
+  # @comment
+  #   rubocop:disable ModuleLength
   module Helpers
     # Construct a Sass Boolean.
     #
@@ -139,7 +141,7 @@ module Sass::Script::Value
         Sass::SCSS::StaticParser.new(str, nil, nil, 1, 1, allow_parent_ref).parse_selector
       rescue Sass::SyntaxError => e
         err = "#{value.inspect} is not a valid selector: #{e}"
-        err = "$#{name.to_s.gsub('_', '-')}: #{err}" if name
+        err = "$#{name.to_s.tr('_', '-')}: #{err}" if name
         raise ArgumentError.new(err)
       end
     end
@@ -163,7 +165,7 @@ module Sass::Script::Value
       return seq if selector.members.length == 1
 
       err = "#{value.inspect} is not a complex selector"
-      err = "$#{name.to_s.gsub('_', '-')}: #{err}" if name
+      err = "$#{name.to_s.tr('_', '-')}: #{err}" if name
       raise ArgumentError.new(err)
     end
 
@@ -190,10 +192,18 @@ module Sass::Script::Value
       end
 
       err = "#{value.inspect} is not a compound selector"
-      err = "$#{name.to_s.gsub('_', '-')}: #{err}" if name
+      err = "$#{name.to_s.tr('_', '-')}: #{err}" if name
       raise ArgumentError.new(err)
     end
 
+    # Returns true when the literal is a string containing a calc()
+    #
+    # @param literal [Sass::Script::Value::Base] The value to check
+    # @return boolean
+    def calc?(literal)
+      literal.is_a?(Sass::Script::Value::String) && literal.value =~ /calc\(/
+    end
+
     private
 
     # Converts a user-provided selector into string form or throws an
@@ -205,7 +215,7 @@ module Sass::Script::Value
 
       err = "#{value.inspect} is not a valid selector: it must be a string,\n" +
         "a list of strings, or a list of lists of strings"
-      err = "$#{name.to_s.gsub('_', '-')}: #{err}" if name
+      err = "$#{name.to_s.tr('_', '-')}: #{err}" if name
       raise ArgumentError.new(err)
     end
 
@@ -242,14 +252,14 @@ module Sass::Script::Value
     def parse_unit_string(unit_string)
       denominator_units = numerator_units = Sass::Script::Value::Number::NO_UNITS
       return numerator_units, denominator_units unless unit_string && unit_string.length > 0
-      num_over_denominator = unit_string.split(/ *\/ */)
+      num_over_denominator = unit_string.split(%r{ */ *})
       unless (1..2).include?(num_over_denominator.size)
         raise ArgumentError.new("Malformed unit string: #{unit_string}")
       end
       numerator_units = num_over_denominator[0].split(/ *\* */)
       denominator_units = (num_over_denominator[1] || "").split(/ *\* */)
       [[numerator_units, "numerator"], [denominator_units, "denominator"]].each do |units, name|
-        if unit_string =~ /\// && units.size == 0
+        if unit_string =~ %r{/} && units.size == 0
           raise ArgumentError.new("Malformed unit string: #{unit_string}")
         end
         if units.any? {|unit| unit !~ VALID_UNIT}

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

@@ -56,7 +56,7 @@ module Sass::Script::Value
       return "()" if value.empty?
 
       to_sass = lambda do |value|
-        if value.is_a?(Map) || (value.is_a?(List) && value.separator == :comma)
+        if value.is_a?(List) && value.separator == :comma
           "(#{value.to_sass(opts)})"
         else
           value.to_sass(opts)

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

@@ -34,25 +34,35 @@ module Sass::Script::Value
     attr_accessor :original
 
     def self.precision
-      @precision ||= 5
+      Thread.current[:sass_numeric_precision] || Thread.main[:sass_numeric_precision] || 5
     end
 
     # Sets the number of digits of precision
     # For example, if this is `3`,
     # `3.1415926` will be printed as `3.142`.
+    # The numeric precision is stored as a thread local for thread safety reasons.
+    # To set for all threads, be sure to set the precision on the main thread.
     def self.precision=(digits)
-      @precision = digits.round
-      @precision_factor = 10.0**@precision
+      Thread.current[:sass_numeric_precision] = digits.round
+      Thread.current[:sass_numeric_precision_factor] = nil
+      Thread.current[:sass_numeric_epsilon] = nil
     end
 
     # the precision factor used in numeric output
     # it is derived from the `precision` method.
     def self.precision_factor
-      @precision_factor ||= 10.0**precision
+      Thread.current[:sass_numeric_precision_factor] ||= 10.0**precision
+    end
+
+    # Used in checking equality of floating point numbers. Any
+    # numbers within an `epsilon` of each other are considered functionally equal.
+    # The value for epsilon is one tenth of the current numeric precision.
+    def self.epsilon
+      Thread.current[:sass_numeric_epsilon] ||= 1 / (precision_factor * 10)
     end
 
     # Used so we don't allocate two new arrays for each new number.
-    NO_UNITS  = []
+    NO_UNITS = []
 
     # @param value [Numeric] The value of the number
     # @param numerator_units [::String, Array<::String>] See \{#numerator\_units}
@@ -63,6 +73,7 @@ module Sass::Script::Value
       super(value)
       @numerator_units = numerator_units
       @denominator_units = denominator_units
+      @options = nil
       normalize!
     end
 
@@ -200,7 +211,7 @@ module Sass::Script::Value
       rescue Sass::UnitConversionError
         return Bool::FALSE
       end
-      Bool.new(this.value == other.value)
+      Bool.new(basically_equal?(this.value, other.value))
     end
 
     def hash
@@ -211,7 +222,7 @@ module Sass::Script::Value
     # Hash-equality must be transitive, so it just compares the exact value,
     # numerator units, and denominator units.
     def eql?(other)
-      value == other.value && numerator_units == other.numerator_units &&
+      basically_equal?(value, other.value) && numerator_units == other.numerator_units &&
         denominator_units == other.denominator_units
     end
 
@@ -281,20 +292,30 @@ module Sass::Script::Value
       # and confusing.
       str = ("%0.#{self.class.precision}f" % value).gsub(/0*$/, '') if str.include?('e')
 
+      # Sometimes numeric formatting will result in a decimal number with a trailing zero (x.0)
+      if str =~ /(.*)\.0$/
+        str = $1
+      end
+
+      # We omit a leading zero before the decimal point in compressed mode.
+      if @options && options[:style] == :compressed
+        str.sub!(/^(-)?0\./, '\1.')
+      end
+
       unitless? ? str : "#{str}#{unit_str}"
     end
     alias_method :to_sass, :inspect
 
-    # @return [Fixnum] The integer value of the number
+    # @return [Integer] The integer value of the number
     # @raise [Sass::SyntaxError] if the number isn't an integer
     def to_i
       super unless int?
-      value
+      value.to_i
     end
 
     # @return [Boolean] Whether or not this number is an integer.
     def int?
-      value % 1 == 0.0
+      basically_equal?(value % 1, 0.0)
     end
 
     # @return [Boolean] Whether or not this number has no units.
@@ -375,12 +396,24 @@ module Sass::Script::Value
 
     private
 
+    # @private
+    # @see Sass::Script::Number.basically_equal?
+    def basically_equal?(num1, num2)
+      self.class.basically_equal?(num1, num2)
+    end
+
+    # Checks whether two numbers are within an epsilon of each other.
+    # @return [Boolean]
+    def self.basically_equal?(num1, num2)
+      (num1 - num2).abs < epsilon
+    end
+
     # @private
     def self.round(num)
       if num.is_a?(Float) && (num.infinite? || num.nan?)
         num
-      elsif num % 1 == 0.0
-        num.to_i
+      elsif basically_equal?(num % 1, 0.0)
+        num.round
       else
         ((num * precision_factor).round / precision_factor).to_f
       end
@@ -439,11 +472,10 @@ module Sass::Script::Value
         sans_common_units(@numerator_units, @denominator_units)
 
       @denominator_units.each_with_index do |d, i|
-        if convertable?(d) && (u = @numerator_units.find(&method(:convertable?)))
-          @value /= conversion_factor(d, u)
-          @denominator_units.delete_at(i)
-          @numerator_units.delete_at(@numerator_units.index(u))
-        end
+        next unless convertable?(d) && (u = @numerator_units.find(&method(:convertable?)))
+        @value /= conversion_factor(d, u)
+        @denominator_units.delete_at(i)
+        @numerator_units.delete_at(@numerator_units.index(u))
       end
     end
 
@@ -458,6 +490,7 @@ module Sass::Script::Value
         'cm' => Rational(1, 2.54),
         'pc' => Rational(1, 6),
         'mm' => Rational(1, 25.4),
+        'q' => Rational(1, 101.6),
         'pt' => Rational(1, 72),
         'px' => Rational(1, 96)
       },
@@ -477,8 +510,8 @@ module Sass::Script::Value
       },
       {
         'dpi'  => Rational(1),
-        'dpcm' => Rational(1, 2.54),
-        'dppx' => Rational(1, 96)
+        'dpcm' => Rational(254, 100),
+        'dppx' => Rational(96)
       }
     ]
 

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

@@ -2,6 +2,8 @@
 module Sass::Script::Value
   # A SassScript object representing a CSS string *or* a CSS identifier.
   class String < Base
+    @@interpolation_deprecation = Sass::Deprecation.new
+
     # The Ruby value of the string.
     #
     # @return [String]
@@ -28,9 +30,18 @@ module Sass::Script::Value
       end
     end
 
-    def self.quote(contents, quote = nil)
+    # Returns the quoted string representation of `contents`.
+    #
+    # @options opts :quote [String]
+    #   The preferred quote style for quoted strings. If `:none`, strings are
+    #   always emitted unquoted. If `nil`, quoting is determined automatically.
+    # @options opts :sass [String]
+    #   Whether to quote strings for Sass source, as opposed to CSS. Defaults to `false`.
+    def self.quote(contents, opts = {})
+      quote = opts[:quote]
+
       # Short-circuit if there are no characters that need quoting.
-      unless contents =~ /[\n\\"']/
+      unless contents =~ /[\n\\"']|\#\{/
         quote ||= '"'
         return "#{quote}#{contents}#{quote}"
       end
@@ -50,6 +61,9 @@ module Sass::Script::Value
       # Replace single backslashes with multiples.
       contents = contents.gsub("\\", "\\\\\\\\")
 
+      # Escape interpolation.
+      contents = contents.gsub('#{', "\\\#{") if opts[:sass]
+
       if quote == '"'
         contents = contents.gsub('"', "\\\"")
       else
@@ -64,9 +78,13 @@ module Sass::Script::Value
     #
     # @param value [String] See \{#value}
     # @param type [Symbol] See \{#type}
-    def initialize(value, type = :identifier)
+    # @param deprecated_interp_equivalent [String?]
+    #   If this was created via a potentially-deprecated string interpolation,
+    #   this is the replacement expression that should be suggested to the user.
+    def initialize(value, type = :identifier, deprecated_interp_equivalent = nil)
       super(value)
       @type = type
+      @deprecated_interp_equivalent = deprecated_interp_equivalent
     end
 
     # @see Value#plus
@@ -82,12 +100,35 @@ module Sass::Script::Value
     # @see Value#to_s
     def to_s(opts = {})
       return @value.gsub(/\n\s*/, ' ') if opts[:quote] == :none || @type == :identifier
-      Sass::Script::Value::String.quote(value, opts[:quote])
+      String.quote(value, opts)
     end
 
     # @see Value#to_sass
     def to_sass(opts = {})
-      to_s
+      to_s(opts.merge(:sass => true))
+    end
+
+    def separator
+      check_deprecated_interp
+      super
+    end
+
+    def to_a
+      check_deprecated_interp
+      super
+    end
+
+    # Prints a warning if this string was created using potentially-deprecated
+    # interpolation.
+    def check_deprecated_interp
+      return unless @deprecated_interp_equivalent
+
+      @@interpolation_deprecation.warn(source_range.file, source_range.start_pos.line, <<WARNING)
+\#{} interpolation near operators will be simplified in a future version of Sass.
+To preserve the current behavior, use quotes:
+
+  #{@deprecated_interp_equivalent}
+WARNING
     end
 
     def inspect

data/lib/sass/script.rb

@@ -16,12 +16,12 @@ module Sass
     # Parses a string of SassScript
     #
     # @param value [String] The SassScript
-    # @param line [Fixnum] The number of the line on which the SassScript appeared.
+    # @param line [Integer] The number of the line on which the SassScript appeared.
     #   Used for error reporting
-    # @param offset [Fixnum] The number of characters in on `line` that the SassScript started.
+    # @param offset [Integer] The number of characters in on `line` that the SassScript started.
     #   Used for error reporting
     # @param options [{Symbol => Object}] An options hash;
-    #   see {file:SASS_REFERENCE.md#sass_options the Sass options documentation}
+    #   see {file:SASS_REFERENCE.md#Options the Sass options documentation}
     # @return [Script::Tree::Node] The root node of the parse tree
     def self.parse(value, line, offset, options = {})
       Parser.parse(value, line, offset, options)

data/lib/sass/scss/css_parser.rb

@@ -14,6 +14,13 @@ module Sass
       def interpolation(warn_for_color = false); nil; end
       def use_css_import?; true; end
 
+      def block_contents(node, context)
+        if node.is_a?(Sass::Tree::DirectiveNode) && node.normalized_name == '@keyframes'
+          context = :keyframes
+        end
+        super(node, context)
+      end
+
       def block_child(context)
         case context
         when :ruleset
@@ -22,6 +29,8 @@ module Sass
           directive || ruleset
         when :directive
           directive || declaration_or_ruleset
+        when :keyframes
+          keyframes_ruleset
         end
       end
 
@@ -35,8 +44,13 @@ module Sass
         block(node(Sass::Tree::RuleNode.new(selector, range(start_pos)), start_pos), :ruleset)
       end
 
-      @sass_script_parser = Class.new(Sass::Script::CssParser)
-      @sass_script_parser.send(:include, ScriptParser)
+      def keyframes_ruleset
+        start_pos = source_position
+        return unless (selector = keyframes_selector)
+        block(node(Sass::Tree::KeyframeRuleNode.new(selector.strip), start_pos), :ruleset)
+      end
+
+      @sass_script_parser = Sass::Script::CssParser
     end
   end
 end