sass 3.4.22 → 3.4.24

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

@@ -34,29 +34,31 @@ 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
-      @epsilon = 1 / (@precision_factor * 10)
+      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
-      @epsilon ||= 1 / (precision_factor * 10)
+      Thread.current[:sass_numeric_epsilon] ||= 1 / (precision_factor * 10)
     end
 
     # Used so we don't allocate two new arrays for each new number.
@@ -304,7 +306,7 @@ module Sass::Script::Value
     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?
@@ -508,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.rb

@@ -16,9 +16,9 @@ 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}

data/lib/sass/scss/parser.rb

@@ -16,9 +16,9 @@ module Sass
       #   warnings and source maps.
       # @param importer [Sass::Importers::Base] The importer used to import the
       #   file being parsed. Used for source maps.
-      # @param line [Fixnum] The 1-based line on which the source string appeared,
+      # @param line [Integer] The 1-based line on which the source string appeared,
       #   if it's part of another document.
-      # @param offset [Fixnum] The 1-based character (not byte) offset in the line on
+      # @param offset [Integer] The 1-based character (not byte) offset in the line on
       #   which the source string starts. Used for error reporting and sourcemap
       #   building.
       def initialize(str, filename, importer, line = 1, offset = 1)
@@ -560,7 +560,7 @@ module Sass
       def supports_clause
         return unless tok(/supports\(/i)
         ss
-        supports = supports_condition
+        supports = import_supports_condition
         ss
         tok!(/\)/)
         supports
@@ -570,6 +570,10 @@ module Sass
         supports_negation || supports_operator || supports_interpolation
       end
 
+      def import_supports_condition
+        supports_condition || supports_declaration
+      end
+
       def supports_negation
         return unless tok(/not/i)
         ss
@@ -589,6 +593,13 @@ module Sass
         cond
       end
 
+      def supports_declaration
+          name = sass_script(:parse)
+          tok!(/:/); ss
+          value = sass_script(:parse)
+          Sass::Supports::Declaration.new(name, value)
+      end
+
       def supports_condition_in_parens
         interp = supports_interpolation
         return interp if interp
@@ -597,11 +608,9 @@ module Sass
           tok!(/\)/); ss
           cond
         else
-          name = sass_script(:parse)
-          tok!(/:/); ss
-          value = sass_script(:parse)
+          decl = supports_declaration
           tok!(/\)/); ss
-          Sass::Supports::Declaration.new(name, value)
+          decl
         end
       end
 
