sass 3.1.5 → 3.1.6

data/lib/sass/tree/variable_node.rb

@@ -10,7 +10,7 @@ module Sass
 
       # The parse tree for the variable value.
       # @return [Script::Node]
-      attr_reader :expr
+      attr_accessor :expr
 
       # Whether this is a guarded variable assignment (`!default`).
       # @return [Boolean]
@@ -25,12 +25,6 @@ module Sass
         @guarded = guarded
         super()
       end
-
-      # Returns sub nodes that are not tree children.
-      def subnodes
-        Array(expr)
-      end
-
     end
   end
 end

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

@@ -0,0 +1,87 @@
+# A visitor for copying the full structure of a Sass tree.
+class Sass::Tree::Visitors::DeepCopy < Sass::Tree::Visitors::Base
+  protected
+
+  def visit(node)
+    super(node.dup)
+  end
+
+  def visit_children(parent)
+    parent.children = parent.children.map {|c| visit(c)}
+    parent
+  end
+
+  def visit_debug(node)
+    node.expr = node.expr.deep_copy
+    yield
+  end
+
+  def visit_each(node)
+    node.list = node.list.deep_copy
+    yield
+  end
+
+  def visit_extend(node)
+    node.selector = node.selector.map {|c| c.is_a?(Sass::Script::Node) ? c.deep_copy : c}
+    yield
+  end
+
+  def visit_for(node)
+    node.from = node.from.deep_copy
+    node.to = node.to.deep_copy
+    yield
+  end
+
+  def visit_function(node)
+    node.args = node.args.map {|k, v| [k.deep_copy, v && v.deep_copy]}
+    yield
+  end
+
+  def visit_if(node)
+    node.expr = node.expr.deep_copy if node.expr
+    node.else = visit(node.else) if node.else
+    yield
+  end
+
+  def visit_mixin_def(node)
+    node.args = node.args.map {|k, v| [k.deep_copy, v && v.deep_copy]}
+    yield
+  end
+
+  def visit_mixin(node)
+    node.args = node.args.map {|a| a.deep_copy}
+    node.keywords = Hash[node.keywords.map {|k, v| [k, v.deep_copy]}]
+    yield
+  end
+
+  def visit_prop(node)
+    node.name = node.name.map {|c| c.is_a?(Sass::Script::Node) ? c.deep_copy : c}
+    node.value = node.value.deep_copy
+    yield
+  end
+
+  def visit_return(node)
+    node.expr = node.expr.deep_copy
+    yield
+  end
+
+  def visit_rule(node)
+    node.rule = node.rule.map {|c| c.is_a?(Sass::Script::Node) ? c.deep_copy : c}
+    yield
+  end
+
+  def visit_variable(node)
+    node.expr = node.expr.deep_copy
+    yield
+  end
+
+  def visit_warn(node)
+    node.expr = node.expr.deep_copy
+    yield
+  end
+
+  def visit_while(node)
+    node.expr = node.expr.deep_copy
+    yield
+  end
+end

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

@@ -227,6 +227,11 @@ END
   def visit_rule(node)
     parser = Sass::SCSS::StaticParser.new(run_interp(node.rule), node.line)
     node.parsed_rules ||= parser.parse_selector(node.filename)
+    if node.options[:trace_selectors]
+      @environment.push_frame(:filename => node.filename, :line => node.line)
+      node.stack_trace = @environment.stack_trace
+      @environment.pop_frame
+    end
     yield
   end
 
@@ -243,13 +248,9 @@ END
     @environment.push_frame(:filename => node.filename, :line => node.line)
     res = node.expr.perform(@environment)
     res = res.value if res.is_a?(Sass::Script::String)
