sass 3.2.6 → 3.2.7

data/VERSION

@@ -1 +1 @@
-3.2.6
+3.2.7

data/VERSION_DATE

@@ -1 +1 @@
-23 February 2013 01:41:39 UTC
+09 March 2013 01:30:08 UTC

data/lib/sass/exec.rb

@@ -307,6 +307,7 @@ END
         return watch_or_update if @options[:watch] || @options[:update]
         super
         @options[:for_engine][:filename] = @options[:filename]
+        @options[:for_engine][:css_filename] = @options[:output].path if @options[:output].is_a?(File)
 
         begin
           input = @options[:input]

data/lib/sass/script/functions.rb

@@ -1371,9 +1371,9 @@ module Sass::Script
       length = nil
       values = []
       lists.each do |list|
-        assert_type list, :List
-        values << list.value.dup
-        length = length.nil? ? list.value.length : [length, list.value.length].min
+        array = list.to_a
+        values << array.dup
+        length = length.nil? ? array.length : [length, array.length].min
       end
       values.each do |value|
         value.slice!(length)
@@ -1391,8 +1391,7 @@ module Sass::Script
     #   index(1px solid red, solid) => 2
     #   index(1px solid red, dashed) => false
     def index(list, value)
-      assert_type list, :List
-      index = list.value.index {|e| e.eq(value).to_bool }
+      index = list.to_a.index {|e| e.eq(value).to_bool }
       if index
         Number.new(index + 1)
       else

data/lib/sass/script/parser.rb

@@ -365,38 +365,41 @@ RUBY
       end
 
       def fn_arglist
-        arglist(:fn_arglist, :equals)
+        arglist(:equals, "function argument")
       end
 
       def mixin_arglist
-        arglist(:mixin_arglist, :interpolation)
+        arglist(:interpolation, "mixin argument")
       end
 
-      def arglist(type, subexpr)
+      def arglist(subexpr, description)
         return unless e = send(subexpr)
-        if @lexer.peek && @lexer.peek.type == :colon
-          name = e
-          @lexer.expected!("comma") unless name.is_a?(Variable)
-          assert_tok(:colon)
-          keywords = {name.underscored_name => assert_expr(subexpr, EXPR_NAMES[type])}
-        end
 
-        unless try_tok(:comma)
-          return [], keywords if keywords
-          return [], {}, e if try_tok(:splat)
-          return [e], {}
-        end
+        args = []
+        keywords = {}
+        loop do
+          if @lexer.peek && @lexer.peek.type == :colon
+            name = e
+            @lexer.expected!("comma") unless name.is_a?(Variable)
+            assert_tok(:colon)
+            value = assert_expr(subexpr, description)
+
+            if keywords[name.underscored_name]
+              raise SyntaxError.new("Keyword argument \"#{name.to_sass}\" passed more than once")
+            end
 
-        other_args, other_keywords, splat = assert_expr(type)
-        if keywords
-          if !other_args.empty? || splat
-            raise SyntaxError.new("Positional arguments must come before keyword arguments.")
-          elsif other_keywords[name.underscored_name]
-            raise SyntaxError.new("Keyword argument \"#{name.to_sass}\" passed more than once")
+            keywords[name.underscored_name] = value
+          else
+            if !keywords.empty?
+              raise SyntaxError.new("Positional arguments must come before keyword arguments.")
+            end
+
+            return args, keywords, e if try_tok(:splat)
+            args << e
           end
-          return other_args, keywords.merge(other_keywords), splat
-        else
-          return [e, *other_args], other_keywords, splat
+
+          return args, keywords unless try_tok(:comma)
+          e = assert_expr(subexpr, description)
         end
       end
 

data/lib/sass/script/string.rb

@@ -33,7 +33,7 @@ module Sass::Script
     # @see Node#to_s
     def to_s(opts = {})
       if @type == :identifier
-        return @value.tr("\n", " ")
+        return @value.gsub(/\s+/, " ")
       end
 
       return "\"#{value.gsub('"', "\\\"")}\"" if opts[:quote] == %q{"}

data/lib/sass/scss/rx.rb

@@ -124,11 +124,9 @@ module Sass
       STRING1_NOINTERP = /\"((?:[^\n\r\f\\"#]|#(?!\{)|\\#{NL}|#{ESCAPE})*)\"/
       STRING2_NOINTERP = /\'((?:[^\n\r\f\\'#]|#(?!\{)|\\#{NL}|#{ESCAPE})*)\'/
       STRING_NOINTERP = /#{STRING1_NOINTERP}|#{STRING2_NOINTERP}/
