sass 3.5.6 → 3.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2a0be81d849341f77d658cfb6a44988a273038b3
-  data.tar.gz: e2d3106b331b62359df2b422d4d7142af4cf215e
+SHA256:
+  metadata.gz: 339eac076bbfeee4552a45a36f17ef5fbdaea2e235d68c9718cb92459a899dfb
+  data.tar.gz: 484f472c548c347f149d73e92c548dde738f8dab06b1d4dca3a544bc993a8ec3
 SHA512:
-  metadata.gz: fd05bc99a4719679bcdfde4d7d2e755080ecb93ba1b48ebab9d43a0ed24a03b2ea5ca190efd3dcace28c9b0bfdf56cb469d7efddc39a8ab70f1e0996769feb65
-  data.tar.gz: db99debfdb3863aa2d04fa105e1be80403ba82e94f9f76f40cd26e5072b56a13215f78c6cf02bb901a96565c6224efef4acfe3903ea02ffb90301915ddf7427f
+  metadata.gz: 65baebb984171bd1b450f5bc1bbfb654bd2d5956063ed3a67be5517c6b4ded665fa694456470271bc840a1f12bec12dcdd8428708d401bcd999b58b93cf20dc1
+  data.tar.gz: 16483932b2658065f79b04fa5876409e041cdb8fec4a080d88d03b348110f7a3026f632003b816ebdc92ad3ae5b9e8a8015c63bf307b85e4938fd9853907c67b

data/README.md

@@ -1,4 +1,4 @@
-# Sass [![Travis Build Status](https://travis-ci.org/sass/sass.svg?branch=next)](https://travis-ci.org/sass/sass) [![Gem Version](https://badge.fury.io/rb/sass.svg)](http://badge.fury.io/rb/sass) [![Inline docs](http://inch-ci.org/github/sass/sass.svg)](http://inch-ci.org/github/sass/sass)
+# Sass [![Travis Build Status](https://travis-ci.org/sass/ruby-sass.svg?branch=next)](https://travis-ci.org/sass/ruby-sass) [![Gem Version](https://badge.fury.io/rb/sass.svg)](http://badge.fury.io/rb/sass) [![Inline docs](http://inch-ci.org/github/sass/sass.svg)](http://inch-ci.org/github/sass/sass)
 
 **Sass makes CSS fun again**. Sass is an extension of CSS,
 adding nested rules, variables, mixins, selector inheritance, and more.

data/Rakefile

@@ -27,7 +27,7 @@ task :test do
   test_cases = [
     {
       'env'   => {'MATHN' => 'true'},
-      'tasks' => ['test:ruby', 'test:spec', :rubocop]
+      'tasks' => ['test:ruby', 'test:spec']
     },
     {
       'env'   => {'MATHN' => 'false'},
@@ -110,20 +110,6 @@ def ruby_version_at_least?(version_string)
   ruby_version >= version
 end
 
-begin
-  require 'rubocop/rake_task'
-  RuboCop = Rubocop unless defined?(RuboCop)
-  RuboCop::RakeTask.new do |t|
-    t.patterns = FileList["lib/**/*"]
-  end
-rescue LoadError
-  task :rubocop do
-    puts "Rubocop is disabled."
-    puts "Passing this check is required in order for your patch to be accepted."
-    puts "Install Rubocop and then run the style check with: rake rubocop."
-  end
-end
-
 # ----- Packaging -----
 
 # Don't use Rake::GemPackageTast because we want prerequisites to run

data/VERSION

@@ -1 +1 @@
-3.5.6
+3.5.7

data/VERSION_DATE

@@ -1 +1 @@
-23 March 2018 00:44:24 UTC
+18 July 2018 19:10:13 UTC

data/lib/sass/engine.rb

@@ -499,7 +499,6 @@ END
       lines
     end
 
-    # @comment
     def try_comment(line, last, tab_str, comment_tab_str, index)
       return unless last && last.comment?
       # Nested comment stuff must be at least one whitespace char deeper
@@ -726,10 +725,7 @@ WARNING
       end
     end
 
-    # @comment
-    #   rubocop:disable ParameterLists
     def parse_property(name, parsed_name, value, prop, line, start_offset)
-      # rubocop:enable ParameterLists
 
       if name.start_with?('--')
         unless line.children.empty?
@@ -1038,8 +1034,6 @@ WARNING
       values
     end
 
-    # @comment
-    #   rubocop:disable MethodLength
     def parse_import_arg(scanner, offset)
       return if scanner.eos?
 
@@ -1114,8 +1108,6 @@ WARNING
       end
       node
     end
-    # @comment
-    #   rubocop:enable MethodLength
 
     def parse_mixin_directive(parent, line, root, value, offset)
       parse_mixin_definition(line)

data/lib/sass/exec/base.rb

@@ -14,7 +14,6 @@ module Sass::Exec
     #
     # @see #parse
     def parse!
-      # rubocop:disable RescueException
       begin
         parse
       rescue Exception => e
@@ -38,7 +37,6 @@ module Sass::Exec
         exit 1
       end
       exit 0
-      # rubocop:enable RescueException
     end
 
     # Parses the command-line arguments and runs the executable.

data/lib/sass/exec/sass_scss.rb

@@ -256,8 +256,6 @@ MESSAGE
       Sass::Repl.new(@options).run
     end
 
-    # @comment
-    #   rubocop:disable MethodLength
     def watch_or_update
       require 'sass/plugin'
       Sass::Plugin.options.merge! @options[:for_engine]
@@ -359,8 +357,6 @@ WARNING
 
       Sass::Plugin.watch(files)
     end
-    # @comment
-    #   rubocop:enable MethodLength
 
     def run
       input = @options[:input]

data/lib/sass/script/functions.rb

@@ -1,9 +1,7 @@
 require 'sass/script/value/helpers'
 
 module Sass::Script
-  # @comment
   #   YARD can't handle some multiline tags, and we need really long tags for function declarations.
-  #   rubocop:disable LineLength
   # Methods in this module are accessible from the SassScript context.
   # For example, you can write
   #
@@ -364,9 +362,6 @@ module Sass::Script
   # representation) on those objects without first setting {Tree::Node#options=
   # the #options attribute}.
   #
-  # @comment
-  #   rubocop:enable LineLength
-  #   rubocop:disable ModuleLength
   module Functions
     @signatures = {}
 
@@ -1500,13 +1495,11 @@ module Sass::Script
     def unquote(string)
       unless string.is_a?(Sass::Script::Value::String)
         # Don't warn multiple times for the same source line.
-        # rubocop:disable GlobalVars
         $_sass_warned_for_unquote ||= Set.new
         frame = environment.stack.frames.last
         key = [frame.filename, frame.line] if frame
         return string if frame && $_sass_warned_for_unquote.include?(key)
         $_sass_warned_for_unquote << key if frame
-        # rubocop:enable GlobalVars
 
         Sass::Util.sass_warn(<<MESSAGE.strip)
 DEPRECATION WARNING: Passing #{string.to_sass}, a non-string value, to unquote()
@@ -2065,12 +2058,9 @@ MESSAGE
     #     will be bracketed. If this is `auto` (the default), the separator is
     #     determined as explained above.
     # @return [Sass::Script::Value::List]
-    # @comment
-    #   rubocop:disable ParameterLists
     def join(list1, list2,
              separator = identifier("auto"), bracketed = identifier("auto"),
              kwargs = nil, *rest)
-      # rubocop:enable ParameterLists
       if separator.is_a?(Hash)
         kwargs = separator
         separator = identifier("auto")
@@ -2913,10 +2903,7 @@ WARNING
         yield(value.value), value.numerator_units, value.denominator_units)
     end
 
-    # @comment
-    #   rubocop:disable ParameterLists
     def _adjust(color, amount, attr, range, op, units = "")
-      # rubocop:enable ParameterLists
       assert_type color, :Color, :color
       assert_type amount, :Number, :amount
       Sass::Util.check_range('Amount', range, amount, units)

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

@@ -68,13 +68,11 @@ module Sass::Script::Tree
     def inspect
       args = @args.map {|a| a.inspect}.join(', ')
       keywords = @keywords.as_stored.to_a.map {|k, v| "$#{k}: #{v.inspect}"}.join(', ')
-      # rubocop:disable RedundantSelf
       if self.splat
         splat = args.empty? && keywords.empty? ? "" : ", "
         splat = "#{splat}#{self.splat.inspect}..."
         splat = "#{splat}, #{kwarg_splat.inspect}..." if kwarg_splat
       end
-      # rubocop:enable RedundantSelf
       "#{name}(#{args}#{', ' unless args.empty? || keywords.empty?}#{keywords}#{splat})"
     end
 
@@ -89,12 +87,10 @@ module Sass::Script::Tree
       args = @args.map(&arg_to_sass)
       keywords = @keywords.as_stored.to_a.map {|k, v| "$#{dasherize(k, opts)}: #{arg_to_sass[v]}"}
 
-      # rubocop:disable RedundantSelf
       if self.splat
         splat = "#{arg_to_sass[self.splat]}..."
         kwarg_splat = "#{arg_to_sass[self.kwarg_splat]}..." if self.kwarg_splat
       end
-      # rubocop:enable RedundantSelf
 
       arglist = [args, splat, keywords, kwarg_splat].flatten.compact.join(', ')
       "#{dasherize(name, opts)}(#{arglist})"

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

@@ -47,10 +47,7 @@ module Sass::Script::Tree
     # @param wa [Boolean] See {Interpolation#whitespace_after}
     # @param originally_text [Boolean] See {Interpolation#originally_text}
     # @param warn_for_color [Boolean] See {Interpolation#warn_for_color}
-    # @comment
-    #   rubocop:disable ParameterLists
     def initialize(before, mid, after, wb, wa, opts = {})
-      # rubocop:enable ParameterLists
       @before = before
       @mid = mid
       @after = after

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

@@ -1,8 +1,6 @@
 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.
     #

data/lib/sass/scss/static_parser.rb

@@ -51,10 +51,7 @@ module Sass
       # @see Parser#initialize
       # @param allow_parent_ref [Boolean] Whether to allow the
       #   parent-reference selector, `&`, when parsing the document.
-      # @comment
-      #   rubocop:disable ParameterLists
       def initialize(str, filename, importer, line = 1, offset = 1, allow_parent_ref = true)
-        # rubocop:enable ParameterLists
         super(str, filename, importer, line, offset)
         @allow_parent_ref = allow_parent_ref
       end

data/lib/sass/selector/comma_sequence.rb

@@ -120,7 +120,7 @@ module Sass
             @@compound_extend_deprecation.warn(sseq.filename, sseq.line, <<WARNING)
 Extending a compound selector, #{sseq}, is deprecated and will not be supported in a future release.
 Consider "@extend #{sseq.members.join(', ')}" instead.
-See https://github.com/sass/sass/issues/1599 for details.
+See http://bit.ly/ExtendCompound for details.
 WARNING
           end
 

data/lib/sass/selector/sequence.rb

@@ -344,8 +344,6 @@ module Sass
       #   be nil. Otherwise, this will contained the merged selector. Array
       #   elements are [Sass::Util#paths]-style options; conceptually, an "or"
       #   of multiple selectors.
-      # @comment
-      #   rubocop:disable MethodLength
       def merge_final_ops(seq1, seq2, res = [])
         ops1, ops2 = [], []
         ops1 << seq1.pop while seq1.last.is_a?(String)
@@ -427,8 +425,6 @@ module Sass
           return merge_final_ops(seq1, seq2, res)
         end
       end
-      # @comment
-      #   rubocop:enable MethodLength
 
       # Takes initial subsequences of `seq1` and `seq2` and returns all
       # orderings of those subsequences. The initial subsequences are determined

data/lib/sass/source/map.rb

@@ -84,8 +84,6 @@ module Sass::Source
     # @return [String] The JSON string.
     # @raise [ArgumentError] If neither `:css_uri` nor `:css_path` and
     #   `:sourcemap_path` are specified.
-    # @comment
-    #   rubocop:disable MethodLength
     def to_json(options)
       css_uri, css_path, sourcemap_path =
         options[:css_uri], options[:css_path], options[:sourcemap_path]
@@ -197,8 +195,6 @@ module Sass::Source
       result << "\n}"
       result
     end
-    # @comment
-    #   rubocop:enable MethodLength
 
     private
 

data/lib/sass/tree/rule_node.rb

@@ -141,9 +141,7 @@ module Sass::Tree
       parser = nil
       warnings = Sass.logger.capture do
         parser = Sass::SCSS::StaticParser.new(@rule.join.strip, nil, nil, 1)
-        # rubocop:disable RescueModifier
         @parsed_rules = parser.parse_selector rescue nil
-        # rubocop:enable RescueModifier
       end
 
       # If parsing produces a warning, throw away the result so we can parse

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

@@ -11,8 +11,6 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
     end
 
     # @api private
-    # @comment
-    #   rubocop:disable MethodLength
     def perform_arguments(callable, args, splat, environment)
       desc = "#{callable.type.capitalize} #{callable.name}"
       downcase_desc = "#{callable.type} #{callable.name}"
@@ -145,8 +143,6 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
       end
     end
   end
-  # @comment
-  #   rubocop:enable MethodLength
 
   protected
 
@@ -351,7 +347,7 @@ WARNING
       mixin = @environment.mixin(node.name)
       raise Sass::SyntaxError.new("Undefined mixin '#{node.name}'.") unless mixin
 
-      if node.children.any? && !mixin.has_content
+      if node.has_children && !mixin.has_content
         raise Sass::SyntaxError.new(%(Mixin "#{node.name}" does not accept a content block.))
       end
 

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

@@ -171,8 +171,6 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
     for_node(node) {output(content)}
   end
 
-  # @comment
-  #   rubocop:disable MethodLength
   def visit_directive(node)
     was_in_directive = @in_directive
     tab_str = '  ' * @tabs
@@ -244,8 +242,6 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
   ensure
     @in_directive = was_in_directive
   end
-  # @comment
-  #   rubocop:enable MethodLength
 
   def visit_media(node)
     with_tabs(@tabs + node.tabs) {visit_directive(node)}
@@ -277,8 +273,6 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
     output(";") unless node.style == :compressed
   end
 
-  # @comment
-  #   rubocop:disable MethodLength
   def visit_rule(node)
     with_tabs(@tabs + node.tabs) do
       rule_separator = node.style == :compressed ? ',' : ', '
@@ -377,8 +371,6 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
       output("}" + trailer)
     end
   end
-  # @comment
-  #   rubocop:enable MethodLength
 
   def visit_keyframerule(node)
     visit_directive(node)

data/lib/sass/util.rb

@@ -13,8 +13,6 @@ require 'sass/util/subset_map'
 
 module Sass
   # A module containing various useful functions.
-  # @comment
-  #   rubocop:disable ModuleLength
   module Util
     extend self
 
@@ -1069,12 +1067,10 @@ module Sass
       end
       c
     end
-    # rubocop:disable ParameterLists
 
     # Computes a single longest common subsequence for arrays x and y.
     # Algorithm from [Wikipedia](http://en.wikipedia.org/wiki/Longest_common_subsequence_problem#Reading_out_an_LCS)
     def lcs_backtrace(c, x, y, i, j, &block)
-      # rubocop:enable ParameterList
       return [] if i == 0 || j == 0
       if (v = yield(x[i], y[j]))
         return lcs_backtrace(c, x, y, i - 1, j - 1, &block) << v

data/lib/sass/version.rb

@@ -42,7 +42,6 @@ module Sass
     #     }
     #
     # @return [{Symbol => String/Integer}] The version hash
-    # @comment
     def version
       return @@version if defined?(@@version)
 

data/test/sass/extend_test.rb

@@ -539,7 +539,7 @@ SCSS
 DEPRECATION WARNING on line 2 of test_long_extendee_inline.scss:
 Extending a compound selector, .foo.bar, is deprecated and will not be supported in a future release.
 Consider "@extend .foo, .bar" instead.
-See https://github.com/sass/sass/issues/1599 for details.
+See http://bit.ly/ExtendCompound for details.
 WARNING
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass
 version: !ruby/object:Gem::Version
-  version: 3.5.6
+  version: 3.5.7
 platform: ruby
 authors:
 - Natalie Weizenbaum
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-23 00:00:00.000000000 Z
+date: 2018-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass-listen
@@ -370,7 +370,19 @@ homepage: http://sass-lang.com/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message: |2+
+
+  Ruby Sass is deprecated and will be unmaintained as of 26 March 2019.
+
+  * If you use Sass as a command-line tool, we recommend using Dart Sass, the new
+    primary implementation: https://sass-lang.com/install
+
+  * If you use Sass as a plug-in for a Ruby web framework, we recommend using the
+    sassc gem: https://github.com/sass/sassc-ruby#readme
+
+  * For more details, please refer to the Sass blog:
+    http://sass.logdown.com/posts/7081811
+
 rdoc_options: []
 require_paths:
 - lib
@@ -386,34 +398,34 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: sass
-rubygems_version: 2.6.14
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: A powerful but elegant CSS compiler that makes CSS fun again.
 test_files:
-- test/sass/extend_test.rb
-- test/sass/css2sass_test.rb
-- test/sass/util_test.rb
-- test/sass/superselector_test.rb
-- test/sass/value_helpers_test.rb
 - test/sass/plugin_test.rb
-- test/sass/logger_test.rb
-- test/sass/functions_test.rb
-- test/sass/conversion_test.rb
-- test/sass/source_map_test.rb
-- test/sass/cache_test.rb
 - test/sass/encoding_test.rb
-- test/sass/script_test.rb
+- test/sass/importer_test.rb
 - test/sass/callbacks_test.rb
-- test/sass/script_conversion_test.rb
 - test/sass/scss/css_test.rb
 - test/sass/scss/rx_test.rb
 - test/sass/scss/scss_test.rb
+- test/sass/util/multibyte_string_scanner_test.rb
+- test/sass/util/normalized_map_test.rb
+- test/sass/util/subset_map_test.rb
+- test/sass/functions_test.rb
+- test/sass/util_test.rb
+- test/sass/cache_test.rb
 - test/sass/exec_test.rb
-- test/sass/importer_test.rb
+- test/sass/value_helpers_test.rb
+- test/sass/conversion_test.rb
+- test/sass/script_test.rb
+- test/sass/logger_test.rb
+- test/sass/compiler_test.rb
 - test/sass/engine_test.rb
+- test/sass/css2sass_test.rb
+- test/sass/superselector_test.rb
+- test/sass/script_conversion_test.rb
 - test/sass/css_variable_test.rb
-- test/sass/compiler_test.rb
-- test/sass/util/subset_map_test.rb
-- test/sass/util/normalized_map_test.rb
-- test/sass/util/multibyte_string_scanner_test.rb
+- test/sass/source_map_test.rb
+- test/sass/extend_test.rb