sass 3.2.1 → 3.2.2

data/README.md

@@ -173,10 +173,11 @@ See `sass-convert --help` for further information and options.
 
 ## Authors
 
-Sass was envisioned by [Hampton Catlin](http://hamptoncatlin.com) (hcatlin).
-However, Hampton doesn't even know his way around the code anymore and now
-occasionally consults on the language issues. Hampton lives in Cambridge, UK and
-is the owner of [Catlin Software](http://www.catlinsoftware.com/).
+Sass was envisioned by [Hampton Catlin](http://www.hamptoncatlin.com)
+(@hcatlin). However, Hampton doesn't even know his way around the code anymore
+and now occasionally consults on the language issues. Hampton lives in San
+Francisco, California and works as VP of Technology
+at [Moovweb](http://www.moovweb.com/).
 
 [Nathan Weizenbaum](http://nex-3.com) is the primary developer and architect of
 Sass. His hard work has kept the project alive by endlessly answering forum

data/VERSION

@@ -1 +1 @@
-3.2.1
+3.2.2

data/VERSION_DATE

@@ -1 +1 @@
-16 August 2012 00:34:28 UTC
+03 November 2012 01:05:14 UTC

data/lib/sass/callbacks.rb

@@ -48,7 +48,7 @@ module Sass
     # @param name [Symbol] The name of the callback
     # @return [void]
     def define_callback(name)
-      class_eval <<RUBY
+      class_eval <<RUBY, __FILE__, __LINE__ + 1
 def on_#{name}(&block)
   @_sass_callbacks ||= {}
   (@_sass_callbacks[#{name.inspect}] ||= []) << block

data/lib/sass/engine.rb

@@ -820,7 +820,7 @@ WARNING
         media_parser = Sass::SCSS::Parser.new(scanner, @options[:filename], @line)
         media = media_parser.parse_media_query_list
         Tree::CssImportNode.new(str || uri, media.to_a)
-      elsif val =~ /^http:\/\//
+      elsif val =~ /^(https?:)?\/\//
         Tree::CssImportNode.new("url(#{val})")
       else
         Tree::ImportNode.new(val)

data/lib/sass/exec.rb

@@ -125,6 +125,7 @@ module Sass
       def puts_action(name, color, arg)
         return if @options[:for_engine][:quiet]
         printf color(color, "%11s %s\n"), name, arg
+        STDOUT.flush
       end
 
       # Same as \{Kernel.puts}, but doesn't print anything if the `--quiet` option is set.
@@ -229,6 +230,10 @@ END
                                    'Only meaningful for --watch and --update.') do
           @options[:stop_on_error] = true
         end
+        opts.on('--poll', 'Check for file changes manually, rather than relying on the OS.',
+                          'Only meaningful for --watch.') do
+          @options[:poll] = true
+        end
         opts.on('-f', '--force', 'Recompile all Sass files, even if the CSS file is newer.',
                                  'Only meaningful for --update.') do
           @options[:force] = true
@@ -357,6 +362,7 @@ END
         require 'sass/plugin'
         ::Sass::Plugin.options.merge! @options[:for_engine]
         ::Sass::Plugin.options[:unix_newlines] = @options[:unix_newlines]
+        ::Sass::Plugin.options[:poll] = @options[:poll]
 
         if @options[:force]
           raise "The --force flag may only be used with --update." unless @options[:update]

data/lib/sass/importers/filesystem.rb

@@ -1,4 +1,5 @@
 require 'pathname'
+require 'set'
 
 module Sass
   module Importers
@@ -14,6 +15,7 @@ module Sass
       #   This importer will import files relative to this path.
       def initialize(root)
         @root = File.expand_path(root)
+        @same_name_warnings = Set.new
       end
 
       # @see Base#find_relative
@@ -28,7 +30,7 @@ module Sass
 
       # @see Base#mtime
       def mtime(name, options)
-        file, s = find_real_file(@root, name)
+        file, s = Sass::Util.destructure(find_real_file(@root, name, options))
         File.mtime(file) if file
       rescue Errno::ENOENT
         nil
@@ -106,15 +108,46 @@ module Sass
       # @param dir [String] The directory relative to which to search.
       # @param name [String] The filename to search for.
       # @return [(String, Symbol)] A filename-syntax pair.
-      def find_real_file(dir, name)
-        for (f,s) in possible_files(remove_root(name))
+      def find_real_file(dir, name, options)
+        found = possible_files(remove_root(name)).map do |f, s|
           path = (dir == "." || Pathname.new(f).absolute?) ? f : "#{dir}/#{f}"
-          if full_path = Dir[path].first
-            full_path.gsub!(REDUNDANT_DIRECTORY,File::SEPARATOR)
-            return full_path, s
+          Dir[path].map do |full_path|
+            full_path.gsub!(REDUNDANT_DIRECTORY, File::SEPARATOR)
+            [full_path, s]
           end
         end
-        nil
+        found = Sass::Util.flatten(found, 1)
+        return if found.empty?
+  
+        if found.size > 1 && !@same_name_warnings.include?(found.first.first)
+          found.each {|(f, _)| @same_name_warnings << f}
+          relative_to = Pathname.new(dir)
+          if options[:_line]
+            # If _line exists, we're here due to an actual import in an
+            # import_node and we want to print a warning for a user writing an
+            # ambiguous import.
+            candidates = found.map {|(f, _)| "    " + Pathname.new(f).relative_path_from(relative_to).to_s}.join("\n")
+            Sass::Util.sass_warn <<WARNING
+WARNING: On line #{options[:_line]}#{" of #{options[:filename]}" if options[:filename]}:
+  It's not clear which file to import for '@import "#{name}"'.
+  Candidates:
+#{candidates}
+  For now I'll choose #{File.basename found.first.first}.
+  This will be an error in future versions of Sass.
+WARNING
+          else
+            # Otherwise, we're here via StalenessChecker, and we want to print a
+            # warning for a user running `sass --watch` with two ambiguous files.
+            candidates = found.map {|(f, _)| "    " + File.basename(f)}.join("\n")
+            Sass::Util.sass_warn <<WARNING
+WARNING: In #{File.dirname(name)}:
+  There are multiple files that match the name "#{File.basename(name)}":
+#{candidates}
+  This will be an error in future versions of Sass.
+WARNING
+          end
+        end
+        found.first
       end
 
       # Splits a filename into three parts, a directory part, a basename, and an extension
@@ -132,7 +165,7 @@ module Sass
       private
 
       def _find(dir, name, options)
-        full_filename, syntax = find_real_file(dir, name)
+        full_filename, syntax = Sass::Util.destructure(find_real_file(dir, name, options))
         return unless full_filename && File.readable?(full_filename)
 
         options[:syntax] = syntax

data/lib/sass/logger/log_level.rb

@@ -36,14 +36,14 @@ module Sass
         end
 
         def define_logger(name, options = {})
-          class_eval %Q{
+          class_eval <<-RUBY, __FILE__, __LINE__ + 1
             def #{name}(message)
               #{options.fetch(:to, :log)}(#{name.inspect}, message)
             end
-          }
+          RUBY
         end
       end
       
     end
   end
-end
+end

data/lib/sass/plugin/compiler.rb

@@ -300,7 +300,7 @@ module Sass::Plugin
 
       # The native windows listener is much slower than the polling
       # option, according to https://github.com/nex3/sass/commit/a3031856b22bc834a5417dedecb038b7be9b9e3e#commitcomment-1295118
-      listener.force_polling(true) if Sass::Util.windows?
+      listener.force_polling(true) if @options[:poll] || Sass::Util.windows?
 
       begin
         listener.start

data/lib/sass/plugin/staleness_checker.rb

@@ -140,7 +140,7 @@ module Sass
       end
 
       def dependencies(uri, importer)
-        stored_mtime, dependencies = @dependencies[[uri, importer]]
+        stored_mtime, dependencies = Sass::Util.destructure(@dependencies[[uri, importer]])
 
         if !stored_mtime || stored_mtime < mtime(uri, importer)
           dependencies = compute_dependencies(uri, importer)

data/lib/sass/script/functions.rb

@@ -90,13 +90,13 @@ module Sass::Script
   #
   # ## Other Color Functions
   #
-  # \{#adjust_color adjust-color($color, \[$red\], \[$green\], \[$blue\], \[$hue\], \[$saturation\], \[$lightness\], \[$alpha\]}
+  # \{#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\], \[$saturation\], \[$lightness\], \[$alpha\])}
   # : Fluidly scale one or more components of a color.
   #
-  # \{#change_color change-color($color, \[$red\], \[$green\], \[$blue\], \[$hue\], \[$saturation\], \[$lightness\], \[$alpha\]}
+  # \{#change_color change-color($color, \[$red\], \[$green\], \[$blue\], \[$hue\], \[$saturation\], \[$lightness\], \[$alpha\])}
   # : Changes one or more properties of a color.
   #
   # \{#ie_hex_str ie-hex-str($color)}
@@ -1235,8 +1235,8 @@ module Sass::Script
     # arguments.
     #
     # @example
-    #   max(1px, 4px) => 1px
-    #   max(5em, 3em, 4em) => 3em
+    #   max(1px, 4px) => 4px
+    #   max(5em, 3em, 4em) => 5em
     # @return [Number] The maximum value
     # @raise [ArgumentError] if any argument isn't a number, or if not all of
     #   the arguments have comparable units

data/lib/sass/script/parser.rb

@@ -203,7 +203,7 @@ module Sass
         # sub is the name of the production beneath it,
         # and ops is a list of operators for this precedence level
         def production(name, sub, *ops)
-          class_eval <<RUBY
+          class_eval <<RUBY, __FILE__, __LINE__ + 1
             def #{name}
               interp = try_ops_after_interp(#{ops.inspect}, #{name.inspect}) and return interp
               return unless e = #{sub}
@@ -223,7 +223,7 @@ RUBY
         end
 
         def unary(op, sub)
-          class_eval <<RUBY
+          class_eval <<RUBY, __FILE__, __LINE__ + 1
             def unary_#{op}
               return #{sub} unless tok = try_tok(:#{op})
               interp = try_op_before_interp(tok) and return interp

data/lib/sass/scss/parser.rb

@@ -307,6 +307,7 @@ module Sass
       end
 
       def import_arg
+        line = @line
         return unless (str = tok(STRING)) || (uri = tok?(/url\(/i))
         if uri
           str = sass_script(:parse_string)
@@ -319,17 +320,19 @@ module Sass
         ss
 
         media = media_query_list
-        if path =~ /^http:\/\// || media || use_css_import?
-          return node(Sass::Tree::CssImportNode.new(str, media.to_a))
+        if path =~ /^(https?:)?\/\// || media || use_css_import?
+          node = Sass::Tree::CssImportNode.new(str, media.to_a)
+        else
+          node = Sass::Tree::ImportNode.new(path.strip)
         end
-
-        node(Sass::Tree::ImportNode.new(path.strip))
+        node.line = line
+        node
       end
 
       def use_css_import?; false; end
 
       def media_directive
-        block(node(Sass::Tree::MediaNode.new(media_query_list.to_a)), :directive)
+        block(node(Sass::Tree::MediaNode.new(expr!(:media_query_list).to_a)), :directive)
       end
 
       # http://www.w3.org/TR/css3-mediaqueries/#syntax
@@ -674,7 +677,7 @@ module Sass
             expected('"{"') if res.length == 1 && res[0].is_a?(Selector::Universal)
             throw_error {expected('"{"')}
           rescue Sass::SyntaxError => e
-            e.message << "\n\n\"#{sel}\" may only be used at the beginning of a selector."
+            e.message << "\n\n\"#{sel}\" may only be used at the beginning of a compound selector."
             raise e
           end
         end
@@ -706,7 +709,7 @@ module Sass
       end
 
       def element_name
-        ns, name = qualified_name(:allow_star_name)
+        ns, name = Sass::Util.destructure(qualified_name(:allow_star_name))
         return unless ns || name
 
         if name == '*'
@@ -797,7 +800,7 @@ module Sass
         # could start a pseudo expression like "n+1", or it could start a
         # selector like "n|m". In order to handle this, we must regrettably
         # backtrack.
-        expr, sel = nil
+        expr, sel = nil, nil
         pseudo_err = catch_error do
           expr = pseudo_expr
           next if tok?(/[,)]/)
@@ -1021,6 +1024,7 @@ MESSAGE
 
       EXPR_NAMES = {
         :media_query => "media query (e.g. print, screen, print and screen)",
+        :media_query_list => "media query (e.g. print, screen, print and screen)",
         :media_expr => "media expression (e.g. (min-device-width: 800px))",
         :pseudo_arg => "expression (e.g. fr, 2n+1)",
         :interp_ident => "identifier",

data/lib/sass/tree/import_node.rb

@@ -9,6 +9,9 @@ module Sass
       # @return [String]
       attr_reader :imported_filename
 
+      # Sets the imported file.
+      attr_writer :imported_file
+
       # @param imported_filename [String] The name of the imported file
       def initialize(imported_filename)
         @imported_filename = imported_filename
@@ -43,12 +46,12 @@ module Sass
 
         if @options[:importer]
           f = @options[:importer].find_relative(
-            @imported_filename, @options[:filename], @options.dup)
+            @imported_filename, @options[:filename], options_for_importer)
           return f if f
         end
 
         paths.each do |p|
-          if f = p.find(@imported_filename, @options.dup)
+          if f = p.find(@imported_filename, options_for_importer)
             return f
           end
         end
@@ -63,6 +66,10 @@ module Sass
       rescue SyntaxError => e
         raise SyntaxError.new(e.message, :line => self.line, :filename => @filename)
       end
+
+      def options_for_importer
+        @options.merge(:_line => line)
+      end
     end
   end
 end

data/lib/sass/tree/visitors/perform.rb

@@ -218,15 +218,17 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
     file = node.imported_file
     handle_import_loop!(node) if @stack.any? {|e| e[:filename] == file.options[:filename]}
 
-    @stack.push(:filename => node.filename, :line => node.line)
-    root = file.to_tree
-    Sass::Tree::Visitors::CheckNesting.visit(root)
-    node.children = root.children.map {|c| visit(c)}.flatten
-    node
-  rescue Sass::SyntaxError => e
-    e.modify_backtrace(:filename => node.imported_file.options[:filename])
-    e.add_backtrace(:filename => node.filename, :line => node.line)
-    raise e
+    begin
+      @stack.push(:filename => node.filename, :line => node.line)
+      root = file.to_tree
+      Sass::Tree::Visitors::CheckNesting.visit(root)
+      node.children = root.children.map {|c| visit(c)}.flatten
+      node
+    rescue Sass::SyntaxError => e
+      e.modify_backtrace(:filename => node.imported_file.options[:filename])
+      e.add_backtrace(:filename => node.filename, :line => node.line)
+      raise e
+    end
   ensure
     @stack.pop unless path
   end

data/lib/sass/tree/visitors/set_options.rb

@@ -50,6 +50,14 @@ class Sass::Tree::Visitors::SetOptions < Sass::Tree::Visitors::Base
     yield
   end
 
+  def visit_import(node)
+    # We have no good way of propagating the new options through an Engine
+    # instance, so we just null it out. This also lets us avoid caching an
+    # imported Engine along with the importing source tree.
+    node.imported_file = nil
+    yield
+  end
+
   def visit_mixindef(node)
     node.args.each do |k, v|
       k.options = @options

data/lib/sass/util.rb

@@ -467,6 +467,19 @@ module Sass
       Dir.glob(path, &block)
     end
 
+    # Prepare a value for a destructuring assignment (e.g. `a, b =
+    # val`). This works around a performance bug when using
+    # ActiveSupport, and only needs to be called when `val` is likely
+    # to be `nil` reasonably often.
+    #
+    # See [this bug report](http://redmine.ruby-lang.org/issues/4917).
+    #
+    # @param val [Object]
+    # @return [Object]
+    def destructure(val)
+      val || []
+    end
+
     ## Cross-Ruby-Version Compatibility
 
     # Whether or not this is running under Ruby 1.8 or lower.

data/test/sass/engine_test.rb

@@ -145,8 +145,8 @@ MSG
     "$var: true\n@while $var\n  @extend .bar\n  $var: false" => ["Extend directives may only be used within rules.", 3],
     "@for $i from 0 to 1\n  @extend .bar" => ["Extend directives may only be used within rules.", 2],
     "@mixin foo\n  @extend .bar\n@include foo" => ["Extend directives may only be used within rules.", 2],
-    "foo\n  &a\n    b: c" => ["Invalid CSS after \"&\": expected \"{\", was \"a\"\n\n\"a\" may only be used at the beginning of a selector.", 2],
-    "foo\n  &1\n    b: c" => ["Invalid CSS after \"&\": expected \"{\", was \"1\"\n\n\"1\" may only be used at the beginning of a selector.", 2],
+    "foo\n  &a\n    b: c" => ["Invalid CSS after \"&\": expected \"{\", was \"a\"\n\n\"a\" may only be used at the beginning of a compound selector.", 2],
+    "foo\n  &1\n    b: c" => ["Invalid CSS after \"&\": expected \"{\", was \"1\"\n\n\"1\" may only be used at the beginning of a compound selector.", 2],
     "foo %\n  a: b" => ['Invalid CSS after "foo %": expected placeholder name, was ""', 1],
     "=foo\n  @content error" => "Invalid content directive. Trailing characters found: \"error\".",
     "=foo\n  @content\n    b: c" => "Illegal nesting: Nothing may be nested beneath @content directives.",
@@ -217,7 +217,47 @@ MSG
     assert_equal("p {\n  a: b; }\n  p q {\n    c: d; }\n",
                  render("p\n\ta: b\n\tq\n\t\tc: d\n"))
   end
-  
+
+  def test_import_same_name_different_ext
+    assert_warning <<WARNING do
+WARNING: On line 1 of test_import_same_name_different_ext_inline.sass:
+  It's not clear which file to import for '@import "same_name_different_ext"'.
+  Candidates:
+    same_name_different_ext.sass
+    same_name_different_ext.scss
+  For now I'll choose same_name_different_ext.sass.
+  This will be an error in future versions of Sass.
+WARNING
+      options = {:load_paths => [File.dirname(__FILE__) + '/templates/']}
+      munge_filename options
+      result = Sass::Engine.new("@import 'same_name_different_ext'", options).render
+      assert_equal(<<CSS, result)
+.foo {
+  ext: sass; }
+CSS
+    end
+  end
+
+  def test_import_same_name_different_partiality
+    assert_warning <<WARNING do
+WARNING: On line 1 of test_import_same_name_different_partiality_inline.sass:
+  It's not clear which file to import for '@import "same_name_different_partiality"'.
+  Candidates:
+    _same_name_different_partiality.scss
+    same_name_different_partiality.scss
+  For now I'll choose _same_name_different_partiality.scss.
+  This will be an error in future versions of Sass.
+WARNING
+      options = {:load_paths => [File.dirname(__FILE__) + '/templates/']}
+      munge_filename options
+      result = Sass::Engine.new("@import 'same_name_different_partiality'", options).render
+      assert_equal(<<CSS, result)
+.foo {
+  partial: yes; }
+CSS
+    end
+  end
+
   EXCEPTION_MAP.each do |key, value|
     define_method("test_exception (#{key.inspect})") do
       line = 10
@@ -625,6 +665,11 @@ CSS
       render("@import \"http://fonts.googleapis.com/css?family=Droid+Sans\""))
   end
 
+  def test_protocol_relative_import
+    assert_equal("@import url(//fonts.googleapis.com/css?family=Droid+Sans);\n",
+      render("@import \"//fonts.googleapis.com/css?family=Droid+Sans\""))
+  end
+
   def test_import_with_interpolation
     assert_equal(<<CSS, render(<<SASS))
 @import url("http://fonts.googleapis.com/css?family=Droid+Sans");

data/test/sass/plugin_test.rb

@@ -9,6 +9,12 @@ module Sass::Script::Functions
     filename = options[:filename].gsub(%r{.*((/[^/]+){4})}, '\1')
     Sass::Script::String.new(filename)
   end
+
+  def whatever
+    custom = options[:custom]
+    whatever = custom && custom[:whatever]
+    Sass::Script::String.new(whatever || "incorrect")
+  end
 end
 
 class SassPluginTest < Test::Unit::TestCase
@@ -123,7 +129,7 @@ CSS
     File.open(tempfile_loc('single_import_loop')) do |file|
       assert_equal(<<CSS.strip, file.read.split("\n")[0...2].join("\n"))
 /*
-Sass::SyntaxError: An @import loop has been found: #{template_loc('single_import_loop')} imports itself
+Syntax error: An @import loop has been found: #{template_loc('single_import_loop')} imports itself
 CSS
     end
   end
@@ -134,9 +140,9 @@ CSS
     File.open(tempfile_loc('double_import_loop1')) do |file|
       assert_equal(<<CSS.strip, file.read.split("\n")[0...4].join("\n"))
 /*
-Sass::SyntaxError: An @import loop has been found:
-    #{template_loc('double_import_loop1')} imports #{template_loc('_double_import_loop2')}
-    #{template_loc('_double_import_loop2')} imports #{template_loc('double_import_loop1')}
+Syntax error: An @import loop has been found:
+                  #{template_loc('double_import_loop1')} imports #{template_loc('_double_import_loop2')}
+                  #{template_loc('_double_import_loop2')} imports #{template_loc('double_import_loop1')}
 CSS
     end
   end
@@ -210,6 +216,19 @@ CSS
     assert_needs_update "basic"
   end
 
+  def test_import_same_name
+    assert_warning <<WARNING do
+WARNING: In #{template_loc}:
+  There are multiple files that match the name "same_name_different_partiality.scss":
+    _same_name_different_partiality.scss
+    same_name_different_partiality.scss
+  This will be an error in future versions of Sass.
+WARNING
+      touch "_same_name_different_partiality"
+      assert_needs_update "same_name_different_partiality"
+    end
+  end
+
   # Callbacks
 
   def test_updating_stylesheets_callback
@@ -333,7 +352,24 @@ CSS
     check_for_updates!
     assert_renders_correctly 'if'
   ensure
-    set_plugin_opts :cache_store => @@cache_store
+    set_plugin_opts
+  end
+
+  def test_cached_import_option
+    set_plugin_opts :custom => {:whatever => "correct"}
+    check_for_updates!
+    assert_renders_correctly "cached_import_option"
+
+    @@cache_store.reset!
+    set_plugin_opts :custom => nil, :always_update => false
+    check_for_updates!
+    assert_renders_correctly "cached_import_option"
+
+    set_plugin_opts :custom => {:whatever => "correct"}, :always_update => true
+    check_for_updates!
+    assert_renders_correctly "cached_import_option"
+  ensure
+    set_plugin_opts :custom => nil
   end
 
  private
@@ -388,7 +424,7 @@ CSS
     end
 
     if block_given?
-      yield
+      Sass::Util.silence_sass_warnings {yield}
     else
       check_for_updates!
     end

data/test/sass/results/cached_import_option.css

@@ -0,0 +1,3 @@
+partial { value: correct; }
+
+main { value: correct; }

data/test/sass/scss/css_test.rb

@@ -1042,6 +1042,18 @@ body {
 SCSS
   end
 
+  def test_malformed_media
+    render <<SCSS
+@media {
+  margin: 0;
+}
+SCSS
+    assert(false, "Expected syntax error")
+  rescue Sass::SyntaxError => e
+    assert_equal 'Invalid CSS after "@media ": expected media query (e.g. print, screen, print and screen), was "{"', e.message
+    assert_equal 1, e.sass_line
+  end
+
   private
 
   def assert_selector_parses(selector)

data/test/sass/scss/scss_test.rb

@@ -290,6 +290,11 @@ SCSS
       render("@import \"http://fonts.googleapis.com/css?family=Droid+Sans\";"))
   end
 
+  def test_protocol_relative_import
+    assert_equal("@import \"//fonts.googleapis.com/css?family=Droid+Sans\";\n",
+      render("@import \"//fonts.googleapis.com/css?family=Droid+Sans\";"))
+  end
+
   def test_import_with_interpolation
     assert_equal <<CSS, render(<<SCSS)
 @import url("http://fonts.googleapis.com/css?family=Droid+Sans");
@@ -1664,7 +1669,7 @@ SCSS
     assert_raise_message(Sass::SyntaxError, <<MESSAGE.rstrip) {render <<SCSS}
 Invalid CSS after "  .foo": expected "{", was "&.bar {a: b}"
 
-"&.bar" may only be used at the beginning of a selector.
+"&.bar" may only be used at the beginning of a compound selector.
 MESSAGE
 flim {
   .foo&.bar {a: b}
@@ -1676,7 +1681,7 @@ SCSS
     assert_raise_message(Sass::SyntaxError, <<MESSAGE.rstrip) {render <<SCSS}
 Invalid CSS after "  .foo.bar": expected "{", was "& {a: b}"
 
-"&" may only be used at the beginning of a selector.
+"&" may only be used at the beginning of a compound selector.
 MESSAGE
 flim {
   .foo.bar& {a: b}
@@ -1688,7 +1693,7 @@ SCSS
     assert_raise_message(Sass::SyntaxError, <<MESSAGE.rstrip) {render <<SCSS}
 Invalid CSS after "  &": expected "{", was "& {a: b}"
 
-"&" may only be used at the beginning of a selector.
+"&" may only be used at the beginning of a compound selector.
 MESSAGE
 flim {
   && {a: b}

data/test/sass/templates/_cached_import_option_partial.scss

@@ -0,0 +1 @@
+partial {value: whatever()}

data/test/sass/templates/_same_name_different_partiality.scss

@@ -0,0 +1 @@
+.foo {partial: yes}

data/test/sass/templates/cached_import_option.scss

@@ -0,0 +1,3 @@
+@import "cached_import_option_partial";
+
+main {value: whatever()}

data/test/sass/templates/same_name_different_ext.sass

@@ -0,0 +1,2 @@
+.foo
+  ext: sass

data/test/sass/templates/same_name_different_ext.scss

@@ -0,0 +1 @@
+.foo {ext: scss}

data/test/sass/templates/same_name_different_partiality.scss

@@ -0,0 +1 @@
+.foo {partial: no}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-16 00:00:00.000000000 Z
+date: 2012-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
@@ -224,11 +224,13 @@ files:
 - test/sass/templates/filename_fn.scss
 - test/sass/templates/alt.sass
 - test/sass/templates/nested_bork1.sass
+- test/sass/templates/same_name_different_partiality.scss
 - test/sass/templates/complex.sass
 - test/sass/templates/units.sass
 - test/sass/templates/nested_import.sass
 - test/sass/templates/importee.sass
 - test/sass/templates/importee.less
+- test/sass/templates/_cached_import_option_partial.scss
 - test/sass/templates/scss_importee.scss
 - test/sass/templates/line_numbers.sass
 - test/sass/templates/expanded.sass
@@ -242,6 +244,7 @@ files:
 - test/sass/templates/nested.sass
 - test/sass/templates/compact.sass
 - test/sass/templates/single_import_loop.sass
+- test/sass/templates/_same_name_different_partiality.scss
 - test/sass/templates/multiline.sass
 - test/sass/templates/_imported_charset_ibm866.sass
 - test/sass/templates/double_import_loop1.sass
@@ -251,15 +254,18 @@ files:
 - test/sass/templates/import.sass
 - test/sass/templates/nested_bork3.sass
 - test/sass/templates/script.sass
+- test/sass/templates/same_name_different_ext.scss
 - test/sass/templates/bork4.sass
 - test/sass/templates/if.sass
 - test/sass/templates/_partial.sass
 - test/sass/templates/nested_mixin_bork.sass
 - test/sass/templates/import_charset_1_8.sass
+- test/sass/templates/same_name_different_ext.sass
 - test/sass/templates/nested_bork2.sass
 - test/sass/templates/mixin_bork.sass
 - test/sass/templates/compressed.sass
 - test/sass/templates/nested_bork4.sass
+- test/sass/templates/cached_import_option.scss
 - test/sass/templates/_imported_charset_utf8.sass
 - test/sass/conversion_test.rb
 - test/sass/script_test.rb
@@ -288,6 +294,7 @@ files:
 - test/sass/results/parent_ref.css
 - test/sass/results/script.css
 - test/sass/results/complex.css
+- test/sass/results/cached_import_option.css
 - test/sass/results/import_charset.css
 - test/sass/results/alt.css
 - test/sass/results/if.css