sass 3.1.0.alpha.221 → 3.1.0.alpha.246

data/REVISION

@@ -1 +1 @@
-a8bdef1b0251ef20490c2df9fa0daac9419238c4
+7dc3a7bda300a9a18b37b58776ebe02915b49e82

data/Rakefile

@@ -11,7 +11,7 @@ task :default => :test
 require 'rake/testtask'
 
 Rake::TestTask.new do |t|
-  t.libs << 'lib'
+  t.libs << 'test'
   test_files = FileList[scope('test/**/*_test.rb')]
   test_files.exclude(scope('test/rails/*'))
   test_files.exclude(scope('test/plugins/*'))

data/VERSION

@@ -1 +1 @@
-3.1.0.alpha.221
+3.1.0.alpha.246

data/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/lib/sass/engine.rb

@@ -97,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 = ?/
@@ -125,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
@@ -533,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)
@@ -580,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)
@@ -712,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')
@@ -734,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

data/lib/sass/exec.rb

@@ -325,6 +325,7 @@ END
           end
         end
         Compass.add_project_configuration
+        Compass.configuration.project_path ||= Dir.pwd
         @options[:for_engine][:load_paths] += Compass.configuration.sass_load_paths
       end
 
@@ -447,12 +448,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
@@ -536,14 +536,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]
@@ -594,11 +592,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]

data/lib/sass/importers/filesystem.rb

@@ -25,8 +25,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
@@ -67,13 +67,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 +80,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(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

data/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/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`}

data/lib/sass/plugin/compiler.rb

@@ -161,7 +161,7 @@ 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
-      @checked_for_updates = true
+      Sass::Plugin.checked_for_updates = true
       staleness_checker = StalenessChecker.new(engine_options)
 
       individual_files.each do |t, c|
@@ -174,7 +174,7 @@ module Sass::Plugin
 
         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)

data/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/lib/sass/script/color.rb

@@ -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

data/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}

data/lib/sass/script/functions.rb

@@ -329,30 +329,20 @@ module Sass::Script
     end
 
     class << self
-      FUNCTIONS = Set.new
-
       # Returns whether user function with a given name exists.
       #
       # @param function_name [String]
       # @return [Boolean]
-      def callable?(function_name)
-        FUNCTIONS.include?(function_name)
-      end
+      alias_method :callable?, :public_method_defined?
 
       private
       def include(*args)
         r = super
-        update_callable_functions
         # We have to re-include ourselves into EvaluationContext to work around
         # an icky Ruby restriction.
         EvaluationContext.send :include, self
         r
       end
-
-      def update_callable_functions
-        FUNCTIONS.clear
-        public_instance_methods.each {|function_name| FUNCTIONS << function_name.to_s}
-      end
     end
 
     # Creates a {Color} object from red, green, and blue values.
@@ -1347,15 +1337,5 @@ module Sass::Script
       color.with(attr => Sass::Util.restrict(
           color.send(attr).send(op, amount.value), range))
     end
-
-    class << self
-      private
-      def method_added(name)
-        update_callable_functions
-        super
-      end
-    end
-
-    update_callable_functions # generate the initial set
   end
 end

data/lib/sass/script/lexer.rb

@@ -87,7 +87,7 @@ module Sass
         :whitespace => /\s+/,
         :comment => COMMENT,
         :single_line_comment => SINGLE_LINE_COMMENT,
-        :variable => /([!\$])(#{IDENT})/,
+        :variable => /(\$)(#{IDENT})/,
         :ident => /(#{IDENT})(\()?/,
         :number => /(-)?(?:(\d*\.\d+)|(\d+))([a-zA-Z%]+)?/,
         :color => HEXCOLOR,
@@ -242,9 +242,6 @@ module Sass
         line = @line
         offset = @offset
         return unless scan(rx)
-        if @scanner[1] == '!' && @scanner[2] != 'important'
-          Script.var_warning(@scanner[2], line, offset + 1, @options[:filename])
-        end
 
         [:const, @scanner[2]]
       end