-    msg = "WARNING: #{res}\n"
-    @environment.stack.reverse.each_with_index do |entry, i|
-      msg << "        #{i == 0 ? "on" : "from"} line #{entry[:line]}" <<
-        " of #{entry[:filename] || "an unknown file"}"
-      msg << ", in `#{entry[:mixin]}'" if entry[:mixin]
-      msg << "\n"
-    end
+    msg = "WARNING: #{res}\n         "
+    msg << @environment.stack_trace.join("\n         ")
+    msg << "\n"
     Sass::Util.sass_warn msg
     []
   ensure

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

@@ -0,0 +1,97 @@
+# A visitor for setting options on the Sass tree
+class Sass::Tree::Visitors::SetOptions < Sass::Tree::Visitors::Base
+  # @param root [Tree::Node] The root node of the tree to visit.
+  # @param options [{Symbol => Object}] The options has to set.
+  def self.visit(root, options); new(options).send(:visit, root); end
+
+  protected
+
+  def initialize(options)
+    @options = options
+  end
+
+  def visit(node)
+    node.instance_variable_set('@options', @options)
+    super
+  end
+
+  def visit_debug(node)
+    node.expr.options = @options
+    yield
+  end
+
+  def visit_each(node)
+    node.list.options = @options
+    yield
+  end
+
+  def visit_extend(node)
+    node.selector.each {|c| c.options = @options if c.is_a?(Sass::Script::Node)}
+    yield
+  end
+
+  def visit_for(node)
+    node.from.options = @options
+    node.to.options = @options
+    yield
+  end
+
+  def visit_function(node)
+    node.args.each do |k, v|
+      k.options = @options
+      v.options = @options if v
+    end
+    yield
+  end
+
+  def visit_if(node)
+    node.expr.options = @options if node.expr
+    visit(node.else) if node.else
+    yield
+  end
+
+  def visit_mixin_def(node)
+    node.args.each do |k, v|
+      k.options = @options
+      v.options = @options if v
+    end
+    yield
+  end
+
+  def visit_mixin(node)
+    node.args.each {|a| a.options = @options}
+    node.keywords.each {|k, v| v.options = @options}
+    yield
+  end
+
+  def visit_prop(node)
+    node.name.each {|c| c.options = @options if c.is_a?(Sass::Script::Node)}
+    node.value.options = @options
+    yield
+  end
+
+  def visit_return(node)
+    node.expr.options = @options
+    yield
+  end
+
+  def visit_rule(node)
+    node.rule.each {|c| c.options = @options if c.is_a?(Sass::Script::Node)}
+    yield
+  end
+
+  def visit_variable(node)
+    node.expr.options = @options
+    yield
+  end
+
+  def visit_warn(node)
+    node.expr.options = @options
+    yield
+  end
+
+  def visit_while(node)
+    node.expr.options = @options
+    yield
+  end
+end

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

@@ -156,6 +156,10 @@ MESSAGE
       if node.style != :compressed
         if node.options[:debug_info]
           to_return << visit(debug_info_rule(node.debug_info, node.options)) << "\n"
+        elsif node.options[:trace_selectors]
+          to_return << "#{old_spaces}/* "
+          to_return << node.stack_trace.join("\n   #{old_spaces}")
+          to_return << " */\n"
         elsif node.options[:line_comments]
           to_return << "#{old_spaces}/* line #{node.line}"
 
@@ -204,7 +208,7 @@ MESSAGE
                 [Sass::Selector::Element.new(k.to_s.gsub(/[^\w-]/, "\\\\\\0"), nil)])
             ])
         ])
-      prop = Sass::Tree::PropNode.new([""], "", :new)
+      prop = Sass::Tree::PropNode.new([""], Sass::Script::String.new(''), :new)
       prop.resolved_name = "font-family"
       prop.resolved_value = Sass::SCSS::RX.escape_ident(v.to_s)
       rule << prop

data/lib/sass/tree/warn_node.rb

@@ -6,19 +6,13 @@ module Sass
     class WarnNode < Node
       # The expression to print.
       # @return [Script::Node]
