haml 2.2.17 → 2.2.18

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.

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

Files changed (38) hide show
  1. data/.yardopts +3 -0
  2. data/Rakefile +6 -6
  3. data/VERSION +1 -1
  4. data/extra/haml-mode.el +99 -13
  5. data/extra/sass-mode.el +2 -2
  6. data/lib/haml/engine.rb +1 -1
  7. data/lib/haml/exec.rb +13 -5
  8. data/lib/haml/filters.rb +1 -1
  9. data/lib/haml/helpers.rb +3 -2
  10. data/lib/haml/helpers/action_view_mods.rb +2 -1
  11. data/lib/haml/helpers/xss_mods.rb +43 -13
  12. data/lib/haml/html.rb +8 -0
  13. data/lib/haml/precompiler.rb +20 -1
  14. data/lib/haml/template.rb +2 -2
  15. data/lib/haml/util.rb +27 -0
  16. data/lib/sass/engine.rb +42 -2
  17. data/lib/sass/plugin.rb +5 -4
  18. data/lib/sass/plugin/rails.rb +2 -2
  19. data/lib/sass/script.rb +3 -0
  20. data/lib/sass/script/color.rb +4 -2
  21. data/lib/sass/script/lexer.rb +8 -5
  22. data/lib/sass/script/number.rb +2 -0
  23. data/lib/sass/script/parser.rb +1 -1
  24. data/lib/sass/tree/rule_node.rb +1 -0
  25. data/test/haml/engine_test.rb +21 -0
  26. data/test/haml/helper_test.rb +0 -0
  27. data/test/haml/html2haml_test.rb +0 -0
  28. data/test/haml/spec/lua_haml_spec.lua +1 -1
  29. data/test/haml/spec/tests.json +64 -18
  30. data/test/haml/template_test.rb +17 -3
  31. data/test/haml/util_test.rb +0 -0
  32. data/test/sass/css2sass_test.rb +1 -0
  33. data/test/sass/engine_test.rb +31 -0
  34. data/test/sass/functions_test.rb +1 -0
  35. data/test/sass/plugin_test.rb +28 -17
  36. data/test/sass/script_test.rb +7 -7
  37. data/test/sass/to_sass_test.rb +549 -0
  38. metadata +144 -142
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: haml
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.2.17
4
+ version: 2.2.18
5
5
  platform: ruby
6
6
  authors:
7
7
  - Nathan Weizenbaum
@@ -10,7 +10,7 @@ autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
12
 
13
- date: 2010-01-11 00:00:00 -08:00
13
+ date: 2010-02-04 00:00:00 -08:00
14
14
  default_executable:
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
@@ -21,7 +21,7 @@ dependencies:
21
21
  requirements:
22
22
  - - ">="
23
23
  - !ruby/object:Gem::Version
24
- version: 0.4.0
24
+ version: 0.5.3
25
25
  version:
26
26
  - !ruby/object:Gem::Dependency
27
27
  name: maruku
@@ -43,201 +43,202 @@ executables:
43
43
  extensions: []
44
44
 
45
45
  extra_rdoc_files:
46
- - VERSION
47
- - MIT-LICENSE
48
- - README.md
49
46
  - VERSION_NAME
50
- - REVISION
51
47
  - CONTRIBUTING
48
+ - README.md
49
+ - MIT-LICENSE
50
+ - VERSION
51
+ - REVISION
52
52
  files:
53
53
  - rails/init.rb
54
54
  - lib/sass.rb
55
- - lib/sass/plugin/rails.rb
56
- - lib/sass/plugin/rack.rb
57
- - lib/sass/plugin/merb.rb
55
+ - lib/sass/css.rb
56
+ - lib/sass/script/node.rb
57
+ - lib/sass/script/number.rb
58
+ - lib/sass/script/operation.rb
59
+ - lib/sass/script/literal.rb
60
+ - lib/sass/script/functions.rb
61
+ - lib/sass/script/bool.rb
62
+ - lib/sass/script/color.rb
63
+ - lib/sass/script/lexer.rb
64
+ - lib/sass/script/parser.rb
65
+ - lib/sass/script/variable.rb
66
+ - lib/sass/script/string.rb
67
+ - lib/sass/script/funcall.rb
68
+ - lib/sass/script/unary_operation.rb
58
69
  - lib/sass/script.rb
