sass 3.3.0.rc.5 → 3.3.0.rc.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +8 -8
- data/VERSION +1 -1
- data/VERSION_DATE +1 -1
- data/ext/mkrf_conf.rb +2 -2
- data/lib/sass/plugin/compiler.rb +15 -3
- data/lib/sass/selector/simple_sequence.rb +7 -4
- data/test/sass/script_test.rb +2 -0
- data/test/sass/scss/scss_test.rb +11 -0
- metadata +16 -2
checksums.yaml
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
---
|
2
2
|
!binary "U0hBMQ==":
|
3
3
|
metadata.gz: !binary |-
|
4
|
-
|
4
|
+
ZWRiNjA5MDgxMzBiNmFiYjRlN2ZkMTI2ZWM3ZGIwNDQ3M2M3OTRjNw==
|
5
5
|
data.tar.gz: !binary |-
|
6
|
-
|
6
|
+
OWI2Njk3NzRlOTExOGFjNWY3MzEwMjUyN2IzMGY1OGVlMGY3MmYxZg==
|
7
7
|
SHA512:
|
8
8
|
metadata.gz: !binary |-
|
9
|
-
|
10
|
-
|
11
|
-
|
9
|
+
MzI1YmZkMTEzMWM2ZjViOGFlOWRkOWJkM2U1Y2M5MzdlYjVlODYxNDY2N2Zh
|
10
|
+
MDJmYjdkOWJiYWZlM2Q2ZTMyZTY4NjRmYmRhM2M0OWI2Y2Y5ZWZhNWYxOGNl
|
11
|
+
NTJjZmEwNmI5ZjgwMjU0YmQ4ZWQ0MDlmNmE3Y2QyMmFmMGM4ZWI=
|
12
12
|
data.tar.gz: !binary |-
|
13
|
-
|
14
|
-
|
15
|
-
|
13
|
+
OWFiNDNhZDQ2NWQ1ZmY1ZDIzMmVhMzE3OWU5N2VjM2Y1NmVmNjlmMTdhYWEx
|
14
|
+
OTRkZGIyNjkxZjVjZGFjNWE4NDc2OTZiZmRlYmNiNzFmMThhNmJkZjMwYzFk
|
15
|
+
ZDQwYjg3MzM1MjIxYjFhMDFlMmQyMDNjMDBmZjkyNWExZTdjODY=
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
3.3.0.rc.
|
1
|
+
3.3.0.rc.6
|
data/VERSION_DATE
CHANGED
@@ -1 +1 @@
|
|
1
|
-
|
1
|
+
03 March 2014 22:36:24 UTC
|
data/ext/mkrf_conf.rb
CHANGED
@@ -14,8 +14,8 @@ puts "Ensuring you have the right version of listen installed."
|
|
14
14
|
Gem::Command.build_args = ARGV
|
15
15
|
inst = Gem::DependencyInstaller.new
|
16
16
|
if Sass::Util.version_geq(RUBY_VERSION, "1.9.3")
|
17
|
-
puts "Installing listen >= 1.1.0, <
|
18
|
-
inst.install "listen", Gem::Requirement.new(">= 1.1.0", "<
|
17
|
+
puts "Installing listen >= 1.1.0, < 3.0.0"
|
18
|
+
inst.install "listen", Gem::Requirement.new(">= 1.1.0", "< 3.0.0")
|
19
19
|
else
|
20
20
|
puts "Installing listen ~> 1.1.0"
|
21
21
|
inst.install "listen", "~> 1.1.0"
|
data/lib/sass/plugin/compiler.rb
CHANGED
@@ -230,6 +230,16 @@ module Sass::Plugin
|
|
230
230
|
# TODO: Keep better track of what depends on what
|
231
231
|
# so we don't have to run a global update every time anything changes.
|
232
232
|
listener_args = directories + [{:relative_paths => false}]
|
233
|
+
|
234
|
+
# The native windows listener is much slower than the polling option, according to
|
235
|
+
# https://github.com/nex3/sass/commit/a3031856b22bc834a5417dedecb038b7be9b9e3e
|
236
|
+
poll = @options[:poll] || Sass::Util.windows?
|
237
|
+
if poll && Sass::Util.listen_geq_2?
|
238
|
+
# In Listen 2.0.0 and on, :force_polling is an option. In earlier
|
239
|
+
# versions, it's a method on the listener (called below).
|
240
|
+
listener_args.last[:force_polling] = true
|
241
|
+
end
|
242
|
+
|
233
243
|
listener = create_listener(*listener_args) do |modified, added, removed|
|
234
244
|
recompile_required = false
|
235
245
|
|
@@ -276,9 +286,11 @@ module Sass::Plugin
|
|
276
286
|
end
|
277
287
|
end
|
278
288
|
|
279
|
-
|
280
|
-
|
281
|
-
|
289
|
+
if poll && !Sass::Util.listen_geq_2?
|
290
|
+
# In Listen 2.0.0 and on, :force_polling is an option (set above). In
|
291
|
+
# earlier versions, it's a method on the listener.
|
292
|
+
listener.force_polling(true)
|
293
|
+
end
|
282
294
|
|
283
295
|
listen_to(listener)
|
284
296
|
end
|
@@ -89,12 +89,14 @@ module Sass
|
|
89
89
|
return super_cseq if @members.size == 1 && parent.suffix.empty?
|
90
90
|
|
91
91
|
CommaSequence.new(super_cseq.members.map do |super_seq|
|
92
|
-
|
92
|
+
members = super_seq.members.dup
|
93
|
+
newline = members.pop if members.last == "\n"
|
94
|
+
unless members.last.is_a?(SimpleSequence)
|
93
95
|
raise Sass::SyntaxError.new("Invalid parent selector for \"#{self}\": \"" +
|
94
96
|
super_seq.to_a.join + '"')
|
95
97
|
end
|
96
98
|
|
97
|
-
parent_sub =
|
99
|
+
parent_sub = members.last.members
|
98
100
|
unless parent.suffix.empty?
|
99
101
|
parent_sub = parent_sub.dup
|
100
102
|
parent_sub[-1] = parent_sub.last.dup
|
@@ -120,8 +122,9 @@ module Sass
|
|
120
122
|
end
|
121
123
|
end
|
122
124
|
|
123
|
-
Sequence.new(
|
124
|
-
[SimpleSequence.new(parent_sub + @members[1..-1], subject?)]
|
125
|
+
Sequence.new(members[0...-1] +
|
126
|
+
[SimpleSequence.new(parent_sub + @members[1..-1], subject?)] +
|
127
|
+
[newline].compact)
|
125
128
|
end)
|
126
129
|
end
|
127
130
|
|
data/test/sass/script_test.rb
CHANGED
@@ -576,6 +576,7 @@ DEPRECATION WARNING on line 4 of test_setting_global_variable_locally_warns_inli
|
|
576
576
|
Assigning to global variable "$var" by default is deprecated.
|
577
577
|
In future versions of Sass, this will create a new local variable.
|
578
578
|
If you want to assign to the global variable, use "$var: x !global" instead.
|
579
|
+
Note that this will be incompatible with Sass 3.2.
|
579
580
|
WARNING
|
580
581
|
.foo {
|
581
582
|
a: x; }
|
@@ -602,6 +603,7 @@ DEPRECATION WARNING on line 3 of test_setting_global_variable_locally_warns_only
|
|
602
603
|
Assigning to global variable "$var" by default is deprecated.
|
603
604
|
In future versions of Sass, this will create a new local variable.
|
604
605
|
If you want to assign to the global variable, use "$var: x !global" instead.
|
606
|
+
Note that this will be incompatible with Sass 3.2.
|
605
607
|
WARNING
|
606
608
|
CSS
|
607
609
|
$var: 1;
|
data/test/sass/scss/scss_test.rb
CHANGED
@@ -3099,6 +3099,17 @@ SCSS
|
|
3099
3099
|
end
|
3100
3100
|
|
3101
3101
|
# Regression
|
3102
|
+
|
3103
|
+
def test_parent_ref_with_newline
|
3104
|
+
assert_equal(<<CSS, render(<<SCSS))
|
3105
|
+
a.c
|
3106
|
+
, b.c {
|
3107
|
+
x: y; }
|
3108
|
+
CSS
|
3109
|
+
a
|
3110
|
+
, b {&.c {x: y}}
|
3111
|
+
SCSS
|
3112
|
+
end
|
3102
3113
|
|
3103
3114
|
def test_parent_ref_in_nested_at_root
|
3104
3115
|
assert_equal(<<CSS, render(<<SCSS))
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: sass
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.3.0.rc.
|
4
|
+
version: 3.3.0.rc.6
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Nathan Weizenbaum
|
@@ -10,8 +10,22 @@ authors:
|
|
10
10
|
autorequire:
|
11
11
|
bindir: bin
|
12
12
|
cert_chain: []
|
13
|
-
date: 2014-
|
13
|
+
date: 2014-03-03 00:00:00.000000000 Z
|
14
14
|
dependencies:
|
15
|
+
- !ruby/object:Gem::Dependency
|
16
|
+
name: rake
|
17
|
+
requirement: !ruby/object:Gem::Requirement
|
18
|
+
requirements:
|
19
|
+
- - ! '>='
|
20
|
+
- !ruby/object:Gem::Version
|
21
|
+
version: '0'
|
22
|
+
type: :runtime
|
23
|
+
prerelease: false
|
24
|
+
version_requirements: !ruby/object:Gem::Requirement
|
25
|
+
requirements:
|
26
|
+
- - ! '>='
|
27
|
+
- !ruby/object:Gem::Version
|
28
|
+
version: '0'
|
15
29
|
- !ruby/object:Gem::Dependency
|
16
30
|
name: yard
|
17
31
|
requirement: !ruby/object:Gem::Requirement
|