-      # Can't use IDENT here, because it seems to take exponential time on 1.8.
-      # 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.
-      STATIC_VALUE = /(-?#{NMSTART}|#{STRING_NOINTERP}|#[a-f0-9]|[,%]|-?#{NUMBER}|\!important)+([;}])/i
+
+      STATIC_COMPONENT = /#{IDENT}|#{STRING_NOINTERP}|#{HEXCOLOR}|[+-]?#{NUMBER}|\!important/i
+      STATIC_VALUE = /#{STATIC_COMPONENT}(\s*[\s,\/]\s*#{STATIC_COMPONENT})*([;}])/i
       STATIC_SELECTOR = /(#{NMCHAR}|[ \t]|[,>+*]|[:#.]#{NMSTART}){0,50}([{])/i
     end
   end

data/test/sass/engine_test.rb

@@ -134,13 +134,13 @@ MSG
     '+foo(1 + 1: 2)' => 'Invalid CSS after "(1 + 1": expected comma, was ": 2)"',
     '+foo($var: )' => 'Invalid CSS after "($var: ": expected mixin argument, was ")"',
     '+foo($var: a, $var: b)' => 'Keyword argument "$var" passed more than once',
-    '+foo($var-var: a, $var_var: b)' => 'Keyword argument "$var-var" passed more than once',
-    '+foo($var_var: a, $var-var: b)' => 'Keyword argument "$var_var" passed more than once',
+    '+foo($var-var: a, $var_var: b)' => 'Keyword argument "$var_var" passed more than once',
+    '+foo($var_var: a, $var-var: b)' => 'Keyword argument "$var-var" passed more than once',
     "a\n  b: foo(1 + 1: 2)" => 'Invalid CSS after "foo(1 + 1": expected comma, was ": 2)"',
     "a\n  b: foo($var: )" => 'Invalid CSS after "foo($var: ": expected function argument, was ")"',
     "a\n  b: foo($var: a, $var: b)" => 'Keyword argument "$var" passed more than once',
-    "a\n  b: foo($var-var: a, $var_var: b)" => 'Keyword argument "$var-var" passed more than once',
-    "a\n  b: foo($var_var: a, $var-var: b)" => 'Keyword argument "$var_var" passed more than once',
+    "a\n  b: foo($var-var: a, $var_var: b)" => 'Keyword argument "$var_var" passed more than once',
+    "a\n  b: foo($var_var: a, $var-var: b)" => 'Keyword argument "$var-var" passed more than once',
     "@if foo\n  @extend .bar" => ["Extend directives may only be used within rules.", 2],
     "$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],

data/test/sass/functions_test.rb

@@ -1018,14 +1018,17 @@ MSG
   def test_zip
     assert_equal("1 3 5, 2 4 6", evaluate("zip(1 2, 3 4, 5 6)"))
     assert_equal("1 4 7, 2 5 8", evaluate("zip(1 2 3, 4 5 6, 7 8)"))
+    assert_equal("1 2 3", evaluate("zip(1, 2, 3)"))
   end
 
   def test_index
     assert_equal("1", evaluate("index(1px solid blue, 1px)"))
     assert_equal("2", evaluate("index(1px solid blue, solid)"))
     assert_equal("3", evaluate("index(1px solid blue, #00f)"))
+    assert_equal("1", evaluate("index(1px, 1px)"))
     assert_equal("false", evaluate("index(1px solid blue, 1em)"))
     assert_equal("false", evaluate("index(1px solid blue, notfound)"))
+    assert_equal("false", evaluate("index(1px, #00f)"))
   end
 
   def test_if

data/test/sass/scss/css_test.rb

@@ -425,7 +425,7 @@ SCSS
     assert_equal <<CSS, render(<<SCSS)
 foo {
   a: -0.5em;
-  b: 0.5em;
+  b: +0.5em;
   c: -foo(12px);
   d: +foo(12px); }
 CSS
@@ -1011,6 +1011,17 @@ SCSS
 
   ## Regressions
 
+  def test_very_long_number_with_important_doesnt_take_forever
+    assert_equal(<<CSS, render(<<SCSS))
+.foo {
+  width: 97.916666666666666666666666666667% !important; }
+CSS
+.foo {
+  width: 97.916666666666666666666666666667% !important;
+}
+SCSS
+  end
+
   def test_selector_without_closing_bracket
     assert_not_parses('"]"', "foo[bar <err>{a: b}")
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass
 version: !ruby/object:Gem::Version
-  version: 3.2.6
+  version: 3.2.7
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-23 00:00:00.000000000 Z
+date: 2013-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
@@ -58,281 +58,281 @@ extensions: []
 extra_rdoc_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/CONTRIBUTING.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/dependency_manager.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/bsd.rb
+- vendor/listen/lib/listen/adapters/polling.rb
 - vendor/listen/lib/listen/adapters/windows.rb
+- vendor/listen/lib/listen/adapters/bsd.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/dependency_manager.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/CONTRIBUTING.md
+- vendor/listen/Gemfile
+- vendor/listen/README.md
+- vendor/listen/Guardfile
 - vendor/listen/listen.gemspec
-- vendor/listen/Vagrantfile
-- vendor/listen/spec/listen/dependency_manager_spec.rb
-- 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/bsd_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
+- vendor/listen/spec/listen/dependency_manager_spec.rb
 - 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:
 - MIT
@@ -359,21 +359,21 @@ 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/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