sass 3.4.5 → 3.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf0926f17a403b6e66c37ae0c7bc650305f19b20
-  data.tar.gz: fd72f981a1398c5b48bbb8ff6213742908625507
+  metadata.gz: 25939bfbe2548dc0bc9ce36e84b69cb2097defab
+  data.tar.gz: 70b91642e6e2f72c388d664ab4a322de692d70a6
 SHA512:
-  metadata.gz: 7693230e4871ca0d0539b56f854bfd6e4945edfc87f11179416f2521130966cf53be50986a70e65e2dbe2e00e3fe7dc9019196f354be3846d3d45f28d0d78f48
-  data.tar.gz: f3ef8096eec2b1a90f48b928167d1226edc8276eb07a23f6d1b337c6991f9799ea6bf780c9e9747155859b188791778a90032ebdb28d48a0b9c57e9586187205
+  metadata.gz: 0ccbfbd420d684612d1826af5744004b728f480161f4fa241f417fd5edc78177c05de259520e26a4c4cab01779ee4e423043d6d2060c8cc1fec765bf6389acfc
+  data.tar.gz: 11e59d8d04b67c8272533ec4081e2119c5ffe3cd0f652507cbf80ee400d2465bfe7aa4380bdde2225f6eea9d7112487871fc31016e96a0002d41990ff7ab919f

data/VERSION

@@ -1 +1 @@
-3.4.5
+3.4.6

data/VERSION_DATE

@@ -1 +1 @@
-20 September 2014 01:03:27 UTC
+17 October 2014 01:32:48 UTC

data/lib/sass/importers/filesystem.rb

@@ -51,7 +51,7 @@ module Sass
       end
 
       def eql?(other)
-        root.eql?(other.root)
+        !other.nil? && other.respond_to?(:root) && root.eql?(other.root)
       end
 
       # @see Base#directories_to_watch

data/lib/sass/script/value/number.rb

@@ -289,7 +289,7 @@ module Sass::Script::Value
     # @raise [Sass::SyntaxError] if the number isn't an integer
     def to_i
       super unless int?
-      value
+      value.to_i
     end
 
     # @return [Boolean] Whether or not this number is an integer.

data/lib/sass/selector/comma_sequence.rb

@@ -25,12 +25,7 @@ module Sass
       # @raise [Sass::SyntaxError] If a parent selector is invalid
       def resolve_parent_refs(super_cseq, implicit_parent = true)
         if super_cseq.nil?
-          if @members.any? do |sel|
-               sel.members.any? do |sel_or_op|
-                 sel_or_op.is_a?(SimpleSequence) &&
-                   sel_or_op.members.any? {|ssel| ssel.is_a?(Parent)}
-               end
-             end
+          if contains_parent_ref?
             raise Sass::SyntaxError.new(
               "Base-level rules cannot contain the parent-selector-referencing character '&'.")
           end
@@ -42,6 +37,13 @@ module Sass
         end))
       end
 
+      # Returns whether there's a {Parent} selector anywhere in this sequence.
+      #
+      # @return [Boolean]
+      def contains_parent_ref?
+        @members.any? {|sel| sel.contains_parent_ref?}
+      end
+
       # Non-destrucively extends this selector with the extensions specified in a hash
       # (which should come from {Sass::Tree::Visitors::Cssize}).
       #

data/lib/sass/selector/sequence.rb

@@ -52,9 +52,7 @@ module Sass
       def resolve_parent_refs(super_cseq, implicit_parent)
         members = @members.dup
         nl = (members.first == "\n" && members.shift)
-        contains_parent_ref = members.any? do |seq_or_op|
-          seq_or_op.is_a?(SimpleSequence) && seq_or_op.members.first.is_a?(Parent)
-        end
+        contains_parent_ref = contains_parent_ref?
         return CommaSequence.new([self]) if !implicit_parent && !contains_parent_ref
 
         unless contains_parent_ref
@@ -75,6 +73,19 @@ module Sass
         end)
       end
 
+      # Returns whether there's a {Parent} selector anywhere in this sequence.
+      #
+      # @return [Boolean]
+      def contains_parent_ref?
+        members.any? do |sseq_or_op|
+          next false unless sseq_or_op.is_a?(SimpleSequence)
+          next true if sseq_or_op.members.first.is_a?(Parent)
+          sseq_or_op.members.any? do |sel|
+            sel.is_a?(Pseudo) && sel.selector && sel.selector.contains_parent_ref?
+          end
+        end
+      end
+
       # Non-destructively extends this selector with the extensions specified in a hash
       # (which should come from {Sass::Tree::Visitors::Cssize}).
       #