-      attr_reader :expr
+      attr_accessor :expr
 
       # @param expr [Script::Node] The expression to print
       def initialize(expr)
         @expr = expr
         super()
       end
-
-      # Returns sub nodes that are not tree children.
-      def subnodes
-        Array(expr)
-      end
-
     end
   end
 end

data/lib/sass/tree/while_node.rb

@@ -7,18 +7,12 @@ module Sass::Tree
   class WhileNode < Node
     # The parse tree for the continuation expression.
     # @return [Script::Node]
-    attr_reader :expr
+    attr_accessor :expr
 
     # @param expr [Script::Node] See \{#expr}
     def initialize(expr)
       @expr = expr
       super()
     end
-
-    # Returns sub nodes that are not tree children.
-    def subnodes
-      Array(expr)
-    end
-
   end
 end

data/test/sass/cache_test.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../test_helper'
+require File.dirname(__FILE__) + '/test_helper'
 require 'sass/engine'
 
 class CacheTest < Test::Unit::TestCase
@@ -11,6 +12,7 @@ class CacheTest < Test::Unit::TestCase
 
   def teardown
     FileUtils.rm_rf @@cache_dir
+    clean_up_sassc
   end
 
   def test_file_cache_writes_a_file
@@ -64,6 +66,19 @@ class CacheTest < Test::Unit::TestCase
     assert_equal an_object, cache.retrieve("an_object", "")
   end
 
+  class Unmarshalable
+    def _dump(_)
+      raise 'Unmarshalable'
+    end
+  end
+
+  def test_cache_node_with_unmarshalable_option
+    engine = Sass::Engine.new("foo {a: b + c}",
+      :syntax => :scss, :object => Unmarshalable.new, :filename => 'file.scss',
+      :importer => Sass::Importers::Filesystem.new(absolutize('templates')))
+    engine.to_tree
+  end
+
   private
   def root_node
     Sass::Engine.new(<<-SCSS, :syntax => :scss).to_tree

data/test/sass/engine_test.rb

@@ -305,6 +305,23 @@ SASS
     end
   end
 
+  def test_selector_tracing
+    actual_css = render(<<-SCSS, :syntax => :scss, :trace_selectors => true)
+      @mixin mixed {
+        .mixed { color: red; }
+      }
+      .context {
+        @include mixed;
+      }
+    SCSS
+    assert_equal(<<CSS,actual_css)
+/* on line 2 of test_selector_tracing_inline.scss, in `mixed'
+   from line 5 of test_selector_tracing_inline.scss */
+.context .mixed {
+  color: red; }
+CSS
+  end
+
   def test_mixin_exception
     render(<<SASS)
 =error-mixin($a)
@@ -1787,11 +1804,11 @@ SASS
   def test_warn_directive
   expected_warning = <<EXPECTATION
 WARNING: this is a warning
-        on line 4 of test_warn_directive_inline.sass
+         on line 4 of test_warn_directive_inline.sass
 
 WARNING: this is a mixin warning
-        on line 2 of test_warn_directive_inline.sass, in `foo'
-        from line 7 of test_warn_directive_inline.sass
+         on line 2 of test_warn_directive_inline.sass, in `foo'
+         from line 7 of test_warn_directive_inline.sass
 EXPECTATION
     assert_warning expected_warning do
       assert_equal <<CSS, render(<<SASS)
@@ -1821,15 +1838,15 @@ SASS
   def test_warn_with_imports
     expected_warning = <<WARN
 WARNING: In the main file
-        on line 1 of #{File.dirname(__FILE__)}/templates/warn.sass
+         on line 1 of #{File.dirname(__FILE__)}/templates/warn.sass
 
 WARNING: Imported
-        on line 1 of #{File.dirname(__FILE__)}/templates/warn_imported.sass
-        from line 2 of #{File.dirname(__FILE__)}/templates/warn.sass
+         on line 1 of #{File.dirname(__FILE__)}/templates/warn_imported.sass
+         from line 2 of #{File.dirname(__FILE__)}/templates/warn.sass
 
 WARNING: In an imported mixin
