haml 3.1.8 → 3.2.0.alpha.2

data/vendor/sass/lib/sass/plugin/configuration.rb

@@ -31,6 +31,8 @@ module Sass
       # @return [{Symbol => Object}]
       def options
         @options ||= default_options.dup
+        @options[:cache_store] ||= Sass::CacheStores::Filesystem.new(@options[:cache_location])
+        @options
       end
 
       # Sets the options hash.

data/vendor/sass/lib/sass/railtie.rb

@@ -2,7 +2,7 @@
 if defined?(ActiveSupport) && Sass::Util.has?(:public_method, ActiveSupport, :on_load) &&
     !Sass::Util.ap_geq?('3.1.0.beta')
   require 'sass/plugin/configuration'
-  ActiveSupport.on_load(:before_configuration) do
+  ActiveSupport.on_load(:before_initialize) do
     require 'sass'
     require 'sass/plugin'
   end

data/vendor/sass/lib/sass/script/funcall.rb

@@ -57,14 +57,6 @@ module Sass
         @args + @keywords.values
       end
 
-      # @see Node#deep_copy
-      def deep_copy
-        node = dup
-        node.instance_variable_set('@args', args.map {|a| a.deep_copy})
-        node.instance_variable_set('@keywords', Hash[keywords.map {|k, v| [k, v.deep_copy]}])
-        node
-      end
-
       protected
 
       # Evaluates the function call.
@@ -88,12 +80,7 @@ module Sass
           opts(Functions::EvaluationContext.new(environment.options).send(ruby_name, *args))
         end
       rescue ArgumentError => e
-        # If this is a legitimate Ruby-raised argument error, re-raise it.
-        # Otherwise, it's an error in the user's stylesheet, so wrap it.
-        if e.message =~ /^wrong number of arguments \(\d+ for \d+\)/ &&
-            e.backtrace[0] !~ /:in `(block in )?#{ruby_name}'$/
-          raise e
-        end
+        raise e unless e.backtrace.any? {|t| t =~ /:in `(block in )?(#{name}|perform)'$/}
         raise Sass::SyntaxError.new("#{e.message} for `#{name}'")
       end
 

data/vendor/sass/lib/sass/script/functions.rb

@@ -93,7 +93,7 @@ module Sass::Script
   # \{#adjust_color adjust-color($color, \[$red\], \[$green\], \[$blue\], \[$hue\], \[$saturation\], \[$lightness\], \[$alpha\]}
   # : Increase or decrease any of the components of a color.
   #
-  # \{#scale_color scale-color($color, \[$red\], \[$green\], \[$blue\], \[$saturation\], \[$lightness\], \[$alpha\]}
+  # \{#scale_color scale-color($color, \[$red\], \[$green\], \[$blue\], \[$hue\], \[$saturation\], \[$lightness\], \[$alpha\]}
   # : Fluidly scale one or more components of a color.
   #
   # \{#change_color change-color($color, \[$red\], \[$green\], \[$blue\], \[$hue\], \[$saturation\], \[$lightness\], \[$alpha\]}
@@ -1299,49 +1299,6 @@ module Sass::Script
     declare :append, [:list, :val]
     declare :append, [:list, :val, :separator]
 
-    # Combines several lists into a single comma separated list
-    # space separated lists.
-    #
-    # The length of the resulting list is the length of the
-    # shortest list.
-    #
-    # @example
-    #   zip(1px 1px 3px, solid dashed solid, red green blue)
-    #   => 1px solid red, 1px dashed green, 3px solid blue
-    def zip(*lists)
-      length = nil
-      values = []
-      lists.each do |list|
-        assert_type list, :List
-        values << list.value.dup
-        length = length.nil? ? list.value.length : [length, list.value.length].min
-      end
-      values.each do |value|
-        value.slice!(length)
-      end
-      new_list_value = values.first.zip(*values[1..-1])
-      List.new(new_list_value.map{|list| List.new(list, :space)}, :comma)
-    end
-    declare :zip, [], :var_args => true
-
-
-    # Returns the position of the given value within the given
-    # list. If not found, returns false.
-    #
-    # @example
-    #   index(1px solid red, solid) => 2
-    #   index(1px solid red, dashed) => false
-    def index(list, value)
-      assert_type list, :List
-      index = list.value.index {|e| e.eq(value).to_bool }
-      if index
-        Number.new(index + 1)
-      else
-        Bool.new(false)
-      end
-    end
-    declare :index, [:list, :value]
-
     # Returns one of two values based on the truth value of the first argument.
     #
     # @example

data/vendor/sass/lib/sass/script/interpolation.rb

@@ -50,15 +50,6 @@ module Sass::Script
       [@before, @mid, @after].compact
     end
 
-    # @see Node#deep_copy
-    def deep_copy
-      node = dup
-      node.instance_variable_set('@before', @before.deep_copy) if @before
-      node.instance_variable_set('@mid', @mid.deep_copy)
-      node.instance_variable_set('@after', @after.deep_copy) if @after
-      node
-    end
-
     protected
 
     # Evaluates the interpolation.

data/vendor/sass/lib/sass/script/lexer.rb

@@ -231,7 +231,7 @@ module Sass
 
         variable || string(:double, false) || string(:single, false) || number ||
           color || bool || string(:uri, false) || raw(UNICODERANGE) ||
-          special_fun || special_val || ident_op || ident || op
+          special_fun || ident_op || ident || op
       end
 
       def variable
@@ -302,11 +302,6 @@ MESSAGE
           str1.size + str2.size]
       end
 
-      def special_val
-        return unless scan(/!important/i)
-        [:string, Script::String.new("!important")]
-      end
-
       def ident_op
         return unless op = scan(REGULAR_EXPRESSIONS[:ident_op])
         [OPERATORS[op]]

data/vendor/sass/lib/sass/script/list.rb

@@ -24,13 +24,6 @@ module Sass::Script
       @separator = separator
     end
 
-    # @see Node#deep_copy
-    def deep_copy
-      node = dup
-      node.instance_variable_set('@value', value.map {|c| c.deep_copy})
-      node
-    end
-
     # @see Node#eq
     def eq(other)
       Sass::Script::Bool.new(

data/vendor/sass/lib/sass/script/literal.rb

@@ -33,11 +33,6 @@ module Sass::Script
       []
     end
 
-    # @see Node#deep_copy
-    def deep_copy
-      dup
-    end
-
     # Returns the options hash for this node.
     #
     # @return [{Symbol => Object}]

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

@@ -57,14 +57,6 @@ module Sass::Script
       Sass::Util.abstract(self)
     end
 
-    # Returns a deep clone of this node.
-    # The child nodes are cloned, but options are not.
-    #
-    # @return [Node]
-    def deep_copy
-      Sass::Util.abstract(self)
-    end
-
     protected
 
     # Converts underscores to dashes if the :dasherize option is set.

data/vendor/sass/lib/sass/script/number.rb

@@ -35,34 +35,11 @@ module Sass::Script
     # @return [Boolean, nil]
     attr_accessor :original
 
-    def self.precision
-      @precision ||= 3
-    end
-
-    # Sets the number of digits of precision
-    # For example, if this is `3`,
+    # The precision with which numbers will be printed to CSS files.
+    # For example, if this is `1000.0`,
     # `3.1415926` will be printed as `3.142`.
-    def self.precision=(digits)
-      @precision = digits.round
-      @precision_factor = 10.0**@precision
-    end
-
-    # the precision factor used in numeric output
-    # it is derived from the `precision` method.
-    def self.precision_factor
-      @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
+    # @api public
+    PRECISION = 1000.0
 
     # Used so we don't allocate two new arrays for each new number.
     NO_UNITS  = []
@@ -360,7 +337,7 @@ module Sass::Script
       elsif num % 1 == 0.0
         num.to_i
       else
-        (num * self.precision_factor).round / self.precision_factor
+        (num * PRECISION).round / PRECISION
       end
     end
 

data/vendor/sass/lib/sass/script/operation.rb

@@ -55,14 +55,6 @@ module Sass::Script
       [@operand1, @operand2]
     end
 
-    # @see Node#deep_copy
-    def deep_copy
-      node = dup
-      node.instance_variable_set('@operand1', @operand1.deep_copy)
-      node.instance_variable_set('@operand2', @operand2.deep_copy)
-      node
-    end
-
     protected
 
     # Evaluates the operation.

data/vendor/sass/lib/sass/script/parser.rb

@@ -182,11 +182,7 @@ module Sass
               interp = try_ops_after_interp(#{ops.inspect}, #{name.inspect}) and return interp
               return unless e = #{sub}
               while tok = try_tok(#{ops.map {|o| o.inspect}.join(', ')})
-                if interp = try_op_before_interp(tok, e)
-                  return interp unless other_interp = try_ops_after_interp(#{ops.inspect}, #{name.inspect}, interp)
-                  return other_interp
-                end
-
+                interp = try_op_before_interp(tok, e) and return interp
                 line = @lexer.line
                 e = Operation.new(e, assert_expr(#{sub.inspect}), tok.type)
                 e.line = line
@@ -221,10 +217,7 @@ RUBY
         return unless e = interpolation
         arr = [e]
         while tok = try_tok(:comma)
-          if interp = try_op_before_interp(tok, e)
-            return interp unless other_interp = try_ops_after_interp([:comma], :expr, interp)
-            return other_interp
-          end
+          interp = try_op_before_interp(tok, e) and return interp
           arr << assert_expr(:interpolation)
         end
         arr.size == 1 ? arr.first : node(List.new(arr, :comma), line)
@@ -242,15 +235,15 @@ RUBY
         interpolation(interp)
       end
 
-      def try_ops_after_interp(ops, name, prev = nil)
+      def try_ops_after_interp(ops, name)
         return unless @lexer.after_interpolation?
         return unless op = try_tok(*ops)
-        interp = try_op_before_interp(op, prev) and return interp
+        interp = try_op_before_interp(op) and return interp
 
         wa = @lexer.whitespace?
         str = Script::String.new(Lexer::OPERATORS_REVERSE[op.type])
         str.line = @lexer.line
-        interp = Script::Interpolation.new(prev, str, assert_expr(name), !:wb, wa, :originally_text)
+        interp = Script::Interpolation.new(nil, str, assert_expr(name), !:wb, wa, :originally_text)
         interp.line = @lexer.line
         return interp
       end

data/vendor/sass/lib/sass/script/string_interpolation.rb

@@ -60,15 +60,6 @@ module Sass::Script
       [@before, @mid, @after].compact
     end
 
-    # @see Node#deep_copy
-    def deep_copy
-      node = dup
-      node.instance_variable_set('@before', @before.deep_copy) if @before
-      node.instance_variable_set('@mid', @mid.deep_copy)
-      node.instance_variable_set('@after', @after.deep_copy) if @after
-      node
-    end
-
     protected
 
     # Evaluates the interpolation.

data/vendor/sass/lib/sass/script/unary_operation.rb

@@ -38,13 +38,6 @@ module Sass::Script
       [@operand]
     end
 
-    # @see Node#deep_copy
-    def deep_copy
-      node = dup
-      node.instance_variable_set('@operand', @operand.deep_copy)
-      node
-    end
-
     protected
 
     # Evaluates the operation.

data/vendor/sass/lib/sass/script/variable.rb

@@ -34,11 +34,6 @@ module Sass
         []
       end
 
-      # @see Node#deep_copy
-      def deep_copy
-        dup
-      end
-
       protected
 
       # Evaluates the variable.

data/vendor/sass/lib/sass/scss/parser.rb

@@ -9,12 +9,10 @@ module Sass
       # @param str [String, StringScanner] The source document to parse.
       #   Note that `Parser` *won't* raise a nice error message if this isn't properly parsed;
       #   for that, you should use the higher-level {Sass::Engine} or {Sass::CSS}.
-      # @param filename [String] The name of the file being parsed. Used for warnings.
       # @param line [Fixnum] The line on which the source string appeared,
-      #   if it's part of another document.
-      def initialize(str, filename, line = 1)
+      #   if it's part of another document
+      def initialize(str, line = 1)
         @template = str
-        @filename = filename
         @line = line
         @strs = []
       end
@@ -89,28 +87,14 @@ module Sass
       end
 
       def process_comment(text, node)
-        silent = text =~ /^\/\//
-        line = @line - text.count("\n")
-        if loud = text =~ %r{^/[/*]!}
-          value = Sass::Engine.parse_interp(text, line, @scanner.pos - text.size, :filename => @filename)
-          value[0].slice!(2) # get rid of the "!"
-        else
-          value = [text]
-        end
-
-        if silent
-          value = Sass::Util.with_extracted_values(value) do |str|
-            str.sub(/^\s*\/\//, '/*').gsub(/^\s*\/\//, ' *') + ' */'
-          end
-        else
-          value.unshift(@scanner.
-            string[0...@scanner.pos].
-            reverse[/.*?\*\/(.*?)($|\Z)/, 1].
-            reverse.gsub(/[^\s]/, ' '))
-        end
-
-        comment = Sass::Tree::CommentNode.new(value, silent, loud)
-        comment.line = line
+        single_line = text =~ /^\/\//
+        pre_str = single_line ? "" : @scanner.
+          string[0...@scanner.pos].
+          reverse[/.*?\*\/(.*?)($|\Z)/, 1].
+          reverse.gsub(/[^\s]/, ' ')
+        text = text.sub(/^\s*\/\//, '/*').gsub(/^\s*\/\//, ' *') + ' */' if single_line
+        comment = Sass::Tree::CommentNode.new(pre_str + text, single_line)
+        comment.line = @line - text.count("\n")
         node << comment
       end
 
@@ -503,30 +487,21 @@ module Sass
         res = [e]
 
         # The tok(/\*/) allows the "E*" hack
-        while v = id_selector || class_selector || attrib || negation || pseudo ||
-            interpolation_selector || (tok(/\*/) && Selector::Universal.new(nil))
+        while v = element_name || id_selector || class_selector ||
+            attrib || negation || pseudo || interpolation_selector ||
+            (tok(/\*/) && Selector::Universal.new(nil))
           res << v
         end
 
-        pos = @scanner.pos
-        line = @line
-        if sel = str? {simple_selector_sequence}
-          @scanner.pos = pos
-          @line = line
-
-          if sel =~ /^&/
-            begin
-              throw_error {expected('"{"')}
-            rescue Sass::SyntaxError => e
-              e.message << "\n\n\"#{sel}\" may only be used at the beginning of a selector."
-              raise e
-            end
-          else
-            Sass::Util.sass_warn(<<MESSAGE)
-DEPRECATION WARNING:
-On line #{@line}#{" of \"#{@filename}\"" if @filename}, after "#{self.class.prior_snippet(@scanner)}"
-Starting in Sass 3.2, "#{sel}" may only be used at the beginning of a selector.
+        if tok?(/&/)
+          begin
+            expected('"{"')
+          rescue Sass::SyntaxError => e
+            e.message << "\n\n" << <<MESSAGE
+In Sass 3, the parent selector & can only be used where element names are valid,
+since it could potentially be replaced by an element name.
 MESSAGE
+            raise e
           end
         end
 
@@ -663,9 +638,11 @@ MESSAGE
         tok!(/:/)
         space, value = value!
         ss
+        important = tok(IMPORTANT)
+        ss
         require_block = tok?(/\{/)
 
-        node = node(Sass::Tree::PropNode.new(name.flatten.compact, value, :new))
+        node = node(Sass::Tree::PropNode.new(name.flatten.compact, value, !!important, :new))
 
         return node unless require_block
         nested_properties! node, space
@@ -770,7 +747,7 @@ MESSAGE
       end
 
       def interp_ident(start = IDENT)
-        return unless val = tok(start) || interpolation || tok(IDENT_HYPHEN_INTERP)
+        return unless val = tok(start) || interpolation
         res = [val]
         while val = tok(NAME) || interpolation
           res << val
@@ -790,15 +767,9 @@ MESSAGE
         @strs.pop
       end
 
-      def str?(&block)
-        pos = @scanner.pos
-        line = @line
+      def str?
         @strs.push ""
-        throw_error(&block) && @strs.last
-      rescue Sass::SyntaxError => e
-        @scanner.pos = pos
-        @line = line
-        nil
+        yield && @strs.last
       ensure
         @strs.pop
       end
@@ -877,13 +848,6 @@ MESSAGE
         raise Sass::SyntaxError.new(msg, :line => @line)
       end
 
-      def throw_error
-        old_throw_error, @throw_error = @throw_error, false
-        yield
-      ensure
-        @throw_error = old_throw_error
-      end
-
       def catch_error(&block)
         old_throw_error, @throw_error = @throw_error, true
         pos = @scanner.pos
@@ -913,6 +877,16 @@ MESSAGE
 
       # @private
       def self.expected(scanner, expected, line)
+        pos = scanner.pos
+
+        after = scanner.string[0...pos]
+        # Get rid of whitespace between pos and the last token,
+        # but only if there's a newline in there
+        after.gsub!(/\s*\n\s*$/, '')
+        # Also get rid of stuff before the last newline
+        after.gsub!(/.*\n/, '')
+        after = "..." + after[-15..-1] if after.size > 18
+
         was = scanner.rest.dup
         # Get rid of whitespace between pos and the next token,
         # but only if there's a newline in there
@@ -922,24 +896,10 @@ MESSAGE
         was = was[0...15] + "..." if was.size > 18
 
         raise Sass::SyntaxError.new(
-          "Invalid CSS after \"#{prior_snippet(scanner)}\": expected #{expected}, was \"#{was}\"",
+          "Invalid CSS after \"#{after}\": expected #{expected}, was \"#{was}\"",
           :line => line)
       end
 
-      # @private
-      def self.prior_snippet(scanner)
-        pos = scanner.pos
-
-        after = scanner.string[0...pos]
-        # Get rid of whitespace between pos and the last token,
-        # but only if there's a newline in there
-        after.gsub!(/\s*\n\s*$/, '')
-        # Also get rid of stuff before the last newline
-        after.gsub!(/.*\n/, '')
-        after = "..." + after[-15..-1] if after.size > 18
-        after
-      end
-
       # Avoid allocating lots of new strings for `#tok`.
       # This is important because `#tok` is called all the time.
       NEWLINE = "\n"