sass 3.4.22 → 3.4.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 414603b66564f231de620f9baff16563174a4b72
-  data.tar.gz: 4f09c7d1af56afa99f42b2c5922144774befd481
+  metadata.gz: 798967a96737a6978563e8b46a97cf3254d1bd54
+  data.tar.gz: 57ed07a4077a5d81a9b821da7b7f4dcffb939fd2
 SHA512:
-  metadata.gz: 40de104dabb794e5fd4fb20bdfcf0c2d57444d4b2f283312d4698482c3117fc5093b7e65daaacbae1b4ccd93989d0e6c3a3c0f3548a3c5710de74563d9ee6b96
-  data.tar.gz: 738319bc6f7d3b10e4ec16e0e5c5b9ed7b7c21f6c09d7bc244cbd5d0fab785778ccf4b2270ba86eb68597a8b1eb4836ef4f7460c7063381a7cfa2c9017b73c15
+  metadata.gz: a86659601d7713959b8213d53a09ced83a3d3eb09eb64fdcab54fcba0e3f4b05477db9ded2f30c7e77a44f078115ee9b6efed016f868b40e725e40d7bb4a1d3e
+  data.tar.gz: 42da27fb2cd7325d5df8404ea20bd6e4d57f926ee835f266120dc2fbd2beee43a7dc2e8932d136365c43f26a66fe019457a46afe376578ce11a8abc2316625cc

data/.yardopts

@@ -1,6 +1,6 @@
 --readme          README.md
 --markup          markdown
---markup-provider maruku
+--markup-provider redcarpet
 --default-return  ""
 --title           "Sass Documentation"
 --query           'object.type != :classvariable'

data/CONTRIBUTING.md

@@ -37,6 +37,29 @@ branch, but don't worry about it too much; if you make a request against the
 wrong branch, the maintainer will take responsibility for rebasing it before
 merging.
 
