sass 3.4.19 → 3.4.20

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWUyNTcwMjI2MDViMjQ1MjdkMTUzYjAyMzAwNDM4OGMyODUwNmQ3ZA==
+    ZmQ4ODgyYzJhYWQzYjhkN2YwM2MxNTUxNDU1ZmUwZmRjMTdjNzc0ZQ==
   data.tar.gz: !binary |-
-    NDU0NjNmOTk2MzU2ODllMGRjMGMwYTU5OTNiOTk2YzYwNGRmYjg2MQ==
+    YjBlMTNlNzkwYjBjMzQ5MzUxNGM1OTliZTdhNGE1ZTMzMTI3NmM1Yg==
 SHA512:
   metadata.gz: !binary |-
-    ODVlN2I2NjI5NGUyNjMyZjIyNGE4YzkwNmUwYzZhOThlMWE3OWM4N2U3MDMw
-    OGNiODViMmRiMGZlZTA1MGZjNTUzYTg1MzY2YWRhOGM3MTdhZDNlMmVmODk5
-    MTJmOGJhYWQ4YWMxNzRkN2JiNjJlNGYwMWJlZWFiNWY5MjIxYTY=
+    YTQ5ZWU3MWJkYTU3OTk3YTgzNjVlMzQzZDljYzg0NTVlM2U1ZGE0YWI1YzQ0
+    NmE3YjE4OWIzOTRlMDdkY2Q2OWY5ZTRjYjdmODc1OGU4NGRiMmUzZjNiMTIx
+    MWUxMDYyOGY2OWE0MmJhMThmNGRkNzNjZDJjMmM0ODk1NjA2YTY=
   data.tar.gz: !binary |-
-    ZWY5NDhjODk1YThkMGE5OTcyMmQ5MTY3NWZlNDEzNWFjMDI0YWMxZDlmMWU4
-    YjcwZWJiNDdkM2RlYmI5Njc1MTVmYzM0YzA5OGQ5N2UxNzA4YjUzMGQ5Nzk2
-    YzNkYzVjYjI1NTBjMDdlODdkZjcwNmMzNWI0NzBkZTY4MjgyODU=
+    Nzg1YTgxNTdmOWI3MjQxOGYwYWQzZTM4OTE3Mjk4NjAzNzRiYTYxNmRmOTIx
+    NDgwODRiNzQ4ZGIyZDFjMTZmNTUwMzM5NTNjMmZmN2Y5OGYzNTcyOTRhOTU1
+    NmE1NjY1NTVlYzZhMzUyMjE0ZTFkNTQ4MTNiODUwM2E3YzUzNDk=

data/.yardopts

@@ -9,3 +9,5 @@
 --protected
 --no-private
 --no-highlight
+--tag             comment
+--hide-tag        comment

data/Rakefile

@@ -23,7 +23,14 @@ end
 
 # ----- Code Style Enforcement -----
 
-if RUBY_VERSION !~ /^(1\.8)/ && (ENV.has_key?("RUBOCOP") && ENV["RUBOCOP"] == "true" || !(ENV.has_key?("RUBOCOP") || ENV.has_key?("TEST")))
+version = RUBY_VERSION.split(".").map {|n| n.to_i}
+
+# TODO: Run Rubocop on Ruby 2.2+ when it's supported. See
+# https://github.com/sass/sass/pull/1805.
+if (version[0] > 1 || (version[0] == 1 && version[1] > 8)) &&
+    (version[0] < 2 || (version[0] == 2 && version[1] < 2)) &&
+    (ENV.has_key?("RUBOCOP") && ENV["RUBOCOP"] == "true" ||
+      !(ENV.has_key?("RUBOCOP") || ENV.has_key?("TEST")))
   require 'rubocop/rake_task'
   Rubocop::RakeTask.new do |t|
     t.patterns = FileList["lib/**/*"]
@@ -98,7 +105,7 @@ end
 
 desc "Install Sass as a gem. Use SUDO=1 to install with sudo."
 task :install => [:package] do
