sass 3.2.2 → 3.2.3

data/VERSION

@@ -1 +1 @@
-3.2.2
+3.2.3

data/VERSION_DATE

@@ -1 +1 @@
-03 November 2012 01:05:14 UTC
+10 November 2012 01:57:05 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/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.

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,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,373 +1,389 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: sass
-version: !ruby/object:Gem::Version
-  version: 3.2.2
+version: !ruby/object:Gem::Version 
+  hash: 9
   prerelease: 
+  segments: 
+  - 3
+  - 2
+  - 3
+  version: 3.2.3
 platform: ruby
-authors:
+authors: 
 - Nathan Weizenbaum
 - Chris Eppstein
 - Hampton Catlin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-03 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-11-10 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: yard
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.5.3
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 0
+        - 5
+        - 3
         version: 0.5.3
-- !ruby/object:Gem::Dependency
-  name: maruku
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.5.9
   type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: maruku
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 5
+        - 9
         version: 0.5.9
-description: ! "      Sass makes CSS fun again. Sass is an extension of CSS3, adding\n
-  \     nested rules, variables, mixins, selector inheritance, and more.\n      It's
-  translated to well-formatted, standard CSS using the\n      command line tool or
-  a web-framework plugin.\n"
+  type: :development
+  version_requirements: *id002
+description: "      Sass makes CSS fun again. Sass is an extension of CSS3, adding\n      nested rules, variables, mixins, selector inheritance, and more.\n      It's translated to well-formatted, standard CSS using the\n      command line tool or a web-framework plugin.\n"
 email: sass-lang@googlegroups.com
-executables:
+executables: 
 - sass
 - sass-convert
 - scss
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - rails/init.rb
-- lib/sass.rb
-- lib/sass/cache_stores.rb
-- lib/sass/plugin/compiler.rb
-- lib/sass/plugin/merb.rb
-- lib/sass/plugin/staleness_checker.rb
-- lib/sass/plugin/rack.rb
-- lib/sass/plugin/rails.rb
-- lib/sass/plugin/configuration.rb
-- lib/sass/plugin/generic.rb
-- lib/sass/version.rb
-- lib/sass/supports.rb
+- lib/sass/util/multibyte_string_scanner.rb
+- lib/sass/util/subset_map.rb
+- lib/sass/shared.rb
+- lib/sass/error.rb
 - lib/sass/media.rb
+- lib/sass/importers.rb
+- lib/sass/supports.rb
+- lib/sass/cache_stores/filesystem.rb
 - lib/sass/cache_stores/chain.rb
 - lib/sass/cache_stores/memory.rb
 - lib/sass/cache_stores/null.rb
-- lib/sass/cache_stores/filesystem.rb
 - lib/sass/cache_stores/base.rb
-- lib/sass/shared.rb
-- lib/sass/repl.rb
-- lib/sass/error.rb
-- lib/sass/tree/import_node.rb
-- lib/sass/tree/trace_node.rb
-- lib/sass/tree/return_node.rb
-- lib/sass/tree/root_node.rb
-- lib/sass/tree/if_node.rb
-- lib/sass/tree/charset_node.rb
-- lib/sass/tree/css_import_node.rb
-- lib/sass/tree/function_node.rb
-- lib/sass/tree/media_node.rb
-- lib/sass/tree/while_node.rb
-- lib/sass/tree/for_node.rb
-- lib/sass/tree/directive_node.rb
-- lib/sass/tree/rule_node.rb
-- lib/sass/tree/each_node.rb
-- lib/sass/tree/node.rb
-- lib/sass/tree/mixin_node.rb
-- lib/sass/tree/extend_node.rb
-- lib/sass/tree/mixin_def_node.rb
-- lib/sass/tree/supports_node.rb
-- lib/sass/tree/visitors/perform.rb
-- lib/sass/tree/visitors/to_css.rb
-- lib/sass/tree/visitors/check_nesting.rb
+- lib/sass/environment.rb
+- lib/sass/plugin/rack.rb
+- lib/sass/plugin/staleness_checker.rb
+- lib/sass/plugin/compiler.rb
+- lib/sass/plugin/configuration.rb
+- lib/sass/plugin/merb.rb
+- lib/sass/plugin/rails.rb
+- lib/sass/plugin/generic.rb
+- lib/sass/railtie.rb
+- lib/sass/logger.rb
+- lib/sass/callbacks.rb
+- lib/sass/script/string.rb
+- lib/sass/script/node.rb
+- lib/sass/script/null.rb
+- lib/sass/script/lexer.rb
+- lib/sass/script/string_interpolation.rb
+- lib/sass/script/css_parser.rb
+- lib/sass/script/variable.rb
+- lib/sass/script/literal.rb
+- lib/sass/script/bool.rb
+- lib/sass/script/arg_list.rb
+- lib/sass/script/number.rb
+- lib/sass/script/unary_operation.rb
+- lib/sass/script/css_lexer.rb
+- lib/sass/script/operation.rb
+- lib/sass/script/parser.rb
+- lib/sass/script/funcall.rb
+- lib/sass/script/color.rb
+- lib/sass/script/interpolation.rb
+- lib/sass/script/list.rb
+- lib/sass/script/functions.rb
+- lib/sass/version.rb
 - lib/sass/tree/visitors/deep_copy.rb