59
70
  - lib/sass/error.rb
71
+ - lib/sass/repl.rb
72
+ - lib/sass/tree/comment_node.rb
73
+ - lib/sass/tree/node.rb
60
74
  - lib/sass/tree/for_node.rb
61
- - lib/sass/tree/mixin_node.rb
62
- - lib/sass/tree/if_node.rb
63
- - lib/sass/tree/prop_node.rb
64
- - lib/sass/tree/mixin_def_node.rb
65
- - lib/sass/tree/variable_node.rb
66
75
  - lib/sass/tree/debug_node.rb
67
- - lib/sass/tree/directive_node.rb
68
- - lib/sass/tree/node.rb
69
- - lib/sass/tree/comment_node.rb
70
- - lib/sass/tree/rule_node.rb
71
76
  - lib/sass/tree/import_node.rb
72
77
  - lib/sass/tree/while_node.rb
78
+ - lib/sass/tree/mixin_def_node.rb
79
+ - lib/sass/tree/if_node.rb
80
+ - lib/sass/tree/mixin_node.rb
81
+ - lib/sass/tree/directive_node.rb
82
+ - lib/sass/tree/rule_node.rb
83
+ - lib/sass/tree/prop_node.rb
84
+ - lib/sass/tree/variable_node.rb
85
+ - lib/sass/plugin/rails.rb
86
+ - lib/sass/plugin/rack.rb
87
+ - lib/sass/plugin/merb.rb
88
+ - lib/sass/environment.rb
73
89
  - lib/sass/files.rb
74
- - lib/sass/plugin.rb
75
- - lib/sass/script/parser.rb
76
- - lib/sass/script/color.rb
77
- - lib/sass/script/string.rb
78
- - lib/sass/script/unary_operation.rb
79
- - lib/sass/script/number.rb
80
- - lib/sass/script/funcall.rb
81
- - lib/sass/script/variable.rb
82
- - lib/sass/script/functions.rb
83
- - lib/sass/script/bool.rb
84
- - lib/sass/script/lexer.rb
85
- - lib/sass/script/operation.rb
86
- - lib/sass/script/node.rb
87
- - lib/sass/script/literal.rb
88
- - lib/sass/css.rb
89
90
  - lib/sass/engine.rb
90
- - lib/sass/repl.rb
91
- - lib/sass/environment.rb
92
- - lib/haml/util.rb
91
+ - lib/sass/plugin.rb
92
+ - lib/haml/filters.rb
93
93
  - lib/haml/exec.rb
94
- - lib/haml/html.rb
95
94
  - lib/haml/error.rb
96
- - lib/haml/buffer.rb
97
95
  - lib/haml/template.rb
98
- - lib/haml/template/plugin.rb
96
+ - lib/haml/shared.rb
97
+ - lib/haml/engine.rb
98
+ - lib/haml/version.rb
99
99
  - lib/haml/template/patch.rb
100
+ - lib/haml/template/plugin.rb
100
101
  - lib/haml/helpers.rb
101
- - lib/haml/version.rb
102
- - lib/haml/filters.rb
103
- - lib/haml/engine.rb
102
+ - lib/haml/buffer.rb
103
+ - lib/haml/html.rb
104
104
  - lib/haml/precompiler.rb
105
- - lib/haml/shared.rb
106
- - lib/haml/helpers/action_view_extensions.rb
105
+ - lib/haml/util.rb
107
106
  - lib/haml/helpers/action_view_mods.rb
108
107
  - lib/haml/helpers/xss_mods.rb
108
+ - lib/haml/helpers/action_view_extensions.rb
109
109
  - lib/haml.rb
110
- - bin/css2sass
111
110
  - bin/sass
112
- - bin/haml
111
+ - bin/css2sass
113
112
  - bin/html2haml