+### Testing
+
+Tests for changes to the Sass language go in
+[sass-spec](https://github.com/sass/sass-spec) so that other
+implementations (E.g. libSass) can be tested against the same test
+suite. The sass-spec repo follows a "trunk development" model in that
+the tests there test against different version of the Sass language (as
+opposed to having branches that track different Sass versions). When
+contributing changes to Sass, update the Gemfile to use sass-spec from a
+branch or fork that has the new tests. When the feature lands in Sass,
+the committer will also merge the corresponding sass-spec changes.
+
+The [documentation of
+sass-spec](https://github.com/sass/sass-spec/blob/master/README.md)
+explains how to run sass-spec and contribute changes. In development,
+Change the Gemfile(s) to use the `:path` option against the sass-spec gem
+to link your local checkout of sass and sass-spec together in one or
+both directions.
+
+Changes to Sass internals or Ruby Sass specific features (E.g.
+the `sass-convert` tool) should always have tests in the Sass `test`
+directory following the conventions you see there.
+
 ### Feature Branches
 
 Sometimes it won't be possible to merge a new feature into `next` or `master`

data/README.md

@@ -1,4 +1,4 @@
-# Sass [![Gem Version](https://badge.fury.io/rb/sass.png)](http://badge.fury.io/rb/sass) [![Inline docs](http://inch-ci.org/github/sass/sass.svg)](http://inch-ci.org/github/sass/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)
 
 **Sass makes CSS fun again**. Sass is an extension of CSS,
 adding nested rules, variables, mixins, selector inheritance, and more.
@@ -184,7 +184,7 @@ See `sass-convert --help` for further information and options.
 To run the Sass executables from a source checkout instead of from rubygems:
 
 ```
-$ cd <SASS_CHECKOUT_DIRECTORY>
+$ cd sass
 $ bundle
 $ bundle exec sass ...
 $ bundle exec scss ...
@@ -199,12 +199,12 @@ and now occasionally consults on the language issues. Hampton lives in San
 Francisco, California and works as VP of Technology
 at [Moovweb](http://www.moovweb.com/).
 
-[Natalie Weizenbaum](https://twitter.com/nex3) is the primary developer and architect of
-Sass. Her hard work has kept the project alive by endlessly answering forum
-posts, fixing bugs, refactoring, finding speed improvements, writing
-documentation, implementing new features, and getting Hampton coffee (a fitting
-task for a girl genius). Natalie lives in Seattle, Washington and works on
-[Dart](http://dartlang.org) application libraries at Google.
+[Natalie Weizenbaum](https://twitter.com/nex3) is the primary developer and
+architect of Sass. Her hard work has kept the project alive by endlessly
+answering forum posts, fixing bugs, refactoring, finding speed improvements,
+writing documentation, implementing new features, and designing the language.
+Natalie lives in Seattle, Washington and works on [Dart](http://dartlang.org)
+application libraries at Google.
 
 [Chris Eppstein](http://twitter.com/chriseppstein) is a core contributor to
 Sass and the creator of [Compass](http://compass-style.org/), the first Sass-based framework, and

data/Rakefile

@@ -48,8 +48,8 @@ namespace :test do
         end
         default_options = {
           :spec_directory => SassSpec::SPEC_DIR,
-          :engine_adapter => SassEngineAdapter.new("sass"),
-          :generate => [],
+          :engine_adapter => SassEngineAdapter.new,
+          :generate => false,
           :tap => false,
           :skip => false,
           :verbose => false,
@@ -57,14 +57,6 @@ namespace :test do
           :limit => -1,
           :unexpected_pass => false,
           :nuke => false,
-
-          # Constants
-          :output_styles => ["nested"],
-          :input_files => ["input.scss", "input.sass"],
-          :nested_output_file => 'expected_output',
-          :compressed_output_file => 'expected.compressed',
-          :expanded_output_file => 'expected.expanded',
-          :compact_output_file => 'expected.compact'
         }
         SassSpec::Runner.new(default_options.merge(sass_spec_options)).run || exit(1)
       ensure

data/VERSION

@@ -1 +1 @@
-3.4.22
+3.4.24

data/VERSION_DATE

@@ -1 +1 @@
-28 March 2016 23:31:39 UTC
+19 May 2017 00:01:41 UTC

data/extra/sass-spec-ref.sh

@@ -0,0 +1,32 @@
+#!/bin/bash -e
+# Copyright 2016 Google Inc. Use of this source code is governed by an MIT-style
+# license that can be found in the LICENSE file or at
+# https://opensource.org/licenses/MIT.
+
+# Echoes the sass-spec Git ref that should be checked out for the current Travis
+# run. If we're running specs for a pull request which refers to a sass-spec
+# pull request, we'll run against the latter rather than sass-spec master.
+
+default=master
+
+if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
+  >&2 echo "TRAVIS_PULL_REQUEST: $TRAVIS_PULL_REQUEST."
+  >&2 echo "Ref: $default."
+  echo "$default"
+  exit 0
+fi
+
+>&2 echo "Fetching pull request $TRAVIS_PULL_REQUEST..."
+
+JSON=$(curl -L -sS https://api.github.com/repos/sass/sass/pulls/$TRAVIS_PULL_REQUEST)
+
+RE_SPEC_PR="sass\/sass-spec(#|\/pull\/)([0-9]+)"
+
+if [[ $JSON =~ $RE_SPEC_PR ]]; then
+  ref="pull/${BASH_REMATCH[2]}/head"
+  >&2 echo "Ref: $ref."
+  echo "$ref"
+else
+  >&2 echo "Ref: $default."
+  echo "$default"
+fi

data/lib/sass/cache_stores/filesystem.rb

@@ -36,7 +36,7 @@ module Sass
       def _store(key, version, sha, contents)
         compiled_filename = path_to(key)
         FileUtils.mkdir_p(File.dirname(compiled_filename))
-        Sass::Util.atomic_create_and_write_file(compiled_filename, 0600) do |f|
+        Sass::Util.atomic_create_and_write_file(compiled_filename) do |f|
           f.puts(version)
           f.puts(sha)
           f.write(contents)

data/lib/sass/engine.rb

@@ -94,13 +94,13 @@ module Sass
     # `text`: `String`
     # : The text in the line, without any whitespace at the beginning or end.
     #
-    # `tabs`: `Fixnum`
+    # `tabs`: `Integer`
     # : The level of indentation of the line.
     #
-    # `index`: `Fixnum`
+    # `index`: `Integer`
     # : The line number in the original document.
     #
-    # `offset`: `Fixnum`
+    # `offset`: `Integer`
     # : The number of bytes in on the line that the text begins.
     #   This ends up being the number of bytes of leading whitespace.
     #

data/lib/sass/error.rb

@@ -69,14 +69,14 @@ module Sass
     # The name of the mixin in which the error occurred.
     # This could be `nil` if the error occurred outside a mixin.
     #
-    # @return [Fixnum]
+    # @return [String]
     def sass_mixin
       sass_backtrace.first[:mixin]
     end
 
     # The line of the Sass template on which the error occurred.
     #
-    # @return [Fixnum]
+    # @return [Integer]
     def sass_line
       sass_backtrace.first[:line]
     end
@@ -153,7 +153,7 @@ module Sass
       # Returns an error report for an exception in CSS format.
       #
       # @param e [Exception]
-      # @param line_offset [Fixnum] The number of the first line of the Sass template.
+      # @param line_offset [Integer] The number of the first line of the Sass template.
       # @return [String] The error report
       # @raise [Exception] `e`, if the
       #   {file:SASS_REFERENCE.md#full_exception-option `:full_exception`} option

data/lib/sass/exec/base.rb

@@ -23,7 +23,7 @@ module Sass::Exec
         # at_exit is a bit of a hack, but it allows us to rethrow when --trace
         # is active and get both the built-in exception formatting and the
         # correct exit code.
-        at_exit {exit 65} if e.is_a?(Sass::SyntaxError)
+        at_exit {exit Sass::Util.windows? ? 13 : 65} if e.is_a?(Sass::SyntaxError)
 
         raise e if @options[:trace] || e.is_a?(SystemExit)
 

data/lib/sass/logger/base.rb

@@ -5,6 +5,7 @@ class Sass::Logger::Base
 
   attr_accessor :log_level
   attr_accessor :disabled
+  attr_accessor :io
 
   log_level :trace
   log_level :debug
@@ -12,8 +13,9 @@ class Sass::Logger::Base
   log_level :warn
   log_level :error
 
-  def initialize(log_level = :debug)
+  def initialize(log_level = :debug, io = nil)
     self.log_level = log_level
+    self.io = io
   end
 
   def logging_level?(level)
@@ -25,6 +27,10 @@ class Sass::Logger::Base
   end
 
   def _log(level, message)
-    Kernel.warn(message)
+    if io
+      io.puts(message)
+    else
+      Kernel.warn(message)
+    end
   end
 end

data/lib/sass/logger/delayed.rb

@@ -0,0 +1,50 @@
+require 'sass/logger/log_level'
+
+# A logger that delays messages until they're explicitly flushed to an inner
+# logger.
+#
+# This can be installed around the current logger by calling \{#install!}, and
+# the original logger can be replaced by calling \{#uninstall!}. The log
+# messages can be flushed by calling \{#flush}.
+class Sass::Logger::Delayed < Sass::Logger::Base
+  # Installs a new delayed logger as the current Sass logger, wrapping the
+  # original logger.
+  #
+  # This can be undone by calling \{#uninstall!}.
+  #
+  # @return [Sass::Logger::Delayed] The newly-created logger.
+  def self.install!
+    logger = Sass::Logger::Delayed.new(Sass.logger)
+    Sass.logger = logger
+    logger
+  end
+
+  # Creates a delayed logger wrapping `inner`.
+  #
+  # @param inner [Sass::Logger::Base] The wrapped logger.
+  def initialize(inner)
+    self.log_level = inner.log_level
+    @inner = inner
+    @messages = []
+  end
+
+  # Flushes all queued logs to the wrapped logger.
+  def flush
+    @messages.each {|(l, m)| @inner.log(l, m)}
+  end
+
+  # Uninstalls this logger from \{Sass.logger\}. This should only be called if
+  # the logger was installed using \{#install!}
+  def uninstall!
+    if Sass.logger != self
+      throw Exception.new("Can't uninstall a logger that's not currently installed.")
+    end
+
+    @inner.log_level = log_level
+    Sass.logger = @inner
+  end
+
+  def _log(level, message)
+    @messages << [level, message]
+  end
+end

data/lib/sass/logger.rb

@@ -2,11 +2,16 @@ module Sass::Logger; end
 
 require "sass/logger/log_level"
 require "sass/logger/base"
+require "sass/logger/delayed"
 
 module Sass
   class << self
-    attr_accessor :logger
-  end
+    def logger=(l)
+      Thread.current[:sass_logger] = l
+    end
 
-  self.logger = Sass::Logger::Base.new
+    def logger
+      Thread.current[:sass_logger] ||= Sass::Logger::Base.new
+    end
+  end
 end

data/lib/sass/plugin/rack.rb

@@ -9,7 +9,7 @@ module Sass
     #
     # ## Customize
     #
-    #     Sass::Plugin.options.merge(
+    #     Sass::Plugin.options.merge!(
     #       :cache_location => './tmp/sass-cache',
     #       :never_update => environment != :production,
     #       :full_exception => environment != :production)

data/lib/sass/plugin/staleness_checker.rb

@@ -72,7 +72,7 @@ module Sass
       # Returns whether a Sass or SCSS stylesheet has been modified since a given time.
       #
       # @param template_file [String] The location of the Sass or SCSS template.
-      # @param mtime [Fixnum] The modification time to check against.
+      # @param mtime [Time] The modification time to check against.
       # @param importer [Sass::Importers::Base] The importer used to locate the stylesheet.
       #   Defaults to the filesystem importer.
       # @return [Boolean] Whether the stylesheet has been modified.
@@ -103,7 +103,7 @@ module Sass
       # so it's better to use when checking multiple stylesheets at once.
       #
       # @param template_file [String] The location of the Sass or SCSS template.
-      # @param mtime [Fixnum] The modification time to check against.
+      # @param mtime [Time] The modification time to check against.
       # @param importer [Sass::Importers::Base] The importer used to locate the stylesheet.
       #   Defaults to the filesystem importer.
       # @return [Boolean] Whether the stylesheet has been modified.

data/lib/sass/script/functions.rb

@@ -431,8 +431,8 @@ module Sass::Script
     # If no signatures match, the first signature is returned for error messaging.
     #
     # @param method_name [Symbol] The name of the Ruby function to be called.
-    # @param arg_arity [Fixnum] The number of unnamed arguments the function was passed.
-    # @param kwarg_arity [Fixnum] The number of keyword arguments the function was passed.
+    # @param arg_arity [Integer] The number of unnamed arguments the function was passed.
+    # @param kwarg_arity [Integer] The number of keyword arguments the function was passed.
     #
     # @return [{Symbol => Object}, nil]
     #   The signature options for the matching signature,
@@ -1305,7 +1305,7 @@ module Sass::Script
     #   @param $color1 [Sass::Script::Value::Color]
     #   @param $color2 [Sass::Script::Value::Color]
     #   @param $weight [Sass::Script::Value::Number] The relative weight of each
-    #     color. Closer to `0%` gives more weight to `$color1`, closer to `100%`
+    #     color. Closer to `100%` gives more weight to `$color1`, closer to `0%`
     #     gives more weight to `$color2`
     # @return [Sass::Script::Value::Color]
     # @raise [ArgumentError] if `$weight` is out of bounds or any parameter is
@@ -1546,7 +1546,7 @@ MESSAGE
     #   @param $start-at [Sass::Script::Value::Number] The index of the first
     #     character of the substring. If this is negative, it counts from the end
     #     of `$string`
-    #   @param $end-before [Sass::Script::Value::Number] The index of the last
+    #   @param $end-at [Sass::Script::Value::Number] The index of the last
     #     character of the substring. If this is negative, it counts from the end
     #     of `$string`. Defaults to -1
     #   @return [Sass::Script::Value::String] The substring. This will be quoted
@@ -1565,7 +1565,7 @@ MESSAGE
       s = string.value.length + s if s < 0
       s = 0 if s < 0
       e = string.value.length + e if e < 0
-      e = 0 if s < 0
+      return Sass::Script::Value::String.new("", string.type) if e < 0
       extracted = string.value.slice(s..e)
       Sass::Script::Value::String.new(extracted || "", string.type)
     end
@@ -1583,7 +1583,7 @@ MESSAGE
     # @raise [ArgumentError] if `$string` isn't a string
     def to_upper_case(string)
       assert_type string, :String, :string
-      Sass::Script::Value::String.new(string.value.upcase, string.type)
+      Sass::Script::Value::String.new(Sass::Util.upcase(string.value), string.type)
     end
     declare :to_upper_case, [:string]
 
@@ -1598,7 +1598,7 @@ MESSAGE
     # @raise [ArgumentError] if `$string` isn't a string
     def to_lower_case(string)
       assert_type string, :String, :string
-      Sass::Script::Value::String.new(string.value.downcase, string.type)
+      Sass::Script::Value::String.new(Sass::Util.downcase(string.value), string.type)
     end
     declare :to_lower_case, [:string]
 
@@ -1611,6 +1611,7 @@ MESSAGE
     #   type-of(true)   => bool
     #   type-of(#fff)   => color
     #   type-of(blue)   => color
+    #   type-of(null)   => null
     # @overload type_of($value)
     #   @param $value [Sass::Script::Value::Base] The value to inspect
     # @return [Sass::Script::Value::String] The unquoted string name of the
@@ -2263,6 +2264,7 @@ MESSAGE
     # @example
     #   $a-false-value: false;
     #   variable-exists(a-false-value) => true
+    #   variable-exists(a-null-value) => true
     #
     #   variable-exists(nonexistent) => false
     #
@@ -2283,6 +2285,7 @@ MESSAGE
     # @example
     #   $a-false-value: false;
     #   global-variable-exists(a-false-value) => true
+    #   global-variable-exists(a-null-value) => true
     #
     #   .foo {
     #     $some-var: false;

data/lib/sass/script/lexer.rb

@@ -19,13 +19,13 @@ module Sass
       # `source_range`: \[`Sass::Source::Range`\]
       # : The range in the source file in which the token appeared.
       #
-      # `pos`: \[`Fixnum`\]
+      # `pos`: \[`Integer`\]
       # : The scanner position at which the SassScript token appeared.
       Token = Struct.new(:type, :value, :source_range, :pos)
 
       # The line number of the lexer's current position.
       #
-      # @return [Fixnum]
+      # @return [Integer]
       def line
         return @line unless @tok
         @tok.source_range.start_pos.line
@@ -34,7 +34,7 @@ module Sass
       # The number of bytes into the current line
       # of the lexer's current position (1-based).
       #
-      # @return [Fixnum]
+      # @return [Integer]
       def offset
         return @offset unless @tok
         @tok.source_range.start_pos.offset
@@ -142,9 +142,9 @@ module Sass
       }
 
       # @param str [String, StringScanner] The source text to lex
-      # @param line [Fixnum] The 1-based line on which the SassScript appears.
+      # @param line [Integer] The 1-based line on which the SassScript appears.
       #   Used for error reporting and sourcemap building
-      # @param offset [Fixnum] The 1-based character (not byte) offset in the line in the source.
+      # @param offset [Integer] The 1-based character (not byte) offset in the line in the source.
       #   Used for error reporting and sourcemap building
       # @param options [{Symbol => Object}] An options hash;
       #   see {file:SASS_REFERENCE.md#sass_options the Sass options documentation}

data/lib/sass/script/parser.rb

@@ -8,22 +8,22 @@ module Sass
     class Parser
       # The line number of the parser's current position.
       #
-      # @return [Fixnum]
+      # @return [Integer]
       def line
         @lexer.line
       end
 
       # The column number of the parser's current position.
       #
-      # @return [Fixnum]
+      # @return [Integer]
       def offset
         @lexer.offset
       end
 
       # @param str [String, StringScanner] The source text to parse
-      # @param line [Fixnum] The line on which the SassScript appears.
+      # @param line [Integer] The line on which the SassScript appears.
       #   Used for error reporting and sourcemap building
-      # @param offset [Fixnum] The character (not byte) offset where the script starts in the line.
+      # @param offset [Integer] The character (not byte) offset where the script starts in the line.
       #   Used for error reporting and sourcemap building
       # @param options [{Symbol => Object}] An options hash; see
       #   {file:SASS_REFERENCE.md#sass_options the Sass options documentation}.
@@ -471,18 +471,24 @@ RUBY
       #   `expr`).
       # @return [Boolean]
       def is_unsafe_before?(expr, char_before)
-        # If the previous expression is an identifier or number, it's safe
-        # unless it was wrapped in parentheses.
-        if expr.is_a?(Script::Tree::Literal) &&
-           (expr.value.is_a?(Script::Value::Number) ||
-            (expr.value.is_a?(Script::Value::String) && expr.value.type == :identifier))
-          return char_before == ')'
-        end
+        return char_before == ')' if is_safe_value?(expr)
 
         # Otherwise, it's only safe if it was another interpolation.
         !expr.is_a?(Script::Tree::Interpolation)
       end
 
+      # Returns whether `expr` is safe as the value immediately before an
+      # interpolation.
+      #
+      # It's safe as long as the previous expression is an identifier or number,
+      # or a list whose last element is also safe.
+      def is_safe_value?(expr)
+        return is_safe_value?(expr.elements.last) if expr.is_a?(Script::Tree::ListLiteral)
+        return false unless expr.is_a?(Script::Tree::Literal)
+        expr.value.is_a?(Script::Value::Number) ||
+          (expr.value.is_a?(Script::Value::String) && expr.value.type == :identifier)
+      end
+
       def space
         start_pos = source_position
         e = or_expr

data/lib/sass/script/tree/node.rb

@@ -10,7 +10,7 @@ module Sass::Script::Tree
 
     # The line of the document on which this node appeared.
     #
-    # @return [Fixnum]
+    # @return [Integer]
     attr_accessor :line
 
     # The source range in the document on which this node appeared.

data/lib/sass/script/value/base.rb

@@ -149,7 +149,7 @@ MSG
     # Returns the hash code of this value. Two objects' hash codes should be
     # equal if the objects are equal.
     #
-    # @return [Fixnum] The hash code.
+    # @return [Integer for Ruby 2.4.0+, Fixnum for earlier Ruby versions] The hash code.
     def hash
       value.hash
     end
@@ -176,7 +176,7 @@ MSG
       eq(other).to_bool
     end
 
-    # @return [Fixnum] The integer value of this value
+    # @return [Integer] The integer value of this value
     # @raise [Sass::SyntaxError] if this value isn't an integer
     def to_i
       raise Sass::SyntaxError.new("#{inspect} is not an integer.")

data/lib/sass/script/value/color.rb

@@ -17,8 +17,8 @@ module Sass::Script::Value
     # @private
     #
     # Convert a ruby integer to a rgba components
-    # @param color [Fixnum]
-    # @return [Array<Fixnum>] Array of 4 numbers representing r,g,b and alpha
+    # @param color [Integer]
+    # @return [Array<Integer>] Array of 4 numbers representing r,g,b and alpha
     def self.int_to_rgba(color)
       rgba = (0..3).map {|n| color >> (n << 3) & 0xff}.reverse
       rgba[-1] = rgba[-1] / 255.0
@@ -293,7 +293,7 @@ module Sass::Script::Value
 
     # The red component of the color.
     #
-    # @return [Fixnum]
+    # @return [Integer]
     def red
       hsl_to_rgb!
       @attrs[:red]
@@ -301,7 +301,7 @@ module Sass::Script::Value
 
     # The green component of the color.
     #
-    # @return [Fixnum]
+    # @return [Integer]
     def green
       hsl_to_rgb!
       @attrs[:green]
@@ -309,7 +309,7 @@ module Sass::Script::Value
 
     # The blue component of the color.
     #
-    # @return [Fixnum]
+    # @return [Integer]
     def blue
       hsl_to_rgb!
       @attrs[:blue]
@@ -342,7 +342,7 @@ module Sass::Script::Value
     # The alpha channel (opacity) of the color.
     # This is 1 unless otherwise defined.
     #
-    # @return [Fixnum]
+    # @return [Integer]
     def alpha
       @attrs[:alpha].to_f
     end
@@ -357,7 +357,7 @@ module Sass::Script::Value
 
     # Returns the red, green, and blue components of the color.
     #
-    # @return [Array<Fixnum>] A frozen three-element array of the red, green, and blue
+    # @return [Array<Integer>] A frozen three-element array of the red, green, and blue
     #   values (respectively) of the color
     def rgb
       [red, green, blue].freeze
@@ -365,7 +365,7 @@ module Sass::Script::Value
 
     # Returns the red, green, blue, and alpha components of the color.
     #
-    # @return [Array<Fixnum>] A frozen four-element array of the red, green,
+    # @return [Array<Integer>] A frozen four-element array of the red, green,
     #   blue, and alpha values (respectively) of the color
     def rgba
       [red, green, blue, alpha].freeze
@@ -373,7 +373,7 @@ module Sass::Script::Value
 
     # Returns the hue, saturation, and lightness components of the color.
     #
-    # @return [Array<Fixnum>] A frozen three-element array of the
+    # @return [Array<Integer>] A frozen three-element array of the
     #   hue, saturation, and lightness values (respectively) of the color
     def hsl
       [hue, saturation, lightness].freeze
@@ -381,7 +381,7 @@ module Sass::Script::Value
 
     # Returns the hue, saturation, lightness, and alpha components of the color.
     #
-    # @return [Array<Fixnum>] A frozen four-element array of the hue,
+    # @return [Array<Integer>] A frozen four-element array of the hue,
     #   saturation, lightness, and alpha values (respectively) of the color
     def hsla
       [hue, saturation, lightness, alpha].freeze