sass 3.3.0.rc.5 → 3.3.0.rc.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTc5YzExMjQxZmJhMzkyNmNjNDQxMTU1ZGMyYWZkYmVjZWIwZmM3Mg==
+    ZWRiNjA5MDgxMzBiNmFiYjRlN2ZkMTI2ZWM3ZGIwNDQ3M2M3OTRjNw==
   data.tar.gz: !binary |-
-    NjYxYmU2OWIwZjNkZWYwNzhmYzYyNGNiZmRiNThjZWJlZGViMGU3MQ==
+    OWI2Njk3NzRlOTExOGFjNWY3MzEwMjUyN2IzMGY1OGVlMGY3MmYxZg==
 SHA512:
   metadata.gz: !binary |-
-    YzdjZmIzZTVhYWZmNDZlZjFlZWQ4NjIxYzBhN2Y3NTZjMzE0Y2YxZWU0MDk5
-    ZmU0ZGRmYTY2MWZiMTVmMGM1NjYxODBjMjdhMTY3YWNlNWJjYjFjMWM4OTA3
-    NTNmMDRhNmM0YmZjZDJhNDRlNzE4NDllMjBhYTY5M2MzNjc5N2Y=
+    MzI1YmZkMTEzMWM2ZjViOGFlOWRkOWJkM2U1Y2M5MzdlYjVlODYxNDY2N2Zh
+    MDJmYjdkOWJiYWZlM2Q2ZTMyZTY4NjRmYmRhM2M0OWI2Y2Y5ZWZhNWYxOGNl
+    NTJjZmEwNmI5ZjgwMjU0YmQ4ZWQ0MDlmNmE3Y2QyMmFmMGM4ZWI=
   data.tar.gz: !binary |-
-    MzNkYTYyODdjMjQzNzU4YzFmMDhmMjg1OTNlMzg0ZWZjMzZiNDAxZGVhZjQy
-    YjFmMDJlZDM4NjZiZTFmNmM0M2NkMmUwNjIwMGQ3NDgyMGJiZDgzYjQzZjIz
-    NTlmNjAyMTZjMTNhYTY5ZTcxODI1Y2EyODY1OGJiNjliMWQ3Nzc=
+    OWFiNDNhZDQ2NWQ1ZmY1ZDIzMmVhMzE3OWU5N2VjM2Y1NmVmNjlmMTdhYWEx
+    OTRkZGIyNjkxZjVjZGFjNWE4NDc2OTZiZmRlYmNiNzFmMThhNmJkZjMwYzFk
+    ZDQwYjg3MzM1MjIxYjFhMDFlMmQyMDNjMDBmZjkyNWExZTdjODY=

data/VERSION

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

data/VERSION_DATE

@@ -1 +1 @@
-21 February 2014 23:09:12 UTC
+03 March 2014 22:36:24 UTC

data/ext/mkrf_conf.rb

@@ -14,8 +14,8 @@ puts "Ensuring you have the right version of listen installed."
 Gem::Command.build_args = ARGV
 inst = Gem::DependencyInstaller.new
 if Sass::Util.version_geq(RUBY_VERSION, "1.9.3")
-  puts "Installing listen >= 1.1.0, < 2.5"
-  inst.install "listen", Gem::Requirement.new(">= 1.1.0", "< 2.5")
+  puts "Installing listen >= 1.1.0, < 3.0.0"
+  inst.install "listen", Gem::Requirement.new(">= 1.1.0", "< 3.0.0")
 else
   puts "Installing listen ~> 1.1.0"
   inst.install "listen", "~> 1.1.0"

data/lib/sass/plugin/compiler.rb

@@ -230,6 +230,16 @@ module Sass::Plugin
       # TODO: Keep better track of what depends on what
       # so we don't have to run a global update every time anything changes.
       listener_args = directories + [{:relative_paths => false}]
