sass 3.4.20 → 3.4.21

data/lib/sass/script/tree/node.rb

@@ -90,7 +90,7 @@ module Sass::Script::Tree
     # Converts underscores to dashes if the :dasherize option is set.
     def dasherize(s, opts)
       if opts[:dasherize]
-        s.gsub(/_/, '-')
+        s.tr('_', '-')
       else
         s
       end

data/lib/sass/script/tree/operation.rb

@@ -93,7 +93,7 @@ module Sass::Script::Tree
                       Sass::Script::Value::Bool::FALSE
                     end)
 
-        operation = "#{value1} #{@operator == :eq ? '==' : '!='} #{value2}"
+        operation = "#{value1.to_sass} #{@operator == :eq ? '==' : '!='} #{value2.to_sass}"
         future_value = @operator == :neq
         Sass::Util.sass_warn <<WARNING
 DEPRECATION WARNING on line #{line}#{" of #{filename}" if filename}:

data/lib/sass/script/tree/variable.rb

@@ -14,7 +14,7 @@ module Sass::Script::Tree
     # @param name [String] See \{#name}
     def initialize(name)
       @name = name
-      @underscored_name = name.gsub(/-/, "_")
+      @underscored_name = name.tr("-", "_")
       super()
     end
 

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

@@ -87,7 +87,7 @@ MSG
     # @return [Script::Value::String] A string containing both values
     #   separated by `"="`
     def single_eq(other)
-      Sass::Script::Value::String.new("#{to_s}=#{other.to_s}")
+      Sass::Script::Value::String.new("#{self}=#{other}")
     end
 
     # The SassScript `+` operation.
@@ -106,7 +106,7 @@ MSG
     # @return [Script::Value::String] A string containing both values
     #   separated by `"-"`
     def minus(other)
-      Sass::Script::Value::String.new("#{to_s}-#{other.to_s}")
+      Sass::Script::Value::String.new("#{self}-#{other}")
     end
 
     # The SassScript `/` operation.
@@ -115,7 +115,7 @@ MSG
     # @return [Script::Value::String] A string containing both values
     #   separated by `"/"`
     def div(other)
-      Sass::Script::Value::String.new("#{to_s}/#{other.to_s}")
+      Sass::Script::Value::String.new("#{self}/#{other}")
     end
 
     # The SassScript unary `+` operation (e.g. `+$a`).
@@ -124,7 +124,7 @@ MSG
     # @return [Script::Value::String] A string containing the value
     #   preceded by `"+"`
     def unary_plus
-      Sass::Script::Value::String.new("+#{to_s}")
+      Sass::Script::Value::String.new("+#{self}")
     end
 
     # The SassScript unary `-` operation (e.g. `-$a`).
@@ -133,7 +133,7 @@ MSG
     # @return [Script::Value::String] A string containing the value
     #   preceded by `"-"`
     def unary_minus
-      Sass::Script::Value::String.new("-#{to_s}")
+      Sass::Script::Value::String.new("-#{self}")
     end
 
     # The SassScript unary `/` operation (e.g. `/$a`).
@@ -142,7 +142,7 @@ MSG
     # @return [Script::Value::String] A string containing the value
     #   preceded by `"/"`
     def unary_div
-      Sass::Script::Value::String.new("/#{to_s}")
+      Sass::Script::Value::String.new("/#{self}")
     end
 
     # Returns the hash code of this value. Two objects' hash codes should be

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

@@ -237,7 +237,7 @@ module Sass::Script::Value
         @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?
@@ -421,7 +421,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

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,7 +192,7 @@ 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
 
@@ -199,9 +201,7 @@ module Sass::Script::Value
     # @param literal [Sass::Script::Value::Base] The value to check
     # @return boolean
     def calc?(literal)
