sass 3.2.3 → 3.2.4

data/VERSION

@@ -1 +1 @@
-3.2.3
+3.2.4

data/VERSION_DATE

@@ -1 +1 @@
-10 November 2012 01:57:05 GMT
+22 December 2012 02:32:35 UTC

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)
@@ -143,7 +149,6 @@ WARNING
 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/scss/parser.rb

@@ -300,7 +300,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/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"

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,389 +1,373 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sass
-version: !ruby/object:Gem::Version 
-  hash: 9
+version: !ruby/object:Gem::Version
+  version: 3.2.4
   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-10 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-12-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: yard
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 0
-        - 5
-        - 3
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.5.3
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: maruku
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.3
+- !ruby/object:Gem::Dependency
+  name: maruku
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 5
-        - 9
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.5.9
   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"
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        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"
 email: sass-lang@googlegroups.com
-executables: 
+executables:
 - sass
 - sass-convert
 - scss
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - rails/init.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/base.rb
-- lib/sass/environment.rb
-- lib/sass/plugin/rack.rb
-- lib/sass/plugin/staleness_checker.rb
+- lib/sass.rb
+- lib/sass/cache_stores.rb
 - lib/sass/plugin/compiler.rb
-- lib/sass/plugin/configuration.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/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/set_options.rb
-- lib/sass/tree/visitors/cssize.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/supports.rb
+- lib/sass/media.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/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/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/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/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/base.rb
+- lib/sass/tree/content_node.rb
 - lib/sass/tree/comment_node.rb
-- lib/sass/tree/media_node.rb
-- lib/sass/tree/variable_node.rb
-- lib/sass/tree/function_node.rb
+- lib/sass/tree/warn_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/tree/prop_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/scss/parser.rb
-- lib/sass/scss/static_parser.rb
-- lib/sass/selector/simple_sequence.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/selector/simple.rb
 - lib/sass/selector/sequence.rb
 - lib/sass/selector/abstract_sequence.rb
 - lib/sass/selector/comma_sequence.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/selector/simple_sequence.rb
+- lib/sass/railtie.rb
+- lib/sass/environment.rb
 - lib/sass/exec.rb
-- lib/sass/util.rb
-- lib/sass/cache_stores.rb
-- lib/sass/script.rb
-- lib/sass.rb
-- vendor/listen/lib/listen.rb
+- vendor/listen/README.md
+- vendor/listen/Guardfile
+- vendor/listen/Gemfile
 - 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/adapters/darwin.rb
+- vendor/listen/lib/listen/listener.rb
 - vendor/listen/lib/listen/adapters/polling.rb
-- vendor/listen/lib/listen/adapters/windows.rb
+- vendor/listen/lib/listen/adapters/darwin.rb
 - vendor/listen/lib/listen/adapters/linux.rb
+- vendor/listen/lib/listen/adapters/windows.rb
 - vendor/listen/lib/listen/adapter.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/lib/listen.rb
 - vendor/listen/CHANGELOG.md
-- vendor/listen/LICENSE
 - vendor/listen/Rakefile
-- vendor/listen/Gemfile
-- vendor/listen/README.md
-- vendor/listen/Guardfile
+- vendor/listen/LICENSE
 - vendor/listen/listen.gemspec
-- 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/Vagrantfile
+- vendor/listen/spec/listen/directory_record_spec.rb
 - vendor/listen/spec/listen/adapters/linux_spec.rb
+- vendor/listen/spec/listen/adapters/darwin_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
-- bin/sass
-- bin/scss
+- 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
-- test/sass/plugin_test.rb
-- test/sass/util/subset_map_test.rb
-- test/sass/util/multibyte_string_scanner_test.rb
+- 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
 - test/sass/templates/basic.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/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/filename_fn.scss
-- test/sass/templates/_partial.sass
-- test/sass/templates/units.sass
+- test/sass/templates/alt.sass
 - test/sass/templates/nested_bork1.sass
 - test/sass/templates/same_name_different_partiality.scss
-- test/sass/templates/_double_import_loop2.sass
+- 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/bork3.sass
 - test/sass/templates/import_content.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/warn_imported.sass
 - test/sass/templates/import_charset_ibm866.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/bork1.sass
+- test/sass/templates/warn.sass
+- test/sass/templates/bork2.sass
+- test/sass/templates/nested.sass
 - 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/_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/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/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/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/rx_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/templates/cached_import_option.scss
+- test/sass/templates/_imported_charset_utf8.sass
 - 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/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/results/units.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/importer_test.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/warn.css
-- test/sass/results/script.css
-- test/sass/results/cached_import_option.css
-- test/sass/results/if.css
-- test/sass/results/scss_import.css
+- test/sass/results/compact.css
 - test/sass/results/import_content.css
-- test/sass/results/nested.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/import_charset_1_8.css
+- test/sass/results/scss_import.css
+- test/sass/results/units.css
 - test/sass/results/parent_ref.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/import_charset_1_8.css
+- test/sass/results/warn.css
 - test/sass/results/import_charset_ibm866.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/filename_fn.css
 - test/sass/results/import.css
-- test/sass/results/basic.css
-- test/test_helper.rb
-- test/Gemfile.lock
-- test/Gemfile
+- 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
 - extra/update_watch.rb
 - Rakefile
 - init.rb
 - .yardopts
-- MIT-LICENSE
+- README.md
+- VERSION_NAME
+- VERSION_DATE
 - REVISION
+- MIT-LICENSE
 - 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 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: sass
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A powerful but elegant CSS compiler that makes CSS fun again.
-test_files: 
-- test/sass/plugin_test.rb
+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/util/subset_map_test.rb
 - test/sass/util/multibyte_string_scanner_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/callbacks_test.rb
+- test/sass/importer_test.rb
 - test/sass/scss/css_test.rb
-- test/sass/scss/rx_test.rb
 - test/sass/scss/scss_test.rb
-- test/sass/script_test.rb
-- test/sass/importer_test.rb
+- test/sass/scss/rx_test.rb
+- test/sass/util_test.rb
+- test/sass/script_conversion_test.rb
 - test/sass/cache_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
+- test/sass/plugin_test.rb