haml 3.0.0.beta.1 → 3.0.0.beta.2

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.

Potentially problematic release.

This version of haml might be problematic. Click here for more details.

Files changed (67) hide show
  1. data/README.md +7 -7
  2. data/REMEMBER +2 -1
  3. data/Rakefile +6 -4
  4. data/VERSION +1 -1
  5. data/lib/haml/exec.rb +119 -24
  6. data/lib/haml/filters.rb +5 -1
  7. data/lib/haml/helpers.rb +4 -2
  8. data/lib/haml/helpers/action_view_mods.rb +2 -3
  9. data/lib/haml/precompiler.rb +1 -0
  10. data/lib/sass.rb +1 -1
  11. data/lib/sass/css.rb +25 -6
  12. data/lib/sass/engine.rb +23 -7
  13. data/lib/sass/environment.rb +47 -1
  14. data/lib/sass/files.rb +9 -10
  15. data/lib/sass/plugin.rb +6 -27
  16. data/lib/sass/plugin/merb.rb +1 -0
  17. data/lib/sass/plugin/rails.rb +1 -0
  18. data/lib/sass/plugin/staleness_checker.rb +123 -0
  19. data/lib/sass/script/bool.rb +1 -1
  20. data/lib/sass/script/color.rb +1 -1
  21. data/lib/sass/script/css_lexer.rb +1 -4
  22. data/lib/sass/script/funcall.rb +2 -2
  23. data/lib/sass/script/functions.rb +102 -7
  24. data/lib/sass/script/interpolation.rb +5 -5
  25. data/lib/sass/script/lexer.rb +10 -8
  26. data/lib/sass/script/literal.rb +11 -1
  27. data/lib/sass/script/node.rb +10 -1
  28. data/lib/sass/script/number.rb +25 -10
  29. data/lib/sass/script/operation.rb +7 -6
  30. data/lib/sass/script/parser.rb +37 -28
  31. data/lib/sass/script/string.rb +12 -7
  32. data/lib/sass/script/string_interpolation.rb +70 -0
  33. data/lib/sass/script/unary_operation.rb +3 -3
  34. data/lib/sass/script/variable.rb +2 -2
  35. data/lib/sass/scss/css_parser.rb +1 -0
  36. data/lib/sass/scss/parser.rb +58 -44
  37. data/lib/sass/scss/rx.rb +1 -0
  38. data/lib/sass/tree/comment_node.rb +3 -2
  39. data/lib/sass/tree/debug_node.rb +1 -1
  40. data/lib/sass/tree/for_node.rb +1 -1
  41. data/lib/sass/tree/if_node.rb +1 -1
  42. data/lib/sass/tree/import_node.rb +3 -0
  43. data/lib/sass/tree/mixin_def_node.rb +3 -3
  44. data/lib/sass/tree/mixin_node.rb +7 -3
  45. data/lib/sass/tree/node.rb +8 -0
  46. data/lib/sass/tree/prop_node.rb +21 -16
  47. data/lib/sass/tree/rule_node.rb +3 -3
  48. data/lib/sass/tree/variable_node.rb +1 -1
  49. data/lib/sass/tree/warn_node.rb +41 -0
  50. data/lib/sass/tree/while_node.rb +1 -1
  51. data/test/haml/engine_test.rb +9 -0
  52. data/test/sass/conversion_test.rb +127 -15
  53. data/test/sass/css2sass_test.rb +34 -3
  54. data/test/sass/engine_test.rb +82 -5
  55. data/test/sass/functions_test.rb +31 -0
  56. data/test/sass/plugin_test.rb +25 -24
  57. data/test/sass/results/script.css +4 -4
  58. data/test/sass/results/warn.css +0 -0
  59. data/test/sass/results/warn_imported.css +0 -0
  60. data/test/sass/script_conversion_test.rb +43 -1
  61. data/test/sass/script_test.rb +3 -3
  62. data/test/sass/scss/css_test.rb +46 -5
  63. data/test/sass/scss/scss_test.rb +72 -0
  64. data/test/sass/templates/import.sass +1 -1
  65. data/test/sass/templates/warn.sass +3 -0
  66. data/test/sass/templates/warn_imported.sass +4 -0
  67. metadata +10 -3
