sass 3.2.7 → 3.2.8

data/VERSION

@@ -1 +1 @@
-3.2.7
+3.2.8

data/VERSION_DATE

@@ -1 +1 @@
-09 March 2013 01:30:08 UTC
+22 April 2013 19:59:23 UTC

data/lib/sass/cache_stores/base.rb

@@ -51,6 +51,7 @@ module Sass
         _store(key, Sass::VERSION, sha, Marshal.dump(root))
       rescue TypeError, LoadError => e
         Sass::Util.sass_warn "Warning. Error encountered while saving cache #{path_to(key)}: #{e}"
+        nil
       end
 
       # Retrieve a {Sass::Tree::RootNode}.
@@ -63,6 +64,7 @@ module Sass
         Marshal.load(contents) if contents
       rescue EOFError, TypeError, ArgumentError, LoadError => e
         Sass::Util.sass_warn "Warning. Error encountered while reading cache #{path_to(key)}: #{e}"
+        nil
       end
 
       # Return the key for the sass file.

data/lib/sass/exec.rb

@@ -108,7 +108,7 @@ module Sass
             @options[:filename] = filename
             open_file(filename) || $stdin
           end
-        output ||= open_file(args.shift, 'w') || $stdout
+        output ||= args.shift || $stdout
 
         @options[:input], @options[:output] = input, output
       end
@@ -155,6 +155,14 @@ module Sass
         return "\e[#{COLORS[color]}m#{str}\e[0m"
       end
 
+      def write_output(text, destination)
+        if destination.is_a?(String)
+          File.open(destination, 'w') {|file| file.write(text)}
+        else
+          destination.write(text)
+        end
+      end
+
       private
 
       def open_file(filename, flag = 'r')
@@ -307,7 +315,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)
+        @options[:for_engine][:css_filename] = @options[:output] if @options[:output].is_a?(String)
 
         begin
           input = @options[:input]
@@ -327,8 +335,7 @@ END
 
           input.close() if input.is_a?(File)
 
-          output.write(engine.render)
-          output.close() if output.is_a? File
+          write_output(engine.render, output)
         rescue ::Sass::SyntaxError => e
           raise e if @options[:trace]
           raise e.sass_backtrace_str("standard input")
@@ -633,7 +640,6 @@ END
           end
 
           input = open_file(f)
-          output = @options[:in_place] ? input : open_file(output, "w")
           process_file(input, output)
         end
       end
@@ -678,7 +684,7 @@ END
           end
 
         output = File.open(input.path, 'w') if @options[:in_place]
-        output.write(out)
+        write_output(out, output)
       rescue ::Sass::SyntaxError => e
         raise e if @options[:trace]
         file = " of #{e.sass_filename}" if e.sass_filename

data/lib/sass/script/funcall.rb

@@ -54,12 +54,18 @@ module Sass
 
       # @see Node#to_sass
       def to_sass(opts = {})
-        args = @args.map {|a| a.to_sass(opts)}.join(', ')
+        arg_to_sass = lambda do |arg|
+          sass = arg.to_sass(opts)
+          sass = "(#{sass})" if arg.is_a?(Sass::Script::List) && arg.separator == :comma
+          sass
+        end
+
+        args = @args.map(&arg_to_sass).join(', ')
         keywords = Sass::Util.hash_to_a(@keywords).
-          map {|k, v| "$#{dasherize(k, opts)}: #{v.to_sass(opts)}"}.join(', ')
+          map {|k, v| "$#{dasherize(k, opts)}: #{arg_to_sass[v]}"}.join(', ')
         if self.splat
           splat = (args.empty? && keywords.empty?) ? "" : ", "
-          splat = "#{splat}#{self.splat.inspect}..."
+          splat = "#{splat}#{arg_to_sass[self.splat]}..."
         end
         "#{dasherize(name, opts)}(#{args}#{', ' unless args.empty? || keywords.empty?}#{keywords}#{splat})"
       end

data/lib/sass/script/functions.rb

@@ -147,6 +147,12 @@ module Sass::Script
   # \{#append append($list1, $val, \[$separator\])}
   # : Appends a single value onto the end of a list.
   #
+  # \{#zip zip($list1, $list2, ...)}
+  # : Combines several lists into a single multidimensional list.
+  #
+  # \{#index index($list, $value)}
+  # : Returns the position of a value within a list, or false.
+  #
   # ## Introspection Functions
   #
   # \{#type_of type-of($value)}
@@ -1358,8 +1364,8 @@ module Sass::Script
     declare :append, [:list, :val]
     declare :append, [:list, :val, :separator]
 
-    # Combines several lists into a single comma separated list
-    # space separated lists.
+    # Combines several lists into a single comma separated list, where the nth
+    # value is a space separated list of the source lists' nth values.
     #
     # The length of the resulting list is the length of the
     # shortest list.
@@ -1384,8 +1390,8 @@ module Sass::Script
     declare :zip, [], :var_args => true
 
 
-    # Returns the position of the given value within the given
-    # list. If not found, returns false.
+    # Returns the position of a value within a list. If not found, returns
+    # false.
     #
     # @example
     #   index(1px solid red, solid) => 2

