haml 3.1.0 → 3.1.1

data/vendor/sass/lib/sass.rb

@@ -67,9 +67,6 @@ end
 
 require 'sass/util'
 
-dir = Sass::Util.scope("vendor/fssm/lib")
-$LOAD_PATH.unshift dir unless $LOAD_PATH.include?(dir)
-
 require 'sass/engine'
 require 'sass/plugin' if defined?(Merb::Plugins)
 require 'sass/railtie'

data/vendor/sass/lib/sass/cache_stores.rb

@@ -12,3 +12,4 @@ end
 require 'sass/cache_stores/base'
 require 'sass/cache_stores/filesystem'
 require 'sass/cache_stores/memory'
+require 'sass/cache_stores/chain'

data/vendor/sass/lib/sass/cache_stores/base.rb

@@ -48,7 +48,7 @@ module Sass
       # @param sha [String] The checksum for the contents that are being stored.
       # @param obj [Object] The object to cache.
       def store(key, sha, root)
-        _store(key, Sass::VERSION, sha, Sass::Util.dump(root))
+        _store(key, Sass::VERSION, sha, Marshal.dump(root))
       end
 
       # Retrieve a {Sass::Tree::RootNode}.
@@ -58,7 +58,7 @@ module Sass
       # @return [Object] The cached object.
       def retrieve(key, sha)
         contents = _retrieve(key, Sass::VERSION, sha)
-        Sass::Util.load(contents) if contents
+        Marshal.load(contents) if contents
       rescue EOFError, TypeError, ArgumentError => e
         Sass::Util.sass_warn "Warning. Error encountered while reading cache #{path_to(key)}: #{e}"
       end

data/vendor/sass/lib/sass/cache_stores/chain.rb

@@ -0,0 +1,33 @@
+module Sass
+  module CacheStores
+    # A meta-cache that chains multiple caches together.
+    # Specifically:
+    #
+    # * All `#store`s are passed to all caches.
+    # * `#retrieve`s are passed to each cache until one has a hit.
+    # * When one cache has a hit, the value is `#store`d in all earlier caches.
+    class Chain < Base
+      # Create a new cache chaining the given caches.
+      #
+      # @param caches [Array<Sass::CacheStores::Base>] The caches to chain.
+      def initialize(*caches)
+        @caches = caches
+      end
+
+      # @see Base#store
+      def store(key, sha, obj)
+        @caches.each {|c| c.store(key, sha, obj)}
+      end
+
+      # @see Base#retrieve
+      def retrieve(key, sha)
+        @caches.each_with_index do |c, i|
+          next unless obj = c.retrieve(key, sha)
+          @caches[0...i].each {|c| c.store(key, sha, obj)}
+          return obj
+        end
+        nil
+      end
+    end
+  end
+end

data/vendor/sass/lib/sass/cache_stores/filesystem.rb

@@ -29,17 +29,19 @@ module Sass
 
       # @see Base#\_store
       def _store(key, version, sha, contents)
-        return unless File.writable?(File.dirname(@cache_location))
-        return if File.exists?(@cache_location) && !File.writable?(@cache_location)
+        # return unless File.writable?(File.dirname(@cache_location))
+        # return if File.exists?(@cache_location) && !File.writable?(@cache_location)
         compiled_filename = path_to(key)
-        return if File.exists?(File.dirname(compiled_filename)) && !File.writable?(File.dirname(compiled_filename))
-        return if File.exists?(compiled_filename) && !File.writable?(compiled_filename)
+        # return if File.exists?(File.dirname(compiled_filename)) && !File.writable?(File.dirname(compiled_filename))
+        # return if File.exists?(compiled_filename) && !File.writable?(compiled_filename)
         FileUtils.mkdir_p(File.dirname(compiled_filename))
         File.open(compiled_filename, "wb") do |f|
           f.puts(version)
           f.puts(sha)
           f.write(contents)
         end
+      rescue Errno::EACCES
+        #pass
       end
 
       private

data/vendor/sass/lib/sass/cache_stores/memory.rb

