sass 3.4.24 → 3.4.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 798967a96737a6978563e8b46a97cf3254d1bd54
-  data.tar.gz: 57ed07a4077a5d81a9b821da7b7f4dcffb939fd2
+  metadata.gz: a8b2d6c079c8e8aec59e0dd45294419919f88239
+  data.tar.gz: 5e31ebbe100aa0b066d414ee32e3f29d792907f6
 SHA512:
-  metadata.gz: a86659601d7713959b8213d53a09ced83a3d3eb09eb64fdcab54fcba0e3f4b05477db9ded2f30c7e77a44f078115ee9b6efed016f868b40e725e40d7bb4a1d3e
-  data.tar.gz: 42da27fb2cd7325d5df8404ea20bd6e4d57f926ee835f266120dc2fbd2beee43a7dc2e8932d136365c43f26a66fe019457a46afe376578ce11a8abc2316625cc
+  metadata.gz: 1782f895c1aaeef19491dfb41434ca10a60d28395f53a3ec19f8a65ec21c97625db3325732007fbc3155821c53adf9bcd00ced70e9fe3c1c935295b34f3dfdaf
+  data.tar.gz: 39578a844dd4d6e381cb10ced82d5c6782ddd042c79cc5c4c9cc6a69163badbf1ce368526987447b955d44a3d20470ea5e4eae481ea9359d63eea09cab94ca70

data/Rakefile

@@ -12,8 +12,42 @@ task :default => :test
 
 require 'rake/testtask'
 
+LINE_SIZE = 80
+DECORATION_CHAR = '#'
+
+def print_header(string)
+  length = string.length
+  puts DECORATION_CHAR * LINE_SIZE
+  puts string.center(length + 2, ' ').center(LINE_SIZE, DECORATION_CHAR)
+  puts DECORATION_CHAR * LINE_SIZE
+end
+
 desc "Run all tests"
-task :test => ["test:ruby", "test:spec"]
+task :test do
+  test_cases = [
+    {
+      'env'   => {'MATHN' => 'true'},
+      'tasks' => ['test:ruby', 'test:spec', :rubocop]
+    },
+    {
+      'env'   => {'MATHN' => 'false'},
+      'tasks' => ['test:ruby']
+    }
+  ]
+
+  test_cases.each do |test_case|
+    env = test_case['env']
+    tasks = test_case['tasks']
+
+    env.each do |key, value|
+      ENV[key] = value
+    end
+    tasks.each do |task|
+      print_header("Running task: #{task}, env: #{env}")
+      Rake::Task[task].execute
+    end
+  end
+end
 
 namespace :test do
   desc "Run the ruby tests (without sass-spec)"
@@ -76,25 +110,20 @@ def ruby_version_at_least?(version_string)
   ruby_version >= version
 end
 
-if ruby_version_at_least?("2.2.0") &&
-    (ENV.has_key?("RUBOCOP") && ENV["RUBOCOP"] == "true" ||
-      !(ENV.has_key?("RUBOCOP") || ENV.has_key?("TEST")))
+begin
   require 'rubocop/rake_task'
   RuboCop = Rubocop unless defined?(RuboCop)
   RuboCop::RakeTask.new do |t|
     t.patterns = FileList["lib/**/*"]
   end
-else
+rescue LoadError
   task :rubocop do
-    puts "Skipping rubocop style check."
-    next if ENV.has_key?("RUBOCOP") && ENV["RUBOCOP"] != "true"
+    puts "Rubocop is disabled."
     puts "Passing this check is required in order for your patch to be accepted."
-    puts "Use Ruby 2.2 or greater and then run the style check with: rake rubocop"
+    puts "Install Rubocop and then run the style check with: rake rubocop."
   end
 end
 
-task :test => :rubocop
-
 # ----- Packaging -----
 
 # Don't use Rake::GemPackageTast because we want prerequisites to run

data/VERSION

