sass 3.4.25 → 3.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8b2d6c079c8e8aec59e0dd45294419919f88239
-  data.tar.gz: 5e31ebbe100aa0b066d414ee32e3f29d792907f6
+  metadata.gz: 6442c161b5fc7709753d4bdc2a134f340af6d908
+  data.tar.gz: '0946cacd17612b438ce689b86cce9fa6a90bc208'
 SHA512:
-  metadata.gz: 1782f895c1aaeef19491dfb41434ca10a60d28395f53a3ec19f8a65ec21c97625db3325732007fbc3155821c53adf9bcd00ced70e9fe3c1c935295b34f3dfdaf
-  data.tar.gz: 39578a844dd4d6e381cb10ced82d5c6782ddd042c79cc5c4c9cc6a69163badbf1ce368526987447b955d44a3d20470ea5e4eae481ea9359d63eea09cab94ca70
+  metadata.gz: 87b7eb8440a85957deaf8b83549d60fdb86f8c5f865aab9db67bee7ba8cd5c0985f05018c9a7ff18e1ea514aa2beb8dbca238257f76e6db14b9f6b1793bf4388
+  data.tar.gz: 5c786b64db488ba61d018257943aeb1ab9365c2e7069201ae0a5759fdbe6576f36d57a885ea690824d15d398d2c8c656fb21be0460ca5f6b088f2e10cfd1edee

data/CODE_OF_CONDUCT.md

@@ -7,4 +7,4 @@ fair place to play.
 
 [The full community guidelines can be found on the Sass website.][link]
 
-[link]: http://sass-lang.com/community-guidelines
+[link]: https://sass-lang.com/community-guidelines

data/CONTRIBUTING.md

@@ -1,6 +1,6 @@
 Contributions are welcomed. Please see the following site for guidelines:
 
