sass 3.3.0.alpha.50 → 3.3.0.alpha.59

data/REVISION

@@ -1 +1 @@
-c962fa1b7d90fdb2e9df72ae2527a48f1f770276
+6b1a36d5126d1d8e2b9550a69e3aab09db566fed

data/VERSION

@@ -1 +1 @@
-3.3.0.alpha.50
+3.3.0.alpha.59

data/VERSION_DATE

@@ -1 +1 @@
-29 November 2012 19:00:24 GMT
+22 December 2012 00:18:55 GMT

data/lib/sass/engine.rb

@@ -268,7 +268,9 @@ module Sass
 
     # Render the template to CSS and return the source map.
     #
-    # @param sourcemap_uri [String] The sourcemap URI to use in the @sourceMappingURL comment
+    # @param sourcemap_uri [String] The sourcemap URI to use in the
+    #   @sourceMappingURL comment. This should be relative to the location of
+    #   the CSS file.
     # @return [(String, Sass::Source::Map)] The rendered CSS and the associated source map
     # @raise [Sass::SyntaxError] if there's an error in the document
     # @raise [Encoding::UndefinedConversionError] if the source encoding

data/lib/sass/importers/filesystem.rb

@@ -91,8 +91,14 @@ module Sass
         sorted_exts = extensions.sort
         syntax = extensions[extname]
 
-        return [["#{dirname}/{_,}#{basename}.#{extensions.invert[syntax]}", syntax]] if syntax
-        sorted_exts.map {|ext, syn| ["#{dirname}/{_,}#{basename}.#{ext}", syn]}
+        if syntax
+          ret = [["#{dirname}/{_,}#{basename}.#{extensions.invert[syntax]}", syntax]]
+        else
+          ret = sorted_exts.map {|ext, syn| ["#{dirname}/{_,}#{basename}.#{ext}", syn]}
+        end
+
+        # JRuby chokes when trying to import files from JARs when the path starts with './'.
+        ret.map {|f, s| [f.sub(%r{^\./}, ''), s]}
       end
 
       def escape_glob_characters(name)
@@ -118,7 +124,7 @@ module Sass
         end
         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)
@@ -141,7 +147,6 @@ MESSAGE
 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

data/lib/sass/plugin/compiler.rb

@@ -69,31 +69,6 @@ module Sass::Plugin
     #   The location of the sourcemap being generated, if any.
     define_callback :updated_stylesheet
 
-    # Register a callback to be run before a single stylesheet is updated.
-    # The callback is only run if the stylesheet is guaranteed to be updated;
-    # if the CSS file is fresh, this won't be run.
-    #
-    # Even if the \{file:SASS_REFERENCE.md#full_exception-option `:full_exception` option}
-    # is enabled, this callback won't be run
-    # when an exception CSS file is being written.
-    # To run an action for those files, use \{#on\_compilation\_error}.
-    #
-    # @yield [template, css]
-    # @yieldparam template [String]
-    #   The location of the Sass/SCSS file being updated.
-    # @yieldparam css [String]
-    #   The location of the CSS file being generated.
-    # @yieldparam sourcemap [String]
-    #   The location of the sourcemap file being generated, if any.
-    define_callback :updating_stylesheet
-
-    def on_updating_stylesheet_with_deprecation_warning(&block)
-      Sass::Util.sass_warn("Sass::Compiler#on_updating_stylesheet callback is deprecated and will be removed in a future release. Use Sass::Compiler#on_updated_stylesheet instead, which is run after stylesheet compilation.")
-      on_updating_stylesheet_without_deprecation_warning(&block)
-    end
-    alias_method :on_updating_stylesheet_without_deprecation_warning, :on_updating_stylesheet
-    alias_method :on_updating_stylesheet, :on_updating_stylesheet_with_deprecation_warning
-
     # Register a callback to be run when Sass decides not to update a stylesheet.
     # In particular, the callback is run when Sass finds that
     # the template file and none of its dependencies
@@ -201,8 +176,6 @@ module Sass::Plugin
         end
       end
 