@@ -1 +1 @@
-3.4.24
+3.4.25

data/VERSION_DATE

@@ -1 +1 @@
-19 May 2017 00:01:41 UTC
+07 July 2017 22:00:34 UTC

data/lib/sass.rb

@@ -47,7 +47,7 @@ module Sass
   #
   # @param contents [String] The contents of the Sass file.
   # @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}
   # @raise [Sass::SyntaxError] if there's an error in the document
   # @raise [Encoding::UndefinedConversionError] if the source encoding
   #   cannot be converted to UTF-8
@@ -69,7 +69,7 @@ module Sass
   #
   #   @param filename [String] The path to the Sass, SCSS, or CSS file on disk.
   #   @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 [String] The compiled CSS.
   #
   # @overload compile_file(filename, css_filename, options = {})
@@ -77,7 +77,7 @@ module Sass
   #
   #   @param filename [String] The path to the Sass, SCSS, or CSS file on disk.
   #   @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}
   #   @param css_filename [String] The location to which to write the compiled CSS.
   def self.compile_file(filename, *args)
     options = args.last.is_a?(Hash) ? args.pop : {}

data/lib/sass/css.rb

@@ -18,7 +18,7 @@ module Sass
     #   that can be converted to Unicode.
     #   If the stylesheet contains an `@charset` declaration,
     #   that overrides the Ruby encoding
-    #   (see {file:SASS_REFERENCE.md#encodings the encoding documentation})
+    #   (see {file:SASS_REFERENCE.md#Encodings the encoding documentation})
     # @option options :old [Boolean] (false)
     #     Whether or not to output old property syntax
     #     (`:color blue` as opposed to `color: blue`).

data/lib/sass/deprecation.rb

@@ -0,0 +1,55 @@
+module Sass
+  # A deprecation warning that should only be printed once for a given line in a
+  # given file.
+  #
+  # A global Deprecation instance should be created for each type of deprecation
+  # warning, and `warn` should be called each time a warning is needed.
+  class Deprecation
+    @@allow_double_warnings = false
+
+    # Runs a block in which double deprecation warnings for the same location
+    # are allowed.
+    def self.allow_double_warnings
+      old_allow_double_warnings = @@allow_double_warnings
+      @@allow_double_warnings = true
+      yield
+    ensure
+      @@allow_double_warnings = old_allow_double_warnings
+    end
+
+    def initialize
+      # A set of filename, line pairs for which warnings have been emitted.
+      @seen = Set.new
+    end
+
+    # Prints `message` as a deprecation warning associated with `filename`,
+    # `line`, and optionally `column`.
+    #
+    # This ensures that only one message will be printed for each line of a
+    # given file.
+    #
+    # @overload warn(filename, line, message)
+    #   @param filename [String, nil]
+    #   @param line [Number]
+    #   @param message [String]
+    # @overload warn(filename, line, column, message)
+    #   @param filename [String, nil]
+    #   @param line [Number]
+    #   @param column [Number]
+    #   @param message [String]
+    def warn(filename, line, column_or_message, message = nil)
+      return if !@@allow_double_warnings && @seen.add?([filename, line]).nil?
+      if message
+        column = column_or_message
+      else
+        message = column_or_message
+      end
+
+      location = "line #{line}"
+      location << ", column #{column}" if column
+      location << " of #{filename}" if filename
+
+      Sass::Util.sass_warn("DEPRECATION WARNING on #{location}:\n#{message}")
+    end
+  end
+end

data/lib/sass/engine.rb

@@ -1,6 +1,7 @@
 require 'set'
 require 'digest/sha1'
 require 'sass/cache_stores'
+require 'sass/deprecation'
 require 'sass/source/position'
 require 'sass/source/range'
 require 'sass/source/map'
@@ -89,6 +90,8 @@ module Sass
   #     output = sass_engine.render
   #     puts output
   class Engine
