sass 3.4.25 → 3.5.0.pre.rc.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (156) hide show
  1. checksums.yaml +4 -4
  2. data/.yardopts +1 -1
  3. data/README.md +1 -1
  4. data/Rakefile +13 -157
  5. data/VERSION +1 -1
  6. data/VERSION_DATE +1 -1
  7. data/VERSION_NAME +1 -1
  8. data/lib/sass.rb +3 -10
  9. data/lib/sass/cache_stores/filesystem.rb +1 -1
  10. data/lib/sass/css.rb +2 -3
  11. data/lib/sass/engine.rb +46 -32
  12. data/lib/sass/environment.rb +27 -6
  13. data/lib/sass/error.rb +5 -5
  14. data/lib/sass/exec/base.rb +3 -12
  15. data/lib/sass/features.rb +1 -0
  16. data/lib/sass/importers/filesystem.rb +2 -2
  17. data/lib/sass/plugin.rb +1 -1
  18. data/lib/sass/plugin/compiler.rb +21 -51
  19. data/lib/sass/plugin/configuration.rb +1 -1
  20. data/lib/sass/plugin/rack.rb +3 -3
  21. data/lib/sass/plugin/staleness_checker.rb +3 -3
  22. data/lib/sass/railtie.rb +1 -1
  23. data/lib/sass/script.rb +3 -3
  24. data/lib/sass/script/functions.rb +238 -47
  25. data/lib/sass/script/lexer.rb +8 -6
  26. data/lib/sass/script/parser.rb +76 -75
  27. data/lib/sass/script/tree/funcall.rb +35 -30
  28. data/lib/sass/script/tree/list_literal.rb +23 -8
  29. data/lib/sass/script/tree/map_literal.rb +2 -2
  30. data/lib/sass/script/tree/node.rb +2 -10
  31. data/lib/sass/script/tree/operation.rb +16 -50
  32. data/lib/sass/script/value.rb +2 -0
  33. data/lib/sass/script/value/arg_list.rb +1 -1
  34. data/lib/sass/script/value/base.rb +20 -3
  35. data/lib/sass/script/value/callable.rb +25 -0
  36. data/lib/sass/script/value/color.rb +10 -10
  37. data/lib/sass/script/value/function.rb +19 -0
  38. data/lib/sass/script/value/helpers.rb +16 -7
  39. data/lib/sass/script/value/list.rb +33 -12
  40. data/lib/sass/script/value/map.rb +2 -2
  41. data/lib/sass/script/value/number.rb +3 -3
  42. data/lib/sass/script/value/string.rb +12 -5
  43. data/lib/sass/scss/parser.rb +101 -45
  44. data/lib/sass/scss/rx.rb +5 -11
  45. data/lib/sass/scss/static_parser.rb +0 -7
  46. data/lib/sass/selector.rb +4 -0
  47. data/lib/sass/selector/abstract_sequence.rb +5 -5
  48. data/lib/sass/selector/comma_sequence.rb +3 -15
  49. data/lib/sass/selector/pseudo.rb +4 -0
  50. data/lib/sass/selector/sequence.rb +30 -3
  51. data/lib/sass/selector/simple.rb +13 -7
  52. data/lib/sass/selector/simple_sequence.rb +1 -1
  53. data/lib/sass/shared.rb +3 -5
  54. data/lib/sass/source/map.rb +4 -4
  55. data/lib/sass/source/position.rb +4 -4
  56. data/lib/sass/stack.rb +21 -1
  57. data/lib/sass/tree/charset_node.rb +1 -1
  58. data/lib/sass/tree/comment_node.rb +1 -1
  59. data/lib/sass/tree/node.rb +3 -3
  60. data/lib/sass/tree/prop_node.rb +46 -54
  61. data/lib/sass/tree/rule_node.rb +7 -15
  62. data/lib/sass/tree/visitors/check_nesting.rb +1 -1
  63. data/lib/sass/tree/visitors/convert.rb +2 -3
  64. data/lib/sass/tree/visitors/cssize.rb +1 -10
  65. data/lib/sass/tree/visitors/deep_copy.rb +2 -2
  66. data/lib/sass/tree/visitors/perform.rb +23 -12
  67. data/lib/sass/tree/visitors/set_options.rb +1 -1
  68. data/lib/sass/tree/visitors/to_css.rb +46 -12
  69. data/lib/sass/util.rb +16 -321
  70. data/lib/sass/util/multibyte_string_scanner.rb +127 -131
  71. data/lib/sass/util/normalized_map.rb +1 -8
  72. data/lib/sass/version.rb +2 -2
  73. data/test/sass-spec.yml +1 -1
  74. data/test/sass/compiler_test.rb +4 -14
  75. data/test/sass/conversion_test.rb +113 -162
  76. data/test/sass/css2sass_test.rb +17 -19
  77. data/test/sass/css_variable_test.rb +176 -70
  78. data/test/sass/encoding_test.rb +2 -32
  79. data/test/sass/engine_test.rb +114 -65
  80. data/test/sass/extend_test.rb +37 -51
  81. data/test/sass/functions_test.rb +57 -15
  82. data/test/sass/importer_test.rb +2 -2
  83. data/test/sass/more_templates/more1.sass +10 -10
  84. data/test/sass/more_templates/more_import.sass +2 -2
  85. data/test/sass/plugin_test.rb +9 -12
  86. data/test/sass/script_conversion_test.rb +9 -0
  87. data/test/sass/script_test.rb +38 -48
  88. data/test/sass/scss/css_test.rb +5 -19
  89. data/test/sass/scss/scss_test.rb +58 -39
  90. data/test/sass/source_map_test.rb +26 -28
  91. data/test/sass/templates/_partial.sass +1 -1
  92. data/test/sass/templates/basic.sass +10 -10
  93. data/test/sass/templates/bork1.sass +1 -1
  94. data/test/sass/templates/bork5.sass +1 -1
  95. data/test/sass/templates/compact.sass +10 -10
  96. data/test/sass/templates/complex.sass +187 -187
  97. data/test/sass/templates/compressed.sass +10 -10
  98. data/test/sass/templates/expanded.sass +10 -10
  99. data/test/sass/templates/import.sass +2 -2
  100. data/test/sass/templates/importee.sass +3 -3
  101. data/test/sass/templates/mixins.sass +22 -22
  102. data/test/sass/templates/multiline.sass +4 -4
  103. data/test/sass/templates/nested.sass +13 -13
  104. data/test/sass/templates/parent_ref.sass +12 -12
  105. data/test/sass/templates/script.sass +70 -70
  106. data/test/sass/templates/subdir/nested_subdir/_nested_partial.sass +1 -1
  107. data/test/sass/templates/subdir/nested_subdir/nested_subdir.sass +2 -2
  108. data/test/sass/templates/subdir/subdir.sass +3 -3
  109. data/test/sass/templates/units.sass +10 -10
  110. data/test/sass/util/multibyte_string_scanner_test.rb +139 -149
  111. data/test/sass/util_test.rb +0 -36
  112. data/test/test_helper.rb +39 -0
  113. metadata +30 -57
  114. data/extra/sass-spec-ref.sh +0 -32
  115. data/lib/sass/deprecation.rb +0 -55
  116. data/lib/sass/script/css_variable_warning.rb +0 -52
  117. data/lib/sass/util/cross_platform_random.rb +0 -19
  118. data/lib/sass/util/ordered_hash.rb +0 -192
  119. data/test/sass/results/import_charset_1_8.css +0 -5
  120. data/test/sass/templates/import_charset_1_8.sass +0 -6
  121. data/vendor/listen/CHANGELOG.md +0 -1
  122. data/vendor/listen/CONTRIBUTING.md +0 -38
  123. data/vendor/listen/Gemfile +0 -20
  124. data/vendor/listen/Guardfile +0 -8
  125. data/vendor/listen/LICENSE +0 -20
  126. data/vendor/listen/README.md +0 -349
  127. data/vendor/listen/Rakefile +0 -5
  128. data/vendor/listen/Vagrantfile +0 -96
  129. data/vendor/listen/lib/listen.rb +0 -54
  130. data/vendor/listen/lib/listen/adapter.rb +0 -327
  131. data/vendor/listen/lib/listen/adapters/bsd.rb +0 -75
  132. data/vendor/listen/lib/listen/adapters/darwin.rb +0 -48
  133. data/vendor/listen/lib/listen/adapters/linux.rb +0 -81
  134. data/vendor/listen/lib/listen/adapters/polling.rb +0 -58
  135. data/vendor/listen/lib/listen/adapters/windows.rb +0 -91
  136. data/vendor/listen/lib/listen/directory_record.rb +0 -406
  137. data/vendor/listen/lib/listen/listener.rb +0 -323
  138. data/vendor/listen/lib/listen/turnstile.rb +0 -32
  139. data/vendor/listen/lib/listen/version.rb +0 -3
  140. data/vendor/listen/listen.gemspec +0 -28
  141. data/vendor/listen/spec/listen/adapter_spec.rb +0 -149
  142. data/vendor/listen/spec/listen/adapters/bsd_spec.rb +0 -36
  143. data/vendor/listen/spec/listen/adapters/darwin_spec.rb +0 -37
  144. data/vendor/listen/spec/listen/adapters/linux_spec.rb +0 -47
  145. data/vendor/listen/spec/listen/adapters/polling_spec.rb +0 -68
  146. data/vendor/listen/spec/listen/adapters/windows_spec.rb +0 -30
  147. data/vendor/listen/spec/listen/directory_record_spec.rb +0 -1250
  148. data/vendor/listen/spec/listen/listener_spec.rb +0 -258
  149. data/vendor/listen/spec/listen/turnstile_spec.rb +0 -56
  150. data/vendor/listen/spec/listen_spec.rb +0 -67
  151. data/vendor/listen/spec/spec_helper.rb +0 -25
  152. data/vendor/listen/spec/support/adapter_helper.rb +0 -666
  153. data/vendor/listen/spec/support/directory_record_helper.rb +0 -57
  154. data/vendor/listen/spec/support/fixtures_helper.rb +0 -29
  155. data/vendor/listen/spec/support/listeners_helper.rb +0 -179
  156. data/vendor/listen/spec/support/platform_helper.rb +0 -15
