sass 3.4.20 → 3.4.21

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZmQ4ODgyYzJhYWQzYjhkN2YwM2MxNTUxNDU1ZmUwZmRjMTdjNzc0ZQ==
-  data.tar.gz: !binary |-
-    YjBlMTNlNzkwYjBjMzQ5MzUxNGM1OTliZTdhNGE1ZTMzMTI3NmM1Yg==
+SHA1:
+  metadata.gz: 58d1f34ed3be5533eff693b26e97e7ff371a075b
+  data.tar.gz: b37b28619e83950329b0c7421ba1dac2610e0e71
 SHA512:
-  metadata.gz: !binary |-
-    YTQ5ZWU3MWJkYTU3OTk3YTgzNjVlMzQzZDljYzg0NTVlM2U1ZGE0YWI1YzQ0
-    NmE3YjE4OWIzOTRlMDdkY2Q2OWY5ZTRjYjdmODc1OGU4NGRiMmUzZjNiMTIx
-    MWUxMDYyOGY2OWE0MmJhMThmNGRkNzNjZDJjMmM0ODk1NjA2YTY=
-  data.tar.gz: !binary |-
-    Nzg1YTgxNTdmOWI3MjQxOGYwYWQzZTM4OTE3Mjk4NjAzNzRiYTYxNmRmOTIx
-    NDgwODRiNzQ4ZGIyZDFjMTZmNTUwMzM5NTNjMmZmN2Y5OGYzNTcyOTRhOTU1
-    NmE1NjY1NTVlYzZhMzUyMjE0ZTFkNTQ4MTNiODUwM2E3YzUzNDk=
+  metadata.gz: 974eaab5ff1c88be44d765065daf43bb56d5fc74be054332bbbbba3396ba8ba1605a90a994d7815f31ec3eafaebfb7c30a03f960beb9b14295bc44328d750a7b
+  data.tar.gz: f84b2caf06a1e0d42e78297d73f1441b9e9e796d6370f916acd2446893fa3a00335fc454dd7e1437bf16baa3f65bedb8d1d581da6cbeac6cec97316b68c51651

data/Rakefile

@@ -32,7 +32,9 @@ if (version[0] > 1 || (version[0] == 1 && version[1] > 8)) &&
     (ENV.has_key?("RUBOCOP") && ENV["RUBOCOP"] == "true" ||
       !(ENV.has_key?("RUBOCOP") || ENV.has_key?("TEST")))
   require 'rubocop/rake_task'
-  Rubocop::RakeTask.new do |t|
+  RuboCop = Rubocop unless defined?(RuboCop)
+  RuboCop::RakeTask.new do |t|
+    t.options = ['-c', '.rubocop_0.18.0.yml'] if RUBY_VERSION < '1.9.3'
     t.patterns = FileList["lib/**/*"]
   end
 else

data/VERSION

@@ -1 +1 @@
-3.4.20
+3.4.21

data/VERSION_DATE

@@ -1 +1 @@
-09 December 2015 23:08:32 UTC
+12 January 2016 01:03:01 UTC

data/lib/sass/cache_stores/filesystem.rb

@@ -52,7 +52,7 @@ module Sass
       # @param key [String]
       # @return [String] The path to the cache file.
       def path_to(key)
-        key = key.gsub(/[<>:\\|?*%]/) {|c| "%%%03d" % Sass::Util.ord(c)}
+        key = key.gsub(/[<>:\\|?*%]/) {|c| "%%%03d" % (Sass::Util.ord(c))}
         File.join(cache_location, key)
       end
     end

data/lib/sass/cache_stores/memory.rb

@@ -26,11 +26,10 @@ module Sass
 
       # @see Base#retrieve
       def retrieve(key, sha)
-        if @contents.has_key?(key)
-          return unless @contents[key][:sha] == sha
-          obj = @contents[key][:obj]
-          obj.respond_to?(:deep_copy) ? obj.deep_copy : obj.dup
-        end
+        return unless @contents.has_key?(key)
+        return unless @contents[key][:sha] == sha
+        obj = @contents[key][:obj]
+        obj.respond_to?(:deep_copy) ? obj.deep_copy : obj.dup
       end
 
       # @see Base#store