data/test/sass/templates/import.sass CHANGED
@@ -3,7 +3,7 @@ $preconst: hello
3
3
  =premixin
4
4
  pre-mixin: here
5
5
 
6
- @import importee.sass, scss_importee, basic.sass, basic.css, ../results/complex.css, partial.sass
6
+ @import importee.sass, scss_importee, "basic.sass", basic.css, ../results/complex.css, url(partial.sass)
7
7
 
8
8
  nonimported
9
9
  :myconst $preconst
data/test/sass/templates/warn.sass ADDED
@@ -0,0 +1,3 @@
1
+ @warn "In the main file"
2
+ @import warn_imported.sass
3
+ +emits-a-warning
data/test/sass/templates/warn_imported.sass ADDED
@@ -0,0 +1,4 @@
1
+ @warn "Imported"
2
+
3
+ =emits-a-warning
4
+ @warn "In an imported mixin"
metadata CHANGED
@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
7
7
  - 0
8
8
  - 0
9
9
  - beta
10
- - 1
11
- version: 3.0.0.beta.1
10
+ - 2
11
+ version: 3.0.0.beta.2
12
12
  platform: ruby
13
13
  authors:
14
14
  - Nathan Weizenbaum
@@ -17,7 +17,7 @@ autorequire:
17
17
  bindir: bin
18
18
  cert_chain: []
19
19
 
20
- date: 2010-03-31 00:00:00 -07:00
20
+ date: 2010-04-11 00:00:00 -07:00
21
21
  default_executable:
22
22
  dependencies:
23
23
  - !ruby/object:Gem::Dependency
@@ -77,6 +77,7 @@ files:
77
77
  - lib/sass/script/operation.rb
78
78
  - lib/sass/script/literal.rb
79
79
  - lib/sass/script/functions.rb
80
+ - lib/sass/script/string_interpolation.rb
80
81
  - lib/sass/script/bool.rb
81
82
  - lib/sass/script/color.rb
82
83
  - lib/sass/script/lexer.rb
@@ -92,6 +93,7 @@ files:
92
93
  - lib/sass/tree/comment_node.rb
93
94
  - lib/sass/tree/node.rb
94
95
  - lib/sass/tree/for_node.rb
96
+ - lib/sass/tree/warn_node.rb
95
97
  - lib/sass/tree/debug_node.rb
96
98
  - lib/sass/tree/import_node.rb
97
99
  - lib/sass/tree/while_node.rb
@@ -106,6 +108,7 @@ files:
106
108
  - lib/sass/plugin/rails.rb
107
109
  - lib/sass/plugin/rack.rb
108
110
  - lib/sass/plugin/merb.rb
111
+ - lib/sass/plugin/staleness_checker.rb
109
112
  - lib/sass/environment.rb
110
113
  - lib/sass/callbacks.rb
111
114
  - lib/sass/files.rb
@@ -179,9 +182,11 @@ files:
179
182
  - test/sass/css2sass_test.rb
180
183
  - test/sass/script_conversion_test.rb
181
184
  - test/sass/data/hsl-rgb.txt
185
+ - test/sass/results/warn_imported.css
182
186
  - test/sass/results/units.css
183
187
  - test/sass/results/parent_ref.css
184
188
  - test/sass/results/compressed.css
189
+ - test/sass/results/warn.css
185
190
  - test/sass/results/complex.css
186
191
  - test/sass/results/compact.css
187
192
  - test/sass/results/mixins.css
@@ -218,10 +223,12 @@ files:
218
223
  - test/sass/templates/subdir/nested_subdir/nested_subdir.sass
219
224
  - test/sass/templates/subdir/nested_subdir/_nested_partial.sass
220
225
  - test/sass/templates/options.sass
226
+ - test/sass/templates/warn.sass
221
227
  - test/sass/templates/nested_bork3.sass
222
228
  - test/sass/templates/nested_bork1.sass
223
229
  - test/sass/templates/scss_import.scss
224
230
  - test/sass/templates/bork4.sass
231
+ - test/sass/templates/warn_imported.sass
225
232
  - test/sass/templates/parent_ref.sass
226
233
  - test/sass/templates/alt.sass
227
234
  - test/sass/templates/importee.sass