data/test/sass/templates/compressed.sass CHANGED
@@ -1,15 +1,15 @@
1
1
  #main
2
- width: 15em
3
- color: #0000ff
2
+ :width 15em
3
+ :color #0000ff
4
4
  p
5
- border:
6
- style: dotted
7
- width: 2px
5
+ :border
6
+ :style dotted
7
+ :width 2px
8
8
  .cool
9
- width: 100px
9
+ :width 100px
10
10
 
11
11
  #left
12
- font:
13
- size: 2em
14
- weight: bold
15
- float: left
12
+ :font
13
+ :size 2em
14
+ :weight bold
15
+ :float left
data/test/sass/templates/expanded.sass CHANGED
@@ -1,17 +1,17 @@
1
1
  #main
2
- width: 15em
3
- color: #0000ff
2
+ :width 15em
3
+ :color #0000ff
4
4
  p
5
- border:
6
- style: dotted
5
+ :border
6
+ :style dotted
7
7
  /* Nested comment
8
8
  More nested stuff
9
- width: 2px
9
+ :width 2px
10
10
  .cool
11
- width: 100px
11
+ :width 100px
12
12
 
13
13
  #left
14
- font:
15
- size: 2em
16
- weight: bold
17
- float: left
14
+ :font
15
+ :size 2em
16
+ :weight bold
17
+ :float left
data/test/sass/templates/import.sass CHANGED
@@ -7,6 +7,6 @@ $preconst: hello
7
7
  @import partial.sass
8
8
 
9
9
  nonimported
10
- myconst: $preconst
11
- otherconst: $postconst
10
+ :myconst $preconst
11
+ :otherconst $postconst
12
12
  +postmixin
data/test/sass/templates/importee.sass CHANGED
@@ -4,14 +4,14 @@ $postconst: goodbye
4
4
  post-mixin: here
5
5
 
6
6
  imported
7
- otherconst: $preconst
8
- myconst: $postconst
7
+ :otherconst $preconst
8
+ :myconst $postconst
9
9
  +premixin
10
10
 
11
11
  @import basic
12
12
 
13
13
  midrule
14
- inthe: middle
14
+ :inthe middle
15
15
 
16
16
  =crazymixin
17
17
  foo: bar
data/test/sass/templates/mixins.sass CHANGED
@@ -1,19 +1,19 @@
1
1
  $yellow: #fc0
2
2
 
3
3
  =bordered
4
- border:
5
- top:
6
- width: 2px
7
- color: $yellow
8
- left:
9
- width: 1px
10
- color: #000
4
+ :border
5
+ :top
6
+ :width 2px
7
+ :color $yellow
8
+ :left
9
+ :width 1px
10
+ :color #000
11
11
  -moz-border-radius: 10px
12
12
 
13
13
  =header-font
14
- color: #f00
15
- font:
16
- size: 20px
14
+ :color #f00
15
+ :font
16
+ :size 20px
17
17
 
18
18
  =compound
19
19
  +header-font
@@ -34,32 +34,32 @@ $yellow: #fc0
34
34
  +header-font
35
35
  =deep
36
36
  a:hover
37
- text-decoration: underline
37
+ :text-decoration underline
38
38
  +compound
39
39
 
40
40
 
41
41
  #main
42
- width: 15em
43
- color: #0000ff
42
+ :width 15em
43
+ :color #0000ff
44
44
  p
45
45
  +bordered
46
- border:
47
- style: dotted
48
- width: 2px
46
+ :border
47
+ :style dotted
48
+ :width 2px
49
49
  .cool
50
- width: 100px
50
+ :width 100px
51
51
 
52
52
  #left
53
53
  +bordered
54
- font:
55
- size: 2em
56
- weight: bold
57
- float: left
54
+ :font
55
+ :size 2em
56
+ :weight bold
57
+ :float left
58
58
 
59
59
  #right
60
60
  +bordered
61
61
  +header-font
62
- float: right
62
+ :float right
63
63
 
64
64
  .bordered
65
65
  +bordered
data/test/sass/templates/multiline.sass CHANGED
@@ -14,7 +14,7 @@
14
14
  div.nested,
15
15
  span.nested,
16
16
  p.nested
17
- font:
18
- weight: bold
19
- border-color: red
20
- display: block
17
+ :font
18
+ :weight bold
19
+ :border-color red
20
+ :display block
data/test/sass/templates/nested.sass CHANGED
@@ -1,25 +1,25 @@
1
1
  #main
2
- width: 15em
3
- color: #0000ff
2
+ :width 15em
3
+ :color #0000ff
4
4
  p
5
- border:
6
- style: dotted
5
+ :border
6
+ :style dotted
7
7
  /* Nested comment
8
8
  More nested stuff
9
- width: 2px
9
+ :width 2px
10
10
  .cool
11
- width: 100px
11
+ :width 100px
12
12
 
13
13
  #left
14
- font:
15
- size: 2em
16
- weight: bold
17
- float: left
14
+ :font
15
+ :size 2em
16
+ :weight bold
17
+ :float left
18
18
 
19
19
  #right
20
20
  .header
21
- border-style: solid
21
+ :border-style solid
22
22
  .body
23
- border-style: dotted
23
+ :border-style dotted
24
24
  .footer
25
- border-style: dashed
25
+ :border-style dashed
data/test/sass/templates/parent_ref.sass CHANGED
@@ -1,25 +1,25 @@
1
1
  a
2
- color: #000
2
+ :color #000
3
3
  &:hover
4
- color: #f00
4
+ :color #f00
5
5
 
6
6
  p, div
7
- width: 100em
7
+ :width 100em
8
8
  & foo
9
- width: 10em
9
+ :width 10em
10
10
  &:hover, bar
11
- height: 20em
11
+ :height 20em
12
12
 
13
13
  #cool
14
- border:
15
- style: solid
16
- width: 2em
14
+ :border
15
+ :style solid
16
+ :width 2em
17
17
  .ie7 &, .ie6 &
18
- content: string("Totally not cool.")
18
+ :content string("Totally not cool.")
19
19
  .firefox &
20
- content: string("Quite cool.")
20
+ :content string("Quite cool.")
21
21
 
22
22
  .wow, .snazzy
23
- font-family: fantasy
23
+ :font-family fantasy
24
24
  &:hover, &:visited
25
- font-weight: bold
25
+ :font-weight bold
data/test/sass/templates/script.sass CHANGED
@@ -14,88 +14,88 @@ $percent: 11%
14
14
  $complex: 1px/1em
15
15
 
16
16
  #main
17
- content: $str
18
- qstr: $qstr
19
- hstr: $hstr
20
- width: $width
21
- background-color: #000
22
- color: $main_text
23
- short-color: #123
24
- named-color: olive
25
- con: "foo" bar ($space "boom")
26
- con2: "noquo" quo
17
+ :content $str
18
+ :qstr $qstr
19
+ :hstr $hstr
20
+ :width $width
21
+ :background-color #000
22
+ :color $main_text
23
+ :short-color #123
24
+ :named-color olive
25
+ :con "foo" bar ($space "boom")
26
+ :con2 "noquo" quo
27
27
  #sidebar
28
- background-color: $color
29
- num:
30
- normal: $num
31
- dec: $dec
32
- dec0: $dec_0
33
- neg: $neg
34
- esc: $esc
35
- many: 1 + 2 + 3
36
- order: 1 + 2 * 3
37
- complex: ((1 + 2) + 15)+#3a8b9f + (hi+(1 +1+ 2)* 4)
28
+ :background-color $color
29
+ :num
30
+ :normal $num
31
+ :dec $dec
32
+ :dec0 $dec_0
33
+ :neg $neg
34
+ :esc $esc
35
+ :many 1 + 2 + 3
36
+ :order 1 + 2 * 3
37
+ :complex ((1 + 2) + 15)+#3a8b9f + (hi+(1 +1+ 2)* 4)
38
38
 
39
39
  #plus
40
- num:
41
- num: 5+2
42
- num-un: 10em + 15em
43
- num-un2: 10 + 13em
44
- num-neg: 10 + -.13
45
- str: 100 * 1px
46
- col: 13 + #aaa
47
- perc: $percent + 20%
48
- str:
49
- str: "hi" + "\ there"
50
- str2: "hi" + " there"
51
- col: "14em solid " + #123
52
- num: "times: " + 13
53
- col:
54
- num: #f02 + 123.5
55
- col: #12A + #405162
40
+ :num
41
+ :num 5+2
42
+ :num-un 10em + 15em
43
+ :num-un2 10 + 13em
44
+ :num-neg 10 + -.13
45
+ :str 100 * 1px
46
+ :col 13 + #aaa
47
+ :perc $percent + 20%
48
+ :str
49
+ :str "hi" + "\ there"
50
+ :str2 "hi" + " there"
51
+ :col "14em solid " + #123
52
+ :num "times: " + 13
53
+ :col
54
+ :num #f02 + 123.5
55
+ :col #12A + #405162
56
56
 
57
57
  #minus
58
- num:
59
- num: 912 - 12
60
- col:
61
- num: #fffffa - 5.2
62
- col: #abcdef - #fedcba
63
- unary:
64
- num: -1
65
- const: -$neg
66
- paren: -(5 + 6)
67
- two: --12
68
- many: --------12
69
- crazy: -----(5 + ---$neg)
58
+ :num
59
+ :num 912 - 12
60
+ :col
61
+ :num #fffffa - 5.2
62
+ :col #abcdef - #fedcba
63
+ :unary
64
+ :num -1
65
+ :const -$neg
66
+ :paren -(5 + 6)
67
+ :two --12
68
+ :many --------12
69
+ :crazy -----(5 + ---$neg)
70
70
 
71
71
  #times
72
- num:
73
- num: 2 * 3.5
74
- col: 2 * #3a4b5c
75
- col:
76
- num: #12468a * 0.5
77
- col: #121212 * #020304
72
+ :num
73
+ :num 2 * 3.5
74
+ :col 2 * #3a4b5c
75
+ :col
76
+ :num #12468a * 0.5
77
+ :col #121212 * #020304
78
78
 
79
79
  #div
80
- num:
81
- num: (10 / 3.0)
82
- num2: (10 / 3)
83
- col:
84
- num: #12468a / 2
85
- col: #abcdef / #0f0f0f
86
- comp: $complex * 1em
80
+ :num
81
+ :num (10 / 3.0)
82
+ :num2 (10 / 3)
83
+ :col
84
+ :num #12468a / 2
85
+ :col #abcdef / #0f0f0f
86
+ :comp $complex * 1em
87
87
 
88
88
  #mod
89
- num:
90
- num: 17 % 3
91
- col:
92
- col: #5f6e7d % #10200a
93
- num: #aaabac % 3
89
+ :num
90
+ :num 17 % 3
91
+ :col
92
+ :col #5f6e7d % #10200a
93
+ :num #aaabac % 3
94
94
 
95
95
  #const
96
- escaped:
97
- quote: \$foo \!bar
98
- default: $str !important
96
+ :escaped
97
+ :quote \$foo \!bar
98
+ :default $str !important
99
99
 
100
100
  #regression
101
- a: (3 + 2) - 1
101
+ :a (3 + 2) - 1
data/test/sass/templates/subdir/nested_subdir/_nested_partial.sass CHANGED
@@ -1,2 +1,2 @@
1
1
  #nested
2
- relative: true
2
+ :relative true
data/test/sass/templates/subdir/nested_subdir/nested_subdir.sass CHANGED
@@ -1,3 +1,3 @@
1
1
  #pi
2
- width: 314px
3
-
2
+ :width 314px
3
+
data/test/sass/templates/subdir/subdir.sass CHANGED
@@ -1,6 +1,6 @@
1
1
  @import nested_subdir/nested_partial.sass
2
2
 
3
3
  #subdir
4
- font:
5
- size: 20px
6
- weight: bold
4
+ :font
5
+ :size 20px
6
+ :weight bold
data/test/sass/templates/units.sass CHANGED
@@ -1,11 +1,11 @@
1
1
  b
2
- foo: 0.5 * 10px
3
- bar: 10zzz * 12px / 5zzz
4
- baz: percentage(12.0px / 18px)
5
- many-units: 10.0zzz / 3yyy * 12px / 5zzz * 3yyy / 3px * 4em
6
- mm: 5mm + 1cm
7
- pc: 1pc + 12pt
8
- pt: 72pt - 2in
9
- inches: 1in + 2.54cm
10
- more-inches: 1in + ((72pt * 2in) + (36pt * 1in)) / 2.54cm
11
- mixed: (1 + (1em * 6px / 3in)) * 4in / 2em
2
+ :foo 0.5 * 10px
3
+ :bar 10zzz * 12px / 5zzz
4
+ :baz percentage(12.0px / 18px)
5
+ :many-units 10.0zzz / 3yyy * 12px / 5zzz * 3yyy / 3px * 4em
6
+ :mm 5mm + 1cm
7
+ :pc 1pc + 12pt
8
+ :pt 72pt - 2in
9
+ :inches 1in + 2.54cm
10
+ :more-inches 1in + ((72pt * 2in) + (36pt * 1in)) / 2.54cm
11
+ :mixed (1 + (1em * 6px / 3in)) * 4in / 2em