+    @@old_property_deprecation = Deprecation.new
+
     # A line of Sass code.
     #
     # `text`: `String`
@@ -168,7 +171,7 @@ module Sass
     # default values and resolving aliases.
     #
     # @param options [{Symbol => Object}] The options hash;
-    #   see {file:SASS_REFERENCE.md#sass_options the Sass options documentation}
+    #   see {file:SASS_REFERENCE.md#Options the Sass options documentation}
     # @return [{Symbol => Object}] The normalized options hash.
     # @private
     def self.normalize_options(options)
@@ -222,7 +225,7 @@ module Sass
     #
     # @param filename [String] The path to the Sass or SCSS file
     # @param options [{Symbol => Object}] The options hash;
-    #   See {file:SASS_REFERENCE.md#sass_options the Sass options documentation}.
+    #   See {file:SASS_REFERENCE.md#Options the Sass options documentation}.
     # @return [Sass::Engine] The Engine for the given Sass or SCSS file.
     # @raise [Sass::SyntaxError] if there's an error in the document.
     def self.for_file(filename, options)
@@ -240,7 +243,7 @@ module Sass
     end
 
     # The options for the Sass engine.
-    # See {file:SASS_REFERENCE.md#sass_options the Sass options documentation}.
+    # See {file:SASS_REFERENCE.md#Options the Sass options documentation}.
     #
     # @return [{Symbol => Object}]
     attr_reader :options
@@ -257,9 +260,9 @@ module Sass
     #   that can be converted to Unicode.
     #   If the template contains an `@charset` declaration,
     #   that overrides the Ruby encoding
-    #   (see {file:SASS_REFERENCE.md#encodings the encoding documentation})
+    #   (see {file:SASS_REFERENCE.md#Encodings the encoding documentation})
     # @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}.
     # @see {Sass::Engine.for_file}
     # @see {Sass::Plugin}
     def initialize(template, options = {})
@@ -625,6 +628,11 @@ WARNING
           raise SyntaxError.new("Invalid property: \"#{line.text}\".",
             :line => @line) if name.nil? || value.nil?
 
+          @@old_property_deprecation.warn(@options[:filename], @line, <<WARNING)
+Old-style properties like "#{line.text}" are deprecated and will be an error in future versions of Sass.
+Use "#{name}: #{value}" instead.
+WARNING
+
           value_start_offset = name_end_offset = name_start_offset + name.length
           unless value.empty?
             # +1 and -1 both compensate for the leading ':', which is part of line.text

data/lib/sass/environment.rb

@@ -81,7 +81,7 @@ module Sass
     inherited_hash_reader :function
 
     # @param options [{Symbol => Object}] The options hash. See
-    #   {file:SASS_REFERENCE.md#sass_options the Sass options documentation}.
+    #   {file:SASS_REFERENCE.md#Options the Sass options documentation}.
     # @param parent [Environment] See \{#parent}
     def initialize(parent = nil, options = nil)
       @parent = parent

data/lib/sass/plugin.rb

@@ -12,7 +12,7 @@ module Sass
   # when it's used as a plugin for various frameworks.
   # All Rack-enabled frameworks are supported out of the box.
   # The plugin is
-  # {file:SASS_REFERENCE.md#rails_merb_plugin automatically activated for Rails and Merb}.
+  # {file:SASS_REFERENCE.md#Rack_Rails_Merb_Plugin automatically activated for Rails and Merb}.
   # Other frameworks must enable it explicitly; see {Sass::Plugin::Rack}.
   #
   # This module has a large set of callbacks available

data/lib/sass/plugin/compiler.rb

@@ -31,7 +31,7 @@ module Sass::Plugin
     # Creates a new compiler.
     #
     # @param opts [{Symbol => Object}]
-    #   See {file:SASS_REFERENCE.md#sass_options the Sass options documentation}.
+    #   See {file:SASS_REFERENCE.md#Options the Sass options documentation}.
     def initialize(opts = {})
       @watched_files = Set.new
       options.merge!(opts)

