sass 3.5.2 → 3.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8bc006450eec1decf66c14cd5291f0bba21ee98
-  data.tar.gz: 215e6234472577c8fad6f03375426b8c4c845f5e
+  metadata.gz: 6442c161b5fc7709753d4bdc2a134f340af6d908
+  data.tar.gz: '0946cacd17612b438ce689b86cce9fa6a90bc208'
 SHA512:
-  metadata.gz: b26dc35c34da276b1be99f68c12731b4c74d219216e6e8353ef52d12f2f0317e5d10d0823268c054925b4eea746570ca281ddb15938201433e3451233ac1d17b
-  data.tar.gz: 247f868f376a2d6c99c0e58aa2a8be7d4db58f0d45c5144febec4cd3a84d22cd2f3e8f50053c3540310ceee87165b92f8f064d7c655b70f7bd858fc28dd69932
+  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 [![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)
+## 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.5.2
+3.7.4

data/VERSION_DATE

@@ -1 +1 @@
-04 October 2017 22:22:40 UTC
+04 April 2019 00:49:58 UTC

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/engine.rb

@@ -375,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
@@ -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

@@ -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]

data/lib/sass/importers/filesystem.rb

@@ -154,7 +154,9 @@ module Sass
             [Sass::Util.cleanpath(full_path).to_s, s]
           end
         end.flatten(1)
-        return if found.empty?
+        if found.empty? && split(name)[2].nil? && File.directory?("#{dir}/#{name}")
+          return find_real_file("#{dir}/#{name}", "index", options)
+        end
 
         if found.size > 1 && !@same_name_warnings.include?(found.first.first)
           found.each {|(f, _)| @same_name_warnings << f}
@@ -202,7 +204,7 @@ WARNING
 
       def _find(dir, name, options)
         full_filename, syntax = Sass::Util.destructure(find_real_file(dir, name, options))
-        return unless full_filename && File.readable?(full_filename)
+        return unless full_filename && File.file?(full_filename) && File.readable?(full_filename)
 
         # TODO: this preserves historical behavior, but it's possible
         # :filename should be either normalized to the native format

data/lib/sass/logger/base.rb

@@ -22,6 +22,17 @@ class Sass::Logger::Base
     !disabled && self.class.log_level?(level, log_level)
   end
 
+  # Captures all logger messages emitted during a block and returns them as a
+  # string.
+  def capture
+    old_io = io
+    self.io = StringIO.new
+    yield
+    io.string
+  ensure
+    self.io = old_io
+  end
+
   def log(level, message)
     _log(level, message) if logging_level?(level)
   end

data/lib/sass/script/css_parser.rb

@@ -24,7 +24,10 @@ module Sass
       end
 
       # Short-circuit all the SassScript-only productions
-      alias_method :interpolation, :space
+      def interpolation(first: nil, inner: :space)
+        first || send(inner)
+      end
+
       alias_method :or_expr, :div
       alias_method :unary_div, :ident
       alias_method :paren, :string

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 = {}
 
@@ -653,7 +648,15 @@ module Sass::Script
     #     inclusive
     # @return [Sass::Script::Value::Color]
     # @raise [ArgumentError] if any parameter is the wrong type or out of bounds
-    def rgb(red, green, blue)
+    def rgb(red, green = nil, blue = nil)
+      if green.nil?
+        return unquoted_string("rgb(#{red})") if var?(red)
+        raise ArgumentError.new("wrong number of arguments (1 for 3)")
+      elsif blue.nil?
+        return unquoted_string("rgb(#{red}, #{green})") if var?(red) || var?(green)
+        raise ArgumentError.new("wrong number of arguments (2 for 3)")
+      end
+
       if special_number?(red) || special_number?(green) || special_number?(blue)
         return unquoted_string("rgb(#{red}, #{green}, #{blue})")
       end
@@ -661,15 +664,11 @@ module Sass::Script
       assert_type green, :Number, :green
       assert_type blue, :Number, :blue
 
-      color_attrs = [red, green, blue].map do |c|
-        if c.is_unit?("%")
-          c.value * 255 / 100.0
-        elsif c.unitless?
-          c.value
-        else
-          raise ArgumentError.new("Expected #{c} to be unitless or have a unit of % but got #{c}")
-        end
-      end
+      color_attrs = [
+        percentage_or_unitless(red, 255, "red"),
+        percentage_or_unitless(green, 255, "green"),
+        percentage_or_unitless(blue, 255, "blue")
+      ]
 
       # Don't store the string representation for function-created colors, both
       # because it's not very useful and because some functions aren't supported
@@ -677,6 +676,8 @@ module Sass::Script
       Sass::Script::Value::Color.new(color_attrs)
     end
     declare :rgb, [:red, :green, :blue]
+    declare :rgb, [:red, :green]
+    declare :rgb, [:red]
 
     # Creates a {Sass::Script::Value::Color Color} from red, green, blue, and
     # alpha values.
@@ -711,16 +712,34 @@ module Sass::Script
     #     is the wrong type
     def rgba(*args)
       case args.size
+      when 1
+        return unquoted_string("rgba(#{args.first})") if var?(args.first)
+        raise ArgumentError.new("wrong number of arguments (1 for 4)")
       when 2
         color, alpha = args
 
+        if var?(color)
+          return unquoted_string("rgba(#{color}, #{alpha})")
+        elsif var?(alpha)
+          if color.is_a?(Sass::Script::Value::Color)
+            return unquoted_string("rgba(#{color.red}, #{color.green}, #{color.blue}, #{alpha})")
+          else
+            return unquoted_string("rgba(#{color}, #{alpha})")
+          end
+        end
+
         assert_type color, :Color, :color
         if special_number?(alpha)
           unquoted_string("rgba(#{color.red}, #{color.green}, #{color.blue}, #{alpha})")
         else
           assert_type alpha, :Number, :alpha
-          check_alpha_unit alpha, 'rgba'
-          color.with(:alpha => alpha.value)
+          color.with(:alpha => percentage_or_unitless(alpha, 1, "alpha"))
+        end
+      when 3
+        if var?(args[0]) || var?(args[1]) || var?(args[2])
+          unquoted_string("rgba(#{args.join(', ')})")
+        else
+          raise ArgumentError.new("wrong number of arguments (3 for 4)")
         end
       when 4
         red, green, blue, alpha = args
@@ -735,7 +754,9 @@ module Sass::Script
       end
     end
     declare :rgba, [:red, :green, :blue, :alpha]
+    declare :rgba, [:red, :green, :blue]
     declare :rgba, [:color, :alpha]
+    declare :rgba, [:red]
 
     # Creates a {Sass::Script::Value::Color Color} from hue, saturation, and
     # lightness values. Uses the algorithm from the [CSS3 spec][].
@@ -753,7 +774,15 @@ module Sass::Script
     # @return [Sass::Script::Value::Color]
     # @raise [ArgumentError] if `$saturation` or `$lightness` are out of bounds
     #   or any parameter is the wrong type
-    def hsl(hue, saturation, lightness)
+    def hsl(hue, saturation = nil, lightness = nil)
+      if saturation.nil?
+        return unquoted_string("hsl(#{hue})") if var?(hue)
+        raise ArgumentError.new("wrong number of arguments (1 for 3)")
+      elsif lightness.nil?
+        return unquoted_string("hsl(#{hue}, #{saturation})") if var?(hue) || var?(saturation)
+        raise ArgumentError.new("wrong number of arguments (2 for 3)")
+      end
+
       if special_number?(hue) || special_number?(saturation) || special_number?(lightness)
         unquoted_string("hsl(#{hue}, #{saturation}, #{lightness})")
       else
@@ -761,6 +790,8 @@ module Sass::Script
       end
     end
     declare :hsl, [:hue, :saturation, :lightness]
+    declare :hsl, [:hue, :saturation]
+    declare :hsl, [:hue]
 
     # Creates a {Sass::Script::Value::Color Color} from hue,
     # saturation, lightness, and alpha values. Uses the algorithm from
@@ -781,7 +812,21 @@ module Sass::Script
     # @return [Sass::Script::Value::Color]
     # @raise [ArgumentError] if `$saturation`, `$lightness`, or `$alpha` are out
     #   of bounds or any parameter is the wrong type
-    def hsla(hue, saturation, lightness, alpha)
+    def hsla(hue, saturation = nil, lightness = nil, alpha = nil)
+      if saturation.nil?
+        return unquoted_string("hsla(#{hue})") if var?(hue)
+        raise ArgumentError.new("wrong number of arguments (1 for 4)")
+      elsif lightness.nil?
+        return unquoted_string("hsla(#{hue}, #{saturation})") if var?(hue) || var?(saturation)
+        raise ArgumentError.new("wrong number of arguments (2 for 4)")
+      elsif alpha.nil?
+        if var?(hue) || var?(saturation) || var?(lightness)
+          return unquoted_string("hsla(#{hue}, #{saturation}, #{lightness})")
+        else
+          raise ArgumentError.new("wrong number of arguments (2 for 4)")
+        end
+      end
+
       if special_number?(hue) || special_number?(saturation) ||
          special_number?(lightness) || special_number?(alpha)
         return unquoted_string("hsla(#{hue}, #{saturation}, #{lightness}, #{alpha})")
@@ -790,7 +835,6 @@ module Sass::Script
       assert_type saturation, :Number, :saturation
       assert_type lightness, :Number, :lightness
       assert_type alpha, :Number, :alpha
-      check_alpha_unit alpha, 'hsla'
 
       h = hue.value
       s = saturation.value
@@ -800,9 +844,13 @@ module Sass::Script
       # because it's not very useful and because some functions aren't supported
       # on older browsers.
       Sass::Script::Value::Color.new(
-        :hue => h, :saturation => s, :lightness => l, :alpha => alpha.value)
+        :hue => h, :saturation => s, :lightness => l,
+        :alpha => percentage_or_unitless(alpha, 1, "alpha"))
     end
     declare :hsla, [:hue, :saturation, :lightness, :alpha]
+    declare :hsla, [:hue, :saturation, :lightness]
+    declare :hsla, [:hue, :saturation]
+    declare :hsla, [:hue]
 
     # Gets the red component of a color. Calculated from HSL where necessary via
     # [this algorithm][hsl-to-rgb].
@@ -1442,13 +1490,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()
@@ -2007,12 +2053,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")
@@ -2855,10 +2898,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)
@@ -2866,19 +2906,14 @@ WARNING
       color.with(attr => color.send(attr).send(op, amount.value))
     end
 
-    def check_alpha_unit(alpha, function)
-      return if alpha.unitless?
-
-      if alpha.is_unit?("%")
-        Sass::Util.sass_warn(<<WARNING)
-DEPRECATION WARNING: Passing a percentage as the alpha value to #{function}() will be
-interpreted differently in future versions of Sass. For now, use #{alpha.value} instead.
-WARNING
+    def percentage_or_unitless(number, max, name)
+      if number.unitless?
+        number.value
+      elsif number.is_unit?("%")
+        max * number.value / 100.0;
       else
-        Sass::Util.sass_warn(<<WARNING)
-DEPRECATION WARNING: Passing a number with units as the alpha value to #{function}() is
-deprecated and will be an error in future versions of Sass. Use #{alpha.value} instead.
-WARNING
+        raise ArgumentError.new(
+          "$#{name}: Expected #{number} to have no units or \"%\"");
       end
     end
   end