sass 3.3.0.rc.6 → 3.3.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZWRiNjA5MDgxMzBiNmFiYjRlN2ZkMTI2ZWM3ZGIwNDQ3M2M3OTRjNw==
-  data.tar.gz: !binary |-
-    OWI2Njk3NzRlOTExOGFjNWY3MzEwMjUyN2IzMGY1OGVlMGY3MmYxZg==
+SHA1:
+  metadata.gz: 93af5ba687645339e994ee22f0322a8da0cd8921
+  data.tar.gz: 585b6cdaf03b5bad3ba5efcac0c2245d8b438768
 SHA512:
-  metadata.gz: !binary |-
-    MzI1YmZkMTEzMWM2ZjViOGFlOWRkOWJkM2U1Y2M5MzdlYjVlODYxNDY2N2Zh
-    MDJmYjdkOWJiYWZlM2Q2ZTMyZTY4NjRmYmRhM2M0OWI2Y2Y5ZWZhNWYxOGNl
-    NTJjZmEwNmI5ZjgwMjU0YmQ4ZWQ0MDlmNmE3Y2QyMmFmMGM4ZWI=
-  data.tar.gz: !binary |-
-    OWFiNDNhZDQ2NWQ1ZmY1ZDIzMmVhMzE3OWU5N2VjM2Y1NmVmNjlmMTdhYWEx
-    OTRkZGIyNjkxZjVjZGFjNWE4NDc2OTZiZmRlYmNiNzFmMThhNmJkZjMwYzFk
-    ZDQwYjg3MzM1MjIxYjFhMDFlMmQyMDNjMDBmZjkyNWExZTdjODY=
+  metadata.gz: 6ee387ccbac66719ae087dd483a5e39746a8998f33e2f8b76194c1cb3bf32c2346a52b651eb0b45527b2e13abc03819f6a7923134f94c154530d19ae35a35120
+  data.tar.gz: 654f947e96a308f21a82be0534ec7a17f6a3d84bdf5bab1228357cc411a7b8d5db7b52aff449026a6e172ea1b52f5c25c28a8a4ee1f597fab8cf9bb8c5753395

data/VERSION

@@ -1 +1 @@
-3.3.0.rc.6
+3.3.0

data/VERSION_DATE

@@ -1 +1 @@
-03 March 2014 22:36:24 UTC
+08 March 2014 02:21:08 UTC

data/lib/sass/exec.rb

@@ -372,8 +372,8 @@ END
               raise "Can't generate a sourcemap for an input without a path."
             end
 