-        on line 4 of #{File.dirname(__FILE__)}/templates/warn_imported.sass, in `emits-a-warning'
-        from line 3 of #{File.dirname(__FILE__)}/templates/warn.sass
+         on line 4 of #{File.dirname(__FILE__)}/templates/warn_imported.sass, in `emits-a-warning'
+         from line 3 of #{File.dirname(__FILE__)}/templates/warn.sass
 WARN
     assert_warning expected_warning do
       renders_correctly "warn", :style => :compact, :load_paths => [File.dirname(__FILE__) + "/templates"]

data/test/sass/scss/scss_test.rb

@@ -1244,6 +1244,14 @@ foo {
   a: $var1;
   b: $var2;
   c: $var3; }
+SCSS
+  end
+
+  def test_options_passed_to_script
+    assert_equal <<CSS, render(<<SCSS, :style => :compressed)
+foo{color:#000}
+CSS
+foo {color: darken(black, 10%)}
 SCSS
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: false
   segments: 
   - 3
   - 1
-  - 5
-  version: 3.1.5
+  - 6
+  version: 3.1.6
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-25 00:00:00 -04:00
+date: 2011-08-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -63,246 +63,248 @@ extra_rdoc_files: []
 
 files: 
 - rails/init.rb
-- lib/sass/util/subset_map.rb
-- lib/sass/shared.rb
-- lib/sass/error.rb
-- lib/sass/importers.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/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/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/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/check_nesting.rb
-- lib/sass/tree/visitors/convert.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/return_node.rb
 - lib/sass/tree/root_node.rb
-- lib/sass/tree/node.rb
 - lib/sass/tree/if_node.rb
 - lib/sass/tree/charset_node.rb
-- lib/sass/tree/extend_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/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/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/set_options.rb
+- lib/sass/tree/visitors/cssize.rb
+- lib/sass/tree/visitors/convert.rb
+- lib/sass/tree/visitors/base.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/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/subset_map.rb
+- lib/sass/scss.rb
+- lib/sass/scss/static_parser.rb
+- lib/sass/scss/parser.rb
 - lib/sass/scss/sass_parser.rb
-- lib/sass/scss/script_parser.rb
-- lib/sass/scss/css_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/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/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/string.rb
+- lib/sass/script/css_parser.rb
+- lib/sass/selector.rb
 - lib/sass/less.rb
-- lib/sass/selector/simple_sequence.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/fssm/lib/fssm.rb
-- vendor/fssm/lib/fssm/path.rb
-- vendor/fssm/lib/fssm/tree.rb
-- vendor/fssm/lib/fssm/monitor.rb
-- vendor/fssm/lib/fssm/support.rb
-- vendor/fssm/lib/fssm/pathname.rb
+- vendor/fssm/README.markdown
+- vendor/fssm/example.rb
+- vendor/fssm/Gemfile
 - vendor/fssm/lib/fssm/version.rb
+- vendor/fssm/lib/fssm/pathname.rb
 - vendor/fssm/lib/fssm/state/file.rb
 - vendor/fssm/lib/fssm/state/directory.rb
-- vendor/fssm/lib/fssm/backends/fsevents.rb
+- vendor/fssm/lib/fssm/monitor.rb
+- vendor/fssm/lib/fssm/tree.rb
+- vendor/fssm/lib/fssm/support.rb
+- vendor/fssm/lib/fssm/backends/rubycocoa/fsevents.rb
 - vendor/fssm/lib/fssm/backends/polling.rb
 - vendor/fssm/lib/fssm/backends/inotify.rb
-- vendor/fssm/lib/fssm/backends/rubycocoa/fsevents.rb
+- vendor/fssm/lib/fssm/backends/fsevents.rb
 - vendor/fssm/lib/fssm/backends/rbfsevent.rb
-- vendor/fssm/example.rb
-- vendor/fssm/LICENSE
-- vendor/fssm/README.markdown
-- vendor/fssm/Rakefile
-- vendor/fssm/profile/prof-fssm-pathname.html
-- vendor/fssm/profile/prof-pathname.rb
+- vendor/fssm/lib/fssm/path.rb
+- vendor/fssm/lib/fssm.rb
 - vendor/fssm/profile/prof-plain-pathname.html
-- vendor/fssm/profile/prof-pathname-rubinius.rb
-- vendor/fssm/profile/prof-cache.rb
+- vendor/fssm/profile/prof-pathname.rb
 - vendor/fssm/profile/prof.html
-- vendor/fssm/Gemfile
+- vendor/fssm/profile/prof-cache.rb
+- vendor/fssm/profile/prof-fssm-pathname.html
+- vendor/fssm/profile/prof-pathname-rubinius.rb
 - vendor/fssm/fssm.gemspec
-- vendor/fssm/spec/spec_helper.rb
+- vendor/fssm/Rakefile
+- vendor/fssm/LICENSE
+- vendor/fssm/spec/count_down_latch.rb
 - vendor/fssm/spec/monitor_spec.rb
 - vendor/fssm/spec/path_spec.rb
-- vendor/fssm/spec/count_down_latch.rb
-- vendor/fssm/spec/root/duck/quack.txt
 - vendor/fssm/spec/root/moo/cow.txt
-- vendor/fssm/spec/root/file.rb
-- vendor/fssm/spec/root/file.css
 - vendor/fssm/spec/root/file.yml
-- bin/sass
-- bin/scss
+- vendor/fssm/spec/root/file.css
+- vendor/fssm/spec/root/file.rb
+- vendor/fssm/spec/root/duck/quack.txt
+- vendor/fssm/spec/spec_helper.rb
 - bin/sass-convert
-- test/sass/plugin_test.rb
-- test/sass/util/subset_map_test.rb
+- bin/scss
+- bin/sass
+- 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/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/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/alt.sass
+- test/sass/templates/nested_bork1.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/warn.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/_partial.sass
-- test/sass/templates/units.sass
-- test/sass/templates/nested_bork1.sass
+- test/sass/templates/line_numbers.sass
+- test/sass/templates/expanded.sass
 - test/sass/templates/bork3.sass
-- test/sass/templates/nested_mixin_bork.sass
-- test/sass/templates/complex.sass
-- test/sass/templates/if.sass
+- test/sass/templates/warn_imported.sass
 - test/sass/templates/import_charset_ibm866.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/multiline.sass
 - test/sass/templates/_imported_charset_ibm866.sass
-- 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/options.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/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/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/less_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/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/_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/callbacks_test.rb
-- test/sass/results/units.css
-- test/sass/results/alt.css
-- test/sass/results/scss_importee.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/if.css
-- test/sass/results/scss_import.css
-- test/sass/results/nested.css
+- test/sass/results/compact.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/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/import.css
-- test/sass/results/basic.css
-- test/test_helper.rb
+- 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/less_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
 - REVISION
+- MIT-LICENSE
 - VERSION
-- VERSION_NAME
-- README.md
 - CONTRIBUTING
 has_rdoc: false
 homepage: http://sass-lang.com/
@@ -339,21 +341,21 @@ 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/sass/util/subset_map_test.rb
-- test/sass/script_conversion_test.rb
-- test/sass/logger_test.rb
+- test/sass/engine_test.rb
 - test/sass/functions_test.rb
-- test/sass/util_test.rb
-- test/sass/less_conversion_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/cache_test.rb
-- test/sass/conversion_test.rb
 - test/sass/extend_test.rb
-- test/sass/engine_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/callbacks_test.rb
+- 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/util_test.rb
+- test/sass/script_conversion_test.rb
+- test/sass/less_conversion_test.rb
+- test/sass/cache_test.rb
+- test/sass/plugin_test.rb