haml 2.0.2 → 2.0.3

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 (27) hide show
  1. data/VERSION +1 -1
  2. data/bin/haml +2 -1
  3. data/lib/haml.rb +19 -22
  4. data/lib/haml/buffer.rb +3 -3
  5. data/lib/haml/engine.rb +2 -1
  6. data/lib/haml/error.rb +1 -1
  7. data/lib/haml/exec.rb +20 -1
  8. data/lib/haml/filters.rb +34 -24
  9. data/lib/haml/helpers.rb +1 -1
  10. data/lib/haml/html.rb +1 -1
  11. data/lib/haml/precompiler.rb +8 -12
  12. data/lib/sass.rb +11 -4
  13. data/lib/sass/constant/number.rb +1 -1
  14. data/lib/sass/css.rb +28 -27
  15. data/lib/sass/error.rb +1 -1
  16. data/lib/sass/plugin.rb +11 -7
  17. data/lib/sass/plugin/merb.rb +1 -1
  18. data/rails/init.rb +1 -0
  19. data/test/haml/engine_test.rb +37 -96
  20. data/test/haml/html2haml_test.rb +2 -1
  21. data/test/haml/results/filters.xhtml +2 -23
  22. data/test/haml/results/just_stuff.xhtml +6 -0
  23. data/test/haml/templates/filters.haml +0 -23
  24. data/test/haml/templates/just_stuff.haml +7 -0
  25. data/test/sass/plugin_test.rb +1 -0
  26. data/test/test_helper.rb +4 -2
  27. metadata +100 -99
data/test/haml/results/just_stuff.xhtml CHANGED
@@ -60,3 +60,9 @@ testtest
60
60
  Woah inner quotes
61
61
  <p class='dynamic_quote' dyn='3' quotes="single '"></p>
62
62
  <p class='dynamic_self_closing' dyn='3' />
63
+ <body>
64
+ hello
65
+ <div>
66
+ <img />
67
+ </div>
68
+ </body>
data/test/haml/templates/filters.haml CHANGED
@@ -15,21 +15,6 @@
15
15
  Not
16
16
  Print
17
17
 
18
- :redcloth
19
- Foo
20
- ===
21
-
22
- This is preformatted!
23
- Look at that!
24
- Wowie-zowie!
25
-
26
- *boldilicious!*
27
-
28
- :textile
29
- h1. Yeah
30
-
31
- _pretty much the same as above_
32
-
33
18
  %p
34
19
  :javascript
