sass 3.4.25 → 3.7.4

data/lib/sass/util/multibyte_string_scanner.rb

@@ -1,155 +1,151 @@
 require 'strscan'
 
-if Sass::Util.ruby1_8?
-  Sass::Util::MultibyteStringScanner = StringScanner
-else
-  if Sass::Util.rbx?
-    # Rubinius's StringScanner class implements some of its methods in terms of
-    # others, which causes us to double-count bytes in some cases if we do
-    # straightforward inheritance. To work around this, we use a delegate class.
-    require 'delegate'
-    class Sass::Util::MultibyteStringScanner < DelegateClass(StringScanner)
-      def initialize(str)
-        super(StringScanner.new(str))
-        @mb_pos = 0
-        @mb_matched_size = nil
-        @mb_last_pos = nil
-      end
-
-      def is_a?(klass)
-        __getobj__.is_a?(klass) || super
-      end
+if Sass::Util.rbx?
+  # Rubinius's StringScanner class implements some of its methods in terms of
+  # others, which causes us to double-count bytes in some cases if we do
+  # straightforward inheritance. To work around this, we use a delegate class.
+  require 'delegate'
+  class Sass::Util::MultibyteStringScanner < DelegateClass(StringScanner)
+    def initialize(str)
+      super(StringScanner.new(str))
+      @mb_pos = 0
+      @mb_matched_size = nil
+      @mb_last_pos = nil
     end
-  else
-    class Sass::Util::MultibyteStringScanner < StringScanner
-      def initialize(str)
-        super
-        @mb_pos = 0
-        @mb_matched_size = nil
-        @mb_last_pos = nil
-      end
+
+    def is_a?(klass)
+      __getobj__.is_a?(klass) || super
     end
   end
-
-  # A wrapper of the native StringScanner class that works correctly with
-  # multibyte character encodings. The native class deals only in bytes, not
-  # characters, for methods like [#pos] and [#matched_size]. This class deals
-  # only in characters, instead.
-  class Sass::Util::MultibyteStringScanner
-    def self.new(str)
-      return StringScanner.new(str) if str.ascii_only?
+else
+  class Sass::Util::MultibyteStringScanner < StringScanner
+    def initialize(str)
       super
+      @mb_pos = 0
+      @mb_matched_size = nil
+      @mb_last_pos = nil
     end
+  end
+end
 
-    alias_method :byte_pos, :pos
-    alias_method :byte_matched_size, :matched_size
-
-    def check(pattern); _match super; end
-    def check_until(pattern); _matched super; end
-    def getch; _forward _match super; end
-    def match?(pattern); _size check(pattern); end
-    def matched_size; @mb_matched_size; end
-    def peek(len); string[@mb_pos, len]; end
-    alias_method :peep, :peek
-    def pos; @mb_pos; end
-    alias_method :pointer, :pos
-    def rest_size; rest.size; end
-    def scan(pattern); _forward _match super; end
-    def scan_until(pattern); _forward _matched super; end
-    def skip(pattern); _size scan(pattern); end
-    def skip_until(pattern); _matched _size scan_until(pattern); end
-
-    def get_byte
-      raise "MultibyteStringScanner doesn't support #get_byte."
-    end
+# A wrapper of the native StringScanner class that works correctly with
+# multibyte character encodings. The native class deals only in bytes, not
+# characters, for methods like [#pos] and [#matched_size]. This class deals
+# only in characters, instead.
+class Sass::Util::MultibyteStringScanner
+  def self.new(str)
+    return StringScanner.new(str) if str.ascii_only?
+    super
+  end
 
-    def getbyte
-      raise "MultibyteStringScanner doesn't support #getbyte."
-    end
+  alias_method :byte_pos, :pos
+  alias_method :byte_matched_size, :matched_size
+
+  def check(pattern); _match super; end
+  def check_until(pattern); _matched super; end
+  def getch; _forward _match super; end
+  def match?(pattern); _size check(pattern); end
+  def matched_size; @mb_matched_size; end
+  def peek(len); string[@mb_pos, len]; end
+  alias_method :peep, :peek
+  def pos; @mb_pos; end
+  alias_method :pointer, :pos
+  def rest_size; rest.size; end
+  def scan(pattern); _forward _match super; end
+  def scan_until(pattern); _forward _matched super; end
+  def skip(pattern); _size scan(pattern); end
+  def skip_until(pattern); _matched _size scan_until(pattern); end
+
+  def get_byte
+    raise "MultibyteStringScanner doesn't support #get_byte."
+  end
 
-    def pos=(n)
-      @mb_last_pos = nil
+  def getbyte
+    raise "MultibyteStringScanner doesn't support #getbyte."
+  end
 