113
+ - bin/haml
114
+ - test/linked_rails.rb
115
+ - test/benchmark.rb
114
116
  - test/sass/script_test.rb
117
+ - test/sass/css2sass_test.rb
118
+ - test/sass/results/units.css
119
+ - test/sass/results/parent_ref.css
120
+ - test/sass/results/compressed.css
121
+ - test/sass/results/complex.css
122
+ - test/sass/results/compact.css
123
+ - test/sass/results/mixins.css
124
+ - test/sass/results/line_numbers.css
125
+ - test/sass/results/alt.css
126
+ - test/sass/results/subdir/subdir.css
127
+ - test/sass/results/subdir/nested_subdir/nested_subdir.css
128
+ - test/sass/results/nested.css
129
+ - test/sass/results/import.css
130
+ - test/sass/results/multiline.css
131
+ - test/sass/results/script.css
132
+ - test/sass/results/basic.css
133
+ - test/sass/results/expanded.css
134
+ - test/sass/more_results/more_import.css
115
135
  - test/sass/more_results/more1_with_line_comments.css
116
136
  - test/sass/more_results/more1.css
117
- - test/sass/more_results/more_import.css
118
- - test/sass/templates/bork2.sass
137
+ - test/sass/to_sass_test.rb
138
+ - test/sass/templates/basic.sass
139
+ - test/sass/templates/bork.sass
119
140
  - test/sass/templates/compressed.sass
120
- - test/sass/templates/expanded.sass
121
141
  - test/sass/templates/import.sass
122
- - test/sass/templates/subdir/subdir.sass
123
- - test/sass/templates/subdir/nested_subdir/_nested_partial.sass
124
- - test/sass/templates/subdir/nested_subdir/nested_subdir.sass
125
- - test/sass/templates/basic.sass
142
+ - test/sass/templates/script.sass
143
+ - test/sass/templates/expanded.sass
144
+ - test/sass/templates/nested.sass
126
145
  - test/sass/templates/_partial.sass
127
- - test/sass/templates/units.sass
128
- - test/sass/templates/mixins.sass
129
- - test/sass/templates/multiline.sass
130
146
  - test/sass/templates/line_numbers.sass
131
- - test/sass/templates/nested.sass
132
147
  - test/sass/templates/compact.sass
148
+ - test/sass/templates/subdir/subdir.sass
149
+ - test/sass/templates/subdir/nested_subdir/nested_subdir.sass
150
+ - test/sass/templates/subdir/nested_subdir/_nested_partial.sass
151
+ - test/sass/templates/parent_ref.sass
133
152
  - test/sass/templates/alt.sass
134
- - test/sass/templates/script.sass
135
153
  - test/sass/templates/importee.sass
136
- - test/sass/templates/parent_ref.sass
137
- - test/sass/templates/bork.sass
154
+ - test/sass/templates/mixins.sass
155
+ - test/sass/templates/multiline.sass
156
+ - test/sass/templates/units.sass
138
157
  - test/sass/templates/complex.sass
139
- - test/sass/css2sass_test.rb
140
- - test/sass/plugin_test.rb
158
+ - test/sass/templates/bork2.sass
159
+ - test/sass/more_templates/_more_partial.sass
141
160
  - test/sass/more_templates/more1.sass
142
161
  - test/sass/more_templates/more_import.sass
143
- - test/sass/more_templates/_more_partial.sass
144
162
  - test/sass/functions_test.rb
145
- - test/sass/results/nested.css
146
- - test/sass/results/units.css
147
- - test/sass/results/script.css
148
- - test/sass/results/subdir/nested_subdir/nested_subdir.css
149
- - test/sass/results/subdir/subdir.css
150
- - test/sass/results/import.css
151
- - test/sass/results/compact.css
152
- - test/sass/results/expanded.css
153
- - test/sass/results/alt.css
154
- - test/sass/results/mixins.css
155
- - test/sass/results/complex.css
156
- - test/sass/results/compressed.css
157
- - test/sass/results/parent_ref.css
158
- - test/sass/results/line_numbers.css
159
- - test/sass/results/multiline.css
160
- - test/sass/results/basic.css
161
163
  - test/sass/engine_test.rb