35
20
  function newline(str) {
@@ -68,14 +53,6 @@
68
53
 
69
54
  .res= res
70
55
 
71
- %p
72
- :textile
73
- I like preserved text:
74
-
75
- Foo
76
- #{"Bar"}!
77
- Baz
78
-
79
56
  :markdown
80
57
  * Foo
81
58
  * Bar
data/test/haml/templates/just_stuff.haml CHANGED
@@ -74,3 +74,10 @@
74
74
  == #{"Woah inner quotes"}
75
75
  %p.dynamic_quote{:quotes => "single '", :dyn => 1 + 2}
76
76
  %p.dynamic_self_closing{:dyn => 1 + 2}/
77
+ %body
78
+ :plain
79
+ hello
80
+ %div
81
+
82
+ %img
83
+
data/test/sass/plugin_test.rb CHANGED
@@ -151,5 +151,6 @@ class Sass::Engine
151
151
  end
152
152
 
153
153
  class ActionController::Base
154
+ undef :sass_old_process
154
155
  def sass_old_process(*args); end
155
156
  end
data/test/test_helper.rb CHANGED
@@ -1,3 +1,4 @@
1
+ lib_dir = File.dirname(__FILE__) + '/../lib'
1
2
  # allows testing with edge Rails by creating a test/rails symlink
2
3
  linked_rails = File.dirname(__FILE__) + '/rails'
3
4
 
@@ -12,5 +13,6 @@ require 'action_controller'
12
13
  require 'action_view'
13
14
 
14
15
  require 'test/unit'
15
- require File.dirname(__FILE__) + '/../lib/haml'
16
- require File.dirname(__FILE__) + '/../lib/sass'
16
+ $:.unshift lib_dir unless $:.include?(lib_dir)
17
+ require 'haml'
18
+ require 'sass'
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.0.2
4
+ version: 2.0.3
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: 2008-07-30 00:00:00 -04:00
13
+ date: 2008-09-07 00:00:00 -07:00
14
14
  default_executable:
15
15
  dependencies: []
16
16
 
@@ -24,162 +24,163 @@ executables:
24
24
  extensions: []
25
25
 
26
26
  extra_rdoc_files:
27
- - FAQ
28
- - MIT-LICENSE
29
27
  - VERSION
28
+ - MIT-LICENSE
30
29
  - README.rdoc
30
+ - FAQ
31
31
  - REVISION
32
32
  files:
33
+ - rails/init.rb
33
34
  - lib/sass.rb
34
35
  - lib/sass
35
- - lib/sass/css.rb
36
+ - lib/sass/plugin
37
+ - lib/sass/plugin/rails.rb
38
+ - lib/sass/plugin/merb.rb
36
39
  - lib/sass/error.rb
37
40
  - lib/sass/tree
38
- - lib/sass/tree/comment_node.rb
39
- - lib/sass/tree/node.rb
40
41
  - lib/sass/tree/value_node.rb
41
- - lib/sass/tree/directive_node.rb
42
42
  - lib/sass/tree/attr_node.rb
43
+ - lib/sass/tree/directive_node.rb
44
+ - lib/sass/tree/node.rb
45
+ - lib/sass/tree/comment_node.rb
43
46
  - lib/sass/tree/rule_node.rb
44
- - lib/sass/plugin
45
- - lib/sass/plugin/rails.rb
46
- - lib/sass/plugin/merb.rb
47
47
  - lib/sass/constant.rb
48
- - lib/sass/engine.rb
49
- - lib/sass/plugin.rb
50
48
  - lib/sass/constant
49
+ - lib/sass/constant/color.rb
50
+ - lib/sass/constant/string.rb
51
51
  - lib/sass/constant/number.rb
52
52
  - lib/sass/constant/operation.rb
53
53
  - lib/sass/constant/literal.rb
54
- - lib/sass/constant/color.rb
55
- - lib/sass/constant/string.rb
56
54
  - lib/sass/constant/nil.rb
55
+ - lib/sass/plugin.rb
56
+ - lib/sass/css.rb
57
+ - lib/sass/engine.rb
57
58
  - lib/haml
58
- - lib/haml/filters.rb
59
59
  - lib/haml/exec.rb
60
+ - lib/haml/html.rb
60
61
  - lib/haml/error.rb
62
+ - lib/haml/buffer.rb
61
63
  - lib/haml/template.rb
62
- - lib/haml/engine.rb
63
64
  - lib/haml/template
64
- - lib/haml/template/patch.rb
65
65
  - lib/haml/template/plugin.rb
66
+ - lib/haml/template/patch.rb
66
67
  - lib/haml/helpers.rb
67
- - lib/haml/buffer.rb
68
- - lib/haml/html.rb
68
+ - lib/haml/filters.rb
69
+ - lib/haml/engine.rb
69
70
  - lib/haml/precompiler.rb
70
71
  - lib/haml/helpers
71
- - lib/haml/helpers/action_view_mods.rb
72
72
  - lib/haml/helpers/action_view_extensions.rb
73
+ - lib/haml/helpers/action_view_mods.rb
73
74
  - lib/haml.rb
74
- - bin/sass
75
75
  - bin/css2sass
76
- - bin/html2haml
76
+ - bin/sass
77
77
  - bin/haml
78
- - test/benchmark.rb
78
+ - bin/html2haml
79
79
  - test/sass
80
- - test/sass/results
81
- - test/sass/results/constants.css
82
- - test/sass/results/parent_ref.css
83
- - test/sass/results/compressed.css
84
- - test/sass/results/complex.css
85
- - test/sass/results/compact.css
86
- - test/sass/results/mixins.css
87
- - test/sass/results/alt.css
88
- - test/sass/results/subdir
89
- - test/sass/results/subdir/subdir.css
90
- - test/sass/results/subdir/nested_subdir
91
- - test/sass/results/subdir/nested_subdir/nested_subdir.css
92
- - test/sass/results/nested.css
93
- - test/sass/results/import.css
94
- - test/sass/results/multiline.css
95
- - test/sass/results/basic.css
96
- - test/sass/results/expanded.css
97
80
  - test/sass/templates
98
- - test/sass/templates/basic.sass
99
- - test/sass/templates/bork.sass
81
+ - test/sass/templates/bork2.sass
100
82
  - test/sass/templates/compressed.sass
101
- - test/sass/templates/import.sass
102
- - test/sass/templates/constants.sass
103
83
  - test/sass/templates/expanded.sass
104
- - test/sass/templates/nested.sass
105
- - test/sass/templates/_partial.sass
106
- - test/sass/templates/compact.sass
84
+ - test/sass/templates/import.sass
107
85
  - test/sass/templates/subdir
108
86
  - test/sass/templates/subdir/subdir.sass
109
87
  - test/sass/templates/subdir/nested_subdir
110
88
  - test/sass/templates/subdir/nested_subdir/nested_subdir.sass
111
- - test/sass/templates/parent_ref.sass
112
- - test/sass/templates/alt.sass
113
- - test/sass/templates/importee.sass
89
+ - test/sass/templates/basic.sass
90
+ - test/sass/templates/_partial.sass
114
91
  - test/sass/templates/mixins.sass
115
92
  - test/sass/templates/multiline.sass
93
+ - test/sass/templates/nested.sass
94
+ - test/sass/templates/compact.sass
95
+ - test/sass/templates/alt.sass
96
+ - test/sass/templates/constants.sass
97
+ - test/sass/templates/importee.sass
98
+ - test/sass/templates/parent_ref.sass
99
+ - test/sass/templates/bork.sass
116
100
  - test/sass/templates/complex.sass
117
- - test/sass/templates/bork2.sass
118
- - test/sass/engine_test.rb
119
101
  - test/sass/plugin_test.rb
102
+ - test/sass/results
103
+ - test/sass/results/nested.css
104
+ - test/sass/results/subdir
105
+ - test/sass/results/subdir/nested_subdir
106
+ - test/sass/results/subdir/nested_subdir/nested_subdir.css
107
+ - test/sass/results/subdir/subdir.css
108
+ - test/sass/results/import.css
109
+ - test/sass/results/compact.css
110
+ - test/sass/results/expanded.css
111
+ - test/sass/results/alt.css
112
+ - test/sass/results/mixins.css
113
+ - test/sass/results/complex.css
114
+ - test/sass/results/constants.css
115
+ - test/sass/results/compressed.css
116
+ - test/sass/results/parent_ref.css
117
+ - test/sass/results/multiline.css
118
+ - test/sass/results/basic.css
119
+ - test/sass/engine_test.rb
120
120
  - test/haml
121
121
  - test/haml/mocks
122
122
  - test/haml/mocks/article.rb
123
+ - test/haml/template_test.rb
124
+ - test/haml/html2haml_test.rb
123
125
  - test/haml/rhtml
124
- - test/haml/rhtml/_av_partial_2.rhtml
125
- - test/haml/rhtml/standard.rhtml
126
126
  - test/haml/rhtml/_av_partial_1.rhtml
127
+ - test/haml/rhtml/standard.rhtml
127
128
  - test/haml/rhtml/action_view.rhtml
128
- - test/haml/html2haml_test.rb
129
- - test/haml/template_test.rb
129
+ - test/haml/rhtml/_av_partial_2.rhtml
130
130
  - test/haml/helper_test.rb
131
+ - test/haml/templates
132
+ - test/haml/templates/list.haml
133
+ - test/haml/templates/_text_area.haml
134
+ - test/haml/templates/_partial.haml
135
+ - test/haml/templates/nuke_outer_whitespace.haml
136
+ - test/haml/templates/_av_partial_2.haml
137
+ - test/haml/templates/helpful.haml
138
+ - test/haml/templates/just_stuff.haml
139
+ - test/haml/templates/silent_script.haml
140
+ - test/haml/templates/very_basic.haml
141
+ - test/haml/templates/nuke_inner_whitespace.haml
142
+ - test/haml/templates/eval_suppressed.haml
143
+ - test/haml/templates/tag_parsing.haml
144
+ - test/haml/templates/whitespace_handling.haml
145
+ - test/haml/templates/partials.haml
146
+ - test/haml/templates/standard.haml
147
+ - test/haml/templates/partialize.haml
148
+ - test/haml/templates/_av_partial_1.haml
149
+ - test/haml/templates/filters.haml
150
+ - test/haml/templates/content_for_layout.haml
151
+ - test/haml/templates/helpers.haml
152
+ - test/haml/templates/original_engine.haml
153
+ - test/haml/templates/breakage.haml
154
+ - test/haml/templates/action_view.haml
131
155
  - test/haml/results
132
- - test/haml/results/tag_parsing.xhtml
133
156
  - test/haml/results/content_for_layout.xhtml
134
- - test/haml/results/helpers.xhtml
135
- - test/haml/results/original_engine.xhtml
136
- - test/haml/results/very_basic.xhtml
137
- - test/haml/results/helpful.xhtml
138
- - test/haml/results/list.xhtml
139
- - test/haml/results/partials.xhtml
140
- - test/haml/results/eval_suppressed.xhtml
141
- - test/haml/results/nuke_inner_whitespace.xhtml
157
+ - test/haml/results/just_stuff.xhtml
142
158
  - test/haml/results/whitespace_handling.xhtml
159
+ - test/haml/results/nuke_outer_whitespace.xhtml
143
160
  - test/haml/results/silent_script.xhtml
144
- - test/haml/results/standard.xhtml
145
- - test/haml/results/just_stuff.xhtml
146
161
  - test/haml/results/filters.xhtml
147
- - test/haml/results/nuke_outer_whitespace.xhtml
162
+ - test/haml/results/standard.xhtml
163
+ - test/haml/results/nuke_inner_whitespace.xhtml
164
+ - test/haml/results/helpful.xhtml
165
+ - test/haml/results/very_basic.xhtml
166
+ - test/haml/results/eval_suppressed.xhtml
167
+ - test/haml/results/partials.xhtml
168
+ - test/haml/results/original_engine.xhtml
169
+ - test/haml/results/helpers.xhtml
170
+ - test/haml/results/list.xhtml
171
+ - test/haml/results/tag_parsing.xhtml
148
172
  - test/haml/markaby
149
173
  - test/haml/markaby/standard.mab
150
- - test/haml/templates
151
- - test/haml/templates/tag_parsing.haml
152
- - test/haml/templates/nuke_inner_whitespace.haml
153
- - test/haml/templates/partials.haml
154
- - test/haml/templates/original_engine.haml
155
- - test/haml/templates/helpers.haml
156
- - test/haml/templates/content_for_layout.haml
157
- - test/haml/templates/silent_script.haml
158
- - test/haml/templates/very_basic.haml
159
- - test/haml/templates/filters.haml
160
- - test/haml/templates/_av_partial_1.haml
161
- - test/haml/templates/_partial.haml
162
- - test/haml/templates/nuke_outer_whitespace.haml
163
- - test/haml/templates/breakage.haml
164
- - test/haml/templates/list.haml
165
- - test/haml/templates/standard.haml
166
- - test/haml/templates/whitespace_handling.haml
167
- - test/haml/templates/eval_suppressed.haml
168
- - test/haml/templates/action_view.haml
169
- - test/haml/templates/_av_partial_2.haml
170
- - test/haml/templates/partialize.haml
171
- - test/haml/templates/just_stuff.haml
172
- - test/haml/templates/helpful.haml
173
- - test/haml/templates/_text_area.haml
174
174
  - test/haml/engine_test.rb
175
- - test/test_helper.rb
176
175
  - test/rails
176
+ - test/benchmark.rb
177
+ - test/test_helper.rb
177
178
  - Rakefile
178
179
  - init.rb
179
- - FAQ
180
- - MIT-LICENSE
181
180
  - VERSION
181
+ - MIT-LICENSE
182
182
  - README.rdoc
183
+ - FAQ
183
184
  - REVISION
184
185
  has_rdoc: true
185
186
  homepage: http://haml.hamptoncatlin.com/
@@ -210,14 +211,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
210
211
  requirements: []
211
212
 
212
213
  rubyforge_project: haml
213
- rubygems_version: 1.2.0
214
+ rubygems_version: 1.1.1
214
215
  signing_key:
215
216
  specification_version: 2
216
217
  summary: An elegant, structured XHTML/XML templating engine. Comes with Sass, a similar CSS templating engine.
217
218
  test_files:
218
- - test/sass/engine_test.rb
219
219
  - test/sass/plugin_test.rb
220
- - test/haml/html2haml_test.rb
220
+ - test/sass/engine_test.rb
221
221
  - test/haml/template_test.rb
222
+ - test/haml/html2haml_test.rb
222
223
  - test/haml/helper_test.rb
223
224
  - test/haml/engine_test.rb