data/lib/sass/engine.rb

@@ -172,7 +172,7 @@ module Sass
     # @return [{Symbol => Object}] The normalized options hash.
     # @private
     def self.normalize_options(options)
-      options = DEFAULT_OPTIONS.merge(options.reject {|k, v| v.nil?})
+      options = DEFAULT_OPTIONS.merge(options.reject {|_k, v| v.nil?})
 
       # If the `:filename` option is passed in without an importer,
       # assume it's using the default filesystem importer.
@@ -476,7 +476,7 @@ ERR
 
         line_tabs = line_tab_str.scan(tab_str).size
         if tab_str * line_tabs != line_tab_str
-          message = <<END.strip.gsub("\n", ' ')
+          message = <<END.strip.tr("\n", ' ')
 Inconsistent indentation: #{Sass::Shared.human_indentation line_tab_str, true} used for indentation,
 but the rest of the document was indented using #{Sass::Shared.human_indentation tab_str}.
 END
@@ -489,15 +489,13 @@ END
     end
 
     # @comment
-    #   rubocop:disable ParameterLists
     def try_comment(line, last, tab_str, comment_tab_str, index)
-      # rubocop:enable ParameterLists
       return unless last && last.comment?
       # Nested comment stuff must be at least one whitespace char deeper
       # than the normal indentation
       return unless line =~ /^#{tab_str}\s/
       unless line =~ /^(?:#{comment_tab_str})(.*)$/
-        raise SyntaxError.new(<<MSG.strip.gsub("\n", " "), :line => index)
+        raise SyntaxError.new(<<MSG.strip.tr("\n", " "), :line => index)
 Inconsistent indentation:
 previous line was indented by #{Sass::Shared.human_indentation comment_tab_str},
 but this line was indented by #{Sass::Shared.human_indentation line[/^\s*/]}.
@@ -798,14 +796,12 @@ WARNING
       :each, :while, :if, :else, :extend, :import, :media, :charset, :content,
       :at_root, :error]
 
-    # @comment
-    #   rubocop:disable MethodLength
     def parse_directive(parent, line, root)
       directive, whitespace, value = line.text[1..-1].split(/(\s+)/, 2)
       raise SyntaxError.new("Invalid directive: '@'.") unless directive
       offset = directive.size + whitespace.size + 1 if whitespace
 
-      directive_name = directive.gsub('-', '_').to_sym
+      directive_name = directive.tr('-', '_').to_sym
       if DIRECTIVES.include?(directive_name)
         return send("parse_#{directive_name}_directive", parent, line, root, value, offset)
       end
@@ -860,8 +856,6 @@ WARNING
       )
       Tree::ExtendNode.new(interp_parsed, optional, selector_range)
     end
-    # @comment
-    #   rubocop:enable MethodLength
 
     def parse_warn_directive(parent, line, root, value, offset)
       raise SyntaxError.new("Invalid warn directive '@warn': expected expression.") unless value

data/lib/sass/error.rb

@@ -86,7 +86,7 @@ module Sass
     # @param attrs [{Symbol => Object}] The information in the backtrace entry.
     #   See \{#sass\_backtrace}
     def add_backtrace(attrs)
-      sass_backtrace << attrs.reject {|k, v| v.nil?}
+      sass_backtrace << attrs.reject {|_k, v| v.nil?}
     end
 
     # Modify the top Sass backtrace entries
@@ -104,12 +104,12 @@ module Sass
     # @param attrs [{Symbol => Object}] The information to add to the backtrace entry.
     #   See \{#sass\_backtrace}
     def modify_backtrace(attrs)
-      attrs = attrs.reject {|k, v| v.nil?}
+      attrs = attrs.reject {|_k, v| v.nil?}
       # Move backwards through the backtrace
-      (0...sass_backtrace.size).to_a.reverse.each do |i|
+      (0...sass_backtrace.size).to_a.reverse_each do |i|
         entry = sass_backtrace[i]
         sass_backtrace[i] = attrs.merge(entry)
-        attrs.reject! {|k, v| entry.include?(k)}
+        attrs.reject! {|k, _v| entry.include?(k)}
         break if attrs.empty?
       end
     end

data/lib/sass/exec/sass_convert.rb