-  gem  = RUBY_PLATFORM =~ /java/  ? 'jgem' : 'gem' 
+  gem  = RUBY_PLATFORM =~ /java/  ? 'jgem' : 'gem'
   sh %{#{'sudo ' if ENV["SUDO"]}#{gem} install --no-ri pkg/sass-#{get_version}}
 end
 
@@ -310,7 +317,7 @@ END
     file = File.read(scope("test/sass/templates/#{file || 'complex'}.sass"))
     result = RubyProf.profile { times.times { Sass::Engine.new(file).render } }
 
-    RubyProf.const_get("#{(ENV['OUTPUT'] || 'Flat').capitalize}Printer").new(result).print 
+    RubyProf.const_get("#{(ENV['OUTPUT'] || 'Flat').capitalize}Printer").new(result).print
   end
 rescue LoadError; end
 

data/VERSION

@@ -1 +1 @@
-3.4.19
+3.4.20

data/VERSION_DATE

@@ -1 +1 @@
-10 October 2015 01:18:29 UTC
+09 December 2015 23:08:32 UTC

data/extra/update_watch.rb

@@ -7,7 +7,7 @@ enable :lock
 Dir.chdir(File.dirname(__FILE__) + "/..")
 
 post "/" do
-  puts "Recieved payload!"
+  puts "Received payload!"
   puts "Rev: #{`git name-rev HEAD`.strip}"
   system %{rake handle_update --trace REF=#{JSON.parse(params["payload"])["ref"].inspect}}
 end

data/lib/sass/css.rb

@@ -31,7 +31,7 @@ module Sass
         template = template.read
       end
 
-      @options = options.dup
+      @options = options.merge(:_convert => true)
       # Backwards compatibility
       @options[:old] = true if @options[:alternate] == false
       @template = template

data/lib/sass/engine.rb

@@ -229,7 +229,7 @@ module Sass
       had_syntax = options[:syntax]
 
       if had_syntax
-        # Use what was explicitly specificed
+        # Use what was explicitly specified
       elsif filename =~ /\.scss$/
         options.merge!(:syntax => :scss)
       elsif filename =~ /\.sass$/
@@ -776,7 +776,19 @@ WARNING
                else
                  :normal
                end
-        Tree::CommentNode.new(value, type)
+        comment = Tree::CommentNode.new(value, type)
+        comment.line = line.index
+        text = line.text.rstrip
+        if text.include?("\n")
+          end_offset = text.length - text.rindex("\n")
+        else
+          end_offset = to_parser_offset(line.offset + text.length)
+        end
+        comment.source_range = Sass::Source::Range.new(
+          Sass::Source::Position.new(@line, to_parser_offset(line.offset)),
+          Sass::Source::Position.new(@line + text.count("\n"), end_offset),
+          @options[:filename])
+        comment
       else
         Tree::RuleNode.new(parse_interp(line.text), full_line_range(line))
       end
@@ -1013,12 +1025,21 @@ WARNING
           end_pos = str.source_range.end_pos
           node = Tree::CssImportNode.new(str)
         else
-          media_parser = Sass::SCSS::Parser.new(scanner,
+          supports_parser = Sass::SCSS::Parser.new(scanner,
             @options[:filename], @options[:importer],
             @line, str.source_range.end_pos.offset)
-          media = media_parser.parse_media_query_list
-          end_pos = Sass::Source::Position.new(@line, media_parser.offset + 1)
-          node = Tree::CssImportNode.new(str, media.to_a)
+          supports_condition = supports_parser.parse_supports_clause
+
+          if scanner.eos?
+            node = Tree::CssImportNode.new(str, [], supports_condition)
+          else
+            media_parser = Sass::SCSS::Parser.new(scanner,
+              @options[:filename], @options[:importer],
+              @line, str.source_range.end_pos.offset)
+            media = media_parser.parse_media_query_list
+            end_pos = Sass::Source::Position.new(@line, media_parser.offset + 1)
+            node = Tree::CssImportNode.new(str, media.to_a, supports_condition)
+          end
         end
 
         node.source_range = Sass::Source::Range.new(
@@ -1180,10 +1201,15 @@ WARNING
           res << "\\" * (escapes - 1) << '#{'
         else
           res << "\\" * [0, escapes - 1].max
-          # Add 1 to emulate to_parser_offset.
-          res << Script::Parser.new(
-            scan, line, offset + scan.pos - scan.matched_size + 1, options).
-            parse_interpolated
+          if scan[1].include?("\n")
+            line = line + scan[1].count("\n")
+            offset = scan.matched_size - scan[1].rindex("\n")
+          else
+            offset += scan.matched_size
+          end
+          node = Script::Parser.new(scan, line, offset, options).parse_interpolated
+          offset = node.source_range.end_pos.offset
+          res << node
         end
       end
       res << rest

data/lib/sass/exec/base.rb

@@ -149,7 +149,7 @@ module Sass::Exec
 
     # Wraps the given string in terminal escapes
     # causing it to have the given color.
-    # If terminal esapes aren't supported on this platform,
+    # If terminal escapes aren't supported on this platform,
     # just returns the string instead.
     #
     # @param color [Symbol] The name of the color to use.

data/lib/sass/importers/base.rb

@@ -90,7 +90,7 @@ module Sass
       #
       # @param uri [String] The URI of the file to check.
       #   Comes from a `:filename` option set on an engine returned by this importer.
-      # @param options [{Symbol => Objet}] Options for the Sass file
+      # @param options [{Symbol => Object}] Options for the Sass file
       #   containing the `@import` currently being checked.
       # @return [Time, nil]
       def mtime(uri, options)

data/lib/sass/plugin/configuration.rb

@@ -1,8 +1,10 @@
 module Sass
   module Plugin
-    # We keep configuration in its own self-contained file
-    # so that we can load it independently in Rails 3,
-    # where the full plugin stuff is lazy-loaded.
+    # We keep configuration in its own self-contained file so that we can load
+    # it independently in Rails 3, where the full plugin stuff is lazy-loaded.
+    #
+    # Note that this is not guaranteed to be thread-safe. For guaranteed thread
+    # safety, use a separate {Sass::Plugin} for each thread.
     module Configuration
       # Returns the default options for a {Sass::Plugin::Compiler}.
       #
@@ -85,33 +87,47 @@ module Sass
       # See the {file:SASS_REFERENCE.md#template_location-option `:template_location` option}
       # for details.
       #
+      # Modifications to the returned array may not be persistent.  Use {#add_template_location}
+      # and {#remove_template_location} instead.
+      #
       # @return [Array<(String, String)>]
       #   An array of `[template_location, css_location]` pairs.
       def template_location_array
-        old_template_location = options[:template_location]
-        normalize_template_location!
-        options[:template_location]
-      ensure
-        options[:template_location] = old_template_location
+        convert_template_location(options[:template_location], options[:css_location])
       end
 
       private
 
-      def normalize_template_location!
-        return if options[:template_location].is_a?(Array)
-        options[:template_location] =
-          case options[:template_location]
-          when nil
-            if options[:css_location]
-              [[File.join(options[:css_location], 'sass'), options[:css_location]]]
-            else
-              []
-            end
-          when String
-            [[options[:template_location], options[:css_location]]]
+      # Returns the given template location, as an array. If it's already an array,
+      # it is returned unmodified. Otherwise, a new array is created and returned.
+      #
+      # @param template_location [String, Array<(String, String)>]
+      #   A single template location, or a pre-normalized array of template
+      #   locations and CSS locations.
+      # @param css_location [String?]
+      #   The location for compiled CSS files.
+      # @return [Array<(String, String)>]
+      #   An array of `[template_location, css_location]` pairs.
+      def convert_template_location(template_location, css_location)
+        return template_location if template_location.is_a?(Array)
+
+        case template_location
+        when nil
+          if css_location
+            [[File.join(css_location, 'sass'), css_location]]
           else
-            options[:template_location].to_a
+            []
           end
+        when String
+          [[template_location, css_location]]
+        else
+          template_location.to_a
+        end
+      end
+
+      def normalize_template_location!
+        options[:template_location] = convert_template_location(
+            options[:template_location], options[:css_location])
       end
     end
   end

data/lib/sass/plugin/merb.rb

@@ -2,7 +2,7 @@ unless defined?(Sass::MERB_LOADED)
   Sass::MERB_LOADED = true
 
   module Sass::Plugin::Configuration
-    # Different default options in a m envirionment.
+    # Different default options in a m environment.
     def default_options
       @default_options ||= begin
         version = Merb::VERSION.split('.').map {|n| n.to_i}

data/lib/sass/plugin/rails.rb

@@ -2,7 +2,7 @@ unless defined?(Sass::RAILS_LOADED)
   Sass::RAILS_LOADED = true
 
   module Sass::Plugin::Configuration
-    # Different default options in a rails envirionment.
+    # Different default options in a rails environment.
     def default_options
       return @default_options if @default_options
       opts = {

data/lib/sass/script/functions.rb

@@ -123,7 +123,7 @@ module Sass::Script
   # : Inserts `$insert` into `$string` at `$index`.
   #
   # \{#str_index str-index($string, $substring)}
-  # : Returns the index of the first occurance of `$substring` in `$string`.
+  # : Returns the index of the first occurrence of `$substring` in `$string`.
   #
   # \{#str_slice str-slice($string, $start-at, [$end-at])}
   # : Extracts a substring from `$string`.
@@ -526,7 +526,11 @@ module Sass::Script
       # @raise [ArgumentError] if value is not of the correct type.
       def assert_type(value, type, name = nil)
         klass = Sass::Script::Value.const_get(type)
-        return if value.is_a?(klass)
+        if value.is_a?(klass)
+          value.check_deprecated_interp if type == :String
+          return
+        end
+
         return if value.is_a?(Sass::Script::Value::List) && type == :Map && value.value.empty?
         err = "#{value.inspect} is not a #{TYPE_NAMES[type] || type.to_s.downcase}"
         err = "$#{name.to_s.gsub('_', '-')}: " + err if name
@@ -1438,6 +1442,7 @@ MESSAGE
         return string
       end
 
+      string.check_deprecated_interp
       return string if string.type == :identifier
       identifier(string.value)
     end
@@ -1624,6 +1629,7 @@ MESSAGE
     # @return [Sass::Script::Value::String] The unquoted string name of the
     #   value's type
     def type_of(value)
+      value.check_deprecated_interp if value.is_a?(Sass::Script::Value::String)
       identifier(value.class.name.gsub(/Sass::Script::Value::/, '').downcase)
     end
     declare :type_of, [:value]
@@ -2352,6 +2358,7 @@ MESSAGE
     # @return [Sass::Script::Value::String] A representation of the value as
     #   it would be written in Sass.
     def inspect(value)
+      value.check_deprecated_interp if value.is_a?(Sass::Script::Value::String)
       unquoted_string(value.to_sass)
     end
     declare :inspect, [:value]

data/lib/sass/script/lexer.rb

@@ -179,6 +179,13 @@ module Sass
         end
       end
 
+      # Returns the given character.
+      #
+      # @return [String]
+      def char(pos = @scanner.pos)
+        @scanner.string[pos, 1]
+      end
+
       # Returns the next token without moving the lexer forward.
       #
       # @return [Token] The next token

data/lib/sass/script/parser.rb

@@ -46,7 +46,8 @@ module Sass
         expr = assert_expr :expr
         assert_tok :end_interpolation
         expr = Sass::Script::Tree::Interpolation.new(
-          nil, expr, nil, !:wb, !:wa, !:originally_text, warn_for_color)
+          nil, expr, nil, !:wb, !:wa, :warn_for_color => warn_for_color)
+        check_for_interpolation expr
         expr.options = @options
         node(expr, start_pos)
       rescue Sass::SyntaxError => e
@@ -62,6 +63,7 @@ module Sass
         expr = assert_expr :expr
         assert_done
         expr.options = @options
+        check_for_interpolation expr
         expr
       rescue Sass::SyntaxError => e
         e.modify_backtrace :line => @lexer.line, :filename => @options[:filename]
@@ -79,6 +81,7 @@ module Sass
         expr = assert_expr :expr
         assert_done
         expr.options = @options
+        check_for_interpolation expr
         expr
       rescue Sass::SyntaxError => e
         e.modify_backtrace :line => @lexer.line, :filename => @options[:filename]
@@ -102,10 +105,26 @@ module Sass
         end
         assert_done
 
-        args.each {|a| a.options = @options}
-        keywords.each {|k, v| v.options = @options}
-        splat.options = @options if splat
-        kwarg_splat.options = @options if kwarg_splat
+        args.each do |a|
+          check_for_interpolation a
+          a.options = @options
+        end
+
+        keywords.each do |k, v|
+          check_for_interpolation v
+          v.options = @options
+        end
+
+        if splat
+          check_for_interpolation splat
+          splat.options = @options
+        end
+
+        if kwarg_splat
+          check_for_interpolation kwarg_splat
+          kwarg_splat.options = @options
+        end
+
         return args, keywords, splat, kwarg_splat
       rescue Sass::SyntaxError => e
         e.modify_backtrace :line => @lexer.line, :filename => @options[:filename]
@@ -122,10 +141,20 @@ module Sass
         assert_done
 
         args.each do |k, v|
+          check_for_interpolation k
           k.options = @options
-          v.options = @options if v
+
+          if v
+            check_for_interpolation v
+            v.options = @options
+          end
         end
-        splat.options = @options if splat
+
+        if splat
+          check_for_interpolation splat
+          splat.options = @options
+        end
+
         return args, splat
       rescue Sass::SyntaxError => e
         e.modify_backtrace :line => @lexer.line, :filename => @options[:filename]
@@ -142,10 +171,20 @@ module Sass
         assert_done
 
         args.each do |k, v|
+          check_for_interpolation k
           k.options = @options
-          v.options = @options if v
+
+          if v
+            check_for_interpolation v
+            v.options = @options
+          end
         end
-        splat.options = @options if splat
+
+        if splat
+          check_for_interpolation splat
+          splat.options = @options
+        end
+
         return args, splat
       rescue Sass::SyntaxError => e
         e.modify_backtrace :line => @lexer.line, :filename => @options[:filename]
@@ -165,6 +204,7 @@ module Sass
         end
 
         expr = assert_expr :funcall
+        check_for_interpolation expr
         expr.options = @options
         @lexer.unpeek!
         expr
@@ -315,13 +355,25 @@ RUBY
 
       production :equals, :interpolation, :single_eq
 
-      def try_op_before_interp(op, prev = nil)
+      def try_op_before_interp(op, prev = nil, after_interp = false)
         return unless @lexer.peek && @lexer.peek.type == :begin_interpolation
+        unary = !prev && !after_interp
         wb = @lexer.whitespace?(op)
         str = literal_node(Script::Value::String.new(Lexer::OPERATORS_REVERSE[op.type]),
                            op.source_range)
+
+        deprecation =
+          case op.type
+          when :comma; :potential
+          when :div, :single_eq; :none
+          when :plus; unary ? :none : :immediate
+          when :minus; @lexer.whitespace?(@lexer.peek) ? :immediate : :none
+          else; :immediate
+          end
+
         interp = node(
-          Script::Tree::Interpolation.new(prev, str, nil, wb, !:wa, :originally_text),
+          Script::Tree::Interpolation.new(
+            prev, str, nil, wb, !:wa, :originally_text => true, :deprecation => deprecation),
           (prev || str).source_range.start_pos)
         interpolation(interp)
       end
@@ -330,15 +382,25 @@ RUBY
         return unless @lexer.after_interpolation?
         op = try_toks(*ops)
         return unless op
-        interp = try_op_before_interp(op, prev)
+        interp = try_op_before_interp(op, prev, :after_interp)
         return interp if interp
 
         wa = @lexer.whitespace?
         str = literal_node(Script::Value::String.new(Lexer::OPERATORS_REVERSE[op.type]),
                            op.source_range)
         str.line = @lexer.line
+
+        deprecation =
+          case op.type
+          when :comma; :potential
+          when :div, :single_eq; :none
+          when :minus; @lexer.whitespace?(op) ? :immediate : :none
+          else; :immediate
+          end
         interp = node(
-          Script::Tree::Interpolation.new(prev, str, assert_expr(name), !:wb, wa, :originally_text),
+          Script::Tree::Interpolation.new(
+            prev, str, assert_expr(name), !:wb, wa,
+            :originally_text => true, :deprecation => deprecation),
           (prev || str).source_range.start_pos)
         interp
       end
@@ -347,16 +409,54 @@ RUBY
         e = first
         while (interp = try_tok(:begin_interpolation))
           wb = @lexer.whitespace?(interp)
+          char_before = @lexer.char(interp.pos - 1)
           mid = assert_expr :expr
           assert_tok :end_interpolation
           wa = @lexer.whitespace?
+          char_after = @lexer.char
+
+          after = space
+          before_deprecation = e.is_a?(Script::Tree::Interpolation) ? e.deprecation : :none
+          after_deprecation = after.is_a?(Script::Tree::Interpolation) ? after.deprecation : :none
+
+          deprecation =
+            if before_deprecation == :immediate || after_deprecation == :immediate ||
+               # Warn for #{foo}$var and #{foo}(1) but not #{$foo}1.
+               (after && !wa && char_after =~ /[$(]/) ||
+               # Warn for $var#{foo} and (a)#{foo} but not a#{foo}.
+               (e && !wb && is_unsafe_before?(e, char_before))
+              :immediate
+            else
+              :potential
+            end
+
           e = node(
-            Script::Tree::Interpolation.new(e, mid, space, wb, wa),
-            (e || mid).source_range.start_pos)
+            Script::Tree::Interpolation.new(e, mid, after, wb, wa, :deprecation => deprecation),
+            (e || interp).source_range.start_pos)
         end
         e
       end
 
+      # Returns whether `expr` is unsafe to include before an interpolation.
+      #
+      # @param expr [Node] The expression to check.
+      # @param char_before [String] The character immediately before the
+      #   interpolation being checked (and presumably the last character of
+      #   `expr`).
+      # @return [Boolean]
+      def is_unsafe_before?(expr, char_before)
+        # If the previous expression is an identifier or number, it's safe
+        # unless it was wrapped in parentheses.
+        if expr.is_a?(Script::Tree::Literal) &&
+           (expr.value.is_a?(Script::Value::Number) ||
+            (expr.value.is_a?(Script::Value::String) && expr.value.type == :identifier))
+          return char_before == ')'
+        end
+
+        # Otherwise, it's only safe if it was another interpolation.
+        !expr.is_a?(Script::Tree::Interpolation)
+      end
+
       def space
         start_pos = source_position
         e = or_expr
@@ -502,8 +602,9 @@ RUBY
         mid = assert_expr :expr
         assert_tok :end_interpolation
         last = assert_expr(:special_fun)
-        node(Tree::Interpolation.new(str, mid, last, false, false),
-            first.source_range.start_pos)
+        node(
+          Tree::Interpolation.new(str, mid, last, !:wb, !:wa),
+          first.source_range.start_pos)
       end
 
       def paren
@@ -538,6 +639,7 @@ RUBY
         tok = try_tok(:number)
         return selector unless tok
         num = tok.value
+        num.options = @options
         num.original = num.to_s
         literal_node(num, tok.source_range.start_pos)
       end
@@ -631,6 +733,41 @@ RUBY
         node.filename = @options[:filename]
         node
       end
+
+      # Checks a script node for any immediately-deprecated interpolations, and
+      # emits warnings for them.
+      #
+      # @param node [Sass::Script::Tree::Node]
+      def check_for_interpolation(node)
+        nodes = [node]
+        until nodes.empty?
+          node = nodes.pop
+          unless node.is_a?(Sass::Script::Tree::Interpolation) &&
+                 node.deprecation == :immediate
+            nodes.concat node.children
+            next
+          end
+
+          interpolation_deprecation(node)
+        end
+      end
+
+      # Emits a deprecation warning for an interpolation node.
+      #
+      # @param node [Sass::Script::Tree::Node]
+      def interpolation_deprecation(interpolation)
+        return if @options[:_convert]
+        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:
+
+  #{interpolation.to_quoted_equivalent.to_sass}
+
+You can use the sass-convert command to automatically fix most cases.
+WARNING
+      end
     end
   end
 end