+
+      # The native windows listener is much slower than the polling option, according to
+      # https://github.com/nex3/sass/commit/a3031856b22bc834a5417dedecb038b7be9b9e3e
+      poll = @options[:poll] || Sass::Util.windows?
+      if poll && Sass::Util.listen_geq_2?
+        # In Listen 2.0.0 and on, :force_polling is an option. In earlier
+        # versions, it's a method on the listener (called below).
+        listener_args.last[:force_polling] = true
+      end
+
       listener = create_listener(*listener_args) do |modified, added, removed|
         recompile_required = false
 
@@ -276,9 +286,11 @@ module Sass::Plugin
         end
       end
 
-      # The native windows listener is much slower than the polling option, according to
-      # https://github.com/nex3/sass/commit/a3031856b22bc834a5417dedecb038b7be9b9e3e
-      listener.force_polling(true) if @options[:poll] || Sass::Util.windows?
+      if poll && !Sass::Util.listen_geq_2?
+        # In Listen 2.0.0 and on, :force_polling is an option (set above). In
+        # earlier versions, it's a method on the listener.
+        listener.force_polling(true)
+      end
 
       listen_to(listener)
     end

data/lib/sass/selector/simple_sequence.rb

@@ -89,12 +89,14 @@ module Sass
         return super_cseq if @members.size == 1 && parent.suffix.empty?
 
         CommaSequence.new(super_cseq.members.map do |super_seq|
-          unless super_seq.members.last.is_a?(SimpleSequence)
+          members = super_seq.members.dup
+          newline = members.pop if members.last == "\n"
+          unless members.last.is_a?(SimpleSequence)
             raise Sass::SyntaxError.new("Invalid parent selector for \"#{self}\": \"" +
               super_seq.to_a.join + '"')
           end
 
-          parent_sub = super_seq.members.last.members
+          parent_sub = members.last.members
           unless parent.suffix.empty?
             parent_sub = parent_sub.dup
             parent_sub[-1] = parent_sub.last.dup
@@ -120,8 +122,9 @@ module Sass
             end
           end
 
-          Sequence.new(super_seq.members[0...-1] +
-            [SimpleSequence.new(parent_sub + @members[1..-1], subject?)])
+          Sequence.new(members[0...-1] +
+            [SimpleSequence.new(parent_sub + @members[1..-1], subject?)] +
+            [newline].compact)
         end)
       end
 

data/test/sass/script_test.rb

@@ -576,6 +576,7 @@ DEPRECATION WARNING on line 4 of test_setting_global_variable_locally_warns_inli
 Assigning to global variable "$var" by default is deprecated.
 In future versions of Sass, this will create a new local variable.
 If you want to assign to the global variable, use "$var: x !global" instead.
+Note that this will be incompatible with Sass 3.2.
 WARNING
 .foo {
   a: x; }
@@ -602,6 +603,7 @@ DEPRECATION WARNING on line 3 of test_setting_global_variable_locally_warns_only
 Assigning to global variable "$var" by default is deprecated.
 In future versions of Sass, this will create a new local variable.
 If you want to assign to the global variable, use "$var: x !global" instead.
+Note that this will be incompatible with Sass 3.2.
 WARNING
 CSS
 $var: 1;

data/test/sass/scss/scss_test.rb

@@ -3099,6 +3099,17 @@ SCSS
   end
 
   # Regression
+ 
+  def test_parent_ref_with_newline
+    assert_equal(<<CSS, render(<<SCSS))
+a.c
+, b.c {
+  x: y; }
+CSS
+a
+, b {&.c {x: y}}
+SCSS
+  end
 
   def test_parent_ref_in_nested_at_root
     assert_equal(<<CSS, render(<<SCSS))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass
 version: !ruby/object:Gem::Version
-  version: 3.3.0.rc.5
+  version: 3.3.0.rc.6
 platform: ruby
 authors:
 - Nathan Weizenbaum
@@ -10,8 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-21 00:00:00.000000000 Z
+date: 2014-03-03 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement