sass 3.5.2 → 3.7.4

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

@@ -139,13 +139,10 @@ module Sass::Tree
       # We don't use real filename/line info because we don't have it yet.
       # When we get it, we'll set it on the parsed rules if possible.
       parser = nil
-      warnings = Sass::Util.silence_warnings do
-        parser = Sass::SCSS::StaticParser.new(@rule.join.strip, nil, nil, 1)
-        # rubocop:disable RescueModifier
+      warnings = Sass.logger.capture do
+        parser = Sass::SCSS::StaticParser.new(
+          Sass::Util.strip_except_escapes(@rule.join), nil, nil, 1)
         @parsed_rules = parser.parse_selector rescue nil
-        # rubocop:enable RescueModifier
-
-        $stderr.string
       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
 
@@ -557,7 +553,7 @@ WARNING
   end
 
   def run_interp(text)
-    run_interp_no_strip(text).strip
+    Sass::Util.strip_except_escapes(run_interp_no_strip(text))
   end
 
   def handle_import_loop!(node)

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 ? ',' : ', '
@@ -304,7 +298,7 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
           rule_part.gsub!(/nth([^( ]*)\(([^)]*)\)/m) do |match|
             match.tr(" \t\n", "")
           end
-          rule_part.strip!
+          rule_part = Sass::Util.strip_except_escapes(rule_part)
         end
         rule_part
       end.compact.join(rule_separator)
@@ -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)
@@ -392,7 +384,8 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
   # @param node [Sass::Script::Tree::PropNode] A custom property node.
   # @return [String]
   def format_custom_property_value(node)
-    if node.style == :compact || node.style == :compressed || !node.resolved_value.include?("\n")
+    value = node.resolved_value.sub(/\n[ \t\r\f\n]*\Z/, ' ')
+    if node.style == :compact || node.style == :compressed || !value.include?("\n")
       # Folding not involving newlines was done in the parser. We can safely
       # fold newlines here because tokens like strings can't contain literal
       # newlines, so we know any adjacent whitespace is tokenized as whitespace.
@@ -401,7 +394,7 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
 
     # Find the smallest amount of indentation in the custom property and use
     # that as the base indentation level.
-    lines = node.resolved_value.split("\n")
+    lines = value.split("\n")
     indented_lines = lines[1..-1]
     min_indentation = indented_lines.
       map {|line| line[/^[ \t]*/]}.

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
 
@@ -137,8 +135,13 @@ module Sass
     def round(value)
       # If the number is within epsilon of X.5, round up (or down for negative
       # numbers).
-      return value.round if (value % 1) - 0.5 <= -1 * Script::Value::Number.epsilon
-      value > 0 ? value.ceil : value.floor
+      mod = value % 1
+      mod_is_half = (mod - 0.5).abs < Script::Value::Number.epsilon
+      if value > 0
+        !mod_is_half && mod < 0.5 ? value.floor : value.ceil
+      else
+        mod_is_half || mod < 0.5 ? value.floor : value.ceil
+      end
     end
 
     # Concatenates all strings that are adjacent in an array,
@@ -243,18 +246,67 @@ module Sass
       res
     end
 
-    # Destructively strips whitespace from the beginning and end
-    # of the first and last elements, respectively,
-    # in the array (if those elements are strings).
+    # Destructively strips whitespace from the beginning and end of the first
+    # and last elements, respectively, in the array (if those elements are
+    # strings). Preserves CSS escapes at the end of the array.
     #
     # @param arr [Array]
     # @return [Array] `arr`
     def strip_string_array(arr)
       arr.first.lstrip! if arr.first.is_a?(String)
-      arr.last.rstrip! if arr.last.is_a?(String)
+      arr[-1] = Sass::Util.rstrip_except_escapes(arr[-1]) if arr.last.is_a?(String)
       arr
     end
 