164
+ - test/sass/plugin_test.rb
162
165
  - test/haml/mocks/article.rb
163
- - test/haml/util_test.rb
164
- - test/haml/template_test.rb
165
- - test/haml/html2haml_test.rb
166
- - test/haml/rhtml/_av_partial_1.rhtml
166
+ - test/haml/rhtml/_av_partial_2.rhtml
167
167
  - test/haml/rhtml/standard.rhtml
168
+ - test/haml/rhtml/_av_partial_1.rhtml
168
169
  - test/haml/rhtml/action_view.rhtml
169
- - test/haml/rhtml/_av_partial_2.rhtml
170
- - test/haml/helper_test.rb
171
- - test/haml/templates/action_view_ugly.haml
172
- - test/haml/templates/list.haml
173
- - test/haml/templates/_text_area.haml
174
- - test/haml/templates/_partial.haml
175
- - test/haml/templates/nuke_outer_whitespace.haml
176
- - test/haml/templates/render_layout.haml
177
- - test/haml/templates/_av_partial_2.haml
178
- - test/haml/templates/partial_layout.haml
179
- - test/haml/templates/helpful.haml
180
- - test/haml/templates/_av_partial_1_ugly.haml
181
- - test/haml/templates/just_stuff.haml
182
- - test/haml/templates/standard_ugly.haml
183
- - test/haml/templates/silent_script.haml
184
- - test/haml/templates/very_basic.haml
185
- - test/haml/templates/nuke_inner_whitespace.haml
186
- - test/haml/templates/eval_suppressed.haml
187
- - test/haml/templates/tag_parsing.haml
188
- - test/haml/templates/whitespace_handling.haml
189
- - test/haml/templates/partials.haml
190
- - test/haml/templates/standard.haml
191
- - test/haml/templates/partialize.haml
192
- - test/haml/templates/_layout_for_partial.haml
193
- - test/haml/templates/_av_partial_1.haml
194
- - test/haml/templates/filters.haml
195
- - test/haml/templates/_layout.erb
196
- - test/haml/templates/content_for_layout.haml
197
- - test/haml/templates/_av_partial_2_ugly.haml
198
- - test/haml/templates/helpers.haml
199
- - test/haml/templates/original_engine.haml
200
- - test/haml/templates/breakage.haml
201
- - test/haml/templates/action_view.haml
202
- - test/haml/spec/tests.json
203
- - test/haml/spec/lua_haml_spec.lua
170
+ - test/haml/util_test.rb
204
171
  - test/haml/spec/ruby_haml_test.rb
205
172
  - test/haml/spec/README.md
173
+ - test/haml/spec/lua_haml_spec.lua
174
+ - test/haml/spec/tests.json
175
+ - test/haml/html2haml_test.rb
176
+ - test/haml/template_test.rb
177
+ - test/haml/helper_test.rb
178
+ - test/haml/results/tag_parsing.xhtml
206
179
  - test/haml/results/content_for_layout.xhtml
207
- - test/haml/results/just_stuff.xhtml
208
- - test/haml/results/whitespace_handling.xhtml
209
- - test/haml/results/nuke_outer_whitespace.xhtml
210
- - test/haml/results/silent_script.xhtml
211
- - test/haml/results/filters.xhtml
212
- - test/haml/results/standard.xhtml
213
- - test/haml/results/nuke_inner_whitespace.xhtml
214
- - test/haml/results/helpful.xhtml
180
+ - test/haml/results/helpers.xhtml
181
+ - test/haml/results/original_engine.xhtml
215
182
  - test/haml/results/very_basic.xhtml
216
- - test/haml/results/eval_suppressed.xhtml
183
+ - test/haml/results/helpful.xhtml
184
+ - test/haml/results/list.xhtml
217
185
  - test/haml/results/partials.xhtml
186
+ - test/haml/results/eval_suppressed.xhtml
187
+ - test/haml/results/nuke_inner_whitespace.xhtml
188
+ - test/haml/results/whitespace_handling.xhtml
218
189
  - test/haml/results/render_layout.xhtml