-      # We set position kind of a lot during parsing, so we want it to be as
-      # efficient as possible. This is complicated by the fact that UTF-8 is a
-      # variable-length encoding, so it's difficult to find the byte length that
-      # corresponds to a given character length.
-      #
-      # Our heuristic here is to try to count the fewest possible characters. So
-      # if the new position is close to the current one, just count the
-      # characters between the two; if the new position is closer to the
-      # beginning of the string, just count the characters from there.
-      if @mb_pos - n < @mb_pos / 2
-        # New position is close to old position
-        byte_delta = @mb_pos > n ? -string[n...@mb_pos].bytesize : string[@mb_pos...n].bytesize
-        super(byte_pos + byte_delta)
-      else
-        # New position is close to BOS
-        super(string[0...n].bytesize)
-      end
-      @mb_pos = n
-    end
+  def pos=(n)
+    @mb_last_pos = nil
+
+    # We set position kind of a lot during parsing, so we want it to be as
+    # efficient as possible. This is complicated by the fact that UTF-8 is a
+    # variable-length encoding, so it's difficult to find the byte length that
+    # corresponds to a given character length.
+    #
+    # Our heuristic here is to try to count the fewest possible characters. So
+    # if the new position is close to the current one, just count the
+    # characters between the two; if the new position is closer to the
+    # beginning of the string, just count the characters from there.
+    if @mb_pos - n < @mb_pos / 2
+      # New position is close to old position
+      byte_delta = @mb_pos > n ? -string[n...@mb_pos].bytesize : string[@mb_pos...n].bytesize
+      super(byte_pos + byte_delta)
+    else
+      # New position is close to BOS
+      super(string[0...n].bytesize)
+    end
+    @mb_pos = n
+  end
 
-    def reset
-      @mb_pos = 0
-      @mb_matched_size = nil
-      @mb_last_pos = nil
-      super
-    end
+  def reset
+    @mb_pos = 0
+    @mb_matched_size = nil
+    @mb_last_pos = nil
+    super
+  end
 
-    def scan_full(pattern, advance_pointer_p, return_string_p)
-      res = _match super(pattern, advance_pointer_p, true)
-      _forward res if advance_pointer_p
-      return res if return_string_p
-    end
+  def scan_full(pattern, advance_pointer_p, return_string_p)
+    res = _match super(pattern, advance_pointer_p, true)
+    _forward res if advance_pointer_p
+    return res if return_string_p
+  end
 
-    def search_full(pattern, advance_pointer_p, return_string_p)
-      res = super(pattern, advance_pointer_p, true)
-      _forward res if advance_pointer_p
-      _matched((res if return_string_p))
-    end
+  def search_full(pattern, advance_pointer_p, return_string_p)
+    res = super(pattern, advance_pointer_p, true)
+    _forward res if advance_pointer_p
+    _matched((res if return_string_p))
+  end
 
-    def string=(str)
-      @mb_pos = 0
-      @mb_matched_size = nil
-      @mb_last_pos = nil
-      super
-    end
+  def string=(str)
+    @mb_pos = 0
+    @mb_matched_size = nil
+    @mb_last_pos = nil
+    super
+  end
 
-    def terminate
-      @mb_pos = string.size
-      @mb_matched_size = nil
-      @mb_last_pos = nil
-      super
-    end
-    alias_method :clear, :terminate
+  def terminate
+    @mb_pos = string.size
+    @mb_matched_size = nil
+    @mb_last_pos = nil
+    super
+  end
+  alias_method :clear, :terminate
 
-    def unscan
-      super
-      @mb_pos = @mb_last_pos
-      @mb_last_pos = @mb_matched_size = nil
-    end
+  def unscan
+    super
+    @mb_pos = @mb_last_pos
+    @mb_last_pos = @mb_matched_size = nil
+  end
 
-    private
+  private
 
-    def _size(str)
-      str && str.size
-    end
+  def _size(str)
+    str && str.size
+  end
 
-    def _match(str)
-      @mb_matched_size = str && str.size
-      str
-    end
+  def _match(str)
+    @mb_matched_size = str && str.size
+    str
+  end
 
-    def _matched(res)
-      _match matched
-      res
-    end
+  def _matched(res)
+    _match matched
+    res
+  end
 
-    def _forward(str)
-      @mb_last_pos = @mb_pos
-      @mb_pos += str.size if str
-      str
-    end
+  def _forward(str)
+    @mb_last_pos = @mb_pos
+    @mb_pos += str.size if str
+    str
   end
 end

data/lib/sass/util/normalized_map.rb

@@ -5,12 +5,11 @@ module Sass
     # A hash that normalizes its string keys while still allowing you to get back
     # to the original keys that were stored. If several different values normalize
     # to the same value, whichever is stored last wins.
-    require 'sass/util/ordered_hash' if ruby1_8?
     class NormalizedMap
       # Create a normalized map
       def initialize(map = nil)
         @key_strings = {}
-        @map = Util.ruby1_8? ? OrderedHash.new : {}
+        @map = {}
 
         map.each {|key, value| self[key] = value} if map
       end