-- lib/sass/tree/visitors/extend.rb
 - lib/sass/tree/visitors/set_options.rb
 - lib/sass/tree/visitors/cssize.rb
-- lib/sass/tree/visitors/convert.rb
+- lib/sass/tree/visitors/to_css.rb
+- lib/sass/tree/visitors/perform.rb
 - lib/sass/tree/visitors/base.rb
+- lib/sass/tree/visitors/extend.rb
+- lib/sass/tree/visitors/check_nesting.rb
+- lib/sass/tree/visitors/convert.rb
+- lib/sass/tree/supports_node.rb
+- lib/sass/tree/root_node.rb
+- lib/sass/tree/node.rb
+- lib/sass/tree/if_node.rb
+- lib/sass/tree/css_import_node.rb
+- lib/sass/tree/charset_node.rb
+- lib/sass/tree/extend_node.rb
+- lib/sass/tree/trace_node.rb
 - lib/sass/tree/content_node.rb
-- lib/sass/tree/comment_node.rb
-- lib/sass/tree/warn_node.rb
-- lib/sass/tree/debug_node.rb
+- lib/sass/tree/rule_node.rb
+- lib/sass/tree/mixin_def_node.rb
+- lib/sass/tree/return_node.rb
+- lib/sass/tree/mixin_node.rb
 - lib/sass/tree/prop_node.rb
+- lib/sass/tree/warn_node.rb
+- lib/sass/tree/directive_node.rb
+- lib/sass/tree/each_node.rb
+- lib/sass/tree/comment_node.rb
+- lib/sass/tree/media_node.rb
 - lib/sass/tree/variable_node.rb
-- lib/sass/engine.rb
-- lib/sass/plugin.rb
-- lib/sass/root.rb
-- lib/sass/importers.rb
-- lib/sass/logger.rb
-- lib/sass/util/multibyte_string_scanner.rb
-- lib/sass/util/subset_map.rb
-- lib/sass/scss.rb
-- lib/sass/scss/static_parser.rb
-- lib/sass/scss/parser.rb
-- lib/sass/scss/script_lexer.rb
-- lib/sass/scss/rx.rb
+- lib/sass/tree/function_node.rb
+- lib/sass/tree/debug_node.rb
+- lib/sass/tree/import_node.rb
+- lib/sass/tree/while_node.rb
+- lib/sass/tree/for_node.rb
 - lib/sass/scss/script_parser.rb
 - lib/sass/scss/css_parser.rb
-- lib/sass/logger/log_level.rb
-- lib/sass/logger/base.rb
-- lib/sass/css.rb
-- lib/sass/script.rb
-- lib/sass/util.rb
-- lib/sass/importers/filesystem.rb
-- lib/sass/importers/base.rb
-- lib/sass/script/color.rb
-- lib/sass/script/variable.rb
-- lib/sass/script/operation.rb
-- lib/sass/script/funcall.rb
-- lib/sass/script/literal.rb
-- lib/sass/script/parser.rb
-- lib/sass/script/functions.rb
-- lib/sass/script/number.rb
-- lib/sass/script/string_interpolation.rb
-- lib/sass/script/interpolation.rb
-- lib/sass/script/arg_list.rb
-- lib/sass/script/node.rb
-- lib/sass/script/bool.rb
-- lib/sass/script/unary_operation.rb
-- lib/sass/script/lexer.rb
-- lib/sass/script/list.rb
-- lib/sass/script/css_lexer.rb
-- lib/sass/script/null.rb
-- lib/sass/script/string.rb
-- lib/sass/script/css_parser.rb
-- lib/sass/selector.rb
-- lib/sass/callbacks.rb
+- lib/sass/scss/script_lexer.rb
+- lib/sass/scss/rx.rb
+- lib/sass/scss/parser.rb
+- lib/sass/scss/static_parser.rb
+- lib/sass/selector/simple_sequence.rb
 - lib/sass/selector/simple.rb
 - lib/sass/selector/sequence.rb
 - lib/sass/selector/abstract_sequence.rb
 - lib/sass/selector/comma_sequence.rb
