haml 3.2.0.alpha.14 → 3.2.0.beta.1

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 (26) hide show
  1. data/CHANGELOG.md +7 -0
  2. data/REFERENCE.md +11 -9
  3. data/lib/haml/compiler.rb +2 -2
  4. data/lib/haml/error.rb +40 -1
  5. data/lib/haml/exec.rb +15 -3
  6. data/lib/haml/filters.rb +20 -17
  7. data/lib/haml/helpers.rb +3 -3
  8. data/lib/haml/options.rb +28 -10
  9. data/lib/haml/parser.rb +66 -39
  10. data/lib/haml/template.rb +1 -2
  11. data/lib/haml/util.rb +3 -9
  12. data/lib/haml/version.rb +1 -1
  13. data/test/engine_test.rb +110 -106
  14. data/test/filters_test.rb +97 -5
  15. data/test/gemfiles/Gemfile.rails-3.0.x +0 -1
  16. data/test/gemfiles/Gemfile.rails-3.1.x +0 -1
  17. data/test/gemfiles/Gemfile.rails-3.2.x +0 -1
  18. data/test/haml-spec/tests.json +62 -14
  19. data/test/helper_test.rb +1 -1
  20. data/test/parser_test.rb +59 -0
  21. data/test/template_test.rb +3 -2
  22. data/test/test_helper.rb +7 -2
  23. metadata +93 -136
  24. data/test/gemfiles/Gemfile.rails-3.0.x.lock +0 -101
  25. data/test/gemfiles/Gemfile.rails-3.1.x.lock +0 -111
  26. data/test/gemfiles/Gemfile.rails-3.2.x.lock +0 -109
data/test/gemfiles/Gemfile.rails-3.0.x.lock DELETED
@@ -1,101 +0,0 @@
1
- PATH
2
- remote: ../../vendor/haml-contrib
3
- specs:
4
- haml-contrib (0.0.0)
5
-
6
- PATH
7
- remote: /Users/norman/work/haml/haml
8
- specs:
9
- haml (3.2.0.alpha.13)
10
- tilt
11
-
12
- GEM
13
- remote: http://rubygems.org/
14
- specs:
15
- abstract (1.0.0)
16
- actionmailer (3.0.12)
17
- actionpack (= 3.0.12)
18
- mail (~> 2.2.19)
19
- actionpack (3.0.12)
20
- activemodel (= 3.0.12)
21
- activesupport (= 3.0.12)
22
- builder (~> 2.1.2)
23
- erubis (~> 2.6.6)
24
- i18n (~> 0.5.0)
25
- rack (~> 1.2.5)
26
- rack-mount (~> 0.6.14)
27
- rack-test (~> 0.5.7)
28
- tzinfo (~> 0.3.23)
29
- activemodel (3.0.12)
30
- activesupport (= 3.0.12)
31
- builder (~> 2.1.2)
32
- i18n (~> 0.5.0)
33
- activerecord (3.0.12)
34
- activemodel (= 3.0.12)
35
- activesupport (= 3.0.12)
36
- arel (~> 2.0.10)
37
- tzinfo (~> 0.3.23)
38
- activeresource (3.0.12)
39
- activemodel (= 3.0.12)
40
- activesupport (= 3.0.12)
41
- activesupport (3.0.12)
42
- arel (2.0.10)
43
- builder (2.1.2)
44
- erubis (2.6.6)
45
- abstract (>= 1.0.0)
46
- i18n (0.5.0)
47
- json (1.7.3)
48
- mail (2.2.19)
49
- activesupport (>= 2.3.6)
50
- i18n (>= 0.4.0)
51
- mime-types (~> 1.16)
52
- treetop (~> 1.4.8)
53
- maruku (0.6.0)
54
- syntax (>= 1.0.0)
55
- mime-types (1.18)
56
- minitest (3.0.1)
57
- polyglot (0.3.3)
58
- rack (1.2.5)
59
- rack-mount (0.6.14)
60
- rack (>= 1.0.0)
61
- rack-test (0.5.7)
62
- rack (>= 1.0)
63
- rails (3.0.12)
64
- actionmailer (= 3.0.12)
65
- actionpack (= 3.0.12)
66
- activerecord (= 3.0.12)
67
- activeresource (= 3.0.12)
68
- activesupport (= 3.0.12)
69
- bundler (~> 1.0)
70
- railties (= 3.0.12)
71
- railties (3.0.12)
72
- actionpack (= 3.0.12)
73
- activesupport (= 3.0.12)
74
- rake (>= 0.8.7)
75
- rdoc (~> 3.4)
76
- thor (~> 0.14.4)
77
- rake (0.9.2.2)
78
- rbench (0.2.3)
79
- rdoc (3.12)
80
- json (~> 1.4)
81
- syntax (1.0.0)
82
- thor (0.14.6)
83
- tilt (1.3.3)
84
- treetop (1.4.10)
85
- polyglot
86
- polyglot (>= 0.3.1)
87
- tzinfo (0.3.33)
88
- yard (0.8.1)
89
-
90
- PLATFORMS
91
- ruby
92
-
93
- DEPENDENCIES
94
- haml!
95
- haml-contrib!
96
- json
97
- maruku (>= 0.5.9)
98
- minitest
99
- rails (>= 3.0.0, < 3.1.0)
100
- rbench
101
- yard (>= 0.5.3)
data/test/gemfiles/Gemfile.rails-3.1.x.lock DELETED
@@ -1,111 +0,0 @@
1
- PATH
2
- remote: ../../vendor/haml-contrib
3
- specs:
4
- haml-contrib (0.0.0)
5
-
6
- PATH
7
- remote: /Users/norman/work/haml/haml
8
- specs:
9
- haml (3.2.0.alpha.13)
10
- tilt
11
-
12
- GEM
13
- remote: http://rubygems.org/
14
- specs:
15
- actionmailer (3.1.5)
16
- actionpack (= 3.1.5)
17
- mail (~> 2.3.3)
18
- actionpack (3.1.5)
19
- activemodel (= 3.1.5)
20
- activesupport (= 3.1.5)
21
- builder (~> 3.0.0)
22
- erubis (~> 2.7.0)
23
- i18n (~> 0.6)
24
- rack (~> 1.3.6)
25
- rack-cache (~> 1.2)
26
- rack-mount (~> 0.8.2)
27
- rack-test (~> 0.6.1)
28
- sprockets (~> 2.0.4)
29
- activemodel (3.1.5)
30
- activesupport (= 3.1.5)
31
- builder (~> 3.0.0)
32
- i18n (~> 0.6)
33
- activerecord (3.1.5)
34
- activemodel (= 3.1.5)
35
- activesupport (= 3.1.5)
36
- arel (~> 2.2.3)
37
- tzinfo (~> 0.3.29)
38
- activeresource (3.1.5)
39
- activemodel (= 3.1.5)
40
- activesupport (= 3.1.5)
41
- activesupport (3.1.5)
42
- multi_json (>= 1.0, < 1.3)
43
- arel (2.2.3)
44
- builder (3.0.0)
45
- erubis (2.7.0)
46
- hike (1.2.1)
47
- i18n (0.6.0)
48
- json (1.7.3)
49
- mail (2.3.3)
50
- i18n (>= 0.4.0)
51
- mime-types (~> 1.16)
52
- treetop (~> 1.4.8)
53
- maruku (0.6.0)
54
- syntax (>= 1.0.0)
55
- mime-types (1.18)
56
- minitest (3.0.1)
57
- multi_json (1.2.0)
58
- polyglot (0.3.3)
59
- rack (1.3.6)
60
- rack-cache (1.2)
61
- rack (>= 0.4)
62
- rack-mount (0.8.3)
63
- rack (>= 1.0.0)
64
- rack-ssl (1.3.2)
65
- rack
66
- rack-test (0.6.1)
67
- rack (>= 1.0)
68
- rails (3.1.5)
69
- actionmailer (= 3.1.5)
70
- actionpack (= 3.1.5)
71
- activerecord (= 3.1.5)
72
- activeresource (= 3.1.5)
73
- activesupport (= 3.1.5)
74
- bundler (~> 1.0)
75
- railties (= 3.1.5)
76
- railties (3.1.5)
77
- actionpack (= 3.1.5)
78
- activesupport (= 3.1.5)
79
- rack-ssl (~> 1.3.2)
80
- rake (>= 0.8.7)
81
- rdoc (~> 3.4)
82
- thor (~> 0.14.6)
83
- rake (0.9.2.2)
84
- rbench (0.2.3)
85
- rdoc (3.12)
86
- json (~> 1.4)
87
- sprockets (2.0.4)
88
- hike (~> 1.2)
89
- rack (~> 1.0)
90
- tilt (~> 1.1, != 1.3.0)
91
- syntax (1.0.0)
92
- thor (0.14.6)
93
- tilt (1.3.3)
94
- treetop (1.4.10)
95
- polyglot
96
- polyglot (>= 0.3.1)
97
- tzinfo (0.3.33)
98
- yard (0.8.1)
99
-
100
- PLATFORMS
101
- ruby
102
-
103
- DEPENDENCIES
104
- haml!
105
- haml-contrib!
106
- json
107
- maruku (>= 0.5.9)
108
- minitest
109
- rails (>= 3.1.0, < 3.2.0)
110
- rbench
111
- yard (>= 0.5.3)
data/test/gemfiles/Gemfile.rails-3.2.x.lock DELETED
@@ -1,109 +0,0 @@
1
- PATH
2
- remote: ../../vendor/haml-contrib
3
- specs:
4
- haml-contrib (0.0.0)
5
-
6
- PATH
7
- remote: /Users/norman/work/haml/haml
8
- specs:
9
- haml (3.2.0.alpha.13)
10
- tilt
11
-
12
- GEM
13
- remote: http://rubygems.org/
14
- specs:
15
- actionmailer (3.2.5)
16
- actionpack (= 3.2.5)
17
- mail (~> 2.4.4)
18
- actionpack (3.2.5)
19
- activemodel (= 3.2.5)
20
- activesupport (= 3.2.5)
21
- builder (~> 3.0.0)
22
- erubis (~> 2.7.0)
23
- journey (~> 1.0.1)
24
- rack (~> 1.4.0)
25
- rack-cache (~> 1.2)
26
- rack-test (~> 0.6.1)
27
- sprockets (~> 2.1.3)
28
- activemodel (3.2.5)
29
- activesupport (= 3.2.5)
30
- builder (~> 3.0.0)
31
- activerecord (3.2.5)
32
- activemodel (= 3.2.5)
33
- activesupport (= 3.2.5)
34
- arel (~> 3.0.2)
35
- tzinfo (~> 0.3.29)
36
- activeresource (3.2.5)
37
- activemodel (= 3.2.5)
38
- activesupport (= 3.2.5)
39
- activesupport (3.2.5)
40
- i18n (~> 0.6)
41
- multi_json (~> 1.0)
42
- arel (3.0.2)
43
- builder (3.0.0)
44
- erubis (2.7.0)
45
- hike (1.2.1)
46
- i18n (0.6.0)
47
- journey (1.0.3)
48
- json (1.7.3)
49
- mail (2.4.4)
50
- i18n (>= 0.4.0)
51
- mime-types (~> 1.16)
52
- treetop (~> 1.4.8)
53
- maruku (0.6.0)
54
- syntax (>= 1.0.0)
55
- mime-types (1.18)
56
- minitest (3.0.1)
57
- multi_json (1.3.6)
58
- polyglot (0.3.3)
59
- rack (1.4.1)
60
- rack-cache (1.2)
61
- rack (>= 0.4)
62
- rack-ssl (1.3.2)
63
- rack
64
- rack-test (0.6.1)
65
- rack (>= 1.0)
66
- rails (3.2.5)
67
- actionmailer (= 3.2.5)
68
- actionpack (= 3.2.5)
69
- activerecord (= 3.2.5)
70
- activeresource (= 3.2.5)
71
- activesupport (= 3.2.5)
72
- bundler (~> 1.0)
73
- railties (= 3.2.5)
74
- railties (3.2.5)
75
- actionpack (= 3.2.5)
76
- activesupport (= 3.2.5)
77
- rack-ssl (~> 1.3.2)
78
- rake (>= 0.8.7)
79
- rdoc (~> 3.4)
80
- thor (>= 0.14.6, < 2.0)
81
- rake (0.9.2.2)
82
- rbench (0.2.3)
83
- rdoc (3.12)
84
- json (~> 1.4)
85
- sprockets (2.1.3)
86
- hike (~> 1.2)
87
- rack (~> 1.0)
88
- tilt (~> 1.1, != 1.3.0)
89
- syntax (1.0.0)
90
- thor (0.15.2)
91
- tilt (1.3.3)
92
- treetop (1.4.10)
93
- polyglot
94
- polyglot (>= 0.3.1)
95
- tzinfo (0.3.33)
96
- yard (0.8.1)
97
-
98
- PLATFORMS
99
- ruby
100
-
101
- DEPENDENCIES
102
- haml!
103
- haml-contrib!
104
- json
105
- maruku (>= 0.5.9)
106
- minitest
107
- rails (>= 3.2.0, < 3.3.0)
108
- rbench
109
- yard (>= 0.5.3)