@@ -24,22 +24,18 @@ module Sass
         @contents = {}
       end
 
-      # @see Base#_retrieve
-      def _retrieve(key, version, sha)
+      # @see Base#retrieve
+      def retrieve(key, sha)
         if @contents.has_key?(key)
-          return unless @contents[key][:version] == version
           return unless @contents[key][:sha] == sha
-          return @contents[key][:contents]
+          obj = @contents[key][:obj]
+          obj.respond_to?(:deep_copy) ? obj.deep_copy : obj.dup
         end
       end
-      
-      # @see Base#_store
-      def _store(key, version, sha, contents)
-        @contents[key] = {
-          :version => version,
-          :sha => sha,
-          :contents => contents
-        }
+
+      # @see Base#store
+      def store(key, sha, obj)
+        @contents[key] = {:sha => sha, :obj => obj}
       end
       
       # Destructively clear the cache.

data/vendor/sass/lib/sass/engine.rb

@@ -12,6 +12,8 @@ require 'sass/tree/media_node'
 require 'sass/tree/variable_node'
 require 'sass/tree/mixin_def_node'
 require 'sass/tree/mixin_node'
+require 'sass/tree/function_node'
+require 'sass/tree/return_node'
 require 'sass/tree/extend_node'
 require 'sass/tree/if_node'
 require 'sass/tree/while_node'
@@ -21,6 +23,12 @@ require 'sass/tree/debug_node'
 require 'sass/tree/warn_node'
 require 'sass/tree/import_node'
 require 'sass/tree/charset_node'
+require 'sass/tree/visitors/base'
+require 'sass/tree/visitors/perform'
+require 'sass/tree/visitors/cssize'
+require 'sass/tree/visitors/convert'
+require 'sass/tree/visitors/to_css'
+require 'sass/tree/visitors/check_nesting'
 require 'sass/selector'
 require 'sass/environment'
 require 'sass/script'
@@ -31,24 +39,24 @@ require 'sass/shared'
 
 module Sass
 
-  # A Sass mixin.
+  # A Sass mixin or function.
   #
   # `name`: `String`
-  # : The name of the mixin.
+  # : The name of the mixin/function.
   #
   # `args`: `Array<(String, Script::Node)>`
-  # : The arguments for the mixin.
+  # : The arguments for the mixin/function.
   #   Each element is a tuple containing the name of the argument
   #   and the parse tree for the default value of the argument.
   #
   # `environment`: {Sass::Environment}
-  # : The environment in which the mixin was defined.
-  #   This is captured so that the mixin can have access
+  # : The environment in which the mixin/function was defined.
+  #   This is captured so that the mixin/function can have access
   #   to local variables defined in its scope.
   #
-  # `tree`: {Sass::Tree::Node}
-  # : The parse tree for the mixin.
-  Mixin = Struct.new(:name, :args, :environment, :tree)
+  # `tree`: `Array<Tree::Node>`
+  # : The parse tree for the mixin/function.
+  Callable = Struct.new(:name, :args, :environment, :tree)
 
   # This class handles the parsing and compilation of the Sass template.
   # Example usage:
@@ -89,10 +97,6 @@ module Sass
     # The character that begins a CSS property.
     PROPERTY_CHAR  = ?:
 
-    # The character that designates that
-    # a property should be assigned to a SassScript expression.
-    SCRIPT_CHAR     = ?=
-
     # The character that designates the beginning of a comment,
     # either Sass or CSS.
     COMMENT_CHAR = ?/
@@ -117,16 +121,9 @@ module Sass
     # Includes named mixin declared using MIXIN_DEFINITION_CHAR
     MIXIN_INCLUDE_CHAR    = ?+
 
