haml 3.1.0 → 3.1.1

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

@@ -5,6 +5,9 @@ module Sass
     # The default importer, used for any strings found in the load path.
     # Simply loads Sass files from the filesystem using the default logic.
     class Filesystem < Base
+
+      attr_accessor :root
+
       # Creates a new filesystem importer that imports files relative to a given path.
       #
       # @param root [String] The root path.
@@ -25,8 +28,8 @@ module Sass
 
       # @see Base#mtime
       def mtime(name, options)
-        file = find_real_file(@root, name)
-        File.mtime(name)
+        file, s = find_real_file(@root, name)
+        File.mtime(file) if file
       rescue Errno::ENOENT
         nil
       end
@@ -44,6 +47,17 @@ module Sass
 
       protected
 
+      # If a full uri is passed, this removes the root from it
+      # otherwise returns the name unchanged
+      def remove_root(name)
+        root = @root.end_with?('/') ? @root : @root + '/'
+        if name.index(root) == 0
+          name[root.length..-1]
+        else
+          name
+        end
+      end
+
       # A hash from file extensions to the syntaxes for those extensions.
       # The syntaxes must be `:sass` or `:scss`.
       #
@@ -67,13 +81,12 @@ module Sass
         sorted_exts = extensions.sort
         syntax = extensions[extname]
 
-        Sass::Util.flatten(
-          ["#{dirname}/#{basename}", "#{dirname}/_#{basename}"].map do |name|
-            next [["#{name}.#{extensions.invert[syntax]}", syntax]] if syntax
-            sorted_exts.map {|ext, syn| ["#{name}.#{ext}", syn]}
-          end, 1)
+        return [["#{dirname}/{_,}#{basename}.#{extensions.invert[syntax]}", syntax]] if syntax
+        sorted_exts.map {|ext, syn| ["#{dirname}/{_,}#{basename}.#{ext}", syn]}
       end
 