-- lib/sass/selector/simple_sequence.rb
-- lib/sass/railtie.rb
-- lib/sass/environment.rb
+- lib/sass/root.rb
+- lib/sass/importers/filesystem.rb
+- lib/sass/importers/base.rb
+- lib/sass/css.rb
+- lib/sass/selector.rb
+- lib/sass/engine.rb
+- lib/sass/plugin.rb
+- lib/sass/logger/log_level.rb
+- lib/sass/logger/base.rb
+- lib/sass/repl.rb
+- lib/sass/scss.rb
 - lib/sass/exec.rb
-- vendor/listen/README.md
-- vendor/listen/Guardfile
-- vendor/listen/Gemfile
+- lib/sass/util.rb
+- lib/sass/cache_stores.rb
+- lib/sass/script.rb
+- lib/sass.rb
+- vendor/listen/lib/listen.rb
 - vendor/listen/lib/listen/turnstile.rb
-- vendor/listen/lib/listen/directory_record.rb
-- vendor/listen/lib/listen/version.rb
 - vendor/listen/lib/listen/multi_listener.rb
-- vendor/listen/lib/listen/listener.rb
-- vendor/listen/lib/listen/adapters/polling.rb
 - vendor/listen/lib/listen/adapters/darwin.rb
-- vendor/listen/lib/listen/adapters/linux.rb
+- vendor/listen/lib/listen/adapters/polling.rb
 - vendor/listen/lib/listen/adapters/windows.rb
+- vendor/listen/lib/listen/adapters/linux.rb
 - vendor/listen/lib/listen/adapter.rb
-- vendor/listen/lib/listen.rb
+- vendor/listen/lib/listen/listener.rb
+- vendor/listen/lib/listen/version.rb
+- vendor/listen/lib/listen/directory_record.rb
+- vendor/listen/Vagrantfile
 - vendor/listen/CHANGELOG.md
-- vendor/listen/Rakefile
 - vendor/listen/LICENSE
+- vendor/listen/Rakefile
+- vendor/listen/Gemfile
+- vendor/listen/README.md
+- vendor/listen/Guardfile
 - vendor/listen/listen.gemspec
-- vendor/listen/Vagrantfile
-- vendor/listen/spec/listen/directory_record_spec.rb
-- vendor/listen/spec/listen/adapters/linux_spec.rb
+- vendor/listen/spec/spec_helper.rb
+- vendor/listen/spec/listen_spec.rb
+- vendor/listen/spec/support/directory_record_helper.rb
+- vendor/listen/spec/support/fixtures_helper.rb
+- vendor/listen/spec/support/listeners_helper.rb
+- vendor/listen/spec/support/platform_helper.rb
+- vendor/listen/spec/support/adapter_helper.rb
+- vendor/listen/spec/listen/turnstile_spec.rb
+- vendor/listen/spec/listen/adapters/windows_spec.rb
 - vendor/listen/spec/listen/adapters/darwin_spec.rb
+- vendor/listen/spec/listen/adapters/linux_spec.rb
 - vendor/listen/spec/listen/adapters/polling_spec.rb
-- vendor/listen/spec/listen/adapters/windows_spec.rb
-- vendor/listen/spec/listen/turnstile_spec.rb
 - vendor/listen/spec/listen/adapter_spec.rb
+- vendor/listen/spec/listen/directory_record_spec.rb
 - vendor/listen/spec/listen/listener_spec.rb
 - vendor/listen/spec/listen/multi_listener_spec.rb
-- vendor/listen/spec/listen_spec.rb
-- vendor/listen/spec/spec_helper.rb
-- vendor/listen/spec/support/directory_record_helper.rb
-- vendor/listen/spec/support/listeners_helper.rb
-- vendor/listen/spec/support/adapter_helper.rb
-- vendor/listen/spec/support/platform_helper.rb
-- vendor/listen/spec/support/fixtures_helper.rb
-- bin/sass-convert
-- bin/scss
 - bin/sass
-- test/Gemfile
-- test/Gemfile.lock
-- test/test_helper.rb
-- test/sass/engine_test.rb
-- test/sass/functions_test.rb
-- test/sass/fixtures/test_staleness_check_across_importers.scss
-- test/sass/fixtures/test_staleness_check_across_importers.css
-- test/sass/data/hsl-rgb.txt
-- test/sass/extend_test.rb
-- test/sass/logger_test.rb
-- test/sass/css2sass_test.rb
-- test/sass/templates/_filename_fn_import.scss
+- bin/scss
+- bin/sass-convert
+- test/sass/plugin_test.rb
+- test/sass/util/subset_map_test.rb
+- test/sass/util/multibyte_string_scanner_test.rb
 - test/sass/templates/basic.sass