@@ -108,10 +108,11 @@ END
         @options[:for_tree][:dasherize] = true
       end
 
-      opts.on('--indent NUM',
+      opts.on(
+        '--indent NUM',
         'How many spaces to use for each level of indentation. Defaults to 2.',
-        '"t" means use hard tabs.') do |indent|
-
+        '"t" means use hard tabs.'
+      ) do |indent|
         if indent == 't'
           @options[:for_tree][:indent] = "\t"
         else
@@ -162,7 +163,8 @@ END
     end
 
     def process_directory
-      unless @options[:input] = @args.shift
+      @options[:input] = @args.shift
+      unless @options[:input]
         raise "Error: directory required when using --recursive."
       end
 

data/lib/sass/exec/sass_scss.rb

@@ -299,8 +299,9 @@ MSG
         # #watched_paths.
         # rubocop:disable ClassVars
         @@working_directory = Sass::Util.realpath('.').to_s
-        # rubocop:ensable ClassVars
+        # rubocop:enable ClassVars
 
+        # rubocop:disable NestedMethodDefinition
         def watched_file?(file)
           super(file) ||
             (file =~ /\.s[ac]ss$/ && file.start_with?(@@working_directory + File::SEPARATOR))
@@ -309,6 +310,7 @@ MSG
         def watched_paths
           @watched_paths ||= super + [@@working_directory]
         end
+        # rubocop:enable NestedMethodDefinition
       end
 
       dirs, files = @args.map {|name| split_colon_path(name)}.
@@ -411,7 +413,8 @@ WARNING
           @options[:sourcemap_filename], Sass::Util.pathname(@options[:output_filename]).dirname)
         rendered, mapping = engine.render_with_sourcemap(relative_sourcemap_path.to_s)
         write_output(rendered, output)
-        write_output(mapping.to_json(
+        write_output(
+          mapping.to_json(
             :type => @options[:sourcemap],
             :css_path => @options[:output_filename],
             :sourcemap_path => @options[:sourcemap_filename]) + "\n",

data/lib/sass/plugin.rb

@@ -93,7 +93,8 @@ module Sass
     #   the second is the location of the CSS file that it should be compiled to.
     # @see #update_stylesheets
     def force_update_stylesheets(individual_files = [])
-      Compiler.new(options.dup.merge(
+      Compiler.new(
+        options.dup.merge(
           :never_update => false,
           :always_update => true,
           :cache => false)).update_stylesheets(individual_files)

data/lib/sass/plugin/compiler.rb

@@ -463,12 +463,12 @@ module Sass::Plugin
         end
       end
 
-      if recompile_required
-        # In case a file we're watching is removed and then recreated we
-        # prune out the non-existant files here.
-        watched_files_remaining = individual_files.select {|(source, _, _)| File.exist?(source)}
-        update_stylesheets(watched_files_remaining)
-      end
+      return unless recompile_required
+
+      # In case a file we're watching is removed and then recreated we
+      # prune out the non-existant files here.
+      watched_files_remaining = individual_files.select {|(source, _, _)| File.exist?(source)}
+      update_stylesheets(watched_files_remaining)
     end
 
     def update_stylesheet(filename, css, sourcemap)
@@ -500,7 +500,9 @@ module Sass::Plugin
 
       write_file(css, rendered)
       if mapping
-        write_file(sourcemap, mapping.to_json(
+        write_file(
+          sourcemap,
+          mapping.to_json(
             :css_path => css, :sourcemap_path => sourcemap, :type => options[:sourcemap]))
       end
       run_updated_stylesheet(filename, css, sourcemap) unless compilation_error_occured
@@ -521,10 +523,11 @@ module Sass::Plugin
         File.delete css
       end
       map = Sass::Util.sourcemap_name(css)
-      if File.exist?(map)
-        run_deleting_sourcemap map
-        File.delete map
-      end
+
+      return unless File.exist?(map)
+
+      run_deleting_sourcemap map
+      File.delete map
     end
 
     def watched_file?(file)

data/lib/sass/plugin/configuration.rb

@@ -127,7 +127,7 @@ module Sass
 
       def normalize_template_location!
         options[:template_location] = convert_template_location(
-            options[:template_location], options[:css_location])
+          options[:template_location], options[:css_location])
       end
     end
   end

data/lib/sass/plugin/merb.rb

@@ -15,7 +15,7 @@ unless defined?(Sass::MERB_LOADED)
         end
 
         {
-          :always_update      => false,
+          :always_update     => false,
           :template_location => root + '/public/stylesheets/sass',
           :css_location      => root + '/public/stylesheets',
           :cache_location    => root + '/tmp/sass-cache',

data/lib/sass/script/css_parser.rb

@@ -19,9 +19,8 @@ module Sass
       def string
         tok = try_tok(:string)
         return number unless tok
-        unless @lexer.peek && @lexer.peek.type == :begin_interpolation
-          return literal_node(tok.value, tok.source_range)
-        end
+        return if @lexer.peek && @lexer.peek.type == :begin_interpolation
+        literal_node(tok.value, tok.source_range)
       end
 
       # Short-circuit all the SassScript-only productions

data/lib/sass/script/functions.rb

@@ -356,6 +356,7 @@ module Sass::Script
   #
   # @comment
   #   rubocop:enable LineLength
+  #   rubocop:disable ModuleLength
   module Functions
     @signatures = {}
 
@@ -454,8 +455,8 @@ module Sass::Script
           t_arg_arity = sig_arity
         end
 
-        if   (t_arg_arity == sig_arity ||   t_arg_arity > sig_arity && signature.var_args) &&
-           (t_kwarg_arity == 0         || t_kwarg_arity > 0         && signature.var_kwargs)
+        if (t_arg_arity == sig_arity || t_arg_arity > sig_arity && signature.var_args) &&
+           (t_kwarg_arity == 0 || t_kwarg_arity > 0 && signature.var_kwargs)
           return signature
         end
       end
@@ -533,7 +534,7 @@ module Sass::Script
 
         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
+        err = "$#{name.to_s.tr('_', '-')}: " + err if name
         raise ArgumentError.new(err)
       end
 
@@ -641,7 +642,7 @@ module Sass::Script
       assert_type green, :Number, :green
       assert_type blue, :Number, :blue
 
-      color_attrs = [[red, :red], [green, :green], [blue, :blue]].map do |(c, name)|
+      color_attrs = [red, green, blue].map do |c|
         if c.is_unit?("%")
           c.value * 255 / 100.0
         elsif c.unitless?
@@ -1102,11 +1103,7 @@ module Sass::Script
     #   adjust-color(#102030, $blue: 5) => #102035
     #   adjust-color(#102030, $red: -5, $blue: 5) => #0b2035
     #   adjust-color(hsl(25, 100%, 80%), $lightness: -30%, $alpha: -0.4) => hsla(25, 100%, 50%, 0.6)
-    # @comment
-    #   rubocop:disable LineLength
     # @overload adjust_color($color, [$red], [$green], [$blue], [$hue], [$saturation], [$lightness], [$alpha])
-    #   @comment
-    #     rubocop:disable LineLength
     #   @param $color [Sass::Script::Value::Color]
     #   @param $red [Sass::Script::Value::Number] The adjustment to make on the
     #     red component, between -255 and 255 inclusive
@@ -1129,15 +1126,14 @@ module Sass::Script
     def adjust_color(color, kwargs)
       assert_type color, :Color, :color
       with = Sass::Util.map_hash(
-          "red" => [-255..255, ""],
-          "green" => [-255..255, ""],
-          "blue" => [-255..255, ""],
-          "hue" => nil,
-          "saturation" => [-100..100, "%"],
-          "lightness" => [-100..100, "%"],
-          "alpha" => [-1..1, ""]
-        ) do |name, (range, units)|
-
+        "red" => [-255..255, ""],
+        "green" => [-255..255, ""],
+        "blue" => [-255..255, ""],
+        "hue" => nil,
+        "saturation" => [-100..100, "%"],
+        "lightness" => [-100..100, "%"],
+        "alpha" => [-1..1, ""]
+      ) do |name, (range, units)|
         val = kwargs.delete(name)
         next unless val
         assert_type val, :Number, name
@@ -1183,11 +1179,7 @@ module Sass::Script
     #   scale-color(hsl(120, 70%, 80%), $lightness: 50%) => hsl(120, 70%, 90%)
     #   scale-color(rgb(200, 150%, 170%), $green: -40%, $blue: 70%) => rgb(200, 90, 229)
     #   scale-color(hsl(200, 70%, 80%), $saturation: -90%, $alpha: -30%) => hsla(200, 7%, 80%, 0.7)
-    # @comment
-    #   rubocop:disable LineLength
     # @overload scale_color($color, [$red], [$green], [$blue], [$saturation], [$lightness], [$alpha])
-    #   @comment
-    #     rubocop:disable LineLength
     #   @param $color [Sass::Script::Value::Color]
     #   @param $red [Sass::Script::Value::Number]
     #   @param $green [Sass::Script::Value::Number]
@@ -1202,14 +1194,13 @@ module Sass::Script
     def scale_color(color, kwargs)
       assert_type color, :Color, :color
       with = Sass::Util.map_hash(
-          "red" => 255,
-          "green" => 255,
-          "blue" => 255,
-          "saturation" => 100,
-          "lightness" => 100,
-          "alpha" => 1
-        ) do |name, max|
-
+        "red" => 255,
+        "green" => 255,
+        "blue" => 255,
+        "saturation" => 100,
+        "lightness" => 100,
+        "alpha" => 1
+      ) do |name, max|
         val = kwargs.delete(name)
         next unless val
         assert_type val, :Number, name
@@ -1244,11 +1235,7 @@ module Sass::Script
     #   change-color(#102030, $blue: 5) => #102005
     #   change-color(#102030, $red: 120, $blue: 5) => #782005
     #   change-color(hsl(25, 100%, 80%), $lightness: 40%, $alpha: 0.8) => hsla(25, 100%, 40%, 0.8)
-    # @comment
-    #   rubocop:disable LineLength
     # @overload change_color($color, [$red], [$green], [$blue], [$hue], [$saturation], [$lightness], [$alpha])
-    #   @comment
-    #     rubocop:disable LineLength
     #   @param $color [Sass::Script::Value::Color]
     #   @param $red [Sass::Script::Value::Number] The new red component for the
     #     color, within 0 and 255 inclusive

data/lib/sass/script/lexer.rb

@@ -71,8 +71,8 @@ module Sass
       OPERATORS_REVERSE = Sass::Util.map_hash(OPERATORS) {|k, v| [v, k]}
 
       TOKEN_NAMES = Sass::Util.map_hash(OPERATORS_REVERSE) {|k, v| [k, v.inspect]}.merge(
-          :const => "variable (e.g. $foo)",
-          :ident => "identifier (e.g. middle)")
+        :const => "variable (e.g. $foo)",
+        :ident => "identifier (e.g. middle)")
 
       # A list of operator strings ordered with longer names first
       # so that `>` and `<` don't clobber `>=` and `<=`.
@@ -80,7 +80,7 @@ module Sass
 
       # A sub-list of {OP_NAMES} that only includes operators
       # with identifier names.
-      IDENT_OP_NAMES = OP_NAMES.select {|k, v| k =~ /^\w+/}
+      IDENT_OP_NAMES = OP_NAMES.select {|k, _v| k =~ /^\w+/}
 
       PARSEABLE_NUMBER = /(?:(\d*\.\d+)|(\d+))(?:[eE]([+-]?\d+))?(#{UNIT})?/
 
@@ -196,11 +196,10 @@ module Sass
       # Rewinds the underlying StringScanner
       # to before the token returned by \{#peek}.
       def unpeek!
-        if @tok
-          @scanner.pos = @tok.pos
-          @line = @tok.source_range.start_pos.line
-          @offset = @tok.source_range.start_pos.offset
-        end
+        return unless @tok
+        @scanner.pos = @tok.pos
+        @line = @tok.source_range.start_pos.line
+        @offset = @tok.source_range.start_pos.offset
       end
 
       # @return [Boolean] Whether or not there's more source text to lex.

data/lib/sass/script/parser.rb

@@ -110,7 +110,7 @@ module Sass
           a.options = @options
         end
 
-        keywords.each do |k, v|
+        keywords.each do |_k, v|
           check_for_interpolation v
           v.options = @options
         end