+
+      REDUNDANT_DIRECTORY = %r{#{Regexp.escape(File::SEPARATOR)}\.#{Regexp.escape(File::SEPARATOR)}}
       # Given a base directory and an `@import`ed name,
       # finds an existant file that matches the name.
       #
@@ -81,8 +94,10 @@ module Sass
       # @param name [String] The filename to search for.
       # @return [(String, Symbol)] A filename-syntax pair.
       def find_real_file(dir, name)
-        possible_files(name).each do |f, s|
-          if File.exists?(full_path = join(dir, f))
+        for (f,s) in possible_files(remove_root(name))
+          path = (dir == ".") ? f : "#{dir}/#{f}"
+          if full_path = Dir[path].first
+            full_path.gsub!(REDUNDANT_DIRECTORY,File::SEPARATOR)
             return full_path, s
           end
         end
@@ -101,6 +116,14 @@ module Sass
         [dirname, basename, extension]
       end
 
+      def hash
+        @root.hash
+      end
+
+      def eql?(other)
+        root.eql?(other.root)
+      end
+
       private
 
       def _find(dir, name, options)

data/vendor/sass/lib/sass/less.rb

@@ -225,7 +225,7 @@ WARNING
     class Property
       def to_sass_tree
         return if hide_in_sass
-        Sass::Tree::PropNode.new([self], @value.to_sass_tree, :new)
+        Sass::Tree::PropNode.new([self], @value.to_sass_tree, false, :new)
       end
     end
 

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

@@ -41,7 +41,7 @@ module Sass
     # (in this Ruby instance).
     #
     # @return [Boolean]
-    attr_reader :checked_for_updates
+    attr_accessor :checked_for_updates
 
     # Same as \{#update\_stylesheets}, but respects \{#checked\_for\_updates}
     # and the {file:SASS_REFERENCE.md#always_update-option `:always_update`}
@@ -114,6 +114,16 @@ module Sass
       end
     end
 
+    # For parity with method_missing
+    def respond_to?(method)
+      super || compiler.respond_to?(method)
+    end
+
+    # There's a small speedup by not using method missing for frequently delegated methods.
+    def options
+      compiler.options
+    end
+
   end
 end
 

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

@@ -161,17 +161,20 @@ module Sass::Plugin
     #   the second is the location of the CSS file that it should be compiled to.
     def update_stylesheets(individual_files = [])
       run_updating_stylesheets individual_files
-
-      individual_files.each {|t, c| update_stylesheet(t, c)}
-
-      @checked_for_updates = true
+      Sass::Plugin.checked_for_updates = true
       staleness_checker = StalenessChecker.new(engine_options)
 
+      individual_files.each do |t, c|
+        if options[:always_update] || staleness_checker.stylesheet_needs_update?(c, t)
+          update_stylesheet(t, c)
+        end
+      end
+
       template_location_array.each do |template_location, css_location|
 
         Dir.glob(File.join(template_location, "**", "[^_]*.s[ca]ss")).sort.each do |file|
           # Get the relative path to the file
-          name = file.sub(template_location.sub(/\/*$/, '/'), "")
+          name = file.sub(template_location.to_s.sub(/\/*$/, '/'), "")
           css = css_filename(name, css_location)
 
           if options[:always_update] || staleness_checker.stylesheet_needs_update?(css, file)
@@ -213,13 +216,19 @@ module Sass::Plugin
       begin
         require 'fssm'
       rescue LoadError => e
-        e.message << "\n" <<
-          if File.exists?(scope(".git"))
-            'Run "git submodule update --init" to get the recommended version.'
-          else
-            'Run "gem install fssm" to get it.'
-          end
-        raise e
+        dir = Sass::Util.scope("vendor/fssm/lib")
+        if $LOAD_PATH.include?(dir)
+          e.message << "\n" <<
+            if File.exists?(scope(".git"))
+              'Run "git submodule update --init" to get the recommended version.'
+            else
+              'Run "gem install fssm" to get it.'
+            end
+          raise e
+        else
+          $LOAD_PATH.unshift dir
+          retry
+        end
       end
 
       unless individual_files.empty? && FSSM::Backends::Default.name == "FSSM::Backends::FSEvents"

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

@@ -11,18 +11,11 @@ unless defined?(Sass::RAILS_LOADED)
         :cache_location    => Sass::Util.rails_root + '/tmp/sass-cache'
       }
 
-      if Sass::Util.ap_geq?('3.1.0.beta')
-        require 'sass/importers/rails'
-        require 'sass/cache_stores/active_support'
-        opts.merge!(:load_paths => [Sass::Importers::Rails.new])
-        opts.merge!(:cache_store => Sass::CacheStores::ActiveSupport.new(Rails.cache)) if Rails.cache
-      else
-        opts.merge!(
-          :always_update      => false,
-          :template_location => Sass::Util.rails_root + '/public/stylesheets/sass',
-          :css_location      => Sass::Util.rails_root + '/public/stylesheets',
-          :always_check      => Sass::Util.rails_env == "development")
-      end
+      opts.merge!(
+        :always_update     => false,
+        :template_location => Sass::Util.rails_root + '/public/stylesheets/sass',
+        :css_location      => Sass::Util.rails_root + '/public/stylesheets',
+        :always_check      => Sass::Util.rails_env == "development")
 
       @default_options = opts.freeze
     end
@@ -30,76 +23,9 @@ unless defined?(Sass::RAILS_LOADED)
 
   Sass::Plugin.options.reverse_merge!(Sass::Plugin.default_options)
 
-  # Disable this for now, until we figure out how to get Rails
-  # to pass in the view.
-  if Sass::Util.ap_geq?('3.1.0.beta')
-    class Sass::Plugin::TemplateHandler
-      attr_reader :syntax
-
-      def initialize(syntax)
-        @syntax = syntax
-      end
-
-      def handles_encoding?; true; end
-
-      def call(template, view)
-        engine = Sass::Engine.new(template.source,
-          Sass::Plugin.engine_options.merge(
-            :syntax => @syntax,
-            :filename => template.virtual_path,
-            :_rails_lookup_context => view.lookup_context,
-            :importer => Sass::Importers::Rails.new))
-
-        template.data[:sass_importers] = engine.dependencies.map do |e|
-          [e.options[:filename], e.options[:importer]]
-        end
-
-        stylesheet =
-          begin
-            engine.render
-          rescue Sass::SyntaxError => e
-            Sass::Plugin::TemplateHandler.munge_exception e, view.lookup_context
-            Sass::SyntaxError.exception_to_css(e, Sass::Plugin.engine_options)
-          end
-
-        <<RUBY
-begin
-  if Sass::Plugin::TemplateHandler.dependencies_changed?(
-      @_template.data[:sass_importers], #{Time.now.to_i}, lookup_context)
-    @_template.expire!
-    @_template.rerender(self)
-  else
-    #{stylesheet.inspect}
-  end
-rescue Sass::SyntaxError => e
-  Sass::Plugin::TemplateHandler.munge_exception e, lookup_context
-  Sass::SyntaxError.exception_to_css(e, Sass::Plugin.engine_options)
-end
-RUBY
-      end
-
-      def self.dependencies_changed?(deps, since, lookup_context)
-        opts = Sass::Plugin.engine_options.merge(:_rails_lookup_context => lookup_context)
-        deps.any? do |d, i|
-          return true unless time = i.mtime(d, opts)
-          time.to_i > since
-        end
-      end
-
-      def self.munge_exception(e, lookup_context)
-        importer = Sass::Importers::Rails.new
-        opts = Sass::Plugin.engine_options.merge(:_rails_lookup_context => lookup_context)
-        e.sass_backtrace.each do |bt|
-          next unless engine = importer.find(bt[:filename], opts)
-          bt[:filename] = engine.options[:_rails_filename]
-        end
-      end
-    end
-
-    ActionView::Template.register_template_handler(:sass, Sass::Plugin::TemplateHandler.new(:sass))
-    ActionView::Template.register_template_handler(:scss, Sass::Plugin::TemplateHandler.new(:scss))
-  elsif defined?(ActionController::Metal)
-    # Rails >= 3.0
+  # Rails 3.1 loads and handles Sass all on its own
+  if defined?(ActionController::Metal)
+    # 3.1 > Rails >= 3.0
     require 'sass/plugin/rack'
     Rails.configuration.middleware.use(Sass::Plugin::Rack)
   elsif defined?(ActionController::Dispatcher) &&

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

@@ -23,7 +23,6 @@ module Sass
     #   *WARNING*: It is important not to retain the instance for too long,
     #   as its instance-level caches are never explicitly expired.
     class StalenessChecker
-      DELETED             = 1.0/0.0 # positive Infinity
       @dependencies_cache = {}
 
       class << self
@@ -54,15 +53,14 @@ module Sass
       # @param template_file [String] The location of the Sass or SCSS template
       #   that is compiled to `css_file`.
       # @return [Boolean] Whether the stylesheet needs to be updated.
-      def stylesheet_needs_update?(css_file, template_file)
+      def stylesheet_needs_update?(css_file, template_file, importer = nil)
         template_file = File.expand_path(template_file)
         begin
-          css_mtime = File.mtime(css_file).to_i
+          css_mtime = File.mtime(css_file)
         rescue Errno::ENOENT
           return true
         end
-
-        stylesheet_modified_since?(template_file, css_mtime)
+        stylesheet_modified_since?(template_file, css_mtime, importer)
       end
 
       # Returns whether a Sass or SCSS stylesheet has been modified since a given time.
@@ -88,8 +86,8 @@ module Sass
       # @param template_file [String] The location of the Sass or SCSS template
       #   that is compiled to `css_file`.
       # @return [Boolean] Whether the stylesheet needs to be updated.
-      def self.stylesheet_needs_update?(css_file, template_file)
-        new(Plugin.engine_options).stylesheet_needs_update?(css_file, template_file)
+      def self.stylesheet_needs_update?(css_file, template_file, importer = nil)
+        new(Plugin.engine_options).stylesheet_needs_update?(css_file, template_file, importer)
       end
 
       # Returns whether a Sass or SCSS stylesheet has been modified since a given time.
@@ -130,9 +128,9 @@ module Sass
             mtime = importer.mtime(uri, @options)
             if mtime.nil?
               @dependencies.delete([uri, importer])
-              DELETED
+              nil
             else
-              mtime.to_i
+              mtime
             end
           end
       end
@@ -150,7 +148,9 @@ module Sass
 
       def dependency_updated?(css_mtime)
         Proc.new do |uri, importer|
-          mtime(uri, importer) > css_mtime ||
+          sass_mtime = mtime(uri, importer)
+          !sass_mtime ||
+            sass_mtime > css_mtime ||
             dependencies_stale?(uri, importer, css_mtime)
         end
       end

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

@@ -1,5 +1,6 @@
-# Rails 3.0.0.beta.2+
-if defined?(ActiveSupport) && Sass::Util.has?(:public_method, ActiveSupport, :on_load)
+# Rails 3.0.0.beta.2+, < 3.1
+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_initialize) do
     require 'sass'

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

@@ -13,10 +13,10 @@ 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*(.+?)(!(?i:default))?$/
 
     # The regular expression used to validate variables without matching.
-    VALIDATE = /^[!\$]#{Sass::SCSS::RX::IDENT}$/
+    VALIDATE = /^\$#{Sass::SCSS::RX::IDENT}$/
 
     # Parses a string of SassScript
     #
@@ -36,28 +36,5 @@ module Sass
       raise e
     end
 
-    # @private
-    def self.var_warning(varname, line, offset, filename)
-      Sass::Util.sass_warn <<MESSAGE
-DEPRECATION WARNING:
-On line #{line}, character #{offset}#{" of '#{filename}'" if filename}
-Variables with ! have been deprecated and will be removed in version 3.2.
-Use \"$#{varname}\" instead.
-
-You can use `sass-convert --in-place --from sass2 file.sass' to convert files automatically.
-MESSAGE
-    end
-
-    # @private
-    def self.equals_warning(types, name, val, guarded, line, offset, filename)
-      Sass::Util.sass_warn <<MESSAGE
-DEPRECATION WARNING:
-On line #{line}#{", character #{offset}" if offset}#{" of '#{filename}'" if filename}
-Setting #{types} with #{"||" if guarded}= has been deprecated and will be removed in version 3.2.
-Use "#{name}: #{val}#{" !default" if guarded}" instead.
-
-You can use `sass-convert --in-place --from sass2 file.sass' to convert files automatically.
-MESSAGE
-    end
   end
 end

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

@@ -102,7 +102,7 @@ module Sass::Script
         next if @attrs[k].nil?
         @attrs[k] = @attrs[k].to_i
         next if (0..255).include?(@attrs[k])
-        raise Sass::SyntaxError.new("#{k.to_s.capitalize} value must be between 0 and 255")
+        raise ArgumentError.new("#{k.to_s.capitalize} value must be between 0 and 255")
       end
 
       [:saturation, :lightness].each do |k|
@@ -110,11 +110,11 @@ module Sass::Script
         @attrs[k] = 0 if @attrs[k] < 0.00001 && @attrs[k] > -0.00001
         @attrs[k] = 100 if @attrs[k] - 100 < 0.00001 && @attrs[k] - 100 > -0.00001
         next if (0..100).include?(@attrs[k])
-        raise Sass::SyntaxError.new("#{k.to_s.capitalize} must be between 0 and 100")
+        raise ArgumentError.new("#{k.to_s.capitalize} must be between 0 and 100")
       end
 
       unless (0..1).include?(@attrs[:alpha])
-        raise Sass::SyntaxError.new("Alpha channel must be between 0 and 1")
+        raise ArgumentError.new("Alpha channel must be between 0 and 1")
       end
     end
 
@@ -182,17 +182,6 @@ module Sass::Script
       alpha < 1
     end
 
-    # @deprecated This will be removed in version 3.2.
-    # @see #rgb
-    def value
-      Sass::Util.sass_warn <<END
-DEPRECATION WARNING:
-The Sass::Script::Color #value attribute is deprecated and will be
-removed in version 3.2. Use the #rgb attribute instead.
-END
-      rgb
-    end
-
     # Returns the red, green, and blue components of the color.
     #
     # @return [Array<Fixnum>] A frozen three-element array of the red, green, and blue
@@ -245,7 +234,7 @@ END
       hsl = !([:hue, :saturation, :lightness] & attrs.keys).empty?
       rgb = !([:red, :green, :blue] & attrs.keys).empty?
       if hsl && rgb
-        raise ArgumentError.new("Color#with may not have both HSL and RGB keys specified")
+        raise ArgumentError.new("Cannot specify HSL and RGB values for a color at the same time")
       end
 
       if hsl

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

@@ -23,15 +23,6 @@ module Sass
       # @return [{String => Script::Node}]
       attr_reader :keywords
 
-      # Don't set the context for child nodes if this is `url()`,
-      # since `url()` allows quoted strings.
-      #
-      # @param context [Symbol]
-      # @see Node#context=
-      def context=(context)
-        super unless @name == "url"
-      end
-
       # @param name [String] See \{#name}
       # @param args [Array<Script::Node>] See \{#args}
       # @param keywords [{String => Script::Node}] See \{#keywords}
@@ -75,12 +66,16 @@ module Sass
       # @raise [Sass::SyntaxError] if the function call raises an ArgumentError
       def _perform(environment)
         args = @args.map {|a| a.perform(environment)}
-        keywords = Sass::Util.map_hash(@keywords) {|k, v| [k, v.perform(environment)]}
+        if fn = environment.function(@name)
+          keywords = Sass::Util.map_hash(@keywords) {|k, v| [k, v.perform(environment)]}
+          return perform_sass_fn(fn, args, keywords)
+        end
+
         ruby_name = @name.tr('-', '_')
-        args = construct_ruby_args(ruby_name, args, keywords)
+        args = construct_ruby_args(ruby_name, args, environment)
 
-        unless Sass::Util.has?(:public_instance_method, Functions, ruby_name) && ruby_name !~ /^__/
-          opts(Script::String.new("#{name}(#{args.join(', ')})"))
+        unless Functions.callable?(ruby_name)
+          opts(to_literal(args))
         else
           opts(Functions::EvaluationContext.new(environment.options).send(ruby_name, *args))
         end
@@ -89,30 +84,79 @@ module Sass
         raise Sass::SyntaxError.new("#{e.message} for `#{name}'")
       end
 
-      def construct_ruby_args(name, args, keywords)
-        return args if keywords.empty?
-        unless signature = Functions.signature(name.to_sym, args.size, keywords.size)
+      # This method is factored out from `_perform` so that compass can override
+      # it with a cross-browser implementation for functions that require vendor prefixes
+      # in the generated css.
+      def to_literal(args)
+        Script::String.new("#{name}(#{args.join(', ')})")
+      end
+
+      private
+
+      def construct_ruby_args(name, args, environment)
+        unless signature = Functions.signature(name.to_sym, args.size, @keywords.size)
+          return args if keywords.empty?
           raise Sass::SyntaxError.new("Function #{name} doesn't support keyword arguments")
         end
+        keywords = Sass::Util.map_hash(@keywords) {|k, v| [k, v.perform(environment)]}
+
+        # If the user passes more non-keyword args than the function expects,
+        # but it does expect keyword args, Ruby's arg handling won't raise an error.
+        # Since we don't want to make functions think about this,
+        # we'll handle it for them here.
+        if signature.var_kwargs && !signature.var_args && args.size > signature.args.size
+          raise Sass::SyntaxError.new(
+            "#{args[signature.args.size].inspect} is not a keyword argument for `#{name}'")
+        elsif keywords.empty?
+          return args 
+        end
 
         args = args + signature.args[args.size..-1].map do |argname|
           if keywords.has_key?(argname)
             keywords.delete(argname)
           else
-            raise Sass::SyntaxError, "Function #{name} requires an argument named $#{argname}"
+            raise Sass::SyntaxError.new("Function #{name} requires an argument named $#{argname}")
           end
         end
 
         if keywords.size > 0
           if signature.var_kwargs
-            args << Sass::Util.map_hash(keywords) {|k, v| [k.to_sym, v]}
+            args << keywords
           else
-            raise Sass::SyntaxError, "Function #{name} doesn't take an argument named $#{keywords.keys.sort.first}"
+            raise Sass::SyntaxError.new("Function #{name} doesn't take an argument named $#{keywords.keys.sort.first}")
           end
         end
 
         args
       end
+
+      def perform_sass_fn(function, args, keywords)
+        # TODO: merge with mixin arg evaluation?
+        keywords.each do |name, value|
+          # TODO: Make this fast
+          unless function.args.find {|(var, default)| var.underscored_name == name}
+            raise Sass::SyntaxError.new("Function #{@name} doesn't have an argument named $#{name}")
+          end
+        end
+
+        if args.size > function.args.size
+          raise ArgumentError.new("Wrong number of arguments (#{args.size} for #{function.args.size})")
+        end
+
+        environment = function.args.zip(args).
+          inject(Sass::Environment.new(function.environment)) do |env, ((var, default), value)|
+          env.set_local_var(var.name,
+            value || keywords[var.underscored_name] || (default && default.perform(env)))
+          raise Sass::SyntaxError.new("Function #{@name} is missing parameter #{var.inspect}.") unless env.var(var.name)
+          env
+        end
+
+        val = catch :_sass_return do
+          function.tree.each {|c| Sass::Tree::Visitors::Perform.visit(c, environment)}
+          raise Sass::SyntaxError.new("Function #{@name} finished without @return")
+        end
+        val
+      end
     end
   end
 end