@@ -115,12 +114,6 @@ module Sass
         @map.send(method, *args, &block)
       end
 
-      if Sass::Util.ruby1_8?
-        def respond_to?(method, include_private = false)
-          super || @map.respond_to?(method, include_private)
-        end
-      end
-
       def respond_to_missing?(method, include_private = false)
         @map.respond_to?(method, include_private)
       end

data/lib/sass/version.rb

@@ -42,8 +42,6 @@ module Sass
     #     }
     #
     # @return [{Symbol => String/Integer}] The version hash
-    # @comment
-    #   rubocop:disable ClassVars
     def version
       return @@version if defined?(@@version)
 
@@ -77,10 +75,8 @@ module Sass
         end
       end
 
-      @@version[:string] << " (#{name})"
       @@version
     end
-    # rubocop:enable ClassVars
 
     private
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass
 version: !ruby/object:Gem::Version
-  version: 3.4.25
+  version: 3.7.4
 platform: ruby
 authors:
 - Natalie Weizenbaum
@@ -10,8 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-07 00:00:00.000000000 Z
+date: 2019-04-04 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: sass-listen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -32,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: '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: 2.3.0
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -55,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
@@ -73,7 +103,6 @@ files:
 - MIT-LICENSE
 - README.md
 - REVISION
-- Rakefile
 - VERSION
 - VERSION_DATE
 - VERSION_NAME
@@ -124,7 +153,6 @@ files:
 - lib/sass/script.rb
 - lib/sass/script/css_lexer.rb
 - lib/sass/script/css_parser.rb
-- lib/sass/script/css_variable_warning.rb
 - lib/sass/script/functions.rb
 - lib/sass/script/lexer.rb
 - lib/sass/script/parser.rb
@@ -144,7 +172,9 @@ files:
 - lib/sass/script/value/arg_list.rb
 - lib/sass/script/value/base.rb
 - lib/sass/script/value/bool.rb
+- lib/sass/script/value/callable.rb
 - lib/sass/script/value/color.rb
+- lib/sass/script/value/function.rb
 - lib/sass/script/value/helpers.rb
 - lib/sass/script/value/list.rb
 - lib/sass/script/value/map.rb
@@ -207,181 +237,30 @@ files:
 - lib/sass/tree/warn_node.rb
 - lib/sass/tree/while_node.rb
 - lib/sass/util.rb
-- lib/sass/util/cross_platform_random.rb
 - lib/sass/util/multibyte_string_scanner.rb
 - lib/sass/util/normalized_map.rb
-- lib/sass/util/ordered_hash.rb
 - lib/sass/util/subset_map.rb
 - 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_1_8.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_1_8.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
-- vendor/listen/CHANGELOG.md
-- vendor/listen/CONTRIBUTING.md
-- vendor/listen/Gemfile
-- vendor/listen/Guardfile
-- vendor/listen/LICENSE
-- vendor/listen/README.md
-- vendor/listen/Rakefile
-- vendor/listen/Vagrantfile
-- vendor/listen/lib/listen.rb
-- vendor/listen/lib/listen/adapter.rb
-- vendor/listen/lib/listen/adapters/bsd.rb
-- vendor/listen/lib/listen/adapters/darwin.rb
-- vendor/listen/lib/listen/adapters/linux.rb
-- vendor/listen/lib/listen/adapters/polling.rb
-- vendor/listen/lib/listen/adapters/windows.rb
-- vendor/listen/lib/listen/directory_record.rb
-- vendor/listen/lib/listen/listener.rb
-- vendor/listen/lib/listen/turnstile.rb
-- vendor/listen/lib/listen/version.rb
-- vendor/listen/listen.gemspec
-- vendor/listen/spec/listen/adapter_spec.rb
-- vendor/listen/spec/listen/adapters/bsd_spec.rb
-- vendor/listen/spec/listen/adapters/darwin_spec.rb
-- vendor/listen/spec/listen/adapters/linux_spec.rb
-- vendor/listen/spec/listen/adapters/polling_spec.rb
-- vendor/listen/spec/listen/adapters/windows_spec.rb
-- vendor/listen/spec/listen/directory_record_spec.rb
-- vendor/listen/spec/listen/listener_spec.rb
-- vendor/listen/spec/listen/turnstile_spec.rb
-- vendor/listen/spec/listen_spec.rb
-- vendor/listen/spec/spec_helper.rb
-- vendor/listen/spec/support/adapter_helper.rb
-- vendor/listen/spec/support/directory_record_helper.rb
-- vendor/listen/spec/support/fixtures_helper.rb
-- vendor/listen/spec/support/listeners_helper.rb
-- vendor/listen/spec/support/platform_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
@@ -389,7 +268,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -397,34 +276,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: sass
-rubygems_version: 2.4.8
+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/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/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/exec_test.rb
-- test/sass/importer_test.rb
-- test/sass/engine_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_files: []