sass 3.3.0.alpha.231 → 3.3.0.alpha.243

data/README.md

@@ -56,7 +56,7 @@ to `config.ru`.
 Then any Sass files in `public/stylesheets/sass`
 will be compiled into CSS files in `public/stylesheets` on every request.
 
-To use Sass programatically,
+To use Sass programmatically,
 check out the [YARD documentation](http://sass-lang.com/docs/yardoc/).
 
 ## Formatting

data/REVISION

@@ -1 +1 @@
-4b12122cb838c1c8b2488b2c0bb3f252d261de2a
+01ca24be4a152901b7caffd7d3eeaf717dda29d4

data/VERSION

@@ -1 +1 @@
-3.3.0.alpha.231
+3.3.0.alpha.243

data/VERSION_DATE

@@ -1 +1 @@
-23 August 2013 23:13:38 GMT
+29 August 2013 23:26:16 GMT

data/lib/sass/engine.rb

@@ -874,21 +874,25 @@ WARNING
     end
 
     def parse_each(line, root, text)
-      var, list_expr = text.scan(/^([^\s]+)\s+in\s+(.+)$/).first
+      vars, list_expr = text.scan(/^([^\s]+(?:\s*,\s*[^\s]+)*)\s+in\s+(.+)$/).first
 
-      if var.nil? # scan failed, try to figure out why for error message
+      if vars.nil? # scan failed, try to figure out why for error message
         if text !~ /^[^\s]+/
           expected = "variable name"
-        elsif text !~ /^[^\s]+\s+from\s+.+/
+        elsif text !~ /^[^\s]+(?:\s*,\s*[^\s]+)*[^\s]+\s+from\s+.+/
           expected = "'in <expr>'"
         end
-        raise SyntaxError.new("Invalid for directive '@each #{text}': expected #{expected}.")
+        raise SyntaxError.new("Invalid each directive '@each #{text}': expected #{expected}.")
+      end
+
+      vars = vars.split(',').map do |var|
+        var.strip!
+        raise SyntaxError.new("Invalid variable \"#{var}\".") unless var =~ Script::VALIDATE
+        var[1..-1]
       end
-      raise SyntaxError.new("Invalid variable \"#{var}\".") unless var =~ Script::VALIDATE
 
-      var = var[1..-1]
       parsed_list = parse_script(list_expr, :offset => line.offset + line.text.index(list_expr))
-      Tree::EachNode.new(var, parsed_list)
+      Tree::EachNode.new(vars, parsed_list)
     end
 
     def parse_else(parent, line, text)

data/lib/sass/environment.rb

@@ -28,6 +28,7 @@ module Sass
     def initialize(parent = nil, options = nil)
       @parent = parent
       @options = options || (parent && parent.options) || {}
+      @stack = Sass::Stack.new if @parent.nil?
     end
 
     # The environment of the caller of this environment's mixin or function.
@@ -47,6 +48,13 @@ module Sass
       @global_env ||= parent.nil? ? self : parent.global_env
     end
 
+    # The import/mixin stack.
+    #
+    # @return [Sass::Stack]
+    def stack
+      @stack || global_env.stack
+    end
+
     private
 
     class << self

data/lib/sass/script/functions.rb

@@ -40,7 +40,7 @@ module Sass::Script
   #
   # \{#hsla hsla($hue, $saturation, $lightness, $alpha)}
   # : Creates a {Sass::Script::Value::Color Color} from hue, saturation,
-  #   lightness, lightness, and alpha values.
+  #   lightness, and alpha values.
   #
   # \{#hue hue($color)}
   # : Gets the hue component of a color.
@@ -154,6 +154,8 @@ module Sass::Script
   #
   # ## List Functions {#list-functions}
   #
+  # All list functions work for maps as well, treating them as lists of pairs.
+  #
   # \{#length length($list)}
   # : Returns the length of a list.
   #
@@ -175,6 +177,23 @@ module Sass::Script
   # \{#list_separator list-separator(#list)}
   # : Returns the separator of a list.
   #
+  # ## Map Functions {#map-functions}
+  #
+  # \{#map_get map-get($map, $key)}
+  # : Returns the value in a map associated with a given key.
+  #
+  # \{#map_merge map-merge($map1, $map2)}
+  # : Merges two maps together into a new map.
+  #
+  # \{#map_keys map-keys($map)}
+  # : Returns a list of all keys in a map.
+  #
+  # \{#map_values map-values($map)}
+  # : Returns a list of all values in a map.
+  #
+  # \{#map_has_key map-has-key($key)}
+  # : Returns whether a map has a value associated with a given key.
+  #
   # ## Introspection Functions
   #
   # \{#feature_exists feature-exists($feature)}
@@ -348,8 +367,7 @@ module Sass::Script
     class EvaluationContext
       include Functions
 
-
-      # The environment of the {Sass::Engine}
+      # The global environment.
       #
       # @return [Environment]
       attr_reader :environment
@@ -380,7 +398,9 @@ module Sass::Script
       # @param name [String, Symbol, nil] The name of the argument.
       # @raise [ArgumentError] if value is not of the correct type.
       def assert_type(value, type, name = nil)
-        return if value.is_a?(Sass::Script::Value.const_get(type))
+        klass = Sass::Script::Value.const_get(type)
+        return if value.is_a?(klass)
+        return if value.is_a?(Sass::Script::Value::List) && type == :Map && value.is_pseudo_map?
         err = "#{value.inspect} is not a #{type.to_s.downcase}"
         err = "$#{name.to_s.gsub('_', '-')}: " + err if name
         raise ArgumentError.new(err)
@@ -552,9 +572,9 @@ module Sass::Script
     end
     declare :hsl, [:hue, :saturation, :lightness]
 
-    # Creates a {Sass::Script::Value::Color Color} from hue, saturation,
-    # lightness, lightness, and alpha values. Uses the algorithm from the [CSS3
-    # spec][].
+    # Creates a {Sass::Script::Value::Color Color} from hue,
+    # saturation, lightness, and alpha values. Uses the algorithm from
+    # the [CSS3 spec][].
     #
     # [CSS3 spec]: http://www.w3.org/TR/css3-color/#hsl-color
     #
@@ -1561,9 +1581,12 @@ module Sass::Script
 
     # Return the length of a list.
     #
+    # This can return the number of pairs in a map as well.
+    #
     # @example
     #   length(10px) => 1
     #   length(10px 20px 30px) => 3
+    #   length((width: 10px, height: 20px)) => 2
     # @overload length($list)
     # @param $list [Sass::Script::Value::Base]
     # @return [Sass::Script::Value::Number]
@@ -1577,9 +1600,12 @@ module Sass::Script
     # Note that unlike some languages, the first item in a Sass list is number
     # 1, the second number 2, and so forth.
     #
+    # This can return the nth pair in a map as well.
+    #
     # @example
     #   nth(10px 20px 30px, 1) => 10px
     #   nth((Helvetica, Arial, sans-serif), 3) => sans-serif
+    #   nth((width: 10px, length: 20px), 2) => length, 20px
     # @overload nth($list, $n)
     # @param $list [Sass::Script::Value::Base]
     # @param $n [Sass::Script::Value::Number] The index of the item to get.
@@ -1627,12 +1653,10 @@ module Sass::Script
       unless %w[auto space comma].include?(separator.value)
         raise ArgumentError.new("Separator name must be space, comma, or auto")
       end
-      sep1 = list1.separator if list1.is_a?(Sass::Script::Value::List) && !list1.value.empty?
-      sep2 = list2.separator if list2.is_a?(Sass::Script::Value::List) && !list2.value.empty?
       Sass::Script::Value::List.new(
         list1.to_a + list2.to_a,
         if separator.value == 'auto'
-          sep1 || sep2 || :space
+          list1.separator || list2.separator || :space
         else
           separator.value.to_sym
         end)
@@ -1663,11 +1687,10 @@ module Sass::Script
       unless %w[auto space comma].include?(separator.value)
         raise ArgumentError.new("Separator name must be space, comma, or auto")
       end
-      sep = list.separator if list.is_a?(Sass::Script::Value::List)
       Sass::Script::Value::List.new(
         list.to_a + [val],
         if separator.value == 'auto'
-          sep || :space
+          list.separator || :space
         else
           separator.value.to_sym
         end)
@@ -1711,9 +1734,12 @@ module Sass::Script
     # Note that unlike some languages, the first item in a Sass list is number
     # 1, the second number 2, and so forth.
     #
+    # This can return the position of a pair in a map as well.
+    #
     # @example
     #   index(1px solid red, solid) => 2
     #   index(1px solid red, dashed) => false
+    #   index((width: 10px, height: 20px), (height, 20px)) => 2
     # @overload index($list, $value)
     # @param $list [Sass::Script::Value::Base]
     # @param $value [Sass::Script::Value::Base]
@@ -1740,14 +1766,99 @@ module Sass::Script
     # @param $list [Sass::Script::Value::Base]
     # @return [Sass::Script::Value::String] `comma` or `space`
     def list_separator(list)
-      if list.is_a?(Sass::Script::Value::List)
-        Sass::Script::Value::String.new(list.separator.to_s)
-      else
-        Sass::Script::Value::String.new('space')
-      end
+      Sass::Script::Value::String.new((list.separator || :space).to_s)
     end
     declare :separator, [:list]
 
+    # Returns the value in a map associated with the given key. If the map
+    # doesn't have such a key, returns `null`.
+    #
+    # @example
+    #   map-get(("foo": 1, "bar": 2), "foo") => 1
+    #   map-get(("foo": 1, "bar": 2), "bar") => 2
+    #   map-get(("foo": 1, "bar": 2), "baz") => null
+    # @overload map_get($map, $key)
+    # @param $map [Sass::Script::Value::Map]
+    # @param $key [Sass::Script::Value::Base]
+    # @return [Sass::Script::Value::Base] The value indexed by `$key`, or `null`
+    #   if the map doesn't contain the given key
+    # @raise [ArgumentError] if `$map` is not a map
+    def map_get(map, key)
+      assert_type map, :Map
+      to_h(map)[key] || Sass::Script::Value::Null.new
+    end
+    declare :map_get, [:map, :key]
+
+    # Merges two maps together into a new map. Keys in `$map2` will take
+    # precedence over keys in `$map1`.
+    #
+    # This is the best way to add new values to a map.
+    #
+    # All keys in the returned map that also appear in `$map1` will have the
+    # same order as in `$map1`. New keys from `$map2` will be placed at the end
+    # of the map.
+    #
+    # @example
+    #   map-merge(("foo": 1), ("bar": 2)) => ("foo": 1, "bar": 2)
+    #   map-merge(("foo": 1, "bar": 2), ("bar": 3)) => ("foo": 1, "bar": 3)
+    # @overload map_merge($map1, $map2)
+    # @param $map1 [Sass::Script::Value::Map]
+    # @param $map2 [Sass::Script::Value::Map]
+    # @return [Sass::Script::Value::Map]
+    # @raise [ArgumentError] if either parameter is not a map
+    def map_merge(map1, map2)
+      assert_type map1, :Map
+      assert_type map2, :Map
+      Sass::Script::Value::Map.new(to_h(map1).merge(to_h(map2)))
+    end
+    declare :map_get, [:map1, :map2]
+
+    # Returns a list of all keys in a map.
+    #
+    # @example
+    #   map-keys(("foo": 1, "bar": 2)) => "foo", "bar"
+    # @overload map_keys($map)
+    # @param $map [Map]
+    # @return [List] the list of keys, comma-separated
+    # @raise [ArgumentError] if `$map` is not a map
+    def map_keys(map)
+      assert_type map, :Map
+      Sass::Script::Value::List.new(to_h(map).keys, :comma)
+    end
+    declare :map_keys, [:map]
+
+    # Returns a list of all values in a map. This list may include duplicate
+    # values, if multiple keys have the same value.
+    #
+    # @example
+    #   map-keys(("foo": 1, "bar": 2)) => 1, 2
+    #   map-keys(("foo": 1, "bar": 2, "baz": 1)) => 1, 2, 1
+    # @overload map_values($map)
+    # @param $map [Map]
+    # @return [List] the list of values, comma-separated
+    # @raise [ArgumentError] if `$map` is not a map
+    def map_values(map)
+      assert_type map, :Map
+      Sass::Script::Value::List.new(to_h(map).values, :comma)
+    end
+    declare :map_values, [:map]
+
+    # Returns whether a map has a value associated with a given key.
+    #
+    # @example
+    #   map-has-key(("foo": 1, "bar": 2), "foo") => true
+    #   map-has-key(("foo": 1, "bar": 2), "baz") => false
+    # @overload map_has_key($map, $key)
+    # @param $map [Sass::Script::Value::Map]
+    # @param $key [Sass::Script::Value::Base]
+    # @return [Sass::Script::Value::Bool]
+    # @raise [ArgumentError] if `$map` is not a map
+    def map_has_key(map, key)
+      assert_type map, :Map
+      Sass::Script::Value::Bool.new(to_h(map).has_key?(key))
+    end
+    declare :map_has_key, [:map, :key]
+
     # Returns one of two values, depending on whether or not `$condition` is
     # true. Just like in `@if`, all values other than `false` and `null` are
     # considered to be true.
@@ -1847,5 +1958,17 @@ module Sass::Script
       color.with(attr => Sass::Util.restrict(
           color.send(attr).send(op, amount.value), range))
     end
+
+    def to_h(obj)
+      return obj.to_h unless obj.is_a?(Sass::Script::Value::List) && obj.needs_map_warning?
+
+      fn_name = Sass::Util.caller_info.last.gsub('_', '-')
+      Sass::Util.sass_warn <<WARNING + environment.stack.to_s.gsub(/^/, '        ')
+DEPRECATION WARNING: Passing lists of pairs to #{fn_name} is deprecated and will
+be removed in future versions of Sass. Use Sass maps instead. For details, see
+http://sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#maps.
+WARNING
+      return obj.to_h
+    end
   end
 end

data/lib/sass/script/parser.rb

@@ -253,11 +253,34 @@ RUBY
       # @private
       def lexer_class; Lexer; end
 
+      def map
+        start_pos = source_position
+        return unless e = interpolation
+        return list e, start_pos unless @lexer.peek && @lexer.peek.type == :colon
+
+        key, value = map_pair(e)
+        map = node(Sass::Script::Tree::MapLiteral.new([[key, value]]), start_pos)
+        while tok = try_tok(:comma)
+          key, value = assert_expr(:map_pair)
+          map.pairs << [key, value]
+        end
+        map
+      end
+
+      def map_pair(key=nil)
+        return unless key ||= interpolation
+        assert_tok :colon
+        return key, assert_expr(:interpolation)
+      end
+
       def expr
-        interp = try_ops_after_interp([:comma], :expr) and return interp
         start_pos = source_position
         return unless e = interpolation
-        list = node(Sass::Script::Tree::ListLiteral.new([e], :comma), start_pos)
+        list e, start_pos
+      end
+
+      def list(first, start_pos)
+        list = node(Sass::Script::Tree::ListLiteral.new([first], :comma), start_pos)
         while tok = try_tok(:comma)
           if interp = try_op_before_interp(tok, list)
             return interp unless other_interp = try_ops_after_interp([:comma], :expr, interp)
@@ -447,10 +470,10 @@ RUBY
         was_in_parens = @in_parens
         @in_parens = true
         start_pos = source_position
-        e = expr
+        e = map
         end_pos = source_position
         assert_tok(:rparen)
-        return e || node(Sass::Script::Tree::ListLiteral.new([], :space), start_pos, end_pos)
+        return e || node(Sass::Script::Tree::ListLiteral.new([], nil), start_pos, end_pos)
       ensure
         @in_parens = was_in_parens
       end
@@ -502,7 +525,7 @@ RUBY
       end
 
       def try_tok(*names)
-        peeked =  @lexer.peek
+        peeked = @lexer.peek
         peeked && names.include?(peeked.type) && @lexer.next
       end
 

data/lib/sass/script/tree.rb

@@ -12,3 +12,4 @@ require 'sass/script/tree/interpolation'
 require 'sass/script/tree/string_interpolation'
 require 'sass/script/tree/literal'
 require 'sass/script/tree/list_literal'
+require 'sass/script/tree/map_literal'

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

@@ -0,0 +1,64 @@
+module Sass::Script::Tree
+  # A class representing a map literal. When resolved, this returns a
+  # {Sass::Script::Node::Map}.
+  class MapLiteral < Node
+    # The key/value pairs that make up this map node. This isn't a Hash so that
+    # we can detect key collisions once all the keys have been performed.
+    #
+    # @return [Array<(Node, Node)>]
+    attr_reader :pairs
+
+    # Creates a new map literal.
+    #
+    # @param pairs [Array<(Node, Node)>] See \{#pairs}
+    def initialize(pairs)
+      @pairs = pairs
+    end
+
+    # @see Node#children
+    def children
+      @pairs.flatten
+    end
+
+    # @see Node#to_sass
+    def to_sass(opts = {})
+      return "()" if pairs.empty?
+
+      to_sass = lambda do |value|
+        if value.is_a?(ListLiteral) && value.separator == :comma
+          "(#{value.to_sass(opts)})"
+        else
+          value.to_sass(opts)
+        end
+      end
+
+      "(" + pairs.map {|(k, v)| "#{to_sass[k]}: #{to_sass[v]}"}.join(', ') + ")"
+    end
+    alias_method :inspect, :to_sass
+
+    # @see Node#deep_copy
+    def deep_copy
+      node = dup
+      node.instance_variable_set('@pairs',
+        pairs.map {|(k, v)| [k.deep_copy, v.deep_copy]})
+      node
+    end
+
+    protected
+
+    # @see Node#_perform
+    def _perform(environment)
+      keys = Set.new
+      map = Sass::Script::Value::Map.new(Sass::Util.to_hash(pairs.map do |(k, v)|
+        k, v = k.perform(environment), v.perform(environment)
+        if keys.include?(k)
+          raise Sass::SyntaxError.new("Duplicate key #{k.inspect} in map #{to_sass}.")
+        end
+        keys << k
+        [k, v]
+      end))
+      map.options = self.options
+      map
+    end
+  end
+end