data/lib/sass/script/literal.rb

@@ -90,24 +90,6 @@ MSG
       Sass::Script::Bool.new(!to_bool)
     end
 
-    # The SassScript default operation (e.g. `$a $b`, `"foo" "bar"`).
-    #
-    # @param other [Literal] The right-hand side of the operator
-    # @return [Script::String] A string containing both literals
-    #   separated by a space
-    def space(other)
-      Sass::Script::String.new("#{self.to_s} #{other.to_s}")
-    end
-
-    # The SassScript `,` operation (e.g. `$a, $b`, `"foo", "bar"`).
-    #
-    # @param other [Literal] The right-hand side of the operator
-    # @return [Script::String] A string containing both literals
-    #   separated by `", "`
-    def comma(other)
-      Sass::Script::String.new("#{self.to_s},#{' ' unless options[:style] == :compressed}#{other.to_s}")
-    end
-
     # The SassScript `=` operation
     # (used for proprietary MS syntax like `alpha(opacity=20)`).
     #

data/lib/sass/script/null.rb

@@ -22,7 +22,10 @@ module Sass::Script
     def to_s(opts = {})
       ''
     end
-    alias_method :to_sass, :to_s
+
+    def to_sass(opts = {})
+      'null'
+    end
 
     # Returns a string representing a null value.
     #

data/lib/sass/script/parser.rb

@@ -242,18 +242,17 @@ RUBY
       def lexer_class; Lexer; end
 
       def expr
-        interp = try_ops_after_interp([:comma], :expr) and return interp
         line = @lexer.line
         return unless e = interpolation
-        arr = [e]
+        list = node(List.new([e], :comma), line)
         while tok = try_tok(:comma)
-          if interp = try_op_before_interp(tok, e)
+          if interp = try_op_before_interp(tok, list)
             return interp unless other_interp = try_ops_after_interp([:comma], :expr, interp)
             return other_interp
           end
-          arr << assert_expr(:interpolation)
+          list.value << assert_expr(:interpolation)
         end
-        arr.size == 1 ? arr.first : node(List.new(arr, :comma), line)
+        list.value.size == 1 ? list.value.first : list
       end
 
       production :equals, :interpolation, :single_eq

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.gsub(/\s+/, " ")
+        return @value.gsub(/\n\s*/, " ")
       end
 
       return "\"#{value.gsub('"', "\\\"")}\"" if opts[:quote] == %q{"}

data/lib/sass/scss/parser.rb

@@ -1112,7 +1112,7 @@ MESSAGE
       end
 
       def rethrow(err)
-        if @throw_err
+        if @throw_error
           throw :_sass_parser_error, err
         else
           @scanner = Sass::Util::MultibyteStringScanner.new(@scanner.string)

data/lib/sass/selector/sequence.rb

@@ -444,8 +444,7 @@ module Sass
         # separate sequences should limit the quadratic behavior.
         seqses.map do |seqs1|
           seqs1.reject do |seq1|
-            min_spec = 0
-            _sources(seq1).map {|seq| min_spec += seq.specificity}
+            min_spec = _sources(seq1).map {|seq| seq.specificity}.min || 0
             seqses.any? do |seqs2|
               next if seqs1.equal?(seqs2)
               # Second Law of Extend: the specificity of a generated selector

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

@@ -195,13 +195,19 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
   end
 
   def visit_mixin(node)
+    arg_to_sass = lambda do |arg|
+      sass = arg.to_sass(@options)
+      sass = "(#{sass})" if arg.is_a?(Sass::Script::List) && arg.separator == :comma
+      sass
+    end
+
     unless node.args.empty? && node.keywords.empty? && node.splat.nil?
-      args = node.args.map {|a| a.to_sass(@options)}.join(", ")
+      args = node.args.map(&arg_to_sass).join(", ")
       keywords = Sass::Util.hash_to_a(node.keywords).
-        map {|k, v| "$#{dasherize(k)}: #{v.to_sass(@options)}"}.join(', ')
+        map {|k, v| "$#{dasherize(k)}: #{arg_to_sass[v]}"}.join(', ')
       if node.splat
         splat = (args.empty? && keywords.empty?) ? "" : ", "
-        splat = "#{splat}#{node.splat.to_sass(@options)}..."
+        splat = "#{splat}#{arg_to_sass[node.splat]}..."
       end
       arglist = "(#{args}#{', ' unless args.empty? || keywords.empty?}#{keywords}#{splat})"
     end

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

@@ -421,7 +421,7 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
       end
     end
 
-    return if mixins.empty?
+    return unless mixins.include?(node.name)
     raise Sass::SyntaxError.new("#{msg} #{node.name} includes itself") if mixins.size == 1
 
     msg << "\n" << Sass::Util.enum_cons(mixins.reverse + [node.name], 2).map do |m1, m2|

data/test/sass/conversion_test.rb

@@ -1618,6 +1618,22 @@ SCSS
 
   ## Regression Tests
 
