sass 3.6.0 → 3.7.0

data/lib/sass/scss/parser.rb

@@ -203,7 +203,7 @@ module Sass
       def directive
         start_pos = source_position
         return unless tok(/@/)
-        name = tok!(IDENT)
+        name = ident!
         ss
 
         if (dir = special_directive(name, start_pos))
@@ -240,14 +240,14 @@ module Sass
       end
 
       def mixin_directive(start_pos)
-        name = tok! IDENT
+        name = ident!
         args, splat = sass_script(:parse_mixin_definition_arglist)
         ss
         block(node(Sass::Tree::MixinDefNode.new(name, args, splat), start_pos), :directive)
       end
 
       def include_directive(start_pos)
-        name = tok! IDENT
+        name = ident!
         args, keywords, splat, kwarg_splat = sass_script(:parse_mixin_include_arglist)
         ss
         include_node = node(
@@ -266,7 +266,7 @@ module Sass
       end
 
       def function_directive(start_pos)
-        name = tok! IDENT
+        name = ident!
         args, splat = sass_script(:parse_function_definition_arglist)
         ss
         block(node(Sass::Tree::FunctionNode.new(name, args, splat), start_pos), :function)
@@ -286,7 +286,7 @@ module Sass
 
       def for_directive(start_pos)
         tok!(/\$/)
-        var = tok! IDENT
+        var = ident!
         ss
 
         tok!(/from/)
@@ -303,12 +303,12 @@ module Sass
 
       def each_directive(start_pos)
         tok!(/\$/)
-        vars = [tok!(IDENT)]
+        vars = [ident!]
         ss
         while tok(/,/)
           ss
           tok!(/\$/)
-          vars << tok!(IDENT)
+          vars << ident!
           ss
         end
 
@@ -477,12 +477,23 @@ module Sass
         return unless tok(/\(/)
         res = ['(']
         ss
-        res << sass_script(:parse)
+        stop_at = Set[:single_eq, :lt, :lte, :gt, :gte]
+        res << sass_script(:parse_until, stop_at)
 
         if tok(/:/)
           res << ': '
           ss
           res << sass_script(:parse)
+        elsif comparison1 = tok(/=|[<>]=?/)
+          res << ' ' << comparison1 << ' '
+          ss
+          res << sass_script(:parse_until, stop_at)
+          if ((comparison1 == ">" || comparison1 == ">=") && comparison2 = tok(/>=?/)) ||
+             ((comparison1 == "<" || comparison1 == "<=") && comparison2 = tok(/<=?/))
+            res << ' ' << comparison2 << ' '
+            ss
+            res << sass_script(:parse_until, stop_at)
+          end
         end
         res << tok!(/\)/)
         ss
@@ -542,10 +553,10 @@ module Sass
       end
 
       def at_root_directive_list
-        return unless (first = tok(IDENT))
+        return unless (first = ident)
         arr = [first]
         ss
-        while (e = tok(IDENT))
+        while (e = ident)
           arr << e
           ss
         end
@@ -636,12 +647,12 @@ module Sass
       def variable
         return unless tok(/\$/)
         start_pos = source_position
-        name = tok!(IDENT)
+        name = ident!
         ss; tok!(/:/); ss
 
         expr = sass_script(:parse)
         while tok(/!/)
-          flag_name = tok!(IDENT)
+          flag_name = ident!
           if flag_name == 'default'
             guarded ||= true
           elsif flag_name == 'global'
@@ -1037,7 +1048,7 @@ module Sass
       def var_expr
         return unless tok(/\$/)
         line = @line
-        var = Sass::Script::Tree::Variable.new(tok!(IDENT))
+        var = Sass::Script::Tree::Variable.new(ident!)
         var.line = line
         var
       end
@@ -1075,11 +1086,27 @@ module Sass
         res
       end
 
-      def interp_ident(start = IDENT)
-        val = tok(start) || interpolation(:warn_for_color) || tok(IDENT_HYPHEN_INTERP)
+      def ident
+        (ident = tok(IDENT)) && Sass::Util.normalize_ident_escapes(ident)
+      end
+
+      def ident!
+        Sass::Util.normalize_ident_escapes(tok!(IDENT))
+      end
+
+      def name
+        (name = tok(NAME)) && Sass::Util.normalize_ident_escapes(name)
+      end
+
+      def name!
+        Sass::Util.normalize_ident_escapes(tok!(NAME))
+      end
+
+      def interp_ident
+        val = ident || interpolation(:warn_for_color) || tok(IDENT_HYPHEN_INTERP)
         return unless val
         res = [val]
-        while (val = tok(NAME) || interpolation(:warn_for_color))
+        while (val = name || interpolation(:warn_for_color))
           res << val
         end
         res

data/lib/sass/scss/static_parser.rb

@@ -71,7 +71,7 @@ module Sass
       def var_expr; nil; end
       def interp_string; (s = tok(STRING)) && [s]; end
       def interp_uri; (s = tok(URI)) && [s]; end
-      def interp_ident(ident = IDENT); (s = tok(ident)) && [s]; end
+      def interp_ident; (s = ident) && [s]; end
       def use_css_import?; true; end
 
       def special_directive(name, start_pos)
@@ -185,25 +185,25 @@ MESSAGE
 
       def parent_selector
         return unless @allow_parent_ref && tok(/&/)
-        Selector::Parent.new(tok(NAME))
+        Selector::Parent.new(name)
       end
 
       def class_selector
         return unless tok(/\./)
         @expected = "class name"
-        Selector::Class.new(tok!(IDENT))
+        Selector::Class.new(ident!)
       end
 
       def id_selector
         return unless tok(/#(?!\{)/)
         @expected = "id name"
-        Selector::Id.new(tok!(NAME))
+        Selector::Id.new(name!)
       end
 
       def placeholder_selector
         return unless tok(/%/)
         @expected = "placeholder name"
-        Selector::Placeholder.new(tok!(IDENT))
+        Selector::Placeholder.new(ident!)
       end
 
       def element_name
@@ -218,13 +218,13 @@ MESSAGE
       end
 
       def qualified_name(allow_star_name = false)
-        name = tok(IDENT) || tok(/\*/) || (tok?(/\|/) && "")
+        name = ident || tok(/\*/) || (tok?(/\|/) && "")
         return unless name
         return nil, name unless tok(/\|/)
 
-        return name, tok!(IDENT) unless allow_star_name
+        return name, ident! unless allow_star_name
         @expected = "identifier or *"
-        return name, tok(IDENT) || tok!(/\*/)
+        return name, ident || tok!(/\*/)
       end
 
       def attrib
@@ -242,21 +242,21 @@ MESSAGE
         if op
           @expected = "identifier or string"
           ss
-          val = tok(IDENT) || tok!(STRING)
+          val = ident || tok!(STRING)
           ss
         end
-        flags = tok(IDENT) || tok(STRING)
+        flags = ident || tok(STRING)
         tok!(/\]/)
 
         Selector::Attribute.new(name, ns, op, val, flags)
       end
 
       def attrib_name!
-        if (name_or_ns = tok(IDENT))
+        if (name_or_ns = ident)
           # E, E|E
           if tok(/\|(?!=)/)
             ns = name_or_ns
-            name = tok(IDENT)
+            name = ident
           else
             name = name_or_ns
           end
@@ -264,7 +264,7 @@ MESSAGE
           # *|E or |E
           ns = tok(/\*/) || ""
           tok!(/\|/)
-          name = tok!(IDENT)
+          name = ident!
         end
         return ns, name
       end
@@ -279,7 +279,7 @@ MESSAGE
         s = tok(/::?/)
         return unless s
         @expected = "pseudoclass or pseudoelement"
-        name = tok!(IDENT)
+        name = ident!
         if tok(/\(/)
           ss
           deprefixed = deprefix(name)
@@ -342,7 +342,7 @@ MESSAGE
       end
 
       def keyframes_selector_component
-        tok(IDENT) || tok(PERCENTAGE)
+        ident || tok(PERCENTAGE)
       end
 
       @sass_script_parser = Class.new(Sass::Script::CssParser)

data/lib/sass/util.rb

@@ -258,6 +258,37 @@ module Sass
       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-\x8\xA-\x1F\x7F0-9]/ : /[\x0-\x8\xA-\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
+
     # Return an array of all possible paths through the given arrays.
     #
     # @param arrs [Array<Array>]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 3.7.0
 platform: ruby
 authors:
 - Natalie Weizenbaum
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-19 00:00:00.000000000 Z
+date: 2018-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass-listen
@@ -83,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
@@ -101,7 +103,6 @@ files:
 - MIT-LICENSE
 - README.md
 - REVISION
-- Rakefile
 - VERSION
 - VERSION_DATE
 - VERSION_NAME
@@ -242,134 +243,11 @@ files:
 - lib/sass/util/test.rb
 - lib/sass/version.rb
 - 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/
 licenses:
 - MIT
-metadata: {}
+metadata:
+  source_code_uri: https://github.com/sass/ruby-sass
 post_install_message: |2+
 
   Ruby Sass is deprecated and will be unmaintained as of 26 March 2019.
@@ -398,34 +276,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: sass
-rubygems_version: 2.7.7
+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: []