-            relative_sourcemap_path = Pathname.new(@options[:sourcemap_filename]).
-              relative_path_from(Pathname.new(@options[:output_filename]).dirname)
+            relative_sourcemap_path = ::Sass::Util.pathname(@options[:sourcemap_filename]).
+              relative_path_from(::Sass::Util.pathname(@options[:output_filename]).dirname)
             rendered, mapping = engine.render_with_sourcemap(relative_sourcemap_path.to_s)
             write_output(rendered, output)
             write_output(mapping.to_json(

data/lib/sass/importers/filesystem.rb

@@ -1,4 +1,3 @@
-require 'pathname'
 require 'set'
 
 module Sass
@@ -69,8 +68,8 @@ module Sass
         if sourcemap_directory.nil?
           warn_about_public_url(name)
         else
-          file_pathname = Pathname.new(Sass::Util.absolute_path(name, @root)).cleanpath
-          sourcemap_pathname = Pathname.new(sourcemap_directory).cleanpath
+          file_pathname = Sass::Util.pathname(Sass::Util.absolute_path(name, @root)).cleanpath
+          sourcemap_pathname = Sass::Util.pathname(sourcemap_directory).cleanpath
           begin
             file_pathname.relative_path_from(sourcemap_pathname).to_s
           rescue ArgumentError # when a relative path cannot be constructed
@@ -144,10 +143,11 @@ module Sass
         dir = dir.gsub(File::ALT_SEPARATOR, File::SEPARATOR) unless File::ALT_SEPARATOR.nil?
 
         found = possible_files(remove_root(name)).map do |f, s|
-          path = dir == "." || Pathname.new(f).absolute? ? f : "#{escape_glob_characters(dir)}/#{f}"
+          path = (dir == "." || Sass::Util.pathname(f).absolute?) ? f :
+            "#{escape_glob_characters(dir)}/#{f}"
           Dir[path].map do |full_path|
             full_path.gsub!(REDUNDANT_DIRECTORY, File::SEPARATOR)
-            [Pathname.new(full_path).cleanpath.to_s, s]
+            [Sass::Util.pathname(full_path).cleanpath.to_s, s]
           end
         end
         found = Sass::Util.flatten(found, 1)
@@ -155,13 +155,13 @@ module Sass
 
         if found.size > 1 && !@same_name_warnings.include?(found.first.first)
           found.each {|(f, _)| @same_name_warnings << f}
-          relative_to = Pathname.new(dir)
+          relative_to = Sass::Util.pathname(dir)
           if options[:_from_import_node]
             # If _line exists, we're here due to an actual import in an
             # import_node and we want to print a warning for a user writing an
             # ambiguous import.
             candidates = found.map do |(f, _)|
-              "  " + Pathname.new(f).relative_path_from(relative_to).to_s
+              "  " + Sass::Util.pathname(f).relative_path_from(relative_to).to_s
             end.join("\n")
             raise Sass::SyntaxError.new(<<MESSAGE)
 It's not clear which file to import for '@import "#{name}"'.

data/lib/sass/plugin/compiler.rb

@@ -1,5 +1,4 @@
 require 'fileutils'
-require 'pathname'
 
 require 'sass'
 # XXX CE: is this still necessary now that we have the compiler class?
@@ -436,7 +435,7 @@ module Sass::Plugin
     end
 
     def relative_to_pwd(f)
-      Pathname.new(f).relative_path_from(Pathname.new(Dir.pwd)).to_s
+      Sass::Util.pathname(f).relative_path_from(Sass::Util.pathname(Dir.pwd)).to_s
     rescue ArgumentError # when a relative path cannot be computed
       f
     end

data/lib/sass/selector/simple.rb

@@ -46,7 +46,7 @@ module Sass
       #
       # @return [Fixnum]
       def hash
-        @_hash ||= to_a.hash
+        @_hash ||= equality_key.hash
       end
 
       # Checks equality between this and another object.
@@ -58,7 +58,7 @@ module Sass
       # @param other [Object] The object to test equality against
       # @return [Boolean] Whether or not this is equal to `other`
       def eql?(other)
-        other.class == self.class && other.hash == hash && other.to_a.eql?(to_a)
+        other.class == self.class && other.hash == hash && other.equality_key.eql?(equality_key)
       end
       alias_method :==, :eql?
 
@@ -94,6 +94,16 @@ module Sass
 
       protected
 
+      # Returns the key used for testing whether selectors are equal.
+      #
+      # This is based on \{#to\_a}, with adjacent strings merged so that
+      # selectors constructed in different ways are considered equivalent.
+      #
+      # @return [Array<String, Sass::Script::Tree::Node>]
+      def equality_key
+        @equality_key ||= Sass::Util.merge_adjacent_strings(to_a)
+      end
+
       # Unifies two namespaces,
       # returning a namespace that works for both of them if possible.
       #

data/lib/sass/source/map.rb

@@ -1,5 +1,3 @@
-require 'pathname'
-
 module Sass::Source
   class Map
     # A mapping from one source range to another. Indicates that `input` was
@@ -99,8 +97,8 @@ module Sass::Source
         raise ArgumentError.new("Sass::Source::Map#to_json requires either " \
           "the :css_uri option or both the :css_path and :soucemap_path options.")
       end
-      css_path &&= Pathname.pwd.join(Pathname.new(css_path)).cleanpath
-      sourcemap_path &&= Pathname.pwd.join(Pathname.new(sourcemap_path)).cleanpath
+      css_path &&= Pathname.pwd.join(Sass::Util.pathname(css_path)).cleanpath
+      sourcemap_path &&= Pathname.pwd.join(Sass::Util.pathname(sourcemap_path)).cleanpath
       css_uri ||= css_path.relative_path_from(sourcemap_path.dirname).to_s
 
       result = "{\n"

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

@@ -306,14 +306,15 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
           output("#{old_spaces}/* line #{node.line}")
 
           if node.filename
-            relative_filename = if node.options[:css_filename]
-                                  begin
-                                    Pathname.new(node.filename).relative_path_from(
-                                      Pathname.new(File.dirname(node.options[:css_filename]))).to_s
-                                  rescue ArgumentError
-                                    nil
-                                  end
-                                end
+            relative_filename =
+              if node.options[:css_filename]
+                begin
+                  Sass::Util.pathname(node.filename).relative_path_from(
+                    Sass::Util.pathname(File.dirname(node.options[:css_filename]))).to_s
+                rescue ArgumentError
+                  nil
+                end
+              end
             relative_filename ||= node.filename
             output(", #{relative_filename}")
           end

data/lib/sass/util.rb

@@ -5,6 +5,7 @@ require 'stringio'
 require 'rbconfig'
 require 'uri'
 require 'thread'
+require 'pathname'
 
 require 'sass/root'
 require 'sass/util/subset_map'
@@ -579,6 +580,16 @@ module Sass
       end
     end
 
+    # Like `Pathname.new`, but normalizes Windows paths to always use backslash
+    # separators.
+    #
+    # `Pathname.relative_path_from` can break if the two pathnames aren't
+    # consistent in their slash style.
+    def pathname(path)
+      path = path.tr("/", "\\") if windows?
+      Pathname.new(path)
+    end
+
     # Prepare a value for a destructuring assignment (e.g. `a, b =
     # val`). This works around a performance bug when using
     # ActiveSupport, and only needs to be called when `val` is likely

data/test/sass/extend_test.rb

@@ -1115,6 +1115,16 @@ SCSS
 
   # Regression Tests
 
+  def test_extend_parent_selector_suffix
+    assert_equal <<CSS, render(<<SCSS)
+.a-b, .c {
+  x: y; }
+CSS
+.a {&-b {x: y}}
+.c {@extend .a-b}
+SCSS
+  end
+
   def test_pseudo_element_superselector
     # Pseudo-elements shouldn't be removed in superselector calculations.
     assert_equal <<CSS, render(<<SCSS)

data/vendor/listen/CHANGELOG.md

@@ -0,0 +1,228 @@
+## 0.7.3 - February 24, 2013
+
+### Bug fix
+
+- [#88] Update wdm dependency. (fixed by [@mrbinky3000][])
+- [#78] Depend on latest rb-inotify. (fixed by [@mbj][])
+
+## 0.7.2 - January 11, 2013
+
+### Bug fix
+
+- [#76] Exception on filename which is not in UTF-8. (fixed by [@piotr-sokolowski][])
+
+## 0.7.1 - January 6, 2013
+
+### Bug fix
+
+- [#75] Default high precision off if the mtime call fails. (fixed by [@zanker][])
+
+## 0.7.0 - December 29, 2012
+
+### Bug fixes
+
+- [#73] Rescue Errno::EOPNOTSUPP on sha1_checksum generation. (fixed by [@thibaudgg][])
+
+### New feature
+
+- Add support for *BSD with rb-kqueue. ([@mat813][])
+
+## 0.6.0 - November 21, 2012
+
+### New feature
+
+- Add bang versions for filter and ignore listener methods. ([@tarsolya][])
+
+## 0.5.3 - October 3, 2012
+
+### Bug fixes
+
+- [#65] Fix ruby warning in adapter.rb. (fixed by [@vongruenigen][])
+- [#64] ENXIO raised when hashing UNIX domain socket file. (fixed by [@sunaku][])
+
+## 0.5.2 - Septemper 23, 2012
+
+### Bug fix
+
+- [#62] Fix double change callback with polling adapter. (fixed by [@thibaudgg][])
+
+## 0.5.1 - Septemper 18, 2012
+
+### Bug fix
+
+- [#61] Fix a synchronisation bug that caused constant fallback to polling. (fixed by [@Maher4Ever][])
+
+## 0.5.0 - Septemper 1, 2012
+
+### New features
+
+- Add a dependency manager to handle platform-specific gems. So there is no need anymore to install
+  extra gems which will never be used on the user system. ([@Maher4Ever][])
+- Add a manual reporting mode to the adapters. ([@Maher4Ever][])
+
+### Improvements
+
+- [#28] Enhance the speed of detecting changes on Windows by using the [WDM][] library. ([@Maher4Ever][])
+
+## 0.4.7 - June 27, 2012
+
+### Bug fixes
+
+- Increase latency to 0.25, to avoid useless polling fallback. (fixed by [@thibaudgg][])
+- Change watched inotify events, to avoid duplication callback. (fixed by [@thibaudgg][])
+- [#41](https://github.com/guard/listen/issues/41) Use lstat instead of stat when calculating mtime. (fixed by [@ebroder][])
+
+## 0.4.6 - June 20, 2012
+
+### Bug fix
+
+- [#39](https://github.com/guard/listen/issues/39) Fix digest race condition. (fixed by [@dkubb][])
+
+## 0.4.5 - June 13, 2012
+
+### Bug fix
+
+- [#39](https://github.com/guard/listen/issues/39) Rescue Errno::ENOENT when path inserted doesn't exist. (reported by [@textgoeshere][], fixed by [@thibaudgg][] and [@rymai][])
+
+## 0.4.4 - June 8, 2012
+
+### Bug fixes
+
+- ~~[#39](https://github.com/guard/listen/issues/39) Non-existing path insertion bug. (reported by [@textgoeshere][], fixed by [@thibaudgg][])~~
+- Fix relative path for directories containing special characters. (reported by [@napcs][], fixed by [@netzpirat][])
+
+## 0.4.3 - June 6, 2012
+
+### Bug fixes
+
+- [#24](https://github.com/guard/listen/issues/24) Fail gracefully when the inotify limit is not enough for Listen to function. (reported by [@daemonza][], fixed by [@Maher4Ever][])
+- [#32](https://github.com/guard/listen/issues/32) Fix a crash when trying to calculate the checksum of unreadable files. (reported by [@nex3][], fixed by [@Maher4Ever][])
+
+### Improvements
+
+- Add `#relative_paths` method to listeners. ([@Maher4Ever][])
+- Add `#started?` query-method to adapters. ([@Maher4Ever][])
+- Dynamically detect the mtime precision used on a system. ([@Maher4Ever][] with help from [@nex3][])
+
+## 0.4.2 - May 1, 2012
+
+### Bug fixes
+
+- [#21](https://github.com/guard/listen/issues/21) Issues when listening to changes in relative paths. (reported by [@akerbos][], fixed by [@Maher4Ever][])
+- [#27](https://github.com/guard/listen/issues/27) Wrong reports for files modifications. (reported by [@cobychapple][], fixed by [@Maher4Ever][])
+- Fix segmentation fault when profiling on Windows. ([@Maher4Ever][])
+- Fix redundant watchers on Windows. ([@Maher4Ever][])
+
+### Improvements
+
+- [#17](https://github.com/guard/listen/issues/17) Use regexp-patterns with the `ignore` method instead of supplying paths. (reported by [@fny][], added by [@Maher4Ever][])
+- Speed improvement when listening to changes in directories with ignored paths. ([@Maher4Ever][])
+- Added `.rbx` and `.svn` to ignored directories. ([@Maher4Ever][])
+
+## 0.4.1 - April 15, 2012
+
+### Bug fix
+
+- [#18](https://github.com/guard/listen/issues/18) Listener crashes when removing directories with nested paths. (reported by [@daemonza][], fixed by [@Maher4Ever][])
+
+## 0.4.0 - April 9, 2012
+
+### New features
+
+- Add `wait_for_callback` method to all adapters. ([@Maher4Ever][])
+- Add `Listen::MultiListener` class to listen to multiple directories at once. ([@Maher4Ever][])
+- Allow passing multiple directories to the `Listen.to` method. ([@Maher4Ever][])
+- Add `blocking` option to `Listen#start` which can be used to disable blocking the current thread upon starting. ([@Maher4Ever][])
+- Use absolute-paths in callbacks by default instead of relative-paths. ([@Maher4Ever][])
+- Add `relative_paths` option to `Listen::Listener` to retain the old functionality. ([@Maher4Ever][])
+
+### Improvements
+
+- Encapsulate thread spawning in the linux-adapter. ([@Maher4Ever][])
+- Encapsulate thread spawning in the darwin-adapter. ([@Maher4Ever][] with [@scottdavis][] help)
+- Encapsulate thread spawning in the windows-adapter. ([@Maher4Ever][])
+- Fix linux-adapter bug where Listen would report file-modification events on the parent-directory. ([@Maher4Ever][])
+
+### Change
+
+- Remove `wait_until_listening` as adapters doesn't need to run inside threads anymore ([@Maher4Ever][])
+
+## 0.3.3 - March 6, 2012
+
+### Improvement
+
+- Improve pause/unpause. ([@thibaudgg][])
+
+## 0.3.2 - March 4, 2012
+
+### New feature
+
+- Add pause/unpause listener's methods. ([@thibaudgg][])
+
+## 0.3.1 - February 22, 2012
+
+### Bug fix
+
+- [#9](https://github.com/guard/listen/issues/9) Ignore doesn't seem to work. (reported by [@markiz][], fixed by [@thibaudgg][])
+
+## 0.3.0 - February 21, 2012
+
+### New features
+
+- Add automatic fallback to polling if system adapter doesn't work (like a DropBox folder). ([@thibaudgg][])
+- Add latency and force_polling options. ([@Maher4Ever][])
+
+## 0.2.0 - February 13, 2012
+
+### New features
+
+- Add checksum comparaison support for detecting consecutive file modifications made during the same second. ([@thibaudgg][])
+- Add rb-fchange support. ([@thibaudgg][])
+- Add rb-inotify support. ([@thibaudgg][] with [@Maher4Ever][] help)
+- Add rb-fsevent support. ([@thibaudgg][])
+- Add non-recursive diff with multiple directories support. ([@thibaudgg][])
+- Ignore .DS_Store by default. ([@thibaudgg][])
+
+## 0.1.0 - January 28, 2012
+
+- First version with only a polling adapter and basic features set (ignore & filter). ([@thibaudgg][])
+
+<!--- The following link definition list is generated by PimpMyChangelog --->
+[#9]: https://github.com/guard/listen/issues/9
+[#17]: https://github.com/guard/listen/issues/17
+[#18]: https://github.com/guard/listen/issues/18
+[#21]: https://github.com/guard/listen/issues/21
+[#24]: https://github.com/guard/listen/issues/24
+[#27]: https://github.com/guard/listen/issues/27
+[#28]: https://github.com/guard/listen/issues/28
+[#32]: https://github.com/guard/listen/issues/32
+[#41]: https://github.com/guard/listen/issues/41
+[#61]: https://github.com/guard/listen/issues/61
+[#62]: https://github.com/guard/listen/issues/62
+[#64]: https://github.com/guard/listen/issues/64
+[#65]: https://github.com/guard/listen/issues/65
+[#73]: https://github.com/guard/listen/issues/73
+[#75]: https://github.com/guard/listen/issues/75
+[#76]: https://github.com/guard/listen/issues/76
+[@Maher4Ever]: https://github.com/Maher4Ever
+[@dkubb]: https://github.com/dkubb
+[@ebroder]: https://github.com/ebroder
+[@akerbos]: https://github.com/akerbos
+[@cobychapple]: https://github.com/cobychapple
+[@daemonza]: https://github.com/daemonza
+[@fny]: https://github.com/fny
+[@markiz]: https://github.com/markiz
+[@mat813]: https://github.com/mat813
+[@napcs]: https://github.com/napcs
+[@netzpirat]: https://github.com/netzpirat
+[@nex3]: https://github.com/nex3
+[@piotr-sokolowski]: https://github.com/piotr-sokolowski
+[@rymai]: https://github.com/rymai
+[@scottdavis]: https://github.com/scottdavis
+[@sunaku]: https://github.com/sunaku
+[@textgoeshere]: https://github.com/textgoeshere
+[@thibaudgg]: https://github.com/thibaudgg
+[@tarsolya]: https://github.com/tarsolya
+[@vongruenigen]: https://github.com/vongruenigen
+[@zanker]: https://github.com/zanker
+[WDM]: https://github.com/Maher4Ever/wdm