sass 3.2.7 → 3.3.0.rc.1

data/lib/sass/script/{number.rb → value/number.rb}

@@ -1,6 +1,4 @@
-require 'sass/script/literal'
-
-module Sass::Script
+module Sass::Script::Value
   # A SassScript object representing a number.
   # SassScript numbers can have decimal values,
   # and can also have units.
@@ -9,7 +7,7 @@ module Sass::Script
   #
   # Numbers can also have more complex units, such as `1px*em/in`.
   # These cannot be inputted directly in Sass code at the moment.
-  class Number < Literal
+  class Number < Base
     # The Ruby value of the number.
     #
     # @return [Numeric]
@@ -17,7 +15,7 @@ module Sass::Script
 
     # A list of units in the numerator of the number.
     # For example, `1px*em/in*cm` would return `["px", "em"]`
-    # @return [Array<String>] 
+    # @return [Array<String>]
     attr_reader :numerator_units
 
     # A list of units in the denominator of the number.
@@ -53,24 +51,15 @@ module Sass::Script
       @precision_factor ||= 10.0**precision
     end
 
-    # Handles the deprecation warning for the PRECISION constant
-    # This can be removed in 3.2.
-    def self.const_missing(const)
-      if const == :PRECISION
-        Sass::Util.sass_warn("Sass::Script::Number::PRECISION is deprecated and will be removed in a future release. Use Sass::Script::Number.precision_factor instead.")
-        const_set(:PRECISION, self.precision_factor)
-      else
-        super
-      end
-    end
-
     # Used so we don't allocate two new arrays for each new number.
     NO_UNITS  = []
 
     # @param value [Numeric] The value of the number
-    # @param numerator_units [Array<String>] See \{#numerator\_units}
-    # @param denominator_units [Array<String>] See \{#denominator\_units}
+    # @param numerator_units [::String, Array<::String>] See \{#numerator\_units}
+    # @param denominator_units [::String, Array<::String>] See \{#denominator\_units}
     def initialize(value, numerator_units = NO_UNITS, denominator_units = NO_UNITS)
+      numerator_units = [numerator_units] if numerator_units.is_a?(::String)
+      denominator_units = [denominator_units] if denominator_units.is_a?(::String)
       super(value)
       @numerator_units = numerator_units
       @denominator_units = denominator_units
@@ -86,11 +75,11 @@ module Sass::Script
     # {Color}
     # : Adds this number to each of the RGB color channels.
     #
-    # {Literal}
-    # : See {Literal#plus}.
+    # {Value}
+    # : See {Value::Base#plus}.
     #
-    # @param other [Literal] The right-hand side of the operator
-    # @return [Literal] The result of the operation
+    # @param other [Value] The right-hand side of the operator
+    # @return [Value] The result of the operation
     # @raise [Sass::UnitConversionError] if `other` is a number with incompatible units
     def plus(other)
       if other.is_a? Number
@@ -108,11 +97,11 @@ module Sass::Script
     # {Number}
     # : Subtracts this number from the other, converting units if possible.
     #
-    # {Literal}
-    # : See {Literal#minus}.
+    # {Value}
+    # : See {Value::Base#minus}.
     #
-    # @param other [Literal] The right-hand side of the operator
-    # @return [Literal] The result of the operation
+    # @param other [Value] The right-hand side of the operator
+    # @return [Value] The result of the operation
     # @raise [Sass::UnitConversionError] if `other` is a number with incompatible units
     def minus(other)
       if other.is_a? Number
@@ -164,16 +153,16 @@ module Sass::Script
     # {Number}
     # : Divides this number by the other, converting units appropriately.
     #
-    # {Literal}
-    # : See {Literal#div}.
+    # {Value}
+    # : See {Value::Base#div}.
     #
-    # @param other [Literal] The right-hand side of the operator
-    # @return [Literal] The result of the operation
+    # @param other [Value] The right-hand side of the operator
+    # @return [Value] The result of the operation
     def div(other)
       if other.is_a? Number
         res = operate(other, :/)
-        if self.original && other.original
-          res.original = "#{self.original}/#{other.original}"
+        if original && other.original
+          res.original = "#{original}/#{other.original}"
         end
         res
       else
@@ -190,7 +179,8 @@ module Sass::Script
     def mod(other)
       if other.is_a?(Number)
         unless other.unitless?
-          raise Sass::UnitConversionError.new("Cannot modulo by a number with units: #{other.inspect}.")
+          raise Sass::UnitConversionError.new(
+            "Cannot modulo by a number with units: #{other.inspect}.")
         end
         operate(other, :%)
       else