-- test/sass/templates/mixins.sass
-- test/sass/templates/options.sass
-- test/sass/templates/scss_import.scss
-- test/sass/templates/subdir/subdir.sass
-- test/sass/templates/subdir/nested_subdir/_nested_partial.sass
-- test/sass/templates/subdir/nested_subdir/nested_subdir.sass
-- test/sass/templates/_imported_content.sass
+- test/sass/templates/line_numbers.sass
+- test/sass/templates/nested_bork2.sass
+- test/sass/templates/_imported_charset_utf8.sass
+- test/sass/templates/mixin_bork.sass
+- test/sass/templates/import_charset.sass
+- test/sass/templates/cached_import_option.scss
+- test/sass/templates/_same_name_different_partiality.scss
+- test/sass/templates/importee.less
+- test/sass/templates/warn.sass
+- test/sass/templates/single_import_loop.sass
+- test/sass/templates/parent_ref.sass
+- test/sass/templates/nested_bork3.sass
+- test/sass/templates/script.sass
+- test/sass/templates/import.sass
+- test/sass/templates/scss_importee.scss
+- test/sass/templates/bork1.sass
+- test/sass/templates/compressed.sass
+- test/sass/templates/importee.sass
 - test/sass/templates/filename_fn.scss
-- test/sass/templates/alt.sass
+- test/sass/templates/_partial.sass
+- test/sass/templates/units.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
+- test/sass/templates/_double_import_loop2.sass
 - test/sass/templates/bork3.sass
 - test/sass/templates/import_content.sass
-- test/sass/templates/warn_imported.sass
+- test/sass/templates/nested_mixin_bork.sass
+- test/sass/templates/complex.sass
+- test/sass/templates/if.sass
+- test/sass/templates/same_name_different_ext.scss
 - test/sass/templates/import_charset_ibm866.sass
-- test/sass/templates/bork1.sass
-- test/sass/templates/warn.sass
-- test/sass/templates/bork2.sass
-- test/sass/templates/nested.sass
+- test/sass/templates/_filename_fn_import.scss
+- test/sass/templates/double_import_loop1.sass
+- test/sass/templates/_imported_content.sass
+- test/sass/templates/alt.sass
+- test/sass/templates/scss_import.scss
 - 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
-- test/sass/templates/_double_import_loop2.sass
-- test/sass/templates/import_charset.sass
-- test/sass/templates/parent_ref.sass
-- 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/_cached_import_option_partial.scss
+- test/sass/templates/nested.sass
+- test/sass/templates/subdir/subdir.sass
+- test/sass/templates/subdir/nested_subdir/_nested_partial.sass
+- test/sass/templates/subdir/nested_subdir/nested_subdir.sass
+- test/sass/templates/warn_imported.sass
+- test/sass/templates/same_name_different_ext.sass
+- test/sass/templates/options.sass
 - 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
-- test/sass/util/subset_map_test.rb
-- test/sass/util/multibyte_string_scanner_test.rb
-- test/sass/callbacks_test.rb
-- test/sass/importer_test.rb
+- test/sass/templates/nested_import.sass
+- test/sass/templates/multiline.sass
+- test/sass/templates/expanded.sass
+- test/sass/templates/mixins.sass
+- test/sass/templates/bork2.sass
+- test/sass/script_conversion_test.rb
+- test/sass/mock_importer.rb
+- test/sass/test_helper.rb
+- test/sass/logger_test.rb
+- test/sass/fixtures/test_staleness_check_across_importers.css
+- test/sass/fixtures/test_staleness_check_across_importers.scss
+- test/sass/functions_test.rb
+- test/sass/util_test.rb
+- test/sass/more_results/more1.css
+- test/sass/more_results/more1_with_line_comments.css
+- test/sass/more_results/more_import.css
+- test/sass/data/hsl-rgb.txt
+- test/sass/scss/test_helper.rb
 - test/sass/scss/css_test.rb
-- test/sass/scss/scss_test.rb
 - test/sass/scss/rx_test.rb