+  def test_list_in_args
+    assert_renders(<<SASS, <<SCSS)
++mixin((a, b, c))
+
++mixin($arg: (a, b, c))
+
++mixin(a, b, (c, d, e)...)
+SASS
+@include mixin((a, b, c));
+
+@include mixin($arg: (a, b, c));
+
+@include mixin(a, b, (c, d, e)...);
+SCSS
+  end
+
   def test_media_query_with_expr
     assert_scss_to_sass <<SASS, <<SCSS
 @media foo and (bar: baz)
@@ -1628,14 +1644,6 @@ SASS
 SCSS
   end
 
-  def test_empty_lists
-    assert_renders(<<SASS, <<SCSS)
-$foo: ()
-SASS
-$foo: ();
-SCSS
-  end
-
   def test_nested_if_statements
     assert_renders(<<SASS, <<SCSS)
 @if $foo

data/test/sass/engine_test.rb

@@ -523,6 +523,21 @@ MESSAGE
     assert_hash_has(err.sass_backtrace[2], :mixin => "foo", :line => 2)
   end
 
+  def test_mixin_loop_with_content
+    render <<SASS
+=foo
+  @content
+=bar
+  +foo
+    +bar
++bar
+SASS
+    assert(false, "Exception not raised")
+  rescue Sass::SyntaxError => err
+    assert_equal("An @include loop has been found: bar includes itself", err.message)
+    assert_hash_has(err.sass_backtrace[0], :mixin => "@content", :line => 5)
+  end
+
   def test_basic_import_loop_exception
     import = filename_for_test
     importer = MockImporter.new
@@ -2381,6 +2396,24 @@ SASS
 
   # Regression tests
 
+  def test_parent_mixin_in_content_nested
+    assert_equal(<<CSS, render(<<SASS))
+a {
+  b: c; }
+CSS
+=foo
+  @content
+
+=bar
+  +foo
+    +foo
+      a
+        b: c
+
++bar
+SASS
+  end
+
   def test_supports_bubbles
     assert_equal <<CSS, render(<<SASS)
 parent {

data/test/sass/extend_test.rb

@@ -1186,6 +1186,29 @@ SCSS
 
   # Regression Tests
 
+  def test_nested_double_extend_optimization
+    assert_equal <<CSS, render(<<SCSS)
+.parent1 .child {
+  a: b; }
+CSS
+%foo %bar {
+  a: b;
+}
+
+.parent1 {
+  @extend %foo;
+
+  .child {
+    @extend %bar;
+  }
+}
+
+.parent2 {
+  @extend %foo;
+}
+SCSS
+  end
+
   def test_extend_in_double_nested_media_query
     assert_equal <<CSS, render(<<SCSS)
 @media all and (orientation: landscape) {

data/test/sass/script_conversion_test.rb

@@ -69,6 +69,20 @@ class SassScriptConversionTest < Test::Unit::TestCase
     assert_renders "$flaznicate"
   end
 
+  def test_null
+    assert_renders "null"
+  end
+
+  def test_empty_list
+    assert_renders "()"
+  end
+
+  def test_list_in_args
+    assert_renders "foo((a, b, c))"
+    assert_renders "foo($arg: (a, b, c))"
+    assert_renders "foo(a, b, (a, b, c)...)"
+  end
+
   def self.test_precedence(outer, inner)
     op_outer = Sass::Script::Lexer::OPERATORS_REVERSE[outer]
     op_inner = Sass::Script::Lexer::OPERATORS_REVERSE[inner]

data/test/sass/script_test.rb

@@ -134,6 +134,7 @@ class SassScriptTest < Test::Unit::TestCase
     assert_equal '3,7', resolve('#{1 + 2},#{3 + 4}')
     assert_equal '3, 7, 11', resolve('#{1 + 2}, #{3 + 4}, #{5 + 6}')
     assert_equal '3, 7, 11', resolve('3, #{3 + 4}, 11')
+    assert_equal '3, 7, 11', resolve('3, 7, #{5 + 6}')
 
     assert_equal '3 / 7', resolve('3 / #{3 + 4}')
     assert_equal '3 /7', resolve('3 /#{3 + 4}')

data/test/sass/scss/css_test.rb

@@ -1011,6 +1011,17 @@ SCSS
 
   ## Regressions
 
+  def test_double_space_string
+    assert_equal(<<CSS, render(<<SCSS))
+.a {
+  content: "  a"; }
+CSS
+.a {
+  content: "  a";
+}
+SCSS
+  end
+
   def test_very_long_number_with_important_doesnt_take_forever
     assert_equal(<<CSS, render(<<SCSS))
 .foo {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass
 version: !ruby/object:Gem::Version
-  version: 3.2.7
+  version: 3.2.8
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-09 00:00:00.000000000 Z
+date: 2013-04-22 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/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/CONTRIBUTING.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/dependency_manager.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/bsd.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/windows.rb
 - vendor/listen/lib/listen/adapter.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/lib/listen.rb
 - vendor/listen/CHANGELOG.md
-- vendor/listen/LICENSE
 - vendor/listen/Rakefile
-- vendor/listen/CONTRIBUTING.md
-- 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/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/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/dependency_manager_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:
 - 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/plugin_test.rb
+- 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