219
- - test/haml/results/original_engine.xhtml
220
- - test/haml/results/helpers.xhtml
221
- - test/haml/results/list.xhtml
190
+ - test/haml/results/silent_script.xhtml
191
+ - test/haml/results/standard.xhtml
192
+ - test/haml/results/just_stuff.xhtml
222
193
  - test/haml/results/partial_layout.xhtml
223
- - test/haml/results/tag_parsing.xhtml
194
+ - test/haml/results/filters.xhtml
195
+ - test/haml/results/nuke_outer_whitespace.xhtml
224
196
  - test/haml/markaby/standard.mab
197
+ - test/haml/templates/tag_parsing.haml
198
+ - test/haml/templates/nuke_inner_whitespace.haml
199
+ - test/haml/templates/partial_layout.haml
200
+ - test/haml/templates/_av_partial_2_ugly.haml
201
+ - test/haml/templates/partials.haml
202
+ - test/haml/templates/_layout_for_partial.haml
203
+ - test/haml/templates/original_engine.haml
204
+ - test/haml/templates/helpers.haml
205
+ - test/haml/templates/_layout.erb
206
+ - test/haml/templates/action_view_ugly.haml
207
+ - test/haml/templates/content_for_layout.haml
208
+ - test/haml/templates/silent_script.haml
209
+ - test/haml/templates/very_basic.haml
210
+ - test/haml/templates/render_layout.haml
211
+ - test/haml/templates/filters.haml
212
+ - test/haml/templates/_av_partial_1.haml
213
+ - test/haml/templates/standard_ugly.haml
214
+ - test/haml/templates/_partial.haml
215
+ - test/haml/templates/nuke_outer_whitespace.haml
216
+ - test/haml/templates/breakage.haml
217
+ - test/haml/templates/list.haml
218
+ - test/haml/templates/standard.haml
219
+ - test/haml/templates/whitespace_handling.haml
220
+ - test/haml/templates/eval_suppressed.haml
221
+ - test/haml/templates/action_view.haml
222
+ - test/haml/templates/_av_partial_2.haml
223
+ - test/haml/templates/partialize.haml
224
+ - test/haml/templates/just_stuff.haml
225
+ - test/haml/templates/helpful.haml
226
+ - test/haml/templates/_av_partial_1_ugly.haml
227
+ - test/haml/templates/_text_area.haml
225
228
  - test/haml/engine_test.rb
226
- - test/linked_rails.rb
227
- - test/benchmark.rb
228
229
  - test/test_helper.rb
229
- - extra/sass-mode.el
230
230
  - extra/haml-mode.el
231
+ - extra/sass-mode.el
231
232
  - extra/update_watch.rb
232
233
  - Rakefile
233
234
  - init.rb
234
235
  - .yardopts
235
- - VERSION
236
- - MIT-LICENSE
237
- - README.md
238
236
  - VERSION_NAME
239
- - REVISION
240
237
  - CONTRIBUTING
238
+ - README.md
239
+ - MIT-LICENSE
240
+ - VERSION
241
+ - REVISION
241
242
  has_rdoc: true
242
243
  homepage: http://haml-lang.com/
243
244
  licenses: []
@@ -276,12 +277,13 @@ summary: An elegant, structured XHTML/XML templating engine. Comes with Sass, a
276
277
  test_files:
277
278
  - test/sass/script_test.rb
278
279
  - test/sass/css2sass_test.rb
279
- - test/sass/plugin_test.rb
280
+ - test/sass/to_sass_test.rb
280
281
  - test/sass/functions_test.rb
281
282
  - test/sass/engine_test.rb
283
+ - test/sass/plugin_test.rb
282
284
  - test/haml/util_test.rb
283
- - test/haml/template_test.rb
285
+ - test/haml/spec/ruby_haml_test.rb
284
286
  - test/haml/html2haml_test.rb
287
+ - test/haml/template_test.rb
285
288
  - test/haml/helper_test.rb
286
- - test/haml/spec/ruby_haml_test.rb
287
289
  - test/haml/engine_test.rb