-      run_updating_stylesheets individual_files
-
       individual_files.each do |file, css, sourcemap|
         # TODO: Does staleness_checker need to check the sourcemap file as well?
         if options[:always_update] || staleness_checker.stylesheet_needs_update?(css, file)
@@ -355,8 +328,6 @@ module Sass::Plugin
         compilation_error_occured = true
         run_compilation_error e, filename, css, sourcemap
         rendered = Sass::SyntaxError.exception_to_css(e, options)
-      else
-        run_updating_stylesheet filename, css, sourcemap
       end
 
       write_file(css, rendered)

data/lib/sass/plugin/configuration.rb

@@ -33,17 +33,6 @@ module Sass
         @options ||= default_options.dup
       end
 
-      # Sets the options hash.
-      # See {file:SASS_REFERENCE.md#sass_options the Sass options documentation}.
-      # See {Sass::Plugin::Configuration#reset!}
-      # @deprecated Instead, modify the options hash in-place.
-      # @param value [{Symbol => Object}] The options hash
-      def options=(value)
-        Sass::Util.sass_warn("Setting Sass::Plugin.options is deprecated " +
-                             "and will be removed in a future release.")
-        options.merge!(value)
-      end
-
       # Adds a new template-location/css-location mapping.
       # This means that Sass/SCSS files in `template_location`
       # will be compiled to CSS files in `css_location`.

data/lib/sass/script/number.rb

@@ -53,17 +53,6 @@ module Sass::Script
       @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
-
     # Used so we don't allocate two new arrays for each new number.
     NO_UNITS  = []
 

data/lib/sass/scss/parser.rb

@@ -318,7 +318,9 @@ module Sass
 
         loop do
           values << expr!(:import_arg)
-          break if use_css_import? || !tok(/,\s*/)
+          break if use_css_import?
+          break unless tok(/,/)
+          ss
         end
 
         return values

data/lib/sass/scss/rx.rb

@@ -128,12 +128,7 @@ module Sass
       # We could use it for 1.9 only, but I don't want to introduce a cross-version
       # behavior difference.
       # In any case, almost all CSS idents will be matched by this.