-- test/sass/scss/test_helper.rb
-- test/sass/util_test.rb
-- test/sass/results/mixins.css
-- test/sass/results/warn_imported.css
-- test/sass/results/expanded.css
-- test/sass/results/compact.css
-- test/sass/results/import_content.css
-- test/sass/results/compressed.css
-- test/sass/results/scss_importee.css
-- test/sass/results/basic.css
-- test/sass/results/subdir/nested_subdir/nested_subdir.css
-- test/sass/results/subdir/subdir.css
-- test/sass/results/options.css
-- test/sass/results/scss_import.css
+- test/sass/scss/scss_test.rb
+- test/sass/script_test.rb
+- test/sass/importer_test.rb
+- test/sass/cache_test.rb
+- test/sass/conversion_test.rb
+- test/sass/more_templates/more1.sass
+- test/sass/more_templates/_more_partial.sass
+- test/sass/more_templates/more_import.sass
+- test/sass/extend_test.rb
+- test/sass/engine_test.rb
+- test/sass/css2sass_test.rb
+- test/sass/callbacks_test.rb
 - test/sass/results/units.css
-- test/sass/results/parent_ref.css
+- test/sass/results/alt.css
+- test/sass/results/scss_importee.css
+- test/sass/results/filename_fn.css
+- test/sass/results/line_numbers.css
+- test/sass/results/import_charset.css
+- test/sass/results/expanded.css
+- test/sass/results/warn.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
-- test/sass/results/multiline.css
+- test/sass/results/scss_import.css
+- test/sass/results/import_content.css
+- test/sass/results/nested.css
+- test/sass/results/options.css
 - test/sass/results/import_charset_1_8.css
-- test/sass/results/warn.css
+- test/sass/results/parent_ref.css
+- test/sass/results/multiline.css
 - test/sass/results/import_charset_ibm866.css
-- test/sass/results/filename_fn.css
+- test/sass/results/subdir/subdir.css
+- test/sass/results/subdir/nested_subdir/nested_subdir.css
+- test/sass/results/warn_imported.css
+- test/sass/results/compact.css
+- test/sass/results/mixins.css
+- test/sass/results/complex.css
+- test/sass/results/compressed.css
 - test/sass/results/import.css
-- test/sass/results/nested.css
-- test/sass/results/line_numbers.css
-- test/sass/test_helper.rb
-- test/sass/more_templates/_more_partial.sass
-- test/sass/more_templates/more_import.sass
-- test/sass/more_templates/more1.sass
-- test/sass/script_conversion_test.rb
-- test/sass/more_results/more1.css
-- test/sass/more_results/more1_with_line_comments.css
-- test/sass/more_results/more_import.css
-- test/sass/mock_importer.rb
-- test/sass/cache_test.rb
-- test/sass/plugin_test.rb
+- test/sass/results/basic.css
+- test/test_helper.rb
+- test/Gemfile.lock
+- test/Gemfile
 - extra/update_watch.rb
 - Rakefile
 - init.rb
 - .yardopts
-- README.md
-- VERSION_NAME
-- VERSION_DATE
-- REVISION
 - MIT-LICENSE
+- REVISION
 - VERSION
+- VERSION_NAME
+- README.md
 - CONTRIBUTING
+- VERSION_DATE
 homepage: http://sass-lang.com/
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 57
+      segments: 
+      - 1
+      - 8
+      - 7
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: sass
-rubygems_version: 1.8.24
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A powerful but elegant CSS compiler that makes CSS fun again.
-test_files:
-- test/sass/engine_test.rb
-- test/sass/functions_test.rb
-- test/sass/extend_test.rb
-- test/sass/logger_test.rb
-- test/sass/css2sass_test.rb
-- test/sass/conversion_test.rb
-- test/sass/script_test.rb
+test_files: 
+- test/sass/plugin_test.rb
 - test/sass/util/subset_map_test.rb
 - test/sass/util/multibyte_string_scanner_test.rb
-- test/sass/callbacks_test.rb
-- test/sass/importer_test.rb
+- test/sass/script_conversion_test.rb
+- test/sass/logger_test.rb
+- test/sass/functions_test.rb
+- test/sass/util_test.rb
 - test/sass/scss/css_test.rb
-- test/sass/scss/scss_test.rb
 - test/sass/scss/rx_test.rb
-- test/sass/util_test.rb
-- test/sass/script_conversion_test.rb
+- test/sass/scss/scss_test.rb
+- test/sass/script_test.rb
+- test/sass/importer_test.rb
 - test/sass/cache_test.rb
-- test/sass/plugin_test.rb
+- test/sass/conversion_test.rb
+- test/sass/extend_test.rb
+- test/sass/engine_test.rb
+- test/sass/css2sass_test.rb
+- test/sass/callbacks_test.rb