@@ -200,10 +190,10 @@ module Sass::Script
 
     # The SassScript `==` operation.
     #
-    # @param other [Literal] The right-hand side of the operator
+    # @param other [Value] The right-hand side of the operator
     # @return [Boolean] Whether this number is equal to the other object
     def eq(other)
-      return Sass::Script::Bool.new(false) unless other.is_a?(Sass::Script::Number)
+      return Bool::FALSE unless other.is_a?(Sass::Script::Value::Number)
       this = self
       begin
         if unitless?
@@ -212,10 +202,21 @@ module Sass::Script
           other = other.coerce(@numerator_units, @denominator_units)
         end
       rescue Sass::UnitConversionError
-        return Sass::Script::Bool.new(false)
+        return Bool::FALSE
       end
+      Bool.new(this.value == other.value)
+    end
+
+    def hash
+      [value, numerator_units, denominator_units].hash
+    end
 
-      Sass::Script::Bool.new(this.value == other.value)
+    # Hash-equality works differently than `==` equality for numbers.
+    # Hash-equality must be transitive, so it just compares the exact value,
+    # numerator units, and denominator units.
+    def eql?(other)
+      value == other.value && numerator_units == other.numerator_units &&
+        denominator_units == other.denominator_units
     end
 
     # The SassScript `>` operation.
@@ -283,7 +284,7 @@ module Sass::Script
     # @raise [Sass::SyntaxError] if the number isn't an integer
     def to_i
       super unless int?
-      return value
+      value
     end
 
     # @return [Boolean] Whether or not this number is an integer.
@@ -296,6 +297,24 @@ module Sass::Script
       @numerator_units.empty? && @denominator_units.empty?
     end
 
+    # Checks whether the number has the numerator unit specified.
+    #
+    # @example
+    #   number = Sass::Script::Value::Number.new(10, "px")
+    #   number.is_unit?("px") => true
+    #   number.is_unit?(nil) => false
+    #
+    # @param unit [::String, nil] The unit the number should have or nil if the number
+    #   should be unitless.
+    # @see Number#unitless? The unitless? method may be more readable.
+    def is_unit?(unit)
+      if unit
+        denominator_units.size == 0 && numerator_units.size == 1 && numerator_units.first == unit
+      else
+        unitless?
+      end
+    end
+
     # @return [Boolean] Whether or not this number has units that can be represented in CSS
     #   (that is, zero or one \{#numerator\_units}).
     def legal_units?
@@ -320,9 +339,9 @@ module Sass::Script
     #   current units
     def coerce(num_units, den_units)
       Number.new(if unitless?
-                   self.value
+                   value
                  else
-                   self.value * coercion_factor(@numerator_units, num_units) /
+                   value * coercion_factor(@numerator_units, num_units) /
                      coercion_factor(@denominator_units, den_units)
                  end, num_units, den_units)
     end
@@ -330,12 +349,10 @@ module Sass::Script
     # @param other [Number] A number to decide if it can be compared with this number.
     # @return [Boolean] Whether or not this number can be compared with the other.
     def comparable_to?(other)
-      begin
-        operate(other, :+)
-        true
-      rescue Sass::UnitConversionError
-        false
-      end
+      operate(other, :+)
+      true
+    rescue Sass::UnitConversionError
+      false
     end
 
     # Returns a human readable representation of the units in this number.
@@ -360,7 +377,7 @@ module Sass::Script
       elsif num % 1 == 0.0
         num.to_i
       else
-        ((num * self.precision_factor).round / self.precision_factor).to_f
+        ((num * precision_factor).round / precision_factor).to_f
       end
     end
 
@@ -376,7 +393,7 @@ module Sass::Script
         end
       end
       # avoid integer division
-      value = (:/ == operation) ? this.value.to_f : this.value
+      value = :/ == operation ? this.value.to_f : this.value
       result = value.send(operation, other.value)
 
       if result.is_a?(Numeric)
@@ -391,29 +408,33 @@ module Sass::Script
       from_units, to_units = sans_common_units(from_units, to_units)
 
       if from_units.size != to_units.size || !convertable?(from_units | to_units)
-        raise Sass::UnitConversionError.new("Incompatible units: '#{from_units.join('*')}' and '#{to_units.join('*')}'.")
+        raise Sass::UnitConversionError.new(
+          "Incompatible units: '#{from_units.join('*')}' and '#{to_units.join('*')}'.")
       end
 