data/lib/sass/selector/simple_sequence.rb

@@ -86,9 +86,14 @@ module Sass
       # @return [CommaSequence] This selector, with parent references resolved
       # @raise [Sass::SyntaxError] If a parent selector is invalid
       def resolve_parent_refs(super_cseq)
+        resolved_members = @members.map do |sel|
+          next sel unless sel.is_a?(Pseudo) && sel.selector
+          sel.with_selector(sel.selector.resolve_parent_refs(super_cseq, !:implicit_parent))
+        end
+
         # Parent selector only appears as the first selector in the sequence
-        unless (parent = @members.first).is_a?(Parent)
-          return CommaSequence.new([Sequence.new([self])])
+        unless (parent = resolved_members.first).is_a?(Parent)
+          return CommaSequence.new([Sequence.new([SimpleSequence.new(resolved_members, subject?)])])
         end
 
         return super_cseq if @members.size == 1 && parent.suffix.nil?

data/test/sass/importer_test.rb

@@ -405,6 +405,15 @@ MESSAGE
     File.join(fixture_dir, path)
   end
 
+  def test_filesystem_importer_eql
+    importer = Sass::Importers::Filesystem.new('.')
+    assert importer.eql?(Sass::Importers::Filesystem.new('.'))
+    assert importer.eql?(ReversedExtImporter.new('.'))
+    assert !importer.eql?(Sass::Importers::Filesystem.new('foo'))
+    assert !importer.eql?(nil)
+    assert !importer.eql?('foo')
+  end
+
   def test_absolute_files_across_template_locations
     importer = Sass::Importers::Filesystem.new(absolutize 'templates')
     refute_nil importer.mtime(absolutize('more_templates/more1.sass'), {})

data/test/sass/scss/scss_test.rb

@@ -3570,6 +3570,52 @@ SCSS
 
   # Regression
 
+  def test_for_directive_with_float_bounds
+    assert_equal(<<CSS, render(<<SCSS))
+.a {
+  b: 0;
+  b: 1;
+  b: 2;
+  b: 3;
+  b: 4;
+  b: 5; }
+CSS
+.a {
+  @for $i from 0.0 through 5.0 {b: $i}
+}
+SCSS
+
+    assert_raise_message(Sass::SyntaxError, "0.5 is not an integer.") {render(<<SCSS)}
+.a {
+  @for $i from 0.5 through 5.0 {b: $i}
+}
+SCSS
+
+    assert_raise_message(Sass::SyntaxError, "5.5 is not an integer.") {render(<<SCSS)}
+.a {
+  @for $i from 0.0 through 5.5 {b: $i}
+}
+SCSS
+  end
+
+  def test_parent_selector_in_function_pseudo_selector
+    assert_equal <<CSS, render(<<SCSS)
+.bar:not(.foo) {
+  a: b; }
+
+.qux:nth-child(2n of .baz .bang) {
+  c: d; }
+CSS
+.foo {
+  .bar:not(&) {a: b}
+}
+
+.baz .bang {
+  .qux:nth-child(2n of &) {c: d}
+}
+SCSS
+  end
+
   def test_attribute_selector_in_selector_pseudoclass
     # Even though this is plain CSS, it only failed when given to the SCSS
     # parser.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass
 version: !ruby/object:Gem::Version
-  version: 3.4.5
+  version: 3.4.6
 platform: ruby
 authors:
 - Natalie Weizenbaum
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-20 00:00:00.000000000 Z
+date: 2014-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
@@ -67,311 +67,310 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- rails/init.rb
+- .yardopts
+- CONTRIBUTING
+- MIT-LICENSE
+- README.md
+- REVISION
+- Rakefile
+- VERSION
+- VERSION_DATE
+- VERSION_NAME
+- bin/sass
+- bin/sass-convert
+- bin/scss
+- extra/update_watch.rb
+- 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/media.rb
-- lib/sass/stack.rb
+- lib/sass/cache_stores/base.rb
 - lib/sass/cache_stores/chain.rb
+- lib/sass/cache_stores/filesystem.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/keyframe_rule_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/at_root_node.rb
-- lib/sass/tree/node.rb
-- lib/sass/tree/mixin_node.rb
-- lib/sass/tree/error_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/warn_node.rb
-- lib/sass/tree/debug_node.rb
-- lib/sass/tree/prop_node.rb
-- lib/sass/tree/variable_node.rb
+- lib/sass/callbacks.rb
+- lib/sass/css.rb
 - lib/sass/engine.rb
-- lib/sass/exec/sass_scss.rb
+- lib/sass/environment.rb
+- lib/sass/error.rb
+- lib/sass/exec.rb
 - lib/sass/exec/base.rb
 - lib/sass/exec/sass_convert.rb
-- lib/sass/plugin.rb
-- lib/sass/root.rb
+- lib/sass/exec/sass_scss.rb
 - lib/sass/features.rb
 - lib/sass/importers.rb
-- lib/sass/source/map.rb
-- lib/sass/source/range.rb
-- lib/sass/source/position.rb
+- lib/sass/importers/base.rb
+- lib/sass/importers/filesystem.rb
 - lib/sass/logger.rb
-- lib/sass/util/normalized_map.rb
-- lib/sass/util/test.rb
-- lib/sass/util/cross_platform_random.rb
-- lib/sass/util/ordered_hash.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/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/logger/log_level.rb
+- lib/sass/media.rb
+- lib/sass/plugin.rb
+- lib/sass/plugin/compiler.rb
+- lib/sass/plugin/configuration.rb
+- lib/sass/plugin/generic.rb
+- lib/sass/plugin/merb.rb
+- lib/sass/plugin/rack.rb
+- lib/sass/plugin/rails.rb
+- lib/sass/plugin/staleness_checker.rb
+- lib/sass/railtie.rb
+- lib/sass/repl.rb
+- lib/sass/root.rb
 - lib/sass/script.rb
-- lib/sass/util.rb
-- lib/sass/importers/filesystem.rb
-- lib/sass/importers/base.rb
-- lib/sass/script/parser.rb
+- lib/sass/script/css_lexer.rb
+- lib/sass/script/css_parser.rb
 - lib/sass/script/functions.rb
-- lib/sass/script/tree/variable.rb
-- lib/sass/script/tree/operation.rb
+- lib/sass/script/lexer.rb
+- lib/sass/script/parser.rb
+- lib/sass/script/tree.rb
 - lib/sass/script/tree/funcall.rb
-- lib/sass/script/tree/literal.rb
-- lib/sass/script/tree/string_interpolation.rb
 - lib/sass/script/tree/interpolation.rb
 - lib/sass/script/tree/list_literal.rb
+- lib/sass/script/tree/literal.rb
+- lib/sass/script/tree/map_literal.rb
 - lib/sass/script/tree/node.rb
-- lib/sass/script/tree/unary_operation.rb
+- lib/sass/script/tree/operation.rb
 - lib/sass/script/tree/selector.rb
-- lib/sass/script/tree/map_literal.rb
-- lib/sass/script/tree.rb
-- lib/sass/script/lexer.rb
-- lib/sass/script/css_lexer.rb
+- lib/sass/script/tree/string_interpolation.rb
+- lib/sass/script/tree/unary_operation.rb
+- lib/sass/script/tree/variable.rb
 - lib/sass/script/value.rb
-- lib/sass/script/value/color.rb
-- lib/sass/script/value/number.rb
-- lib/sass/script/value/map.rb
 - lib/sass/script/value/arg_list.rb
+- lib/sass/script/value/base.rb
 - lib/sass/script/value/bool.rb
-- lib/sass/script/value/list.rb
+- lib/sass/script/value/color.rb
 - lib/sass/script/value/helpers.rb
+- lib/sass/script/value/list.rb
+- lib/sass/script/value/map.rb
 - lib/sass/script/value/null.rb
+- lib/sass/script/value/number.rb
 - lib/sass/script/value/string.rb
-- lib/sass/script/value/base.rb
-- lib/sass/script/css_parser.rb
+- lib/sass/scss.rb
+- lib/sass/scss/css_parser.rb
+- lib/sass/scss/parser.rb
+- lib/sass/scss/rx.rb
+- lib/sass/scss/script_lexer.rb
+- lib/sass/scss/script_parser.rb
+- lib/sass/scss/static_parser.rb
 - lib/sass/selector.rb
-- lib/sass/callbacks.rb
-- lib/sass/selector/simple.rb
-- lib/sass/selector/pseudo.rb
-- lib/sass/selector/sequence.rb
 - lib/sass/selector/abstract_sequence.rb
 - lib/sass/selector/comma_sequence.rb
+- lib/sass/selector/pseudo.rb
+- lib/sass/selector/sequence.rb
+- lib/sass/selector/simple.rb
 - lib/sass/selector/simple_sequence.rb
-- lib/sass/railtie.rb
-- lib/sass/environment.rb
-- lib/sass/exec.rb
-- vendor/listen/README.md
+- lib/sass/shared.rb
+- lib/sass/source/map.rb
+- lib/sass/source/position.rb
+- lib/sass/source/range.rb
+- lib/sass/stack.rb
+- lib/sass/supports.rb
+- lib/sass/tree/at_root_node.rb
+- lib/sass/tree/charset_node.rb
+- lib/sass/tree/comment_node.rb
+- lib/sass/tree/content_node.rb
+- lib/sass/tree/css_import_node.rb
+- lib/sass/tree/debug_node.rb
+- lib/sass/tree/directive_node.rb
+- lib/sass/tree/each_node.rb
+- lib/sass/tree/error_node.rb
+- lib/sass/tree/extend_node.rb
+- lib/sass/tree/for_node.rb
+- lib/sass/tree/function_node.rb
+- lib/sass/tree/if_node.rb
+- lib/sass/tree/import_node.rb
+- lib/sass/tree/keyframe_rule_node.rb
+- lib/sass/tree/media_node.rb
+- lib/sass/tree/mixin_def_node.rb
+- lib/sass/tree/mixin_node.rb
+- lib/sass/tree/node.rb
+- lib/sass/tree/prop_node.rb
+- lib/sass/tree/return_node.rb
+- lib/sass/tree/root_node.rb
+- lib/sass/tree/rule_node.rb
+- lib/sass/tree/supports_node.rb
+- lib/sass/tree/trace_node.rb
+- lib/sass/tree/variable_node.rb
+- lib/sass/tree/visitors/base.rb
+- lib/sass/tree/visitors/check_nesting.rb
+- lib/sass/tree/visitors/convert.rb
+- lib/sass/tree/visitors/cssize.rb
+- lib/sass/tree/visitors/deep_copy.rb
+- lib/sass/tree/visitors/extend.rb
+- lib/sass/tree/visitors/perform.rb
+- lib/sass/tree/visitors/set_options.rb
+- lib/sass/tree/visitors/to_css.rb
+- lib/sass/tree/warn_node.rb
+- lib/sass/tree/while_node.rb
+- lib/sass/util.rb
+- lib/sass/util/cross_platform_random.rb
+- lib/sass/util/multibyte_string_scanner.rb
+- lib/sass/util/normalized_map.rb
+- lib/sass/util/ordered_hash.rb
+- lib/sass/util/subset_map.rb
+- lib/sass/util/test.rb
+- lib/sass/version.rb
+- rails/init.rb
+- test/sass/cache_test.rb
+- test/sass/callbacks_test.rb
+- test/sass/compiler_test.rb
+- test/sass/conversion_test.rb
+- test/sass/css2sass_test.rb
+- test/sass/data/hsl-rgb.txt
+- test/sass/encoding_test.rb
+- test/sass/engine_test.rb
+- test/sass/exec_test.rb
+- test/sass/extend_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/importer_test.rb
+- test/sass/logger_test.rb
+- test/sass/mock_importer.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/more_templates/_more_partial.sass
+- test/sass/more_templates/more1.sass
+- test/sass/more_templates/more_import.sass
+- test/sass/plugin_test.rb
+- test/sass/results/alt.css
+- test/sass/results/basic.css
+- test/sass/results/cached_import_option.css
+- test/sass/results/compact.css
+- test/sass/results/complex.css
+- test/sass/results/compressed.css
+- test/sass/results/expanded.css
+- test/sass/results/filename_fn.css
+- test/sass/results/if.css
+- test/sass/results/import.css
+- test/sass/results/import_charset.css
+- test/sass/results/import_charset_1_8.css
+- test/sass/results/import_charset_ibm866.css
+- test/sass/results/import_content.css
+- test/sass/results/line_numbers.css
+- test/sass/results/mixins.css
+- test/sass/results/multiline.css
+- test/sass/results/nested.css
+- test/sass/results/options.css
+- test/sass/results/parent_ref.css
+- test/sass/results/script.css
+- test/sass/results/scss_import.css
+- test/sass/results/scss_importee.css
+- test/sass/results/subdir/nested_subdir/nested_subdir.css
+- test/sass/results/subdir/subdir.css
+- test/sass/results/units.css
+- test/sass/results/warn.css
+- test/sass/results/warn_imported.css
+- test/sass/script_conversion_test.rb
+- test/sass/script_test.rb
+- test/sass/scss/css_test.rb
+- test/sass/scss/rx_test.rb
+- test/sass/scss/scss_test.rb
+- test/sass/scss/test_helper.rb
+- test/sass/source_map_test.rb
+- test/sass/superselector_test.rb
+- test/sass/templates/_cached_import_option_partial.scss
+- test/sass/templates/_double_import_loop2.sass
+- test/sass/templates/_filename_fn_import.scss
+- test/sass/templates/_imported_charset_ibm866.sass
+- test/sass/templates/_imported_charset_utf8.sass
+- test/sass/templates/_imported_content.sass
+- test/sass/templates/_partial.sass
+- test/sass/templates/_same_name_different_partiality.scss
+- test/sass/templates/alt.sass
+- test/sass/templates/basic.sass
+- test/sass/templates/bork1.sass
+- test/sass/templates/bork2.sass
+- test/sass/templates/bork3.sass
+- test/sass/templates/bork4.sass
+- test/sass/templates/bork5.sass
+- test/sass/templates/cached_import_option.scss
+- test/sass/templates/compact.sass
+- test/sass/templates/complex.sass
+- test/sass/templates/compressed.sass
+- test/sass/templates/double_import_loop1.sass
+- test/sass/templates/expanded.sass
+- test/sass/templates/filename_fn.scss
+- test/sass/templates/if.sass
+- test/sass/templates/import.sass
+- test/sass/templates/import_charset.sass
+- test/sass/templates/import_charset_1_8.sass
+- test/sass/templates/import_charset_ibm866.sass
+- test/sass/templates/import_content.sass
+- test/sass/templates/importee.less
+- test/sass/templates/importee.sass
+- test/sass/templates/line_numbers.sass
+- test/sass/templates/mixin_bork.sass
+- test/sass/templates/mixins.sass
+- test/sass/templates/multiline.sass
+- test/sass/templates/nested.sass
+- test/sass/templates/nested_bork1.sass
+- test/sass/templates/nested_bork2.sass
+- test/sass/templates/nested_bork3.sass
+- test/sass/templates/nested_bork4.sass
+- test/sass/templates/nested_import.sass
+- test/sass/templates/nested_mixin_bork.sass
+- test/sass/templates/options.sass
+- test/sass/templates/parent_ref.sass
+- test/sass/templates/same_name_different_ext.sass
+- test/sass/templates/same_name_different_ext.scss
+- test/sass/templates/same_name_different_partiality.scss
+- test/sass/templates/script.sass
+- test/sass/templates/scss_import.scss
+- test/sass/templates/scss_importee.scss
+- test/sass/templates/single_import_loop.sass
+- test/sass/templates/subdir/import_up1.scss
+- test/sass/templates/subdir/import_up2.scss
+- test/sass/templates/subdir/nested_subdir/_nested_partial.sass
+- test/sass/templates/subdir/nested_subdir/nested_subdir.sass
+- test/sass/templates/subdir/subdir.sass
+- test/sass/templates/units.sass
+- test/sass/templates/warn.sass
+- test/sass/templates/warn_imported.sass
+- test/sass/test_helper.rb
+- test/sass/util/multibyte_string_scanner_test.rb
+- test/sass/util/normalized_map_test.rb
+- test/sass/util/subset_map_test.rb
+- test/sass/util_test.rb
+- test/sass/value_helpers_test.rb
+- test/test_helper.rb
+- vendor/listen/CHANGELOG.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/listener.rb
-- vendor/listen/lib/listen/adapters/polling.rb
+- vendor/listen/Guardfile
+- vendor/listen/LICENSE
+- vendor/listen/README.md
+- vendor/listen/Rakefile
+- vendor/listen/Vagrantfile
+- vendor/listen/lib/listen.rb
+- vendor/listen/lib/listen/adapter.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/polling.rb
 - vendor/listen/lib/listen/adapters/windows.rb
-- vendor/listen/lib/listen/adapter.rb
-- vendor/listen/lib/listen.rb
-- vendor/listen/CHANGELOG.md
-- vendor/listen/Rakefile
-- vendor/listen/LICENSE
+- vendor/listen/lib/listen/directory_record.rb
+- vendor/listen/lib/listen/listener.rb
+- vendor/listen/lib/listen/turnstile.rb
+- vendor/listen/lib/listen/version.rb
 - vendor/listen/listen.gemspec
-- vendor/listen/Vagrantfile
-- vendor/listen/spec/listen/directory_record_spec.rb
-- vendor/listen/spec/listen/adapters/linux_spec.rb
-- vendor/listen/spec/listen/adapters/darwin_spec.rb
+- vendor/listen/spec/listen/adapter_spec.rb
 - vendor/listen/spec/listen/adapters/bsd_spec.rb
+- vendor/listen/spec/listen/adapters/darwin_spec.rb
+- vendor/listen/spec/listen/adapters/linux_spec.rb
 - vendor/listen/spec/listen/adapters/polling_spec.rb
 - vendor/listen/spec/listen/adapters/windows_spec.rb
-- vendor/listen/spec/listen/turnstile_spec.rb
-- vendor/listen/spec/listen/adapter_spec.rb
+- vendor/listen/spec/listen/directory_record_spec.rb
 - vendor/listen/spec/listen/listener_spec.rb
+- vendor/listen/spec/listen/turnstile_spec.rb
 - vendor/listen/spec/listen_spec.rb
 - vendor/listen/spec/spec_helper.rb
+- vendor/listen/spec/support/adapter_helper.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/adapter_helper.rb
 - vendor/listen/spec/support/platform_helper.rb
-- vendor/listen/spec/support/fixtures_helper.rb
-- bin/sass-convert
-- bin/scss
-- bin/sass
-- test/test_helper.rb
-- test/foo.scss
-- test/sass/engine_test.rb
-- test/sass/functions_test.rb
-- test/sass/value_helpers_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/compiler_test.rb
-- test/sass/css2sass_test.rb
-- test/sass/templates/_filename_fn_import.scss
-- 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/import_up2.scss
-- test/sass/templates/subdir/nested_subdir/_nested_partial.sass
-- test/sass/templates/subdir/nested_subdir/nested_subdir.sass
-- test/sass/templates/subdir/import_up1.scss
-- test/sass/templates/_imported_content.sass
-- test/sass/templates/filename_fn.scss
-- test/sass/templates/alt.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/bork3.sass
-- test/sass/templates/bork5.sass
-- test/sass/templates/import_content.sass
-- test/sass/templates/warn_imported.sass
-- 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/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/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/exec_test.rb
-- test/sass/util/subset_map_test.rb
-- test/sass/util/multibyte_string_scanner_test.rb
-- test/sass/util/normalized_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/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/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/filename_fn.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/superselector_test.rb
-- test/sass/encoding_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/source_map_test.rb
-- test/sass/plugin_test.rb
-- extra/update_watch.rb
-- Rakefile
-- init.rb
-- .yardopts
-- README.md
-- VERSION_NAME
-- VERSION_DATE
-- REVISION
-- MIT-LICENSE
-- VERSION
-- CONTRIBUTING
 homepage: http://sass-lang.com/
 licenses:
 - MIT
@@ -392,33 +391,33 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: sass
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 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/value_helpers_test.rb
-- test/sass/extend_test.rb
-- test/sass/logger_test.rb
-- test/sass/compiler_test.rb
-- test/sass/css2sass_test.rb
 - test/sass/conversion_test.rb
+- test/sass/cache_test.rb
 - test/sass/script_test.rb
-- test/sass/exec_test.rb
-- test/sass/util/subset_map_test.rb
-- test/sass/util/multibyte_string_scanner_test.rb
-- test/sass/util/normalized_map_test.rb
+- test/sass/superselector_test.rb
 - test/sass/callbacks_test.rb
-- test/sass/importer_test.rb
+- test/sass/source_map_test.rb
+- test/sass/script_conversion_test.rb
+- test/sass/util_test.rb
+- test/sass/plugin_test.rb
+- test/sass/extend_test.rb
+- test/sass/scss/rx_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/superselector_test.rb
+- test/sass/logger_test.rb
+- test/sass/importer_test.rb
 - test/sass/encoding_test.rb
-- test/sass/cache_test.rb
-- test/sass/source_map_test.rb
-- test/sass/plugin_test.rb
+- test/sass/engine_test.rb
+- test/sass/exec_test.rb
+- test/sass/util/normalized_map_test.rb
+- test/sass/util/subset_map_test.rb
+- test/sass/util/multibyte_string_scanner_test.rb
+- test/sass/functions_test.rb
+- test/sass/compiler_test.rb
+- test/sass/css2sass_test.rb

data/test/foo.scss

@@ -1 +0,0 @@
-foo {a: x}