sass 3.3.0.alpha.15 → 3.3.0.alpha.16

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/REVISION

@@ -1 +1 @@
-236f12d9047615e91e832945ebe06fa4952c0395
+83d6e352af4861f6c8fe852aaee38ca0097b1d9e

data/VERSION

@@ -1 +1 @@
-3.3.0.alpha.15
+3.3.0.alpha.16

data/VERSION_DATE

@@ -1 +1 @@
-01 November 2012 22:44:24 GMT
+10 November 2012 01:58:43 GMT

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.
@@ -406,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/importers/filesystem.rb

@@ -30,7 +30,7 @@ module Sass
 
       # @see Base#mtime
       def mtime(name, options)
-        file, s = find_real_file(@root, name, options)
+        file, s = Sass::Util.destructure(find_real_file(@root, name, options))
         File.mtime(file) if file
       rescue Errno::ENOENT
         nil
@@ -163,7 +163,7 @@ WARNING
       private
 
       def _find(dir, name, options)
-        full_filename, syntax = find_real_file(dir, name, options)
+        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/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/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/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/script/functions.rb

@@ -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/scss/parser.rb

@@ -332,7 +332,7 @@ module Sass
       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
@@ -709,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 == '*'
@@ -800,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?(/[,)]/)
@@ -1024,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/selector/sequence.rb

@@ -437,6 +437,9 @@ module Sass
       # @param seqses [Array<Array<Array<SimpleSequence or String>>>]
       # @return [Array<Array<Array<SimpleSequence or String>>>]
       def trim(seqses)
+        # Avoid truly horrific quadratic behavior. TOOD: I think there
+        # may be a way to get perfect trimming without going quadratic.
+        return seqses if seqses.size > 100
         # This is n^2 on the sequences, but only comparing between
         # separate sequences should limit the quadratic behavior.
         seqses.map do |seqs1|

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.
@@ -467,6 +469,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/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/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

@@ -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,14 @@ 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 double_nested_caller_info_fn
+    nested_caller_info_fn
+  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 +258,22 @@ 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_match(/^(block in )?test_caller_info$/, info[2])
+
+    info = double_nested_caller_info_fn
+    assert_equal(__FILE__, info[0])
+    assert_equal("double_nested_caller_info_fn", info[2])
+
+    info = proc {double_nested_caller_info_fn}.call
+    assert_equal(__FILE__, info[0])
+    assert_equal("double_nested_caller_info_fn", info[2])
   end
 
   def test_version_gt

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 592302867
+  hash: 592302893
   prerelease: 6
   segments: 
   - 3
   - 3
   - 0
   - alpha
-  - 15
-  version: 3.3.0.alpha.15
+  - 16
+  version: 3.3.0.alpha.16
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-01 00:00:00 -04:00
+date: 2012-11-09 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -233,6 +233,7 @@ files:
 - test/sass/plugin_test.rb
 - test/sass/results/alt.css
 - test/sass/results/basic.css
+- test/sass/results/cached_import_option.css
 - test/sass/results/compact.css
 - test/sass/results/complex.css
 - test/sass/results/compressed.css
@@ -258,25 +259,27 @@ files:
 - test/sass/results/units.css
 - test/sass/results/warn.css
 - test/sass/results/warn_imported.css
-- test/sass/results/cached_import_option.css
 - test/sass/script_conversion_test.rb
 - test/sass/script_test.rb
 - test/sass/scss/css_test.rb
 - test/sass/scss/rx_test.rb
 - test/sass/scss/scss_test.rb
 - test/sass/scss/test_helper.rb
+- test/sass/templates/_cached_import_option_partial.scss
 - test/sass/templates/_double_import_loop2.sass
 - test/sass/templates/_filename_fn_import.scss
 - test/sass/templates/_imported_charset_ibm866.sass
 - test/sass/templates/_imported_charset_utf8.sass
 - test/sass/templates/_imported_content.sass
 - test/sass/templates/_partial.sass
+- test/sass/templates/_same_name_different_partiality.scss
 - test/sass/templates/alt.sass
 - test/sass/templates/basic.sass
 - test/sass/templates/bork1.sass
 - test/sass/templates/bork2.sass
 - test/sass/templates/bork3.sass
 - test/sass/templates/bork4.sass
+- test/sass/templates/cached_import_option.scss
 - test/sass/templates/compact.sass
 - test/sass/templates/complex.sass
 - test/sass/templates/compressed.sass
@@ -304,6 +307,9 @@ files:
 - test/sass/templates/nested_mixin_bork.sass
 - test/sass/templates/options.sass
 - test/sass/templates/parent_ref.sass
+- test/sass/templates/same_name_different_ext.sass
+- test/sass/templates/same_name_different_ext.scss
+- test/sass/templates/same_name_different_partiality.scss
 - test/sass/templates/script.sass
 - test/sass/templates/scss_import.scss
 - test/sass/templates/scss_importee.scss
@@ -314,12 +320,6 @@ files:
 - test/sass/templates/units.sass
 - test/sass/templates/warn.sass
 - test/sass/templates/warn_imported.sass
-- test/sass/templates/_cached_import_option_partial.scss
-- test/sass/templates/_same_name_different_partiality.scss
-- test/sass/templates/cached_import_option.scss
-- test/sass/templates/same_name_different_ext.sass
-- test/sass/templates/same_name_different_ext.scss
-- test/sass/templates/same_name_different_partiality.scss
 - test/sass/test_helper.rb
 - test/sass/util/multibyte_string_scanner_test.rb
 - test/sass/util/subset_map_test.rb