-      if literal.is_a?(Sass::Script::Value::String)
-        literal.value =~ /calc\(/
-      end
+      literal.is_a?(Sass::Script::Value::String) && literal.value =~ /calc\(/
     end
 
     private
@@ -215,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
 

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

@@ -60,7 +60,7 @@ module Sass::Script::Value
     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}
@@ -289,9 +289,16 @@ 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
@@ -403,7 +410,7 @@ module Sass::Script::Value
       if num.is_a?(Float) && (num.infinite? || num.nan?)
         num
       elsif basically_equal?(num % 1, 0.0)
-        num.to_i
+        num.round
       else
         ((num * precision_factor).round / precision_factor).to_f
       end

data/lib/sass/scss/parser.rb

@@ -21,10 +21,7 @@ module Sass
       # @param offset [Fixnum] The 1-based character (not byte) offset in the line on
       #   which the source string starts. Used for error reporting and sourcemap
       #   building.
-      # @comment
-      #   rubocop:disable ParameterLists
       def initialize(str, filename, importer, line = 1, offset = 1)
-        # rubocop:enable ParameterLists
         @template = str
         @filename = filename
         @importer = importer
@@ -117,7 +114,7 @@ module Sass
           if @template.is_a?(StringScanner)
             @template
           else
-            Sass::Util::MultibyteStringScanner.new(@template.gsub("\r", ""))
+            Sass::Util::MultibyteStringScanner.new(@template.tr("\r", ""))
           end
       end
 
@@ -396,7 +393,8 @@ module Sass
         ss
         media = media_query_list
         if str =~ %r{^(https?:)?//} || media || supports || use_css_import?
-          return node(Sass::Tree::CssImportNode.new(
+          return node(
+            Sass::Tree::CssImportNode.new(
               Sass::Script::Value::String.quote(str), media.to_a, supports), start_pos)
         end
 
@@ -646,8 +644,9 @@ module Sass
       def ruleset
         start_pos = source_position
         return unless (rules = almost_any_value)
-        block(node(
-          Sass::Tree::RuleNode.new(rules, range(start_pos)), start_pos), :ruleset)
+        block(
+          node(
+            Sass::Tree::RuleNode.new(rules, range(start_pos)), start_pos), :ruleset)
       end
 
       def block(node, context)
@@ -722,8 +721,9 @@ module Sass
           selector << additional_selector
         end
 
-        block(node(
-          Sass::Tree::RuleNode.new(merge(selector), range(start_pos)), start_pos), :ruleset)
+        block(
+          node(
+            Sass::Tree::RuleNode.new(merge(selector), range(start_pos)), start_pos), :ruleset)
       end
 
       # Tries to parse a declaration, and returns the value parsed so far if it
@@ -1187,33 +1187,34 @@ module Sass
 
       def tok(rx, last_group_lookahead = false)
         res = @scanner.scan(rx)
-        if res
-          # This fixes https://github.com/nex3/sass/issues/104, which affects
-          # Ruby 1.8.7 and REE. This fix is to replace the ?= zero-width
-          # positive lookahead operator in the Regexp (which matches without
-          # consuming the matched group), with a match that does consume the
-          # group, but then rewinds the scanner and removes the group from the
-          # end of the matched string. This fix makes the assumption that the
-          # matched group will always occur at the end of the match.
-          if last_group_lookahead && @scanner[-1]
-            @scanner.pos -= @scanner[-1].length
-            res.slice!(-@scanner[-1].length..-1)
-          end
 
-          newline_count = res.count(NEWLINE)
-          if newline_count > 0
-            @line += newline_count
-            @offset = res[res.rindex(NEWLINE)..-1].size
-          else
-            @offset += res.size
-          end
+        return unless res
+
+        # This fixes https://github.com/nex3/sass/issues/104, which affects
+        # Ruby 1.8.7 and REE. This fix is to replace the ?= zero-width
+        # positive lookahead operator in the Regexp (which matches without
+        # consuming the matched group), with a match that does consume the
+        # group, but then rewinds the scanner and removes the group from the
+        # end of the matched string. This fix makes the assumption that the
+        # matched group will always occur at the end of the match.
+        if last_group_lookahead && @scanner[-1]
+          @scanner.pos -= @scanner[-1].length
+          res.slice!(-@scanner[-1].length..-1)
+        end
 
-          @expected = nil
-          if !@strs.empty? && rx != COMMENT && rx != SINGLE_LINE_COMMENT
-            @strs.each {|s| s << res}
-          end
-          res
+        newline_count = res.count(NEWLINE)
+        if newline_count > 0
+          @line += newline_count
+          @offset = res[res.rindex(NEWLINE)..-1].size
+        else
+          @offset += res.size
+        end
+
+        @expected = nil
+        if !@strs.empty? && rx != COMMENT && rx != SINGLE_LINE_COMMENT
+          @strs.each {|s| s << res}
         end
+        res
       end
 
       # Remove a vendor prefix from `str`.

data/lib/sass/scss/rx.rb

@@ -32,7 +32,7 @@ module Sass
       # @return [String] The escaped character
       # @private
       def self.escape_char(c)
-        return "\\%06x" % Sass::Util.ord(c) unless c =~ /[ -\/:-~]/
+        return "\\%06x" % (Sass::Util.ord(c)) unless c =~ /[ -\/:-~]/
         "\\#{c}"
       end
 
@@ -66,7 +66,6 @@ module Sass
 
       IDENT    = /-*#{NMSTART}#{NMCHAR}*/
       NAME     = /#{NMCHAR}+/
-      NUM      = //
       STRING   = /#{STRING1}|#{STRING2}/
       URLCHAR  = /[#%&*-~]|#{NONASCII}|#{ESCAPE}/
       URL      = /(#{URLCHAR}*)/
@@ -99,7 +98,7 @@ module Sass
       # A unit is like an IDENT, but disallows a hyphen followed by a digit.
       # This allows "1px-2px" to be interpreted as subtraction rather than "1"
       # with the unit "px-2px". It also allows "%".
-      UNIT = /-?#{NMSTART}(?:[a-zA-Z0-9_]|#{NONASCII}|#{ESCAPE}|-(?!\d))*|%/
+      UNIT = /-?#{NMSTART}(?:[a-zA-Z0-9_]|#{NONASCII}|#{ESCAPE}|-(?!\.?\d))*|%/
 
       UNITLESS_NUMBER = /(?:[0-9]+|[0-9]*\.[0-9]+)(?:[eE][+-]?\d+)?/
       NUMBER = /#{UNITLESS_NUMBER}(?:#{UNIT})?/

data/lib/sass/selector.rb

@@ -39,7 +39,7 @@ module Sass
       end
 
       # @see Selector#to_s
-      def to_s
+      def to_s(opts = {})
         "&" + (@suffix || '')
       end
 
@@ -65,7 +65,7 @@ module Sass
       end
 
       # @see Selector#to_s
-      def to_s
+      def to_s(opts = {})
         "." + @name
       end
 
@@ -88,7 +88,7 @@ module Sass
       end
 
       # @see Selector#to_s
-      def to_s
+      def to_s(opts = {})
         "#" + @name
       end
 
@@ -123,7 +123,7 @@ module Sass
       end
 
       # @see Selector#to_s
-      def to_s
+      def to_s(opts = {})
         "%" + @name
       end
 
@@ -147,7 +147,7 @@ module Sass
       end
 
       # @see Selector#to_s
-      def to_s
+      def to_s(opts = {})
         @namespace ? "#{@namespace}|*" : "*"
       end
 
@@ -219,7 +219,7 @@ module Sass
       end
 
       # @see Selector#to_s
-      def to_s
+      def to_s(opts = {})
         @namespace ? "#{@namespace}|#{@name}" : @name
       end
 
@@ -296,10 +296,7 @@ module Sass
       # @param operator [String] The matching operator, e.g. `"="` or `"^="`
       # @param value [String] See \{#value}
       # @param flags [String] See \{#flags}
-      # @comment
-      #   rubocop:disable ParameterLists
       def initialize(name, namespace, operator, value, flags)
-        # rubocop:enable ParameterLists
         @name = name
         @namespace = namespace
         @operator = operator
@@ -308,7 +305,7 @@ module Sass
       end
 
       # @see Selector#to_s
-      def to_s
+      def to_s(opts = {})
         res = "["
         res << @namespace << "|" if @namespace
         res << @name

data/lib/sass/selector/abstract_sequence.rb

@@ -71,8 +71,10 @@ module Sass
 
       # Returns the selector string.
       #
+      # @param opts [Hash] rendering options.
+      # @option opts [Symbol] :style The css rendering style.
       # @return [String]
-      def to_s
+      def to_s(opts = {})
         Sass::Util.abstract(self)
       end
 

data/lib/sass/selector/comma_sequence.rb

@@ -159,8 +159,10 @@ module Sass
       end
 
       # @see AbstractSequence#to_s
-      def to_s
-        @members.join(", ").gsub(", \n", ",\n")
+      def to_s(opts = {})
+        @members.map {|m| m.to_s(opts)}.
+          join(opts[:style] == :compressed ? "," : ", ").
+          gsub(", \n", ",\n")
       end
 
       private

data/lib/sass/selector/pseudo.rb

@@ -113,13 +113,13 @@ module Sass
       end
 
       # @see Selector#to_s
-      def to_s
+      def to_s(opts = {})
         res = (syntactic_type == :class ? ":" : "::") + @name
         if @arg || @selector
           res << "("
           res << @arg.strip if @arg
           res << " " if @arg && @selector
-          res << @selector.to_s if @selector
+          res << @selector.to_s(opts) if @selector
           res << ")"
         end
         res

data/lib/sass/selector/sequence.rb

@@ -157,8 +157,8 @@ module Sass
       end
 
       # @see AbstractSequence#to_s
-      def to_s
-        @members.join(" ").gsub(/ ?\n ?/, "\n")
+      def to_s(opts = {})
+        @members.map {|m| m.is_a?(String) ? m : m.to_s(opts)}.join(" ").gsub(/ ?\n ?/, "\n")
       end
 
       # Returns a string representation of the sequence.