sass 3.3.0.alpha.9 → 3.3.0.alpha.11

data/REVISION

@@ -1 +1 @@
-86b12c98ecd0fa693a80ffb679dbb14fdfe30ce3
+eb90864aa1f2b1c2e54e110670417e4de34b2dca

data/VERSION

@@ -1 +1 @@
-3.3.0.alpha.9
+3.3.0.alpha.11

data/VERSION_DATE

@@ -1 +1 @@
-03 November 2012 01:08:14 GMT
+09 November 2012 22:20:10 GMT

data/lib/sass/exec.rb

@@ -407,6 +407,13 @@ MSG
         ::Sass::Plugin.on_creating_directory {|dirname| puts_action :directory, :green, dirname}
         ::Sass::Plugin.on_deleting_css {|filename| puts_action :delete, :yellow, filename}
         ::Sass::Plugin.on_compilation_error do |error, _, _|
+          if error.is_a?(SystemCallError) && !@options[:stop_on_error]
+            had_error = true
+            puts_action :error, :red, error.message
+            STDOUT.flush
+            next
+          end
+
           raise error unless error.is_a?(::Sass::SyntaxError) && !@options[:stop_on_error]
           had_error = true
           puts_action :error, :red, "#{error.sass_filename} (Line #{error.sass_line}: #{error.message})"

data/lib/sass/plugin/compiler.rb

@@ -183,6 +183,7 @@ module Sass::Plugin
     #   The first string in each pair is the location of the Sass/SCSS file,
     #   the second is the location of the CSS file that it should be compiled to.
     def update_stylesheets(individual_files = [])
+      individual_files = individual_files.dup
       Sass::Plugin.checked_for_updates = true
       staleness_checker = StalenessChecker.new(engine_options)
 

data/lib/sass/script/funcall.rb

@@ -109,7 +109,12 @@ module Sass
         # If this is a legitimate Ruby-raised argument error, re-raise it.
         # Otherwise, it's an error in the user's stylesheet, so wrap it.
         if e.message =~ /^wrong number of arguments \(\d+ for \d+\)/ &&