-      from_units.zip(to_units).inject(1) {|m,p| m * conversion_factor(p[0], p[1]) }
+      from_units.zip(to_units).inject(1) {|m, p| m * conversion_factor(p[0], p[1])}
     end
 
     def compute_units(this, other, operation)
       case operation
       when :*
-        [this.numerator_units + other.numerator_units, this.denominator_units + other.denominator_units]
+        [this.numerator_units + other.numerator_units,
+         this.denominator_units + other.denominator_units]
       when :/
-        [this.numerator_units + other.denominator_units, this.denominator_units + other.numerator_units]
-      else  
+        [this.numerator_units + other.denominator_units,
+         this.denominator_units + other.numerator_units]
+      else
         [this.numerator_units, this.denominator_units]
       end
     end
 
     def normalize!
       return if unitless?
-      @numerator_units, @denominator_units = sans_common_units(@numerator_units, @denominator_units)
+      @numerator_units, @denominator_units =
+        sans_common_units(@numerator_units, @denominator_units)
 
       @denominator_units.each_with_index do |d, i|
-        if convertable?(d) && (u = @numerator_units.detect(&method(:convertable?)))
+        if convertable?(d) && (u = @numerator_units.find(&method(:convertable?)))
           @value /= conversion_factor(d, u)
           @denominator_units.delete_at(i)
           @numerator_units.delete_at(@numerator_units.index(u))
@@ -422,13 +443,15 @@ module Sass::Script
     end
 
     # A hash of unit names to their index in the conversion table
-    CONVERTABLE_UNITS = {"in" => 0,        "cm" => 1,    "pc" => 2,    "mm" => 3,   "pt" => 4,  "px" => 5    }
-    CONVERSION_TABLE = [[ 1,                2.54,         6,            25.4,        72        , 96          ], # in
-                        [ nil,              1,            2.36220473,   10,          28.3464567, 37.795275591], # cm
-                        [ nil,              nil,          1,            4.23333333,  12        , 16          ], # pc
-                        [ nil,              nil,          nil,          1,           2.83464567, 3.7795275591], # mm
-                        [ nil,              nil,          nil,          nil,         1         , 1.3333333333], # pt
-                        [ nil,              nil,          nil,          nil,         nil       , 1           ]] # px
+    CONVERTABLE_UNITS = %w(in cm pc mm pt px).inject({}) {|m, v| m[v] = m.size; m}
+
+    #                    in   cm    pc          mm          pt          px
+    CONVERSION_TABLE = [[1,   2.54, 6,          25.4,       72        , 96],           # in
+                        [nil, 1,    2.36220473, 10,         28.3464567, 37.795275591], # cm
+                        [nil, nil,  1,          4.23333333, 12        , 16],           # pc
+                        [nil, nil,  nil,        1,          2.83464567, 3.7795275591], # mm
+                        [nil, nil,  nil,        nil,        1         , 1.3333333333], # pt
+                        [nil, nil,  nil,        nil,        nil       , 1]]            # px
 
     def conversion_factor(from_unit, to_unit)
       res = CONVERSION_TABLE[CONVERTABLE_UNITS[from_unit]][CONVERTABLE_UNITS[to_unit]]
@@ -443,11 +466,14 @@ module Sass::Script
     def sans_common_units(units1, units2)
       units2 = units2.dup
       # Can't just use -, because we want px*px to coerce properly to px*mm
-      return units1.map do |u|
-        next u unless j = units2.index(u)
+      units1 = units1.map do |u|
+        j = units2.index(u)
+        next u unless j
         units2.delete_at(j)
         nil
-      end.compact, units2
+      end
+      units1.compact!
+      return units1, units2
     end
   end
 end

data/lib/sass/script/{string.rb → value/string.rb}

@@ -1,8 +1,6 @@
-require 'sass/script/literal'
-
-module Sass::Script
+module Sass::Script::Value
   # A SassScript object representing a CSS string *or* a CSS identifier.
-  class String < Literal
+  class String < Base
     # The Ruby value of the string.
     #
     # @return [String]
@@ -24,26 +22,26 @@ module Sass::Script
       @type = type
     end
 
-    # @see Literal#plus
+    # @see Value#plus
     def plus(other)
-      other_str = other.is_a?(Sass::Script::String) ? other.value : other.to_s
-      Sass::Script::String.new(self.value + other_str, self.type)
+      other_str = other.is_a?(Sass::Script::Value::String) ? other.value : other.to_s
+      Sass::Script::Value::String.new(value + other_str, type)
     end
 
-    # @see Node#to_s
+    # @see Value#to_s
     def to_s(opts = {})
       if @type == :identifier
-        return @value.gsub(/\s+/, " ")
+        return @value.gsub(/\n\s*/, " ")
       end
 
       return "\"#{value.gsub('"', "\\\"")}\"" if opts[:quote] == %q{"}
       return "'#{value.gsub("'", "\\'")}'" if opts[:quote] == %q{'}
       return "\"#{value}\"" unless value.include?('"')
       return "'#{value}'" unless value.include?("'")
-      "\"#{value.gsub('"', "\\\"")}\"" #'
+      "\"#{value.gsub('"', "\\\"")}\"" # '
     end
 
-    # @see Node#to_sass
+    # @see Value#to_sass
     def to_sass(opts = {})
       to_s
     end

data/lib/sass/script/value.rb

@@ -0,0 +1,11 @@
+module Sass::Script::Value; end
+
+require 'sass/script/value/base'
+require 'sass/script/value/string'
+require 'sass/script/value/number'
+require 'sass/script/value/color'
+require 'sass/script/value/bool'
+require 'sass/script/value/null'
+require 'sass/script/value/list'
+require 'sass/script/value/arg_list'
+require 'sass/script/value/map'

data/lib/sass/script.rb

@@ -1,9 +1,4 @@
-require 'sass/script/node'
-require 'sass/script/variable'
-require 'sass/script/funcall'
-require 'sass/script/operation'
-require 'sass/script/literal'
-require 'sass/script/parser'
+require 'sass/scss/rx'
 
 module Sass
   # SassScript is code that's embedded in Sass documents
@@ -12,7 +7,8 @@ module Sass
   # This module contains code that handles the parsing and evaluation of SassScript.
   module Script
     # The regular expression used to parse variables.
-    MATCH = /^\$(#{Sass::SCSS::RX::IDENT})\s*:\s*(.+?)(!(?i:default))?$/
+    MATCH = /^\$(#{Sass::SCSS::RX::IDENT})\s*:\s*(.+?)
+      (!#{Sass::SCSS::RX::IDENT}(?:\s+!#{Sass::SCSS::RX::IDENT})*)?$/x
 
     # The regular expression used to validate variables without matching.
     VALIDATE = /^\$#{Sass::SCSS::RX::IDENT}$/
@@ -26,7 +22,7 @@ module Sass
     #   Used for error reporting
     # @param options [{Symbol => Object}] An options hash;
     #   see {file:SASS_REFERENCE.md#sass_options the Sass options documentation}
-    # @return [Script::Node] The root node of the parse tree
+    # @return [Script::Tree::Node] The root node of the parse tree
     def self.parse(value, line, offset, options = {})
       Parser.parse(value, line, offset, options)
     rescue Sass::SyntaxError => e
@@ -35,5 +31,36 @@ module Sass
       raise e
     end
 
+    require 'sass/script/functions'
+    require 'sass/script/parser'
+    require 'sass/script/tree'
+    require 'sass/script/value'
+
+    # @private
+    CONST_RENAMES = {
+      :Literal => Sass::Script::Value::Base,
+      :ArgList => Sass::Script::Value::ArgList,
+      :Bool => Sass::Script::Value::Bool,
+      :Color => Sass::Script::Value::Color,
+      :List => Sass::Script::Value::List,
+      :Null => Sass::Script::Value::Null,
+      :Number => Sass::Script::Value::Number,
+      :String => Sass::Script::Value::String,
+      :Node => Sass::Script::Tree::Node,
+      :Funcall => Sass::Script::Tree::Funcall,
+      :Interpolation => Sass::Script::Tree::Interpolation,
+      :Operation => Sass::Script::Tree::Operation,
+      :StringInterpolation => Sass::Script::Tree::StringInterpolation,
+      :UnaryOperation => Sass::Script::Tree::UnaryOperation,
+      :Variable => Sass::Script::Tree::Variable,
+    }
+
+    # @private
+    def self.const_missing(name)
+      klass = CONST_RENAMES[name]
+      super unless klass
+      CONST_RENAMES.each {|n, k| const_set(n, k)}
+      klass
+    end
   end
 end

data/lib/sass/scss/css_parser.rb

@@ -7,6 +7,7 @@ module Sass
     # parent references, nested selectors, and so forth.
     # It does support all the same CSS hacks as the SCSS parser, though.
     class CssParser < StaticParser
+
       private
 
       def placeholder_selector; nil; end
@@ -26,7 +27,7 @@ module Sass
       end
 
       def nested_properties!(node, space)
-        expected('expression (e.g. 1px, bold)');
+        expected('expression (e.g. 1px, bold)')
       end
 
       @sass_script_parser = Class.new(Sass::Script::CssParser)