data/lib/sass/plugin/configuration.rb

@@ -27,7 +27,7 @@ module Sass
       end
 
       # 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 [{Symbol => Object}]
       def options

data/lib/sass/plugin/rack.rb

@@ -14,14 +14,14 @@ module Sass
     #       :never_update => environment != :production,
     #       :full_exception => environment != :production)
     #
-    # {file:SASS_REFERENCE.md#options See the Reference for more options}.
+    # {file:SASS_REFERENCE.md#Options See the Reference for more options}.
     #
     # ## Use
     #
     # Put your Sass files in `public/stylesheets/sass`.
     # Your CSS will be generated in `public/stylesheets`,
     # and regenerated every request if necessary.
-    # The locations and frequency {file:SASS_REFERENCE.md#options can be customized}.
+    # The locations and frequency {file:SASS_REFERENCE.md#Options can be customized}.
     # That's all there is to it!
     class Rack
       # The delay, in seconds, between update checks.

data/lib/sass/plugin/staleness_checker.rb

@@ -39,7 +39,7 @@ module Sass
       # for checking the staleness of several stylesheets at once.
       #
       # @param options [{Symbol => Object}]
-      #   See {file:SASS_REFERENCE.md#sass_options the Sass options documentation}.
+      #   See {file:SASS_REFERENCE.md#Options the Sass options documentation}.
       def initialize(options)
         # URIs that are being actively checked for staleness. Protects against
         # import loops.

data/lib/sass/script.rb

@@ -21,7 +21,7 @@ module Sass
     # @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/script/functions.rb

@@ -2510,7 +2510,7 @@ MESSAGE
 
       extends = Sass::Util::SubsetMap.new
       begin
-        extender.populate_extends(extends, extendee)
+        extender.populate_extends(extends, extendee, nil, [], true)
         selector.do_extend(extends).to_sass_script
       rescue Sass::SyntaxError => e
         raise ArgumentError.new(e.to_s)
@@ -2553,7 +2553,7 @@ MESSAGE
 
       extends = Sass::Util::SubsetMap.new
       begin
-        replacement.populate_extends(extends, original)
+        replacement.populate_extends(extends, original, nil, [], true)
         selector.do_extend(extends, [], true).to_sass_script
       rescue Sass::SyntaxError => e
         raise ArgumentError.new(e.to_s)

data/lib/sass/script/lexer.rb

@@ -147,7 +147,7 @@ module Sass
       # @param offset [Integer] The 1-based character (not byte) offset in the line in the source.
       #   Used for error reporting and sourcemap building
       # @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}
       def initialize(str, line, offset, options)
         @scanner = str.is_a?(StringScanner) ? str : Sass::Util::MultibyteStringScanner.new(str)
         @line = line

data/lib/sass/script/parser.rb

@@ -26,7 +26,7 @@ module Sass
       # @param offset [Integer] The character (not byte) offset where the script starts in the line.
       #   Used for error reporting and sourcemap building
       # @param options [{Symbol => Object}] An options hash; see
-      #   {file:SASS_REFERENCE.md#sass_options the Sass options documentation}.
+      #   {file:SASS_REFERENCE.md#Options the Sass options documentation}.
       #   This supports an additional `:allow_extra_text` option that controls
       #   whether the parser throws an error when extra text is encountered
       #   after the parsed construct.
@@ -818,8 +818,9 @@ RUBY
         location = "on line #{interpolation.line}"
         location << " of #{interpolation.filename}" if interpolation.filename
         Sass::Util.sass_warn <<WARNING
-DEPRECATION WARNING #{location}: \#{} interpolation near operators will be simplified
-in a future version of Sass. To preserve the current behavior, use quotes:
+DEPRECATION WARNING #{location}:
+\#{} interpolation near operators will be simplified in a future version of Sass.
+To preserve the current behavior, use quotes:
 
   #{interpolation.to_quoted_equivalent.to_sass}
 

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