-[http://sass-lang.com/community#Contribute](http://sass-lang.com/community#Contribute)
+[https://sass-lang.com/community#Contribute](https://sass-lang.com/community#Contribute)
 
 * [Branches](#main-development-branches)
   * [Feature Branches](#feature-branches)
@@ -18,7 +18,7 @@ is regularly merged into the one below: `stable` into `next`, `next` into
 `master`.
 
 * The `stable` branch is the default—it's what GitHub shows if you go to
-  [sass/sass](https://github.com/sass/sass), and it's the default place for pull
+  [sass/ruby-sass](https://github.com/sass/ruby-sass), and it's the default place for pull
   requests to go. This branch is where we work on the next patch release. Bug
   fixes and documentation improvements belong here, but not new features.
 
@@ -100,7 +100,7 @@ like [`Sass::Engine`][Sass::Engine] stable, we don't have a strong distinction
 between public and private APIs and we need to be able to freely refactor our
 code.
 
-[Sass::Engine]: http://sass-lang.com/documentation/Sass/Engine.html
+[Sass::Engine]: https://sass-lang.com/documentation/Sass/Engine.html
 
 ### Making Breaking Changes
 

data/README.md

@@ -1,4 +1,12 @@
-# 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)
+## Ruby Sass Has Reached End-of-Life
+
+Ruby Sass should no longer be used, and will no longer be receiving any updates.
+See [the Sass blog][], and consider switching to the [`sassc` gem].
+
+[the Sass blog]: https://sass-lang.com/blog/posts/7828841
+[`sassc` gem]: https://rubygems.org/gems/sassc
+
+# 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.
@@ -44,7 +52,7 @@ In Rails 3, add `gem "sass"` to your Gemfile instead.
 where they'll be automatically compiled
 to corresponding CSS files in `public/stylesheets` when needed
 (the Sass template directory is customizable...
-see [the Sass reference](http://sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#template_location-option) for details).
+see [the Sass reference](https://sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#template_location-option) for details).
 
 Sass can also be used with any Rack-enabled web framework.
 To do so, just add
@@ -59,7 +67,7 @@ Then any Sass files in `public/stylesheets/sass`
 will be compiled into CSS files in `public/stylesheets` on every request.
 
 To use Sass programmatically,
-check out the [YARD documentation](http://sass-lang.com/documentation/file.SASS_REFERENCE.html#using_sass).
+check out the [YARD documentation](https://sass-lang.com/documentation/file.SASS_REFERENCE.html#using_sass).
 
 ## Formatting
 
@@ -73,10 +81,10 @@ and get small stylesheets up and running quickly,
 particularly with the help of
 [the Compass style library](http://compass-style.org).
 
-[vars]:    http://sass-lang.com/documentation/file.SASS_REFERENCE.html#variables_
-[nested]:  http://sass-lang.com/documentation/file.SASS_REFERENCE.html#nested_rules
-[mixins]:  http://sass-lang.com/documentation/file.SASS_REFERENCE.html#mixins
-[imports]: http://sass-lang.com/documentation/file.SASS_REFERENCE.html#import
+[vars]:    https://sass-lang.com/documentation/file.SASS_REFERENCE.html#variables_
+[nested]:  https://sass-lang.com/documentation/file.SASS_REFERENCE.html#nested_rules
+[mixins]:  https://sass-lang.com/documentation/file.SASS_REFERENCE.html#mixins
+[imports]: https://sass-lang.com/documentation/file.SASS_REFERENCE.html#import
 
 Sass has two syntaxes.
 The one presented here, known as "SCSS" (for "Sassy CSS"),
@@ -85,7 +93,7 @@ The other (older) syntax, known as the indented syntax or just "Sass",
 is whitespace-sensitive and indentation-based.
 For more information, see the [reference documentation][syntax].
 
-[syntax]: http://sass-lang.com/documentation/file.SASS_REFERENCE.html#syntax
+[syntax]: https://sass-lang.com/documentation/file.SASS_REFERENCE.html#syntax
 
 To run the following examples and see the CSS they produce,
 put them in a file called `test.scss` and run `sass test.scss`.
@@ -160,7 +168,7 @@ You can even give them arguments.
 ```
 
 A comprehensive list of features is available
-in the [Sass reference](http://sass-lang.com/documentation/file.SASS_REFERENCE.html).
+in the [Sass reference](https://sass-lang.com/documentation/file.SASS_REFERENCE.html).
 
 ## Executables
 

data/VERSION

@@ -1 +1 @@
-3.4.25
+3.7.4

data/VERSION_DATE

@@ -1 +1 @@
-07 July 2017 22:00:34 UTC
+04 April 2019 00:49:58 UTC

data/VERSION_NAME

@@ -1 +1 @@
-Selective Steve
+Bleeding Edge

data/extra/sass-spec-ref.sh

@@ -18,7 +18,15 @@ fi
 
 >&2 echo "Fetching pull request $TRAVIS_PULL_REQUEST..."
 
-JSON=$(curl -L -sS https://api.github.com/repos/sass/sass/pulls/$TRAVIS_PULL_REQUEST)
+url=https://api.github.com/repos/sass/ruby-sass/pulls/$TRAVIS_PULL_REQUEST
+if [ -z "$GITHUB_AUTH" ]; then
+    >&2 echo "Fetching pull request info without authentication"
+    JSON=$(curl -L -sS $url)
+else
+    >&2 echo "Fetching pull request info as sassbot"
+    JSON=$(curl -u "sassbot:$GITHUB_AUTH" -L -sS $url)
+fi
+>&2 echo "$JSON"
 
 RE_SPEC_PR="sass\/sass-spec(#|\/pull\/)([0-9]+)"
 

data/lib/sass.rb

@@ -100,10 +100,3 @@ require 'sass/engine'
 require 'sass/plugin' if defined?(Merb::Plugins)
 require 'sass/railtie'
 require 'sass/features'
-
-if Sass::Util.ruby1?
-  Sass::Util.sass_warn(
-    "DEPRECATION WARNING:\n" +
-    "Sass 3.5 will no longer support Ruby #{RUBY_VERSION}.\n" +
-    "Please upgrade to Ruby 2.0.0 or greater as soon as possible.\n")
-end

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" % c.ord}
         File.join(cache_location, key)
       end
     end

data/lib/sass/css.rb

@@ -51,8 +51,7 @@ module Sass
       raise err
     end
 
-    # Returns the original encoding of the document,
-    # or `nil` under Ruby 1.8.
+    # Returns the original encoding of the document.
     #
     # @return [Encoding, nil]
     # @raise [Encoding::UndefinedConversionError] if the source encoding

data/lib/sass/engine.rb

@@ -80,7 +80,13 @@ module Sass
   #
   # `type`: `String`
   # : The user-friendly name of the type of the callable.
-  Callable = Struct.new(:name, :args, :splat, :environment, :tree, :has_content, :type)
+  #
+  # `origin`: `Symbol`
+  # : From whence comes the callable: `:stylesheet`, `:builtin`, `:css`
+  #   A callable with an origin of `:stylesheet` was defined in the stylesheet itself.
+  #   A callable with an origin of `:builtin` was defined in ruby.
+  #   A callable (function) with an origin of `:css` returns a function call with arguments to CSS.
+  Callable = Struct.new(:name, :args, :splat, :environment, :tree, :has_content, :type, :origin)
 
   # This class handles the parsing and compilation of the Sass template.
   # Example usage:
@@ -316,8 +322,7 @@ module Sass
                 end
     end
 
-    # Returns the original encoding of the document,
-    # or `nil` under Ruby 1.8.
+    # Returns the original encoding of the document.
     #
     # @return [Encoding, nil]
     # @raise [Encoding::UndefinedConversionError] if the source encoding
@@ -370,7 +375,7 @@ Error generating source map: couldn't determine public URL for "#{filename}".
   Without a public URL, there's nothing for the source map to link to.
   An importer was not set for this file.
 ERR
-      elsif Sass::Util.silence_warnings do
+      elsif Sass::Util.silence_sass_warnings do
               sourcemap_dir = nil if @options[:sourcemap] == :file
               importer.public_url(filename, sourcemap_dir).nil?
             end
@@ -386,7 +391,7 @@ ERR
       rendered << "\n" if rendered[-1] != ?\n
       rendered << "\n" unless compressed
       rendered << "/*# sourceMappingURL="
-      rendered << Sass::Util.escape_uri(sourcemap_uri)
+      rendered << URI::DEFAULT_PARSER.escape(sourcemap_uri)
       rendered << " */\n"
       return rendered, sourcemap
     end
@@ -494,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
@@ -520,10 +524,6 @@ MSG
       nodes = []
       while (line = arr[i]) && line.tabs >= base
         if line.tabs > base
-          raise SyntaxError.new(
-            "The line was indented #{line.tabs - base} levels deeper than the previous line.",
-            :line => line.index) if line.tabs > base + 1
-
           nodes.last.children, i = tree(arr, i)
         else
           nodes << line
@@ -695,7 +695,14 @@ WARNING
       end
 
       name = line.text[0...scanner.pos]
-      if (scanned = scanner.scan(/\s*:(?:\s+|$)/)) # test for a property
+      could_be_property =
+        if name.start_with?('--')
+          (scanned = scanner.scan(/\s*:/))
+        else
+          (scanned = scanner.scan(/\s*:(?:\s+|$)/))
+        end
+
+      if could_be_property # test for a property
         offset += scanned.length
         property = parse_property(name, res, scanner.rest, :new, line, offset)
         property.name_source_range = ident_range
@@ -718,26 +725,33 @@ WARNING
       end
     end
 
-    # @comment
-    #   rubocop:disable ParameterLists
     def parse_property(name, parsed_name, value, prop, line, start_offset)
-      # rubocop:enable ParameterLists
-      if value.strip.empty?
-        expr = Sass::Script::Tree::Literal.new(Sass::Script::Value::String.new(""))
+
+      if name.start_with?('--')
+        unless line.children.empty?
+          raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath custom properties.",
+            :line => @line + 1)
+        end
+
+        parser = Sass::SCSS::Parser.new(value,
+          @options[:filename], @options[:importer],
+          @line, to_parser_offset(@offset))
+        parsed_value = parser.parse_declaration_value
+        end_offset = start_offset + value.length
+      elsif value.strip.empty?
+        parsed_value = [Sass::Script::Tree::Literal.new(Sass::Script::Value::String.new(""))]
         end_offset = start_offset
       else
-        expr = parse_script(value,
-          :offset => to_parser_offset(start_offset),
-          :css_variable => name.start_with?("--"))
+        expr = parse_script(value, :offset => to_parser_offset(start_offset))
         end_offset = expr.source_range.end_pos.offset - 1
+        parsed_value = [expr]
       end
-
-      node = Tree::PropNode.new(parse_interp(name), expr, prop)
+      node = Tree::PropNode.new(parse_interp(name), parsed_value, prop)
       node.value_source_range = Sass::Source::Range.new(
         Sass::Source::Position.new(line.index, to_parser_offset(start_offset)),
         Sass::Source::Position.new(line.index, to_parser_offset(end_offset)),
         @options[:filename], @options[:importer])
-      if value.strip.empty? && line.children.empty?
+      if !node.custom_property? && value.strip.empty? && line.children.empty?
         raise SyntaxError.new(
           "Invalid property: \"#{node.declaration}\" (no value)." +
           node.pseudo_class_selector_message)
@@ -1020,8 +1034,6 @@ WARNING
       values
     end
 
-    # @comment
-    #   rubocop:disable MethodLength
     def parse_import_arg(scanner, offset)
       return if scanner.eos?
 
@@ -1096,8 +1108,6 @@ WARNING
       end
       node
     end
-    # @comment
-    #   rubocop:enable MethodLength
 
     def parse_mixin_directive(parent, line, root, value, offset)
       parse_mixin_definition(line)
@@ -1154,9 +1164,9 @@ WARNING
     end
 
     def parse_script(script, options = {})
-      line = options.delete(:line) || @line
-      offset = options.delete(:offset) || @offset + 1
-      Script.parse(script, line, offset, @options.merge(options))
+      line = options[:line] || @line
+      offset = options[:offset] || @offset + 1
+      Script.parse(script, line, offset, @options)
     end
 
     def format_comment_text(text, silent)

data/lib/sass/environment.rb

@@ -175,6 +175,10 @@ module Sass
 
   # A read-only wrapper for a lexical environment for SassScript.
   class ReadOnlyEnvironment < BaseEnvironment
+    def initialize(parent = nil, options = nil)
+      super
+      @content_cached = nil
+    end
     # The read-only environment of the caller of this environment's mixin or function.
     #
     # @see BaseEnvironment#caller
@@ -185,14 +189,31 @@ module Sass
       @caller ||= env.is_a?(ReadOnlyEnvironment) ? env : ReadOnlyEnvironment.new(env, env.options)
     end
 
-    # The read-only content passed to this environment.
+    # The content passed to this environment. If the content's environment isn't already
+    # read-only, it's made read-only.
     #
     # @see BaseEnvironment#content
-    # @return {ReadOnlyEnvironment}
+    #
+    # @return {[Array<Sass::Tree::Node>, ReadOnlyEnvironment]?} The content nodes and
+    #   the lexical environment of the content block.
+    #   Returns `nil` when there is no content in this environment.
     def content
-      return @content if @content
-      env = super
-      @content ||= env.is_a?(ReadOnlyEnvironment) ? env : ReadOnlyEnvironment.new(env, env.options)
+      # Return the cached content from a previous invocation if any
+      return @content if @content_cached
+      # get the content with a read-write environment from the superclass
+      read_write_content = super
+      if read_write_content
+        tree, env = read_write_content
+        # make the content's environment read-only
+        if env && !env.is_a?(ReadOnlyEnvironment)
+          env = ReadOnlyEnvironment.new(env, env.options)
+        end
+        @content_cached = true
+        @content = [tree, env]
+      else
+        @content_cached = true
+        @content = nil
+      end
     end
   end
 

data/lib/sass/error.rb

@@ -142,7 +142,7 @@ module Sass
       msg = lines[0] + lines[1..-1].
         map {|l| "\n" + (" " * "Error: ".size) + l}.join
       "Error: #{msg}" +
-        Sass::Util.enum_with_index(sass_backtrace).map do |entry, i|
+        sass_backtrace.each_with_index.map do |entry, i|
           "\n        #{i == 0 ? 'on' : 'from'} line #{entry[:line]}" +
             " of #{entry[:filename] || default_filename}" +
             (entry[:mixin] ? ", in `#{entry[:mixin]}'" : "")
@@ -186,7 +186,7 @@ END
         section = e.sass_template.rstrip.split("\n")[min...line_num + 5]
         return e.sass_backtrace_str if section.nil? || section.empty?
 
-        e.sass_backtrace_str + "\n\n" + Sass::Util.enum_with_index(section).
+        e.sass_backtrace_str + "\n\n" + section.each_with_index.
           map {|line, i| "#{line_offset + min + i}: #{line}"}.join("\n")
       end
     end

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.
@@ -90,18 +88,9 @@ module Sass::Exec
     #
     # @param opts [OptionParser]
     def encoding_option(opts)
-      encoding_desc = if Sass::Util.ruby1_8?
-                        'Does not work in Ruby 1.8.'
-                      else
-                        'Specify the default encoding for input files.'
-                      end
+      encoding_desc = 'Specify the default encoding for input files.'
       opts.on('-E', '--default-encoding ENCODING', encoding_desc) do |encoding|
-        if Sass::Util.ruby1_8?
-          $stderr.puts "Specifying the encoding is not supported in ruby 1.8."
-          exit 1
-        else
-          Encoding.default_external = encoding
-        end
+        Encoding.default_external = encoding
       end
     end
 

data/lib/sass/exec/sass_scss.rb

@@ -92,7 +92,7 @@ END
       end
 
       opts.on("-v", "--version", "Print the Sass version.") do
-        puts("Sass #{Sass.version[:string]}")
+        puts("Ruby Sass #{Sass.version[:string]}")
         exit
       end
     end
@@ -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]