-    # The regex that matches properties of the form `name: prop`.
-    PROPERTY_NEW_MATCHER = /^[^\s:"\[]+\s*[=:](\s|$)/
-
-    # The regex that matches and extracts data from
-    # properties of the form `name: prop`.
-    PROPERTY_NEW = /^([^\s=:"]+)\s*(=|:)(?:\s+|$)(.*)/
-
     # The regex that matches and extracts data from
     # properties of the form `:name prop`.
-    PROPERTY_OLD = /^:([^\s=:"]+)\s*(=?)(?:\s+|$)(.*)/
+    PROPERTY_OLD = /^:([^\s=:"]+)\s*(?:\s+|$)(.*)/
 
     # The default options for Sass::Engine.
     # @api public
@@ -154,9 +151,10 @@ module Sass
       options[:importer] ||= options[:filesystem_importer].new(".") if options[:filename]
 
       # Tracks the original filename of the top-level Sass file
-      options[:original_filename] = options[:original_filename] || options[:filename]
+      options[:original_filename] ||= options[:filename]
 
-      options[:cache_store] ||= Sass::CacheStores::Filesystem.new(options[:cache_location])
+      options[:cache_store] ||= Sass::CacheStores::Chain.new(
+        Sass::CacheStores::Memory.new, Sass::CacheStores::Filesystem.new(options[:cache_location]))
       # Support both, because the docs said one and the other actually worked
       # for quite a long time.
       options[:line_comments] ||= options[:line_numbers]
@@ -325,7 +323,15 @@ module Sass
       end
 
       root.options = @options
-      @options[:cache_store].store(key, sha, root) if @options[:cache] && key && sha
+      if @options[:cache] && key && sha
+        begin
+          old_options = root.options
+          root.options = {:importer => root.options[:importer]}
+          @options[:cache_store].store(key, sha, root)
+        ensure
+          root.options = old_options
+        end
+      end
       root
     rescue SyntaxError => e
       e.modify_backtrace(:filename => @options[:filename], :line => @line)
@@ -516,19 +522,19 @@ WARNING
       when PROPERTY_CHAR
         if line.text[1] == PROPERTY_CHAR ||
             (@options[:property_syntax] == :new &&
-             line.text =~ PROPERTY_OLD && $3.empty?)
+             line.text =~ PROPERTY_OLD && $2.empty?)
           # Support CSS3-style pseudo-elements,
           # which begin with ::,
           # as well as pseudo-classes
           # if we're using the new property syntax
           Tree::RuleNode.new(parse_interp(line.text))
         else
-          name, eq, value = line.text.scan(PROPERTY_OLD)[0]
+          name, value = line.text.scan(PROPERTY_OLD)[0]
           raise SyntaxError.new("Invalid property: \"#{line.text}\".",
             :line => @line) if name.nil? || value.nil?
-          parse_property(name, parse_interp(name), eq, value, :old, line)
+          parse_property(name, parse_interp(name), value, :old, line)
         end
-      when ?!, ?$
+      when ?$
         parse_variable(line)
       when COMMENT_CHAR
         parse_comment(line.text)
@@ -563,48 +569,39 @@ WARNING
       end
 
       name = line.text[0...scanner.pos]
-      if scanner.scan(/\s*([:=])(?:\s|$)/)
-        parse_property(name, res, scanner[1], scanner.rest, :new, line)
+      if scanner.scan(/\s*:(?:\s|$)/)
+        parse_property(name, res, scanner.rest, :new, line)
       else
         res.pop if comment
         Tree::RuleNode.new(res + parse_interp(scanner.rest))
       end
     end
 
-    def parse_property(name, parsed_name, eq, value, prop, line)
+    def parse_property(name, parsed_name, value, prop, line)
       if value.strip.empty?
         expr = Sass::Script::String.new("")
       else
+        important = false
+        if value =~ Sass::SCSS::RX::IMPORTANT
+          important = true
+          value = value.gsub(Sass::SCSS::RX::IMPORTANT,"")
+        end
         expr = parse_script(value, :offset => line.offset + line.text.index(value))
 
-        if eq.strip[0] == SCRIPT_CHAR
-          expr.context = :equals
-          Script.equals_warning("properties", name,
-            Sass::Tree::PropNode.val_to_sass(expr, @options), false,
-            @line, line.offset + 1, @options[:filename])
-        end
       end
-      Tree::PropNode.new(parse_interp(name), expr, prop)
+      Tree::PropNode.new(parse_interp(name), expr, important, prop)
     end
 
     def parse_variable(line)
-      name, op, value, default = line.text.scan(Script::MATCH)[0]
-      guarded = op =~ /^\|\|/
+      name, value, default = line.text.scan(Script::MATCH)[0]
       raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath variable declarations.",
         :line => @line + 1) unless line.children.empty?
       raise SyntaxError.new("Invalid variable: \"#{line.text}\".",
         :line => @line) unless name && value
-      Script.var_warning(name, @line, line.offset + 1, @options[:filename]) if line.text[0] == ?!
 
       expr = parse_script(value, :offset => line.offset + line.text.index(value))
-      if op =~ /=$/
-        expr.context = :equals
-        type = guarded ? "variable defaults" : "variables"
-        Script.equals_warning(type, "$#{name}", expr.to_sass,
-          guarded, @line, line.offset + 1, @options[:filename])
-      end
 
-      Tree::VariableNode.new(name, expr, default || guarded)
+      Tree::VariableNode.new(name, expr, default)
     end
 
     def parse_comment(line)
@@ -630,6 +627,8 @@ WARNING
         parse_mixin_definition(line)
       elsif directive == "include"
         parse_mixin_include(line, root)
+      elsif directive == "function"
+        parse_function(line, root)
       elsif directive == "for"
         parse_for(line, root, value)
       elsif directive == "each"
@@ -660,6 +659,12 @@ WARNING
           :line => @line + 1) unless line.children.empty?
         offset = line.offset + line.text.index(value).to_i
         Tree::WarnNode.new(parse_script(value, :offset => offset))
+      elsif directive == "return"
+        raise SyntaxError.new("Invalid @return: expected expression.") unless value
+        raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath return directives.",
+          :line => @line + 1) unless line.children.empty?
+        offset = line.offset + line.text.index(value).to_i
+        Tree::ReturnNode.new(parse_script(value, :offset => offset))
       elsif directive == "charset"
         name = value && value[/\A(["'])(.*)\1\Z/, 2] #"
         raise SyntaxError.new("Invalid charset directive '@charset': expected string.") unless name
@@ -687,11 +692,8 @@ WARNING
         raise SyntaxError.new("Invalid for directive '@for #{text}': expected #{expected}.")
       end
       raise SyntaxError.new("Invalid variable \"#{var}\".") unless var =~ Script::VALIDATE
-      if var.slice!(0) == ?!
-        offset = line.offset + line.text.index("!" + var) + 1
-        Script.var_warning(var, @line, offset, @options[:filename])
-      end
 
+      var = var[1..-1]
       parsed_from = parse_script(from_expr, :offset => line.offset + line.text.index(from_expr))
       parsed_to = parse_script(to_expr, :offset => line.offset + line.text.index(to_expr))
       Tree::ForNode.new(var, parsed_from, parsed_to, to_name == 'to')
@@ -709,11 +711,8 @@ WARNING
         raise SyntaxError.new("Invalid for directive '@each #{text}': expected #{expected}.")
       end
       raise SyntaxError.new("Invalid variable \"#{var}\".") unless var =~ Script::VALIDATE
-      if var.slice!(0) == ?!
-        offset = line.offset + line.text.index("!" + var) + 1
-        Script.var_warning(var, @line, offset, @options[:filename])
-      end
 
+      var = var[1..-1]
       parsed_list = parse_script(list_expr, :offset => line.offset + line.text.index(list_expr))
       Tree::EachNode.new(var, parsed_list)
     end
@@ -782,7 +781,6 @@ WARNING
       offset = line.offset + line.text.size - arg_string.size
       args = Script::Parser.new(arg_string.strip, @line, offset, @options).
         parse_mixin_definition_arglist
-      default_arg_found = false
       Tree::MixinDefNode.new(name, args)
     end
 
@@ -799,6 +797,17 @@ WARNING
       Tree::MixinNode.new(name, args, keywords)
     end
 
+    FUNCTION_RE = /^@function\s*(#{Sass::SCSS::RX::IDENT})(.*)$/
+    def parse_function(line, root)
+      name, arg_string = line.text.scan(FUNCTION_RE).first
+      raise SyntaxError.new("Invalid function definition \"#{line.text}\".") if name.nil?
+
+      offset = line.offset + line.text.size - arg_string.size
+      args = Script::Parser.new(arg_string.strip, @line, offset, @options).
+        parse_function_definition_arglist
+      Tree::FunctionNode.new(name, args)
+    end
+
     def parse_script(script, options = {})
       line = options[:line] || @line
       offset = options[:offset] || 0

data/vendor/sass/lib/sass/environment.rb

@@ -2,7 +2,7 @@ require 'set'
 
 module Sass
   # The lexical environment for SassScript.
-  # This keeps track of variable and mixin definitions.
+  # This keeps track of variable, mixin, and function definitions.
   #
   # A new environment is created for each level of Sass nesting.
   # This allows variables to be lexically scoped.
@@ -146,7 +146,10 @@ RUBY
     # Script::Literal
     inherited_hash :var
     # mixin
-    # Engine::Mixin
+    # Sass::Callable
     inherited_hash :mixin
+    # function
+    # Sass::Callable
+    inherited_hash :function
   end
 end

data/vendor/sass/lib/sass/exec.rb

@@ -176,12 +176,15 @@ MESSAGE
 
     # The `sass` executable.
     class Sass < Generic
+      attr_reader :default_syntax
+
       # @param args [Array<String>] The command-line arguments
       def initialize(args)
         super
         @options[:for_engine] = {
           :load_paths => ['.'] + (ENV['SASSPATH'] || '').split(File::PATH_SEPARATOR)
         }
+        @default_syntax = :sass
       end
 
       protected
@@ -193,7 +196,7 @@ MESSAGE
         super
 
         opts.banner = <<END
-Usage: sass [options] [INPUT] [OUTPUT]
+Usage: #{default_syntax} [options] [INPUT] [OUTPUT]
 
 Description:
   Converts SCSS or Sass files to CSS.
@@ -201,14 +204,21 @@ Description:
 Options:
 END
 
-        opts.on('--scss',
-                'Use the CSS-superset SCSS syntax.') do
-          @options[:for_engine][:syntax] = :scss
+        if @default_syntax == :sass
+          opts.on('--scss',
+                  'Use the CSS-superset SCSS syntax.') do
+            @options[:for_engine][:syntax] = :scss
+          end
+        else
+          opts.on('--sass',
+                  'Use the Indented syntax.') do
+            @options[:for_engine][:syntax] = :sass
+          end
         end
         opts.on('--watch', 'Watch files or directories for changes.',
                            'The location of the generated CSS can be set using a colon:',
-                           '  sass --watch input.sass:output.css',
-                           '  sass --watch input-dir:output-dir') do
+                           "  #{@default_syntax} --watch input.#{@default_syntax}:output.css",
+                           "  #{@default_syntax} --watch input-dir:output-dir") do
           @options[:watch] = true
         end
         opts.on('--update', 'Compile files or directories to CSS.',
@@ -231,12 +241,15 @@ END
         opts.on('-q', '--quiet', 'Silence warnings and status messages during compilation.') do
           @options[:for_engine][:quiet] = true
         end
+        opts.on('--compass', 'Make Compass imports available and load project configuration.') do
+          @options[:compass] = true
+        end
         opts.on('-g', '--debug-info',
                 'Emit extra information in the generated CSS that can be used by the FireSass Firebug plugin.') do
           @options[:for_engine][:debug_info] = true
         end
         opts.on('-l', '--line-numbers', '--line-comments',
-                'Emit comments in the generated CSS indicating the corresponding sass line.') do
+                'Emit comments in the generated CSS indicating the corresponding source line.') do
           @options[:for_engine][:line_numbers] = true
         end
         opts.on('-i', '--interactive',
@@ -276,7 +289,7 @@ END
             @options[:update] = true
           end
         end
-
+        load_compass if @options[:compass]
         return interactive if @options[:interactive]
         return watch_or_update if @options[:watch] || @options[:update]
         super
@@ -287,6 +300,7 @@ END
           output = @options[:output]
 
           @options[:for_engine][:syntax] ||= :scss if input.is_a?(File) && input.path =~ /\.scss$/
+          @options[:for_engine][:syntax] ||= @default_syntax
           engine =
             if input.is_a?(File) && !@options[:check_syntax]
               ::Sass::Engine.for_file(input.path, @options[:for_engine])
@@ -309,6 +323,23 @@ END
 
       private
 
+      def load_compass
+        begin
+          require 'compass'
+        rescue LoadError
+          require 'rubygems'
+          begin
+            require 'compass'
+          rescue LoadError
+            puts "ERROR: Cannot load compass."
+            exit 1
+          end
+        end
+        Compass.add_project_configuration
+        Compass.configuration.project_path ||= Dir.pwd
+        @options[:for_engine][:load_paths] += Compass.configuration.sass_load_paths
+      end
+
       def interactive
         require 'sass/repl'
         ::Sass::Repl.new(@options).run
@@ -321,8 +352,8 @@ END
 
         raise <<MSG if @args.empty?
 What files should I watch? Did you mean something like:
-    sass --watch input.sass:output.css
-    sass --watch input-dir:output-dir
+    #{@default_syntax} --watch input.#{@default_syntax}:output.css
+    #{@default_syntax} --watch input-dir:output-dir
 MSG
 
         if !colon_path?(@args[0]) && probably_dest_dir?(@args[1])
@@ -335,7 +366,7 @@ MSG
             end
           raise <<MSG if err
 File #{@args[1]} #{err}.
-    Did you mean: sass #{flag} #{@args[0]}:#{@args[1]}
+    Did you mean: #{@default_syntax} #{flag} #{@args[0]}:#{@args[1]}
 MSG
         end
 
@@ -402,6 +433,14 @@ MSG
       end
     end
 
+    class Scss < Sass
+      # @param args [Array<String>] The command-line arguments
+      def initialize(args)
+        super
+        @default_syntax = :scss
+      end
+    end
+
     # The `sass-convert` executable.
     class SassConvert < Generic
       # @param args [Array<String>] The command-line arguments
@@ -428,12 +467,11 @@ Options:
 END
 
         opts.on('-F', '--from FORMAT',
-          'The format to convert from. Can be css, scss, sass, less, or sass2.',
-          'sass2 is the same as sass, but updates more old syntax to new.',
+          'The format to convert from. Can be css, scss, sass, less.',
           'By default, this is inferred from the input filename.',
           'If there is none, defaults to css.') do |name|
           @options[:from] = name.downcase.to_sym
-          unless [:css, :scss, :sass, :less, :sass2].include?(@options[:from])
+          unless [:css, :scss, :sass, :less].include?(@options[:from])
             raise "Unknown format for sass-convert --from: #{name}"
           end
           try_less_note if @options[:from] == :less
@@ -517,14 +555,12 @@ END
         @options[:output] ||= @options[:input]
 
         from = @options[:from]
-        from = :sass if from == :sass2
         if @options[:to] == @options[:from] && !@options[:in_place]
           fmt = @options[:from]
           raise "Error: converting from #{fmt} to #{fmt} without --in-place"
         end
 
         ext = @options[:from]
-        ext = :sass if ext == :sass2
         Dir.glob("#{@options[:input]}/**/*.#{ext}") do |f|
           output =
             if @options[:in_place]
@@ -575,11 +611,6 @@ END
             end
         end
 
-        if @options[:from] == :sass2
-          @options[:from] = :sass
-          @options[:for_engine][:sass2] = true
-        end
-
         @options[:from] ||= :css
         @options[:to] ||= :sass
         @options[:for_engine][:syntax] = @options[:from]