@@ -828,6 +837,9 @@ module Sass
           |
             (?!url\()
             [^"'/\#!;\{\}] # "
+          |
+            # interp_uri will handle most url() calls, but not ones that take strings
+            url\(#{W}(?=")
           |
             /(?![/*])
           |
@@ -1010,7 +1022,7 @@ WARNING
       end
 
       def str
-        @strs.push ""
+        @strs.push String.new("")
         yield
         @strs.last
       ensure
@@ -1143,14 +1155,20 @@ WARNING
         line = @line
         offset = @offset
         expected = @expected
+
+        logger = Sass::Logger::Delayed.install!
         if catch(:_sass_parser_error) {yield; false}
           @scanner.pos = pos
           @line = line
           @offset = offset
           @expected = expected
           {:pos => pos, :line => line, :expected => @expected, :block => block}
+        else
+          logger.flush
+          nil
         end
       ensure
+        logger.uninstall! if logger
         @throw_error = old_throw_error
       end
 

data/lib/sass/scss/rx.rb

@@ -40,7 +40,7 @@ module Sass
       # escaping all significant characters.
       #
       # @param str [String] The text of the regexp
-      # @param flags [Fixnum] Flags for the created regular expression
+      # @param flags [Integer] Flags for the created regular expression
       # @return [Regexp]
       # @private
       def self.quote(str, flags = 0)

data/lib/sass/selector/abstract_sequence.rb

@@ -8,7 +8,7 @@ module Sass
     class AbstractSequence
       # The line of the Sass template on which this selector was declared.
       #
-      # @return [Fixnum]
+      # @return [Integer]
       attr_reader :line
 
       # The name of the file in which this selector was declared.
@@ -19,8 +19,8 @@ module Sass
       # Sets the line of the Sass template on which this selector was declared.
       # This also sets the line for all child selectors.
       #
-      # @param line [Fixnum]
-      # @return [Fixnum]
+      # @param line [Integer]
+      # @return [Integer]
       def line=(line)
         members.each {|m| m.line = line}
         @line = line
@@ -42,7 +42,7 @@ module Sass
       # Subclasses should define `#_hash` rather than overriding this method,
       # which automatically handles memoizing the result.
       #
-      # @return [Fixnum]
+      # @return [Integer]
       def hash
         @_hash ||= _hash
       end
@@ -83,7 +83,7 @@ module Sass
       # The base is given by {Sass::Selector::SPECIFICITY_BASE}. This can be a
       # number or a range representing possible specificities.
       #
-      # @return [Fixnum, Range]
+      # @return [Integer, Range]
       def specificity
         _specificity(members)
       end

data/lib/sass/selector/sequence.rb

@@ -6,8 +6,8 @@ module Sass
       # Sets the line of the Sass template on which this selector was declared.
       # This also sets the line for all child selectors.
       #
-      # @param line [Fixnum]
-      # @return [Fixnum]
+      # @param line [Integer]
+      # @return [Integer]
       def line=(line)
         members.each {|m| m.line = line if m.is_a?(SimpleSequence)}
         @line = line

data/lib/sass/selector/simple.rb

@@ -5,7 +5,7 @@ module Sass
     class Simple
       # The line of the Sass template on which this selector was declared.
       #
-      # @return [Fixnum]
+      # @return [Integer]
       attr_accessor :line
 
       # The name of the file in which this selector was declared,
@@ -36,7 +36,7 @@ module Sass
       # so if that contains information irrelevant to the identity of the selector,
       # this should be overridden.
       #
-      # @return [Fixnum]
+      # @return [Integer]
       def hash
         @_hash ||= equality_key.hash
       end
@@ -106,10 +106,10 @@ module Sass
       #   could be found at all.
       #   If the second value is `false`, the first should be ignored.
       def unify_namespaces(ns1, ns2)
-        return nil, false unless ns1 == ns2 || ns1.nil? || ns1 == '*' || ns2.nil? || ns2 == '*'
         return ns2, true if ns1 == '*'
         return ns1, true if ns2 == '*'
-        [ns1 || ns2, true]
+        return nil, false unless ns1 == ns2
+        [ns1, true]
       end
     end
   end

data/lib/sass/shared.rb

@@ -31,7 +31,7 @@ module Sass
     #   A `Fixnum` in 1.8, a `String` in 1.9
     # @param finish [Character] The character closing the balanced pair.
     #   A `Fixnum` in 1.8, a `String` in 1.9
-    # @param count [Fixnum] The number of opening characters matched
+    # @param count [Integer] The number of opening characters matched
     #   before calling this method
     # @return [(String, String)] The string matched within the balanced pair
     #   and the rest of the string.

data/lib/sass/source/map.rb

@@ -37,7 +37,7 @@ module Sass::Source
 
     # Shifts all output source ranges forward one or more lines.
     #
-    # @param delta [Fixnum] The number of lines to shift the ranges forward.
+    # @param delta [Integer] The number of lines to shift the ranges forward.
     def shift_output_lines(delta)
       return if delta == 0
       @data.each do |m|
@@ -49,7 +49,7 @@ module Sass::Source
     # Shifts any output source ranges that lie on the first line forward one or
     # more characters on that line.
     #
-    # @param delta [Fixnum] The number of characters to shift the ranges
+    # @param delta [Integer] The number of characters to shift the ranges
     #   forward.
     def shift_output_offsets(delta)
       return if delta == 0
@@ -118,12 +118,14 @@ module Sass::Source
       @data.each do |m|
         file, importer = m.input.file, m.input.importer
 
+        next unless importer
+
         if options[:type] == :inline
           source_uri = file
         else
           sourcemap_dir = sourcemap_path && sourcemap_path.dirname.to_s
           sourcemap_dir = nil if options[:type] == :file
-          source_uri = importer && importer.public_url(file, sourcemap_dir)
+          source_uri = importer.public_url(file, sourcemap_dir)
           next unless source_uri
         end
 

data/lib/sass/source/position.rb

@@ -2,17 +2,17 @@ module Sass::Source
   class Position
     # The one-based line of the document associated with the position.
     #
-    # @return [Fixnum]
+    # @return [Integer]
     attr_accessor :line
 
     # The one-based offset in the line of the document associated with the
     # position.
     #
-    # @return [Fixnum]
+    # @return [Integer]
     attr_accessor :offset
 
-    # @param line [Fixnum] The source line
-    # @param offset [Fixnum] The source offset
+    # @param line [Integer] The source line
+    # @param offset [Integer] The source offset
     def initialize(line, offset)
       @line = line
       @offset = offset

data/lib/sass/tree/comment_node.rb

@@ -59,7 +59,7 @@ module Sass::Tree
 
     # Returns the number of lines in the comment.
     #
-    # @return [Fixnum]
+    # @return [Integer]
     def lines
       @value.inject(0) do |s, e|
         next s + e.count("\n") if e.is_a?(String)

data/lib/sass/tree/node.rb

@@ -69,7 +69,7 @@ module Sass
 
       # The line of the document on which this node appeared.
       #
-      # @return [Fixnum]
+      # @return [Integer]
       attr_accessor :line
 
       # The source range in the document on which this node appeared.

data/lib/sass/tree/prop_node.rb

@@ -39,7 +39,7 @@ module Sass::Tree
     # * This is a child property of another property
     # * The parent property has a value, and thus will be rendered
     #
-    # @return [Fixnum]
+    # @return [Integer]
     attr_accessor :tabs
 
     # The source range in which the property name appears.

data/lib/sass/tree/rule_node.rb

@@ -40,7 +40,7 @@ module Sass::Tree
     # * This is a child rule of another rule
     # * The parent rule has properties, and thus will be rendered
     #
-    # @return [Fixnum]
+    # @return [Integer]
     attr_accessor :tabs
 
     # The entire selector source range for this rule.

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

@@ -289,7 +289,9 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
               child.line + 1 == nxt.line) ||
             (child.is_a?(Sass::Tree::VariableNode) && nxt.is_a?(Sass::Tree::VariableNode) &&
               child.line + 1 == nxt.line) ||
-            (child.is_a?(Sass::Tree::PropNode) && nxt.is_a?(Sass::Tree::PropNode))
+            (child.is_a?(Sass::Tree::PropNode) && nxt.is_a?(Sass::Tree::PropNode)) ||
+            (child.is_a?(Sass::Tree::MixinNode) && nxt.is_a?(Sass::Tree::MixinNode) &&
+              child.line + 1 == nxt.line)
           ""
         else
           "\n"

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

@@ -12,7 +12,7 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
     @tabs = 0
     @line = 1
     @offset = 1
-    @result = ""
+    @result = String.new("")
     @source_mapping = build_source_mapping ? Sass::Source::Map.new : nil
     @lstrip = nil
     @in_directive = false

data/lib/sass/util.rb

@@ -339,6 +339,18 @@ module Sass
       arr
     end
 
+    # Like `String.upcase`, but only ever upcases ASCII letters.
+    def upcase(string)
+      return string.upcase unless ruby2_4?
+      string.upcase(:ascii)
+    end
+
+    # Like `String.downcase`, but only ever downcases ASCII letters.
+    def downcase(string)
+      return string.downcase unless ruby2_4?
+      string.downcase(:ascii)
+    end
+
     # Returns a sub-array of `minuend` containing only elements that are also in
     # `subtrahend`. Ensures that the return value has the same order as
     # `minuend`, even on Rubinius where that's not guaranteed by `Array#-`.
@@ -418,7 +430,7 @@ module Sass
     # Returns information about the caller of the previous method.
     #
     # @param entry [String] An entry in the `#caller` list, or a similarly formatted string
-    # @return [[String, Fixnum, (String, nil)]]
+    # @return [[String, Integer, (String, nil)]]
     #   An array containing the filename, line, and method name of the caller.
     #   The method name may be nil
     def caller_info(entry = nil)
@@ -636,7 +648,7 @@ module Sass
 
     # Returns an array of ints representing the JRuby version number.
     #
-    # @return [Array<Fixnum>]
+    # @return [Array<Integer>]
     def jruby_version
       @jruby_version ||= ::JRUBY_VERSION.split(".").map {|s| s.to_i}
     end
@@ -794,6 +806,19 @@ module Sass
       @ruby1_9_2 = RUBY_VERSION_COMPONENTS == [1, 9, 2]
     end
 
+    # Whether or not this is running under Ruby 2.4 or higher.
+    #
+    # @return [Boolean]
+    def ruby2_4?
+      return @ruby2_4 if defined?(@ruby2_4)
+      @ruby2_4 =
+        if RUBY_VERSION_COMPONENTS[0] == 2
+          RUBY_VERSION_COMPONENTS[1] >= 4
+        else
+          RUBY_VERSION_COMPONENTS[0] > 2
+        end
+    end
+
     # Wehter or not this is running under JRuby 1.6 or lower.
     def jruby1_6?
       return @jruby1_6 if defined?(@jruby1_6)
@@ -941,7 +966,7 @@ module Sass
     # A version of `Enumerable#enum_cons` that works in Ruby 1.8 and 1.9.
     #
     # @param enum [Enumerable] The enumerable to get the enumerator for
-    # @param n [Fixnum] The size of each cons
+    # @param n [Integer] The size of each cons
     # @return [Enumerator] The consed enumerator
     def enum_cons(enum, n)
       ruby1_8? ? enum.enum_cons(n) : enum.each_cons(n)
@@ -950,7 +975,7 @@ module Sass
     # A version of `Enumerable#enum_slice` that works in Ruby 1.8 and 1.9.
     #
     # @param enum [Enumerable] The enumerable to get the enumerator for
-    # @param n [Fixnum] The size of each slice
+    # @param n [Integer] The size of each slice
     # @return [Enumerator] The consed enumerator
     def enum_slice(enum, n)
       ruby1_8? ? enum.enum_slice(n) : enum.each_slice(n)
@@ -977,7 +1002,7 @@ module Sass
     # Returns the ASCII code of the given character.
     #
     # @param c [String] All characters but the first are ignored.
-    # @return [Fixnum] The ASCII code of `c`.
+    # @return [Integer] The ASCII code of `c`.
     def ord(c)
       ruby1_8? ? c[0] : c.ord
     end
@@ -1102,11 +1127,11 @@ module Sass
 
     # Converts the argument into a valid JSON value.
     #
-    # @param v [Fixnum, String, Array, Boolean, nil]
+    # @param v [Integer, String, Array, Boolean, nil]
     # @return [String]
     def json_value_of(v)
       case v
-      when Fixnum
+      when Integer
         v.to_s
       when String
         "\"" + json_escape_string(v) + "\""
@@ -1139,7 +1164,7 @@ module Sass
 
     # Encodes `value` as VLQ (http://en.wikipedia.org/wiki/VLQ).
     #
-    # @param value [Fixnum]
+    # @param value [Integer]
     # @return [String] The encoded value
     def encode_vlq(value)
       if value < 0

data/lib/sass/version.rb

@@ -8,7 +8,7 @@ module Sass
   # if it was installed from Git.
   module Version
     # Returns a hash representing the version of Sass.
-    # The `:major`, `:minor`, and `:teeny` keys have their respective numbers as Fixnums.
+    # The `:major`, `:minor`, and `:teeny` keys have their respective numbers as Integers.
     # The `:name` key has the name of the version.
     # The `:string` key contains a human-readable string representation of the version.
     # The `:number` key is the major, minor, and teeny keys separated by periods.
@@ -41,7 +41,7 @@ module Sass
     #       :prerelease_number => 1
     #     }
     #
-    # @return [{Symbol => String/Fixnum}] The version hash
+    # @return [{Symbol => String/Integer}] The version hash
     # @comment
     #   rubocop:disable ClassVars
     def version

data/test/sass/conversion_test.rb

@@ -1126,6 +1126,23 @@ foo {
 SCSS
   end
 
+  def test_consecutive_mixin_includes
+    assert_renders <<SASS, <<SCSS
+foo
+  +foo-bar
+  +foo-bar
+
+  a: blip
+SASS
+foo {
+  @include foo-bar;
+  @include foo-bar;
+
+  a: blip;
+}
+SCSS
+  end
+
   def test_mixin_include_with_hyphen_conversion_keyword_arg
     assert_renders <<SASS, <<SCSS
 foo