-            e.backtrace[0] !~ /:in `(block in )?#{ruby_name}'$/
+            e.backtrace[0] !~ /:in `(block in )?#{ruby_name}'$/ &&
+            # JRuby (as of 1.6.7.2) doesn't put the actual method for
+            # which the argument error was thrown in the backtrace, so
+            # we detect whether our send threw an argument error.
+            (RUBY_PLATFORM !~ /java/ || e.backtrace[0] !~ /:in `send'$/ ||
+             e.backtrace[1] !~ /:in `_perform'$/)
           raise e
         end
         raise Sass::SyntaxError.new("#{e.message} for `#{name}'")

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

@@ -23,7 +23,8 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
   SCRIPT_NODES = [Sass::Tree::ImportNode] + CONTROL_NODES
   def visit_children(parent)
     old_parent = @parent
-    @parent = parent unless is_any_of?(parent, SCRIPT_NODES)
+    @parent = parent unless is_any_of?(parent, SCRIPT_NODES) ||
+      (parent.bubbles? && !old_parent.is_a?(Sass::Tree::RootNode))
     @parents.push parent
     super
   ensure

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

@@ -333,9 +333,7 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
     res = node.expr.perform(@environment)
     res = res.value if res.is_a?(Sass::Script::String)
     msg = "WARNING: #{res}\n         "
-    msg << stack_trace.join("\n         ")
-    # JRuby doesn't automatically add a newline for #warn
-    msg << (RUBY_PLATFORM =~ /java/ ? "\n\n" : "\n")
+    msg << stack_trace.join("\n         ") << "\n"
     Sass::Util.sass_warn msg
     []
   ensure

data/lib/sass/util.rb

@@ -298,7 +298,9 @@ module Sass
     # @param entry [String] An entry in the `#caller` list, or a similarly formatted string
     # @return [[String, Fixnum, (String, nil)]] An array containing the filename, line, and method name of the caller.
     #   The method name may be nil
-    def caller_info(entry = caller[1])
+    def caller_info(entry = nil)
+      # JRuby evaluates `caller` incorrectly when it's in an actual default argument.
+      entry ||= caller[1]
       info = entry.scan(/^(.*?):(-?.*?)(?::.*`(.+)')?$/).first
       info[1] = info[1].to_i
       # This is added by Rubinius to designate a block, but we don't care about it.

data/test/sass/plugin_test.rb

@@ -237,11 +237,6 @@ WARNING
     assert_callback :updating_stylesheets, []
   end
 
-  def test_updating_stylesheets_callback_with_individual_files
-    files = [[template_loc("basic"), tempfile_loc("basic")]]
-    assert_callback(:updating_stylesheets, files) {Sass::Util.silence_sass_warnings{Sass::Plugin.update_stylesheets(files)}}
-  end
-
   def test_updating_stylesheets_callback_with_never_update
     Sass::Plugin.options[:never_update] = true
     assert_no_callback :updating_stylesheets

data/test/sass/script_test.rb

@@ -489,6 +489,10 @@ SASS
   end
 
   def test_deep_argument_error_not_unwrapped
+    # JRuby (as of 1.6.7.2) offers no way of distinguishing between
+    # argument errors caused by programming errors in a function and
+    # argument errors explicitly thrown within that function.
+    return if RUBY_PLATFORM =~ /java/
     assert_raise_message(ArgumentError, 'wrong number of arguments (0 for 1)') {resolve("arg-error()")}
   end
 

data/test/sass/scss/scss_test.rb

@@ -1977,4 +1977,24 @@ SCSS
 SCSS
     Sass::SCSS::Parser.new(template, "test.scss").parse
   end
+
+  def test_extend_in_media_in_rule
+    assert_equal(<<CSS, render(<<SCSS))
+@media screen {
+  .foo {
+    a: b; } }
+CSS
+.foo {
+  @media screen {
+    @extend %bar;
+  }
+}
+
+@media screen {
+  %bar {
+    a: b;
+  }
+}
+SCSS
+  end
 end

data/test/sass/util_test.rb

@@ -243,6 +243,10 @@ class UtilTest < Test::Unit::TestCase
     test[['foo ', 1, "\n bar\n", [2, 3, 4], "\n baz"]]
   end
 
+  def nested_caller_info_fn
+    caller_info
+  end
+
   def test_caller_info
     assert_equal(["/tmp/foo.rb", 12, "fizzle"], caller_info("/tmp/foo.rb:12: in `fizzle'"))
     assert_equal(["/tmp/foo.rb", 12, nil], caller_info("/tmp/foo.rb:12"))
@@ -250,6 +254,14 @@ class UtilTest < Test::Unit::TestCase
     assert_equal(["", 12, "boop"], caller_info(":12: in `boop'"))
     assert_equal(["/tmp/foo.rb", -12, "fizzle"], caller_info("/tmp/foo.rb:-12: in `fizzle'"))
     assert_equal(["/tmp/foo.rb", 12, "fizzle"], caller_info("/tmp/foo.rb:12: in `fizzle {}'"))
+
+    info = nested_caller_info_fn
+    assert_equal(__FILE__, info[0])
+    assert_equal("test_caller_info", info[2])
+
+    info = proc {nested_caller_info_fn}.call
+    assert_equal(__FILE__, info[0])
+    assert_equal("test_caller_info", info[2])
   end
 
   def test_version_gt

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 592302879
+  hash: 592302875
   prerelease: 6
   segments: 
   - 3
   - 3
   - 0
   - alpha
-  - 9
-  version: 3.3.0.alpha.9
+  - 11
+  version: 3.3.0.alpha.11
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-02 00:00:00 -04:00
+date: 2012-11-09 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency