slim 0.9.4 → 1.0.0

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.
Files changed (21) hide show
  1. data/CHANGES +8 -1
  2. data/README.md +9 -5
  3. data/lib/slim/compiler.rb +20 -23
  4. data/lib/slim/embedded_engine.rb +86 -25
  5. data/lib/slim/end_inserter.rb +2 -2
  6. data/lib/slim/engine.rb +1 -2
  7. data/lib/slim/grammar.rb +1 -2
  8. data/lib/slim/interpolation.rb +8 -6
  9. data/lib/slim/parser.rb +295 -258
  10. data/lib/slim/sections.rb +1 -1
  11. data/lib/slim/version.rb +1 -1
  12. data/test/helper.rb +4 -0
  13. data/test/slim/test_code_evaluation.rb +31 -6
  14. data/test/slim/test_code_output.rb +22 -3
  15. data/test/slim/test_embedded_engines.rb +7 -2
  16. data/test/slim/test_html_structure.rb +79 -10
  17. data/test/slim/test_parser_errors.rb +22 -13
  18. data/test/slim/test_ruby_errors.rb +11 -0
  19. data/test_ruby_errors.rb +191 -0
  20. metadata +107 -111
  21. data/lib/slim/rails.rb +0 -3
metadata CHANGED
@@ -1,153 +1,152 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: slim
3
- version: !ruby/object:Gem::Version
3
+ version: !ruby/object:Gem::Version
4
+ version: 1.0.0
4
5
  prerelease:
5
- version: 0.9.4
6
6
  platform: ruby
7
- authors:
7
+ authors:
8
8
  - Andrew Stone
9
9
  - Fred Wu
10
10
  - Daniel Mendler
11
11
  autorequire:
12
12
  bindir: bin
13
13
  cert_chain: []
14
-
15
- date: 2011-05-21 00:00:00 -04:00
14
+ date: 2011-07-24 00:00:00.000000000 -04:00
16
15
  default_executable:
17
- dependencies:
18
- - !ruby/object:Gem::Dependency
16
+ dependencies:
17
+ - !ruby/object:Gem::Dependency
19
18
  name: temple
20
- prerelease: false
21
- requirement: &id001 !ruby/object:Gem::Requirement
19
+ requirement: &2156211620 !ruby/object:Gem::Requirement
22
20
  none: false
23
- requirements:
21
+ requirements:
24
22
  - - ~>
25
- - !ruby/object:Gem::Version
23
+ - !ruby/object:Gem::Version
26
24
  version: 0.3.0
27
25
  type: :runtime
28
- version_requirements: *id001
29
- - !ruby/object:Gem::Dependency
30
- name: tilt
31
26
  prerelease: false
32
- requirement: &id002 !ruby/object:Gem::Requirement
27
+ version_requirements: *2156211620
28
+ - !ruby/object:Gem::Dependency
29
+ name: tilt
30
+ requirement: &2156211100 !ruby/object:Gem::Requirement
33
31
  none: false
34
- requirements:
32
+ requirements:
35
33
  - - ~>
36
- - !ruby/object:Gem::Version
37
- version: "1.2"
34
+ - !ruby/object:Gem::Version
35
+ version: '1.2'
38
36
  type: :runtime
39
- version_requirements: *id002
40
- - !ruby/object:Gem::Dependency
41
- name: rake
42
37
  prerelease: false
43
- requirement: &id003 !ruby/object:Gem::Requirement
38
+ version_requirements: *2156211100
39
+ - !ruby/object:Gem::Dependency
40
+ name: rake
41
+ requirement: &2156210620 !ruby/object:Gem::Requirement
44
42
  none: false
45
- requirements:
46
- - - ">="
47
- - !ruby/object:Gem::Version
43
+ requirements:
44
+ - - ! '>='
45
+ - !ruby/object:Gem::Version
48
46
  version: 0.8.7
49
47
  type: :development
50
- version_requirements: *id003
51
- - !ruby/object:Gem::Dependency
52
- name: haml
53
48
  prerelease: false
54
- requirement: &id004 !ruby/object:Gem::Requirement
49
+ version_requirements: *2156210620
50
+ - !ruby/object:Gem::Dependency
51
+ name: haml
52
+ requirement: &2156210140 !ruby/object:Gem::Requirement
55
53
  none: false
56
- requirements:
57
- - - ">="
58
- - !ruby/object:Gem::Version
54
+ requirements:
55
+ - - ! '>='
56
+ - !ruby/object:Gem::Version
59
57
  version: 3.1.0
60
58
  type: :development
61
- version_requirements: *id004
62
- - !ruby/object:Gem::Dependency
63
- name: sass
64
59
  prerelease: false
65
- requirement: &id005 !ruby/object:Gem::Requirement
60
+ version_requirements: *2156210140
61
+ - !ruby/object:Gem::Dependency
62
+ name: sass
63
+ requirement: &2156209660 !ruby/object:Gem::Requirement
66
64
  none: false
67
- requirements:
68
- - - ">="
69
- - !ruby/object:Gem::Version
65
+ requirements:
66
+ - - ! '>='
67
+ - !ruby/object:Gem::Version
70
68
  version: 3.1.0
71
69
  type: :development
72
- version_requirements: *id005
73
- - !ruby/object:Gem::Dependency
74
- name: minitest
75
70
  prerelease: false
76
- requirement: &id006 !ruby/object:Gem::Requirement
71
+ version_requirements: *2156209660
72
+ - !ruby/object:Gem::Dependency
73
+ name: minitest
74
+ requirement: &2156209180 !ruby/object:Gem::Requirement
77
75
  none: false
78
- requirements:
79
- - - ">="
80
- - !ruby/object:Gem::Version
81
- version: "0"
76
+ requirements:
77
+ - - ! '>='
78
+ - !ruby/object:Gem::Version
79
+ version: '0'
82
80
  type: :development
83
- version_requirements: *id006
84
- - !ruby/object:Gem::Dependency
85
- name: rcov
86
81
  prerelease: false
87
- requirement: &id007 !ruby/object:Gem::Requirement
82
+ version_requirements: *2156209180
83
+ - !ruby/object:Gem::Dependency
84
+ name: rcov
85
+ requirement: &2156208700 !ruby/object:Gem::Requirement
88
86
  none: false
89
- requirements:
90
- - - ">="
91
- - !ruby/object:Gem::Version
92
- version: "0"
87
+ requirements:
88
+ - - ! '>='
89
+ - !ruby/object:Gem::Version
90
+ version: '0'
93
91
  type: :development
94
- version_requirements: *id007
95
- - !ruby/object:Gem::Dependency
96
- name: rdiscount
97
92
  prerelease: false
98
- requirement: &id008 !ruby/object:Gem::Requirement
93
+ version_requirements: *2156208700
94
+ - !ruby/object:Gem::Dependency
95
+ name: rdiscount
96
+ requirement: &2156208220 !ruby/object:Gem::Requirement
99
97
  none: false
100
- requirements:
101
- - - ">="
102
- - !ruby/object:Gem::Version
103
- version: "0"
98
+ requirements:
99
+ - - ! '>='
100
+ - !ruby/object:Gem::Version
101
+ version: '0'
104
102
  type: :development
105
- version_requirements: *id008
106
- - !ruby/object:Gem::Dependency
107
- name: liquid
108
103
  prerelease: false
109
- requirement: &id009 !ruby/object:Gem::Requirement
104
+ version_requirements: *2156208220
105
+ - !ruby/object:Gem::Dependency
106
+ name: liquid
107
+ requirement: &2156207740 !ruby/object:Gem::Requirement
110
108
  none: false
111
- requirements:
112
- - - ">="
113
- - !ruby/object:Gem::Version
114
- version: "0"
109
+ requirements:
110
+ - - ! '>='
111
+ - !ruby/object:Gem::Version
112
+ version: '0'
115
113
  type: :development
116
- version_requirements: *id009
117
- - !ruby/object:Gem::Dependency
118
- name: yard
119
114
  prerelease: false
120
- requirement: &id010 !ruby/object:Gem::Requirement
115
+ version_requirements: *2156207740
116
+ - !ruby/object:Gem::Dependency
117
+ name: yard
118
+ requirement: &2156207260 !ruby/object:Gem::Requirement
121
119
  none: false
122
- requirements:
123
- - - ">="
124
- - !ruby/object:Gem::Version
125
- version: "0"
120
+ requirements:
121
+ - - ! '>='
122
+ - !ruby/object:Gem::Version
123
+ version: '0'
126
124
  type: :development
127
- version_requirements: *id010
128
- - !ruby/object:Gem::Dependency
129
- name: creole
130
125
  prerelease: false
131
- requirement: &id011 !ruby/object:Gem::Requirement
126
+ version_requirements: *2156207260
127
+ - !ruby/object:Gem::Dependency
128
+ name: creole
129
+ requirement: &2156206780 !ruby/object:Gem::Requirement
132
130
  none: false
133
- requirements:
134
- - - ">="
135
- - !ruby/object:Gem::Version
136
- version: "0"
131
+ requirements:
132
+ - - ! '>='
133
+ - !ruby/object:Gem::Version
134
+ version: '0'
137
135
  type: :development
138
- version_requirements: *id011
139
- description: Slim is a template language whose goal is reduce the syntax to the essential parts without becoming cryptic.
140
- email:
136
+ prerelease: false
137
+ version_requirements: *2156206780
138
+ description: Slim is a template language whose goal is reduce the syntax to the essential
139
+ parts without becoming cryptic.
140
+ email:
141
141
  - andy@stonean.com
142
142
  - ifredwu@gmail.com
143
143
  - mail@daniel-mendler.de
144
- executables:
144
+ executables:
145
145
  - slimrb
146
146
  extensions: []
147
-
148
- extra_rdoc_files:
147
+ extra_rdoc_files:
149
148
  - README.md
150
- files:
149
+ files:
151
150
  - .gemtest
152
151
  - .gitignore
153
152
  - .yardopts
@@ -174,7 +173,6 @@ files:
174
173
  - lib/slim/grammar.rb
175
174
  - lib/slim/interpolation.rb
176
175
  - lib/slim/parser.rb
177
- - lib/slim/rails.rb
178
176
  - lib/slim/sections.rb
179
177
  - lib/slim/template.rb
180
178
  - lib/slim/version.rb
@@ -237,33 +235,31 @@ files:
237
235
  - test/slim/test_slim_template.rb
238
236
  - test/slim/test_text_interpolation.rb
239
237
  - test/slim/test_wrapper.rb
238
+ - test_ruby_errors.rb
240
239
  has_rdoc: true
241
240
  homepage: http://github.com/stonean/slim
242
241
  licenses: []
243
-
244
242
  post_install_message:
245
- rdoc_options:
243
+ rdoc_options:
246
244
  - --charset=UTF-8
247
- require_paths:
245
+ require_paths:
248
246
  - lib
249
- required_ruby_version: !ruby/object:Gem::Requirement
247
+ required_ruby_version: !ruby/object:Gem::Requirement
250
248
  none: false
251
- requirements:
252
- - - ">="
253
- - !ruby/object:Gem::Version
254
- version: "0"
255
- required_rubygems_version: !ruby/object:Gem::Requirement
249
+ requirements:
250
+ - - ! '>='
251
+ - !ruby/object:Gem::Version
252
+ version: '0'
253
+ required_rubygems_version: !ruby/object:Gem::Requirement
256
254
  none: false
257
- requirements:
258
- - - ">="
259
- - !ruby/object:Gem::Version
260
- version: "0"
255
+ requirements:
256
+ - - ! '>='
257
+ - !ruby/object:Gem::Version
258
+ version: '0'
261
259
  requirements: []
262
-
263
260
  rubyforge_project: slim
264
261
  rubygems_version: 1.6.2
265
262
  signing_key:
266
263
  specification_version: 3
267
264
  summary: Slim is a template language.
268
265
  test_files: []
269
-
data/lib/slim/rails.rb DELETED
@@ -1,3 +0,0 @@
1
- # TODO: I would say we remove when we reach 1.0
2
- require 'slim'
3
- puts 'Deprecated: Use `require \'slim\'` instead of `require \'slim/rails\'`'