@@ -33,7 +33,7 @@ module Sass::Script::Tree
 
     # Sets the options hash for this node,
     # as well as for all child nodes.
-    # See {file:SASS_REFERENCE.md#sass_options the Sass options documentation}.
+    # See {file:SASS_REFERENCE.md#Options the Sass options documentation}.
     #
     # @param options [{Symbol => Object}] The options
     def options=(options)

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

@@ -2,6 +2,9 @@ module Sass::Script::Tree
   # A SassScript parse node representing a binary operation,
   # such as `$a + $b` or `"foo" + 1`.
   class Operation < Node
+    @@color_arithmetic_deprecation = Sass::Deprecation.new
+    @@unitless_equals_deprecation = Sass::Deprecation.new
+
     attr_reader :operand1
     attr_reader :operand2
     attr_reader :operator
@@ -92,28 +95,52 @@ module Sass::Script::Tree
         raise Sass::SyntaxError.new("Undefined operation: \"#{value1} #{@operator} #{value2}\".")
       end
 
-      if (@operator == :eq || @operator == :neq) && value1.is_a?(Sass::Script::Value::Number) &&
-         value2.is_a?(Sass::Script::Value::Number) && value1.unitless? != value2.unitless? &&
-         result == (if @operator == :eq
-                      Sass::Script::Value::Bool::TRUE
-                    else
-                      Sass::Script::Value::Bool::FALSE
-                    end)
-
-        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}:
-The result of `#{operation}` will be `#{future_value}` in future releases of Sass.
-Unitless numbers will no longer be equal to the same numbers with units.
-WARNING
-      end
+      warn_for_color_arithmetic(value1, value2)
+      warn_for_unitless_equals(value1, value2, result)
 
       result
     end
 
     private
 
+    def warn_for_color_arithmetic(value1, value2)
+      return unless @operator == :plus || @operator == :times || @operator == :minus ||
+                    @operator == :div || @operator == :mod
+
+      if value1.is_a?(Sass::Script::Value::Number)
+        return unless value2.is_a?(Sass::Script::Value::Color)
+      elsif value1.is_a?(Sass::Script::Value::Color)
+        return unless value2.is_a?(Sass::Script::Value::Color) || value2.is_a?(Sass::Script::Value::Number)
+      else
+        return
+      end
+
+      @@color_arithmetic_deprecation.warn(filename, line, <<WARNING)
+The operation `#{value1} #{@operator} #{value2}` is deprecated and will be an error in future versions.
+Consider using Sass's color functions instead.
+http://sass-lang.com/documentation/Sass/Script/Functions.html#other_color_functions
+WARNING
+    end
+
+    def warn_for_unitless_equals(value1, value2, result)
+      return unless @operator == :eq || @operator == :neq
+      return unless value1.is_a?(Sass::Script::Value::Number)
+      return unless value2.is_a?(Sass::Script::Value::Number)
+      return unless value1.unitless? != value2.unitless?
+      return unless result == (if @operator == :eq
+                                 Sass::Script::Value::Bool::TRUE
+                               else
+                                 Sass::Script::Value::Bool::FALSE
+                               end)
+
+      operation = "#{value1.to_sass} #{@operator == :eq ? '==' : '!='} #{value2.to_sass}"
+      future_value = @operator == :neq
+      @@unitless_equals_deprecation.warn(filename, line, <<WARNING)
+The result of `#{operation}` will be `#{future_value}` in future releases of Sass.
+Unitless numbers will no longer be equal to the same numbers with units.
+WARNING
+    end
+
     def operand_to_sass(op, side, opts)
       return "(#{op.to_sass(opts)})" if op.is_a?(Sass::Script::Tree::ListLiteral)
       return op.to_sass(opts) unless op.is_a?(Operation)