+    # Normalizes identifier escapes.
+    #
+    # See https://github.com/sass/language/blob/master/accepted/identifier-escapes.md.
+    #
+    # @param ident [String]
+    # @return [String]
+    def normalize_ident_escapes(ident, start: true)
+      ident.gsub(/(^)?(#{Sass::SCSS::RX::ESCAPE})/) do |s|
+        at_start = start && $1
+        char = escaped_char(s)
+        next char if char =~ (at_start ? Sass::SCSS::RX::NMSTART : Sass::SCSS::RX::NMCHAR)
+        if char =~ (at_start ? /[\x0-\x1F\x7F0-9]/ : /[\x0-\x1F\x7F]/)
+          "\\#{char.ord.to_s(16)} "
+        else
+          "\\#{char}"
+        end
+      end
+    end
+
+    # Returns the character encoded by the given escape sequence.
+    #
+    # @param escape [String]
+    # @return [String]
+    def escaped_char(escape)
+      if escape =~ /^\\([0-9a-fA-F]{1,6})[ \t\r\n\f]?/
+        $1.to_i(16).chr(Encoding::UTF_8)
+      else
+        escape[1]
+      end
+    end
+
+    # Like [String#strip], but preserves escaped whitespace at the end of the
+    # string.
+    #
+    # @param string [String]
+    # @return [String]
+    def strip_except_escapes(string)
+      rstrip_except_escapes(string.lstrip)
+    end
+
+    # Like [String#rstrip], but preserves escaped whitespace at the end of the
+    # string.
+    #
+    # @param string [String]
+    # @return [String]
+    def rstrip_except_escapes(string)
+      string.sub(/(?<!\\)\s+$/, '')
+    end
+
     # Return an array of all possible paths through the given arrays.
     #
     # @param arrs [Array<Array>]
@@ -451,16 +503,6 @@ module Sass
       Sass::Util.sass_warn full_message
     end
 
-    # Silence all output to STDERR within a block.
-    #
-    # @yield A block in which no output will be printed to STDERR
-    def silence_warnings
-      the_real_stderr, $stderr = $stderr, StringIO.new
-      yield
-    ensure
-      $stderr = the_real_stderr
-    end
-
     # Silences all Sass warnings within a block.
     #
     # @yield A block in which no Sass warnings will be printed
@@ -1074,12 +1116,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)
 
@@ -76,7 +75,6 @@ module Sass
         end
       end
 
-      @@version[:string] << " (#{name})"
       @@version
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass
 version: !ruby/object:Gem::Version
-  version: 3.5.2
+  version: 3.7.4
 platform: ruby
 authors:
 - Natalie Weizenbaum
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-04 00:00:00.000000000 Z
+date: 2019-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass-listen
@@ -46,14 +46,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '3.3'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -69,6 +83,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5'
 description: |2
+        Ruby Sass is deprecated! See https://sass-lang.com/ruby-sass for details.
+
         Sass makes CSS fun again. Sass is an extension of CSS, adding
         nested rules, variables, mixins, selector inheritance, and more.
         It's translated to well-formatted, standard CSS using the
@@ -87,7 +103,6 @@ files:
 - MIT-LICENSE
 - README.md
 - REVISION
-- Rakefile
 - VERSION
 - VERSION_DATE
 - VERSION_NAME
@@ -227,138 +242,25 @@ files:
 - lib/sass/util/subset_map.rb
 - lib/sass/util/test.rb
 - lib/sass/version.rb
-- lib/test.css
-- lib/test.css.map
 - rails/init.rb
-- test/sass-spec.yml
-- test/sass/cache_test.rb
-- test/sass/callbacks_test.rb
-- test/sass/compiler_test.rb
-- test/sass/conversion_test.rb
-- test/sass/css2sass_test.rb
-- test/sass/css_variable_test.rb
-- test/sass/data/hsl-rgb.txt
-- test/sass/encoding_test.rb
-- test/sass/engine_test.rb
-- test/sass/exec_test.rb
-- test/sass/extend_test.rb
-- test/sass/fixtures/test_staleness_check_across_importers.css
-- test/sass/fixtures/test_staleness_check_across_importers.scss
-- test/sass/functions_test.rb
-- test/sass/importer_test.rb
-- test/sass/logger_test.rb
-- test/sass/mock_importer.rb
-- test/sass/more_results/more1.css
-- test/sass/more_results/more1_with_line_comments.css
-- test/sass/more_results/more_import.css
-- test/sass/more_templates/_more_partial.sass
-- test/sass/more_templates/more1.sass
-- test/sass/more_templates/more_import.sass
-- test/sass/plugin_test.rb
-- test/sass/results/alt.css
-- test/sass/results/basic.css
-- test/sass/results/cached_import_option.css
-- test/sass/results/compact.css
-- test/sass/results/complex.css
-- test/sass/results/compressed.css
-- test/sass/results/expanded.css
-- test/sass/results/filename_fn.css
-- test/sass/results/if.css
-- test/sass/results/import.css
-- test/sass/results/import_charset.css
-- test/sass/results/import_charset_ibm866.css
-- test/sass/results/import_content.css
-- test/sass/results/line_numbers.css
-- test/sass/results/mixins.css
-- test/sass/results/multiline.css
-- test/sass/results/nested.css
-- test/sass/results/options.css
-- test/sass/results/parent_ref.css
-- test/sass/results/script.css
-- test/sass/results/scss_import.css
-- test/sass/results/scss_importee.css
-- test/sass/results/subdir/nested_subdir/nested_subdir.css
-- test/sass/results/subdir/subdir.css
-- test/sass/results/units.css
-- test/sass/results/warn.css
-- test/sass/results/warn_imported.css
-- test/sass/script_conversion_test.rb
-- test/sass/script_test.rb
-- test/sass/scss/css_test.rb
-- test/sass/scss/rx_test.rb
-- test/sass/scss/scss_test.rb
-- test/sass/scss/test_helper.rb
-- test/sass/source_map_test.rb
-- test/sass/superselector_test.rb
-- test/sass/templates/_cached_import_option_partial.scss
-- test/sass/templates/_double_import_loop2.sass
-- test/sass/templates/_filename_fn_import.scss
-- test/sass/templates/_imported_charset_ibm866.sass
-- test/sass/templates/_imported_charset_utf8.sass
-- test/sass/templates/_imported_content.sass
-- test/sass/templates/_partial.sass
-- test/sass/templates/_same_name_different_partiality.scss
-- test/sass/templates/alt.sass
-- test/sass/templates/basic.sass
-- test/sass/templates/bork1.sass
-- test/sass/templates/bork2.sass
-- test/sass/templates/bork3.sass
-- test/sass/templates/bork4.sass
-- test/sass/templates/bork5.sass
-- test/sass/templates/cached_import_option.scss
-- test/sass/templates/compact.sass
-- test/sass/templates/complex.sass
-- test/sass/templates/compressed.sass
-- test/sass/templates/double_import_loop1.sass
-- test/sass/templates/expanded.sass
-- test/sass/templates/filename_fn.scss
-- test/sass/templates/if.sass
-- test/sass/templates/import.sass
-- test/sass/templates/import_charset.sass
-- test/sass/templates/import_charset_ibm866.sass
-- test/sass/templates/import_content.sass
-- test/sass/templates/importee.less
-- test/sass/templates/importee.sass
-- test/sass/templates/line_numbers.sass
-- test/sass/templates/mixin_bork.sass
-- test/sass/templates/mixins.sass
-- test/sass/templates/multiline.sass
-- test/sass/templates/nested.sass
-- test/sass/templates/nested_bork1.sass
-- test/sass/templates/nested_bork2.sass
-- test/sass/templates/nested_bork3.sass
-- test/sass/templates/nested_bork4.sass
-- test/sass/templates/nested_import.sass
-- test/sass/templates/nested_mixin_bork.sass
-- test/sass/templates/options.sass
-- test/sass/templates/parent_ref.sass
-- test/sass/templates/same_name_different_ext.sass
-- test/sass/templates/same_name_different_ext.scss
-- test/sass/templates/same_name_different_partiality.scss
-- test/sass/templates/script.sass
-- test/sass/templates/scss_import.scss
-- test/sass/templates/scss_importee.scss
-- test/sass/templates/single_import_loop.sass
-- test/sass/templates/subdir/import_up1.scss
-- test/sass/templates/subdir/import_up2.scss
-- test/sass/templates/subdir/nested_subdir/_nested_partial.sass
-- test/sass/templates/subdir/nested_subdir/nested_subdir.sass
-- test/sass/templates/subdir/subdir.sass
-- test/sass/templates/units.sass
-- test/sass/templates/warn.sass
-- test/sass/templates/warn_imported.sass
-- test/sass/test_helper.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/util_test.rb
-- test/sass/value_helpers_test.rb
-- test/test_helper.rb
-homepage: http://sass-lang.com/
+homepage: https://sass-lang.com/
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  source_code_uri: https://github.com/sass/ruby-sass
+post_install_message: |2+
+
+  Ruby Sass has reached end-of-life and should no longer be used.
+
+  * 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:
+    https://sass-lang.com/blog/posts/7828841
+
 rdoc_options: []
 require_paths:
 - lib
@@ -374,34 +276,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: sass
-rubygems_version: 2.6.11
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: A powerful but elegant CSS compiler that makes CSS fun again.
-test_files:
-- test/sass/plugin_test.rb
-- test/sass/encoding_test.rb
-- test/sass/importer_test.rb
-- test/sass/callbacks_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/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/source_map_test.rb
-- test/sass/extend_test.rb
+test_files: []