-      #
-      # We explicitly avoid parsing newlines or values/selectors longer than
-      # about 50 characters. This mitigates the problem of exponential parsing
-      # time when a value has a long string of valid, parsable content followed
-      # by something invalid.
-      STATIC_VALUE = /(-?#{NMSTART}|#{STRING_NOINTERP}|[ \t](?!%)|#[a-f0-9]|[,%]|#{NUM}|\!important){1,50}([;}])/i
+      STATIC_VALUE = /(-?#{NMSTART}|#{STRING_NOINTERP}|#[a-f0-9]|[,%]|-?#{NUMBER}|\!important)+([;}])/i
       STATIC_SELECTOR = /(#{NMCHAR}|[ \t]|[,>+*]|[:#.]#{NMSTART}){0,50}([{])/i
     end
   end

data/lib/sass/selector/simple_sequence.rb

@@ -105,7 +105,7 @@ module Sass
           group.each {|e, _| e.result = :failed_to_unify}
           next unless unified = seq.members.last.unify(self_without_sel, subject?)
           group.each {|e, _| e.result = :succeeded}
-          next if group.map {|e, _| check_directives_match!(e, parent_directives)}.none?
+          group.each {|e, _| check_directives_match!(e, parent_directives)}
           new_seq = Sequence.new(seq.members[0...-1] + [unified])
           new_seq.add_sources!(sources + [seq])
           [sels, new_seq]
@@ -180,16 +180,15 @@ module Sass
       def check_directives_match!(extend, parent_directives)
         dirs1 = extend.directives.map {|d| d.resolved_value}
         dirs2 = parent_directives.map {|d| d.resolved_value}
-        return true if Sass::Util.subsequence?(dirs1, dirs2)
-
-        Sass::Util.sass_warn <<WARNING
-DEPRECATION WARNING on line #{extend.node.line}#{" of #{extend.node.filename}" if extend.node.filename}:
-  @extending an outer selector from within #{extend.directives.last.name} is deprecated.
-  You may only @extend selectors within the same directive.
-  This will be an error in Sass 3.3.
-  It can only work once @extend is supported natively in the browser.
-WARNING
-        return false
+        return if Sass::Util.subsequence?(dirs1, dirs2)
+
+        # TODO(nweiz): this should use the Sass stack trace of the extend node,
+        # not the selector.
+        raise Sass::SyntaxError.new(<<MESSAGE)
+You may not @extend an outer selector from within #{extend.directives.last.name}.
+You may only @extend selectors within the same directive.
+From "@extend #{extend.target.join(', ')}" on line #{extend.node.line}#{" of #{extend.node.filename}" if extend.node.filename}.
+MESSAGE
       end
 
       def _hash

data/lib/sass/source/range.rb

@@ -20,7 +20,6 @@ module Sass::Source
     # @param end_pos [Sass::Source::Position] See \{#end_pos}
     # @param file [String] See \{#file}
     def initialize(start_pos, end_pos, file)
-      raise 'hell' if end_pos.is_a?(Fixnum)
       @start_pos = start_pos
       @end_pos = end_pos
       @file = file

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

@@ -49,7 +49,7 @@ class Sass::Tree::Visitors::Extend < Sass::Tree::Visitors::Base
   def self.check_extends_fired!(extends)
     extends.each_value do |ex|
       next if ex.result == :succeeded || ex.node.optional?
-      warn = "\"#{ex.extender}\" failed to @extend \"#{ex.target.join}\"."
+      message = "\"#{ex.extender}\" failed to @extend \"#{ex.target.join}\"."
       reason =
         if ex.result == :not_found
           "The selector \"#{ex.target.join}\" was not found."
@@ -57,12 +57,12 @@ class Sass::Tree::Visitors::Extend < Sass::Tree::Visitors::Base
           "No selectors matching \"#{ex.target.join}\" could be unified with \"#{ex.extender}\"."
         end
 
-      Sass::Util.sass_warn <<WARN
-WARNING on line #{ex.node.line}#{" of #{ex.node.filename}" if ex.node.filename}: #{warn}
-  #{reason}
-  This will be an error in future releases of Sass.
-  Use "@extend #{ex.target.join} !optional" if the extend should be able to fail.
-WARN
+      # TODO(nweiz): this should use the Sass stack trace of the extend node.
+      raise Sass::SyntaxError.new(<<MESSAGE, :filename => ex.node.filename, :line => ex.node.line)
+#{message}
+#{reason}
+Use "@extend #{ex.target.join} !optional" if the extend should be able to fail.
+MESSAGE
     end
   end
 end

data/test/sass/engine_test.rb

@@ -2903,12 +2903,6 @@ SCSS
     assert_equal original_filename, importer.engine("imported").options[:original_filename]
   end
 
-  def test_deprecated_PRECISION
-    assert_warning(<<END) {assert_equal 100_000.0, Sass::Script::Number::PRECISION}
-Sass::Script::Number::PRECISION is deprecated and will be removed in a future release. Use Sass::Script::Number.precision_factor instead.
-END
-  end
-
   def test_changing_precision
     old_precision = Sass::Script::Number.precision
     begin

data/test/sass/extend_test.rb

@@ -154,7 +154,7 @@ SCSS
     assert_unification '.foo#baz', '#baz {@extend .foo}', '#baz'
 
     assert_extend_doesnt_match('#bar', '.foo', :failed_to_unify, 2) do
-      assert_unification '.foo#baz', '#bar {@extend .foo}', '.foo#baz'
+      render_unification '.foo#baz', '#bar {@extend .foo}'
     end
   end
 
@@ -180,7 +180,7 @@ SCSS
     assert_unification 'ns|*.foo', '*|* {@extend .foo}', 'ns|*'
 
     assert_extend_doesnt_match('ns2|*', '.foo', :failed_to_unify, 2) do
-      assert_unification 'ns1|*.foo', 'ns2|* {@extend .foo}', 'ns1|*.foo'
+      render_unification 'ns1|*.foo', 'ns2|* {@extend .foo}'
     end
 
     assert_unification 'ns|*.foo', 'ns|* {@extend .foo}', 'ns|*'
@@ -200,7 +200,7 @@ SCSS
     assert_unification 'ns|a.foo', '*|* {@extend .foo}', 'ns|a'
 
     assert_extend_doesnt_match('ns2|*', '.foo', :failed_to_unify, 2) do
-      assert_unification 'ns1|a.foo', 'ns2|* {@extend .foo}', 'ns1|a.foo'
+      render_unification 'ns1|a.foo', 'ns2|* {@extend .foo}'
     end
 
     assert_unification 'ns|a.foo', 'ns|* {@extend .foo}', 'ns|a'
@@ -227,7 +227,7 @@ SCSS
     assert_unification 'ns|*.foo', '*|a {@extend .foo}', 'ns|*.foo, ns|a'
 
     assert_extend_doesnt_match('ns2|a', '.foo', :failed_to_unify, 2) do
-      assert_unification 'ns1|*.foo', 'ns2|a {@extend .foo}', 'ns1|*.foo'
+      render_unification 'ns1|*.foo', 'ns2|a {@extend .foo}'
     end
 
     assert_unification 'ns|*.foo', 'ns|a {@extend .foo}', 'ns|*.foo, ns|a'
@@ -242,7 +242,7 @@ SCSS
     assert_unification '*|a.foo', 'ns|a {@extend .foo}', '*|a.foo, ns|a'
 
     assert_extend_doesnt_match('h1', '.foo', :failed_to_unify, 2) do
-      assert_unification 'a.foo', 'h1 {@extend .foo}', 'a.foo'
+      render_unification 'a.foo', 'h1 {@extend .foo}'
     end
   end
 
@@ -251,7 +251,7 @@ SCSS
     assert_unification 'ns|a.foo', '*|a {@extend .foo}', 'ns|a'
 
     assert_extend_doesnt_match('ns2|a', '.foo', :failed_to_unify, 2) do
-      assert_unification 'ns1|a.foo', 'ns2|a {@extend .foo}', 'ns1|a.foo'
+      render_unification 'ns1|a.foo', 'ns2|a {@extend .foo}'
     end
 
     assert_unification 'ns|a.foo', 'ns|a {@extend .foo}', 'ns|a'
@@ -270,11 +270,11 @@ SCSS
     assert_unification ':foo.baz', '::foo {@extend .baz}', ':foo.baz, :foo::foo'
 
     assert_extend_doesnt_match('::bar', '.baz', :failed_to_unify, 2) do
-      assert_unification '::foo.baz', '::bar {@extend .baz}', '::foo.baz'
+      render_unification '::foo.baz', '::bar {@extend .baz}'
     end
 
     assert_extend_doesnt_match('::foo(2n+1)', '.baz', :failed_to_unify, 2) do
-      assert_unification '::foo.baz', '::foo(2n+1) {@extend .baz}', '::foo.baz'
+      render_unification '::foo.baz', '::foo(2n+1) {@extend .baz}'
     end
 
     assert_unification '::foo.baz', '::foo {@extend .baz}', '::foo'
@@ -348,7 +348,7 @@ SCSS
 
   def test_long_extendee_requires_all_selectors
     assert_extend_doesnt_match('.baz', '.foo.bar', :not_found, 2) do
-      assert_extends '.foo', '.baz {@extend .foo.bar}', '.foo'
+      render_extends '.foo', '.baz {@extend .foo.bar}'
     end
   end
 
@@ -372,11 +372,11 @@ SCSS
 
   def test_long_extender_aborts_unification
     assert_extend_doesnt_match('h1.baz', '.foo', :failed_to_unify, 2) do
-      assert_extends 'a.foo#bar', 'h1.baz {@extend .foo}', 'a.foo#bar'
+      render_extends 'a.foo#bar', 'h1.baz {@extend .foo}'
     end
 
     assert_extend_doesnt_match('.bang#baz', '.foo', :failed_to_unify, 2) do
-      assert_extends 'a.foo#bar', '.bang#baz {@extend .foo}', 'a.foo#bar'
+      render_extends 'a.foo#bar', '.bang#baz {@extend .foo}'
     end
   end
 
@@ -392,7 +392,7 @@ SCSS
 
   def test_nested_extender_aborts_unification
     assert_extend_doesnt_match('foo bar', '.foo', :failed_to_unify, 2) do
-      assert_extends 'baz.foo', 'foo bar {@extend .foo}', 'baz.foo'
+      render_extends 'baz.foo', 'foo bar {@extend .foo}'
     end
   end
 
@@ -810,10 +810,7 @@ SCSS
 
   def test_placeholder_selector_as_modifier
     assert_extend_doesnt_match('div', '%foo', :failed_to_unify, 3) do
-      assert_equal <<CSS, render(<<SCSS)
-a.baz.bar {
-  color: blue; }
-CSS
+      render(<<SCSS)
 a%foo.baz {color: blue}
 .bar {@extend %foo}
 div {@extend %foo}
@@ -844,16 +841,11 @@ SCSS
   end
 
   def test_extend_out_of_media
-    assert_warning(<<WARN) {assert_equal(<<CSS, render(<<SCSS))}
-DEPRECATION WARNING on line 3 of test_extend_out_of_media_inline.scss:
-  @extending an outer selector from within @media is deprecated.
-  You may only @extend selectors within the same directive.
-  This will be an error in Sass 3.3.
-  It can only work once @extend is supported natively in the browser.
-WARN
-.foo {
-  a: b; }
-CSS
+    assert_raise_message(Sass::SyntaxError, <<ERR) {render(<<SCSS)}
+You may not @extend an outer selector from within @media.
+You may only @extend selectors within the same directive.
+From "@extend .foo" on line 3 of test_extend_out_of_media_inline.scss.
+ERR
 .foo {a: b}
 @media screen {
   .bar {@extend .foo}
@@ -862,18 +854,11 @@ SCSS
   end
 
   def test_extend_out_of_unknown_directive
-    assert_warning(<<WARN) {assert_equal(<<CSS, render(<<SCSS))}
-DEPRECATION WARNING on line 3 of test_extend_out_of_unknown_directive_inline.scss:
-  @extending an outer selector from within @flooblehoof is deprecated.
-  You may only @extend selectors within the same directive.
-  This will be an error in Sass 3.3.
-  It can only work once @extend is supported natively in the browser.
-WARN
-.foo {
-  a: b; }
-
-@flooblehoof {}
-CSS
+    assert_raise_message(Sass::SyntaxError, <<ERR) {render(<<SCSS)}
+You may not @extend an outer selector from within @flooblehoof.
+You may only @extend selectors within the same directive.
+From "@extend .foo" on line 3 of test_extend_out_of_unknown_directive_inline.scss.
+ERR
 .foo {a: b}
 @flooblehoof {
   .bar {@extend .foo}
@@ -882,19 +867,11 @@ SCSS
   end
 
   def test_extend_out_of_nested_directives
-    assert_warning(<<WARN) {assert_equal(<<CSS, render(<<SCSS))}
-DEPRECATION WARNING on line 4 of test_extend_out_of_nested_directives_inline.scss:
-  @extending an outer selector from within @flooblehoof is deprecated.
-  You may only @extend selectors within the same directive.
-  This will be an error in Sass 3.3.
-  It can only work once @extend is supported natively in the browser.
-WARN
-@media screen {
-  .foo {
-    a: b; }
-
-  @flooblehoof {} }
-CSS
+    assert_raise_message(Sass::SyntaxError, <<ERR) {render(<<SCSS)}
+You may not @extend an outer selector from within @flooblehoof.
+You may only @extend selectors within the same directive.
+From "@extend .foo" on line 4 of test_extend_out_of_nested_directives_inline.scss.
+ERR
 @media screen {
   .foo {a: b}
   @flooblehoof {
@@ -985,20 +962,11 @@ SCSS
   end
 
   def test_extend_within_and_without_media
-    assert_warning(<<WARN) {assert_equal(<<CSS, render(<<SCSS))}
-DEPRECATION WARNING on line 4 of test_extend_within_and_without_media_inline.scss:
-  @extending an outer selector from within @media is deprecated.
-  You may only @extend selectors within the same directive.
-  This will be an error in Sass 3.3.
-  It can only work once @extend is supported natively in the browser.
-WARN
-.foo {
-  a: b; }
-
-@media screen {
-  .foo, .bar {
-    c: d; } }
-CSS
+    assert_raise_message(Sass::SyntaxError, <<ERR) {render(<<SCSS)}
+You may not @extend an outer selector from within @media.
+You may only @extend selectors within the same directive.
+From "@extend .foo" on line 4 of test_extend_within_and_without_media_inline.scss.
+ERR
 .foo {a: b}
 @media screen {
   .foo {c: d}
@@ -1008,20 +976,11 @@ SCSS
   end
 
   def test_extend_within_and_without_unknown_directive
-    assert_warning(<<WARN) {assert_equal(<<CSS, render(<<SCSS))}
-DEPRECATION WARNING on line 4 of test_extend_within_and_without_unknown_directive_inline.scss:
-  @extending an outer selector from within @flooblehoof is deprecated.
-  You may only @extend selectors within the same directive.
-  This will be an error in Sass 3.3.
-  It can only work once @extend is supported natively in the browser.
-WARN
-.foo {
-  a: b; }
-
-@flooblehoof {
-  .foo, .bar {
-    c: d; } }
-CSS
+    assert_raise_message(Sass::SyntaxError, <<ERR) {render(<<SCSS)}
+You may not @extend an outer selector from within @flooblehoof.
+You may only @extend selectors within the same directive.
+From "@extend .foo" on line 4 of test_extend_within_and_without_unknown_directive_inline.scss.
+ERR
 .foo {a: b}
 @flooblehoof {
   .foo {c: d}
@@ -1031,21 +990,11 @@ SCSS
   end
 
   def test_extend_within_and_without_nested_directives
-    assert_warning(<<WARN) {assert_equal(<<CSS, render(<<SCSS))}
-DEPRECATION WARNING on line 5 of test_extend_within_and_without_nested_directives_inline.scss:
-  @extending an outer selector from within @flooblehoof is deprecated.
-  You may only @extend selectors within the same directive.
-  This will be an error in Sass 3.3.
-  It can only work once @extend is supported natively in the browser.
-WARN
-@media screen {
-  .foo {
-    a: b; }
-
-  @flooblehoof {
-    .foo, .bar {
-      c: d; } } }
-CSS
+    assert_raise_message(Sass::SyntaxError, <<ERR) {render(<<SCSS)}
+You may not @extend an outer selector from within @flooblehoof.
+You may only @extend selectors within the same directive.
+From "@extend .foo" on line 5 of test_extend_within_and_without_nested_directives_inline.scss.
+ERR
 @media screen {
   .foo {a: b}
   @flooblehoof {
@@ -1115,33 +1064,28 @@ SCSS
 end
 
   def test_extend_warns_when_extendee_doesnt_exist
-    assert_warning(<<WARN) {assert_equal("", render(<<SCSS))}
-WARNING on line 1 of test_extend_warns_when_extendee_doesnt_exist_inline.scss: ".foo" failed to @extend ".bar".
-  The selector ".bar" was not found.
-  This will be an error in future releases of Sass.
-  Use "@extend .bar !optional" if the extend should be able to fail.
-WARN
+    assert_raise_message(Sass::SyntaxError, <<ERR) {render(<<SCSS)}
+".foo" failed to @extend ".bar".
+The selector ".bar" was not found.
+Use "@extend .bar !optional" if the extend should be able to fail.
+ERR
 .foo {@extend .bar}
 SCSS
   end
 
   def test_extend_warns_when_extension_fails
-    assert_warning(<<WARN) {assert_equal(<<CSS, render(<<SCSS))}
-WARNING on line 2 of test_extend_warns_when_extension_fails_inline.scss: "b.foo" failed to @extend ".bar".
-  No selectors matching ".bar" could be unified with "b.foo".
-  This will be an error in future releases of Sass.
-  Use "@extend .bar !optional" if the extend should be able to fail.
-WARN
-a.bar {
-  a: b; }
-CSS
+    assert_raise_message(Sass::SyntaxError, <<ERR) {render(<<SCSS)}
+"b.foo" failed to @extend ".bar".
+No selectors matching ".bar" could be unified with "b.foo".
+Use "@extend .bar !optional" if the extend should be able to fail.
+ERR
 a.bar {a: b}
 b.foo {@extend .bar}
 SCSS
   end
 
-  def test_extend_does_not_warn_when_one_extension_fails_but_others_dont
-    assert_no_warning {assert_equal(<<CSS, render(<<SCSS))}
+  def test_extend_succeeds_when_one_extension_fails_but_others_dont
+    assert_equal(<<CSS, render(<<SCSS))
 a.bar {
   a: b; }
 
@@ -1154,8 +1098,8 @@ b.foo {@extend .bar}
 SCSS
   end
 
-  def test_extend_does_not_warn_when_one_extension_fails_but_others_dont
-    assert_no_warning {assert_equal(<<CSS, render(<<SCSS))}
+  def test_extend_succeeds_when_one_extension_fails_but_others_dont
+    assert_equal(<<CSS, render(<<SCSS))
 a.bar {
   a: b; }
 
@@ -1168,14 +1112,14 @@ b.foo {@extend .bar}
 SCSS
   end
 
-  def test_optional_extend_does_not_warn_when_extendee_doesnt_exist
-    assert_no_warning {assert_equal("", render(<<SCSS))}
+  def test_optional_extend_succeeds_when_extendee_doesnt_exist
+    assert_equal("", render(<<SCSS))
 .foo {@extend .bar !optional}
 SCSS
   end
 
-  def test_optional_extend_does_not_warn_when_extension_fails
-    assert_no_warning {assert_equal(<<CSS, render(<<SCSS))}
+  def test_optional_extend_succeeds_when_extension_fails
+    assert_equal(<<CSS, render(<<SCSS))
 a.bar {
   a: b; }
 CSS
@@ -1295,7 +1239,7 @@ SCSS
   private
 
   def assert_extend_doesnt_match(extender, target, reason, line, syntax = :scss)
-    warn = "\"#{extender}\" failed to @extend \"#{target}\"."
+    message = "\"#{extender}\" failed to @extend \"#{target}\"."
     reason = 
       if reason == :not_found
         "The selector \"#{target}\" was not found."
@@ -1303,12 +1247,11 @@ SCSS
         "No selectors matching \"#{target}\" could be unified with \"#{extender}\"."
       end
 
-    assert_warning(<<WARNING) {yield}
-WARNING on line #{line} of #{filename_for_test syntax}: #{warn}
-  #{reason}
-  This will be an error in future releases of Sass.
-  Use "@extend #{target} !optional" if the extend should be able to fail.
-WARNING
+    assert_raise_message(Sass::SyntaxError, <<ERR) {yield}
+#{message}
+#{reason}
+Use "@extend #{target} !optional" if the extend should be able to fail.
+ERR
   end
 
   def assert_unification(selector, extension, unified)
@@ -1319,11 +1262,21 @@ WARNING
       unified.split(', ').map {|s| "-a #{s}"}.join(', '))
   end
 
+  def render_unification(selector, extension)
+    render_extends(
+      "%-a #{selector}",
+      extension + " -a {@extend %-a}")
+  end
+
   def assert_extends(selector, extension, result)
-    assert_equal <<CSS, render(<<SCSS)
+    assert_equal <<CSS, render_extends(selector, extension)
 #{result} {
   a: b; }
 CSS
+  end
+
+  def render_extends(selector, extension)
+    render(<<SCSS)
 #{selector} {a: b}
 #{extension}
 SCSS

data/test/sass/plugin_test.rb

@@ -222,7 +222,6 @@ 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"
@@ -231,17 +230,6 @@ WARNING
 
   # Callbacks
 
-  def test_updating_stylesheets_callback
-    # Should run even when there's nothing to update
-    Sass::Plugin.options[:template_location] = nil
-    assert_callback :updating_stylesheets, []
-  end
-
-  def test_updating_stylesheets_callback_with_never_update
-    Sass::Plugin.options[:never_update] = true
-    assert_no_callback :updating_stylesheets
-  end
-
   def test_updated_stylesheet_callback_for_updated_template
     Sass::Plugin.options[:always_update] = false
     touch 'basic'

data/test/sass/scss/scss_test.rb

@@ -1711,6 +1711,41 @@ SCSS
 
   # Regression
 
+  def test_parsing_decimals_followed_by_comments_doesnt_take_forever
+    assert_equal(<<CSS, render(<<SCSS))
+.foo {
+  padding: 4.21053% 4.21053% 5.63158%; }
+CSS
+.foo {
+  padding: 4.21052631578947% 4.21052631578947% 5.631578947368421% /**/
+}
+SCSS
+  end
+
+  def test_parsing_many_numbers_doesnt_take_forever
+    values = ["80% 90%"] * 1000
+    assert_equal(<<CSS, render(<<SCSS))
+.foo {
+  padding: #{values.join(', ')}; }
+CSS
+.foo {
+  padding: #{values.join(', ')};
+}
+SCSS
+  end
+
+  def test_import_comments_in_imports
+    assert_equal(<<CSS, render(<<SCSS))
+@import url(foo.css);
+@import url(bar.css);
+@import url(baz.css);
+CSS
+@import "foo.css", // this is a comment
+        "bar.css", // this is another comment
+        "baz.css"; // this is a third comment
+SCSS
+  end
+
   def test_reference_combinator_with_parent_ref
     assert_equal <<CSS, render(<<SCSS)
 a /foo/ b {

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 592302953
+  hash: 592302971
   prerelease: 6
   segments: 
   - 3
   - 3
   - 0
   - alpha
-  - 50
-  version: 3.3.0.alpha.50
+  - 59
+  version: 3.3.0.alpha.59
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-29 00:00:00 -05:00
+date: 2012-12-21 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -132,6 +132,7 @@ files:
 - lib/sass/selector/simple.rb
 - lib/sass/selector/simple_sequence.rb
 - lib/sass/shared.rb
+- lib/sass/util.rb
 - lib/sass/supports.rb
 - lib/sass/tree/charset_node.rb
 - lib/sass/tree/comment_node.rb
@@ -167,13 +168,12 @@ files:
 - lib/sass/tree/visitors/to_css.rb
 - lib/sass/tree/warn_node.rb
 - lib/sass/tree/while_node.rb
-- lib/sass/util.rb
-- lib/sass/util/multibyte_string_scanner.rb
-- lib/sass/util/subset_map.rb
-- lib/sass/version.rb
 - lib/sass/source/map.rb
 - lib/sass/source/position.rb
 - lib/sass/source/range.rb
+- lib/sass/util/multibyte_string_scanner.rb
+- lib/sass/util/subset_map.rb
+- lib/sass/version.rb
 - vendor/listen/CHANGELOG.md
 - vendor/listen/Gemfile
 - vendor/listen/Guardfile
@@ -268,6 +268,7 @@ files:
 - test/sass/scss/rx_test.rb
 - test/sass/scss/scss_test.rb
 - test/sass/scss/test_helper.rb
+- test/sass/util_test.rb
 - test/sass/templates/_cached_import_option_partial.scss
 - test/sass/templates/_double_import_loop2.sass
 - test/sass/templates/_filename_fn_import.scss
@@ -326,7 +327,6 @@ files:
 - test/sass/test_helper.rb
 - test/sass/util/multibyte_string_scanner_test.rb
 - test/sass/util/subset_map_test.rb
-- test/sass/util_test.rb
 - test/sass/source_map_test.rb
 - test/test_helper.rb
 - extra/update_watch.rb
@@ -394,7 +394,7 @@ test_files:
 - test/sass/scss/css_test.rb
 - test/sass/scss/rx_test.rb
 - test/sass/scss/scss_test.rb
+- test/sass/util_test.rb
 - test/sass/util/multibyte_string_scanner_test.rb
 - test/sass/util/subset_map_test.rb
-- test/sass/util_test.rb
 - test/sass/source_map_test.rb