faml 0.7.0 → 0.7.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: fbb7777d09caaf6c398326ad22eb8f86a6fb4f2b
4
- data.tar.gz: f5ce8d0e1e6f7a0d43e1e153bdf47f2905e147a1
3
+ metadata.gz: c75f4eb1e20a0f8b34c9727c3bc6f71dfa968ffe
4
+ data.tar.gz: a488b7a8c9786cbd0da1c23a2631ab00b3001324
5
5
  SHA512:
6
- metadata.gz: 963b5897db86f1fdb168725f38194b5a29ffc5d40b5d4ebae219b19bd4bc7c7b82fd06b1ca23c7636917c71a8a9407c415fcf695505e0b0bb4e3b5ebf1dc9a1b
7
- data.tar.gz: 41b0e8980767ae9fad3dcec64dbda59dfbb8a2d40bad2cf3c7545072ac2168bad850511f89c7ce904c6fcfb98765f4a452147d0c4346b88c7354dd2b744dd0d1
6
+ metadata.gz: 5ffad9305eba0e7af43647e43d79b5ba67074a3657414d0a19ac361b1954b155c022e01d4c26a876eec740a0498c9db0184cc71db90c6d0679fbcc7555793208
7
+ data.tar.gz: f8a2342f8a888fe2293187ea532b03e0c2bef59fbe58c88acec5f80ae6dcef2c2e996db23b0018c69f3d4114cee8b1a547ff1d796bb62e49a817a8ce2fb11de7
@@ -13,6 +13,8 @@ gemfile:
13
13
  branches:
14
14
  only:
15
15
  - master
16
+ before_script:
17
+ - ruby -e 'puts RbConfig::CONFIG.map { |k, v| "#{k}=#{v}" }.sort'
16
18
  after_script:
17
19
  - bundle exec rake benchmark
18
20
  matrix:
@@ -1,3 +1,6 @@
1
+ ## 0.7.1 (2015-12-04)
2
+ - Fix compiler options for old compilers
3
+
1
4
  ## 0.7.0 (2015-11-30)
2
5
  - Rewrite AttributeBuilder in C++
3
6
  - It improves performance, memory usage, and readability
@@ -2,7 +2,7 @@
2
2
  require 'mkmf'
3
3
 
4
4
  $CFLAGS << ' -Wall -W'
5
- $CXXFLAGS << ' -Wall -W -std=c++03'
5
+ $CXXFLAGS << ' -Wall -W -std=c++98'
6
6
  houdini_dir = File.expand_path('../../vendor/houdini', __dir__)
7
7
  $INCFLAGS << " -I#{houdini_dir}"
8
8
 
@@ -38,6 +38,6 @@ Gem::Specification.new do |spec|
38
38
  spec.add_development_dependency 'rspec', '>= 3.3'
39
39
  spec.add_development_dependency 'rubocop'
40
40
  spec.add_development_dependency 'sass'
41
- spec.add_development_dependency 'simplecov'
41
+ spec.add_development_dependency 'simplecov', '>= 0.9.0'
42
42
  spec.add_development_dependency 'slim' # for benchmark
43
43
  end
@@ -1,14 +1,13 @@
1
1
  # Incompatibilities
2
2
  ## Versions
3
3
  - Haml 4.1.0.beta.1
4
- - Faml 0.7.0
5
- - Hamlit 1.7.2
4
+ - Faml 0.7.1
5
+ - Hamlit 2.0.1
6
6
 
7
7
  ## Table of contents
8
8
  - [spec/compiler_newline_spec.md](spec/compiler_newline_spec.md)
9
9
  - [spec/render/array_attribute_spec.md](spec/render/array_attribute_spec.md)
10
10
  - [spec/render/attribute_spec.md](spec/render/attribute_spec.md)
11
- - [spec/render/comment_spec.md](spec/render/comment_spec.md) (Hamlit's incompatibility)
12
11
  - [spec/render/doctype_spec.md](spec/render/doctype_spec.md)
13
12
  - [spec/render/element_spec.md](spec/render/element_spec.md)
14
13
  - [spec/render/filters/cdata_spec.md](spec/render/filters/cdata_spec.md) (Hamlit's incompatibility)
@@ -20,9 +19,5 @@
20
19
  - [spec/render/filters/preserve_spec.md](spec/render/filters/preserve_spec.md) (Hamlit's incompatibility)
21
20
  - [spec/render/hash_attribute_spec.md](spec/render/hash_attribute_spec.md)
22
21
  - [spec/render/helpers_spec.md](spec/render/helpers_spec.md) (Hamlit's incompatibility)
23
- - [spec/render/multiline_spec.md](spec/render/multiline_spec.md) (Hamlit's incompatibility)
24
- - [spec/render/newline_spec.md](spec/render/newline_spec.md) (Hamlit's incompatibility)
25
- - [spec/render/plain_spec.md](spec/render/plain_spec.md) (Hamlit's incompatibility)
26
- - [spec/render/sanitize_spec.md](spec/render/sanitize_spec.md) (Hamlit's incompatibility)
27
22
  - [spec/render/silent_script_spec.md](spec/render/silent_script_spec.md)
28
23
  - [spec/render/unescape_spec.md](spec/render/unescape_spec.md)
@@ -15,17 +15,10 @@
15
15
 
16
16
  ```
17
17
 
18
- ## Haml
18
+ ## Haml, Hamlit
19
19
  ```html
20
20
  1 1 1
21
21
  <span>4</span>
22
22
 
23
23
  ```
24
24
 
25
- ## Hamlit
26
- ```html
27
- 1 1 1
28
- <span>2</span>
29
-
30
- ```
31
-
@@ -1,80 +1,3 @@
1
- # [./spec/render/array_attribute_spec.rb:15](../../../spec/render/array_attribute_spec.rb#L15)
2
- ## Input
3
- ```haml
4
- - h1 = {class: 'c1', id: ['id1', 'id3']}
5
- - h2 = {class: [{}, 'c2'], id: 'id2'}
6
- %span#main.content{h1, h2} hello
7
-
8
- ```
9
-
10
- ## Faml, Haml
11
- ```html
12
- <span class='c1 c2 content {}' id='main_id1_id3_id2'>hello</span>
13
-
14
- ```
15
-
16
- ## Hamlit
17
- ```html
18
- <span class='c1 content c2 {}' id='main_id1_id3_id2'>hello</span>
19
-
20
- ```
21
-
22
- # [./spec/render/array_attribute_spec.rb:23](../../../spec/render/array_attribute_spec.rb#L23)
23
- ## Input
24
- ```haml
25
- %span.foo{class: "foo bar"}
26
- ```
27
-
28
- ## Faml, Haml
29
- ```html
30
- <span class='bar foo'></span>
31
-
32
- ```
33
-
34
- ## Hamlit
35
- ```html
36
- <span class='foo bar foo'></span>
37
-
38
- ```
39
-
40
- # [./spec/render/array_attribute_spec.rb:23](../../../spec/render/array_attribute_spec.rb#L23)
41
- ## Input
42
- ```haml
43
- - v = "foo bar"
44
- %span.foo{class: v}
45
- ```
46
-
47
- ## Faml, Haml
48
- ```html
49
- <span class='bar foo'></span>
50
-
51
- ```
52
-
53
- ## Hamlit
54
- ```html
55
- <span class='foo foo bar'></span>
56
-
57
- ```
58
-
59
- # [./spec/render/array_attribute_spec.rb:23](../../../spec/render/array_attribute_spec.rb#L23)
60
- ## Input
61
- ```haml
62
- - h = {class: "foo bar"}
63
- %span.foo{h}
64
- ```
65
-
66
- ## Faml, Haml
67
- ```html
68
- <span class='bar foo'></span>
69
-
70
- ```
71
-
72
- ## Hamlit
73
- ```html
74
- <span class='foo foo bar'></span>
75
-
76
- ```
77
-
78
1
  # [./spec/render/array_attribute_spec.rb:35](../../../spec/render/array_attribute_spec.rb#L35)
79
2
  ## Input
80
3
  ```haml
@@ -131,62 +54,6 @@
131
54
 
132
55
  ```
133
56
 
134
- # [./spec/render/array_attribute_spec.rb:41](../../../spec/render/array_attribute_spec.rb#L41)
135
- ## Input
136
- ```haml
137
- %span{class: [1, nil, false, true]}
138
- ```
139
-
140
- ## Faml, Haml
141
- ```html
142
- <span class='1 true'></span>
143
-
144
- ```
145
-
146
- ## Hamlit
147
- ```html
148
- <span class='1 false true'></span>
149
-
150
- ```
151
-
152
- # [./spec/render/array_attribute_spec.rb:41](../../../spec/render/array_attribute_spec.rb#L41)
153
- ## Input
154
- ```haml
155
- - v = [1, nil, false, true]
156
- %span{class: v}
157
- ```
158
-
159
- ## Faml, Haml
160
- ```html
161
- <span class='1 true'></span>
162
-
163
- ```
164
-
165
- ## Hamlit
166
- ```html
167
- <span class='1 false true'></span>
168
-
169
- ```
170
-
171
- # [./spec/render/array_attribute_spec.rb:41](../../../spec/render/array_attribute_spec.rb#L41)
172
- ## Input
173
- ```haml
174
- - h = {class: [1, nil, false, true]}
175
- %span{h}
176
- ```
177
-
178
- ## Faml, Haml
179
- ```html
180
- <span class='1 true'></span>
181
-
182
- ```
183
-
184
- ## Hamlit
185
- ```html
186
- <span class='1 false true'></span>
187
-
188
- ```
189
-
190
57
  # [./spec/render/array_attribute_spec.rb:61](../../../spec/render/array_attribute_spec.rb#L61)
191
58
  ## Input
192
59
  ```haml
@@ -243,59 +110,3 @@
243
110
 
244
111
  ```
245
112
 
246
- # [./spec/render/array_attribute_spec.rb:67](../../../spec/render/array_attribute_spec.rb#L67)
247
- ## Input
248
- ```haml
249
- %span{id: [1, nil, false, true]}
250
- ```
251
-
252
- ## Faml, Haml
253
- ```html
254
- <span id='1_true'></span>
255
-
256
- ```
257
-
258
- ## Hamlit
259
- ```html
260
- <span id='1__false_true'></span>
261
-
262
- ```
263
-
264
- # [./spec/render/array_attribute_spec.rb:67](../../../spec/render/array_attribute_spec.rb#L67)
265
- ## Input
266
- ```haml
267
- - v = [1, nil, false, true]
268
- %span{id: v}
269
- ```
270
-
271
- ## Faml, Haml
272
- ```html
273
- <span id='1_true'></span>
274
-
275
- ```
276
-
277
- ## Hamlit
278
- ```html
279
- <span id='1__false_true'></span>
280
-
281
- ```
282
-
283
- # [./spec/render/array_attribute_spec.rb:67](../../../spec/render/array_attribute_spec.rb#L67)
284
- ## Input
285
- ```haml
286
- - h = {id: [1, nil, false, true]}
287
- %span{h}
288
- ```
289
-
290
- ## Faml, Haml
291
- ```html
292
- <span id='1_true'></span>
293
-
294
- ```
295
-
296
- ## Hamlit
297
- ```html
298
- <span id='1__false_true'></span>
299
-
300
- ```
301
-
@@ -15,26 +15,7 @@
15
15
 
16
16
  ## Hamlit
17
17
  ```html
18
- <a foo='should be overwritten'></a>
19
-
20
- ```
21
-
22
- # [./spec/render/attribute_spec.rb:52](../../../spec/render/attribute_spec.rb#L52)
23
- ## Input
24
- ```haml
25
- - h = {foo: 1, 'foo' => 2}
26
- %span{h}
27
- ```
28
-
29
- ## Faml, Haml
30
- ```html
31
- <span foo='2'></span>
32
-
33
- ```
34
-
35
- ## Hamlit
36
- ```html
37
- <span foo='1' foo='2'></span>
18
+ <a foo=''></a>
38
19
 
39
20
  ```
40
21
 
@@ -97,8 +78,7 @@
97
78
  # [./spec/render/attribute_spec.rb:75](../../../spec/render/attribute_spec.rb#L75)
98
79
  ## Input (with options={:format=>:xhtml})
99
80
  ```haml
100
- - v = true
101
- %span{foo: v}hello
81
+ %span{foo: true}hello
102
82
  ```
103
83
 
104
84
  ## Faml, Haml
@@ -116,8 +96,8 @@
116
96
  # [./spec/render/attribute_spec.rb:75](../../../spec/render/attribute_spec.rb#L75)
117
97
  ## Input (with options={:format=>:xhtml})
118
98
  ```haml
119
- - h = {foo: true}
120
- %span{h}hello
99
+ - v = true
100
+ %span{foo: v}hello
121
101
  ```
122
102
 
123
103
  ## Faml, Haml
@@ -128,45 +108,26 @@
128
108
 
129
109
  ## Hamlit
130
110
  ```html
131
- <span foo>hello</span>
132
-
133
- ```
134
-
135
- # [./spec/render/attribute_spec.rb:89](../../../spec/render/attribute_spec.rb#L89)
136
- ## Input
137
- ```haml
138
- %span{b: __LINE__,
139
- a: __LINE__}
140
-
141
- ```
142
-
143
- ## Faml, Haml
144
- ```html
145
- <span a='2' b='1'></span>
146
-
147
- ```
148
-
149
- ## Hamlit
150
- ```html
151
- <span a='1' b='1'></span>
111
+ <span foo='true'>hello</span>
152
112
 
153
113
  ```
154
114
 
155
- # [./spec/render/attribute_spec.rb:96](../../../spec/render/attribute_spec.rb#L96)
156
- ## Input
115
+ # [./spec/render/attribute_spec.rb:75](../../../spec/render/attribute_spec.rb#L75)
116
+ ## Input (with options={:format=>:xhtml})
157
117
  ```haml
158
- %span{"foo\0bar" => "hello"}
118
+ - h = {foo: true}
119
+ %span{h}hello
159
120
  ```
160
121
 
161
122
  ## Faml, Haml
162
123
  ```html
163
- <span foo<0x00>bar='hello'></span>
124
+ <span foo='foo'>hello</span>
164
125
 
165
126
  ```
166
127
 
167
128
  ## Hamlit
168
129
  ```html
169
- <span foo\0bar='hello'></span>
130
+ <span foo='true'>hello</span>
170
131
 
171
132
  ```
172
133
 
@@ -190,64 +151,6 @@
190
151
 
191
152
  ```
192
153
 
193
- # [./spec/render/attribute_spec.rb:96](../../../spec/render/attribute_spec.rb#L96)
194
- ## Input
195
- ```haml
196
- - key = "foo\0bar"
197
- - val = "hello"
198
- %span{key => val}
199
-
200
- ```
201
-
202
- ## Faml, Haml
203
- ```html
204
- <span foo<0x00>bar='hello'></span>
205
-
206
- ```
207
-
208
- ## Hamlit (Error)
209
- ```html
210
- (eval):3: syntax error, unexpected =>
211
- ...::Temple::Utils.escape_html((=> val))); _buf << ("'></span>\...
212
- ... ^
213
- ```
214
-
215
- # [./spec/render/attribute_spec.rb:110](../../../spec/render/attribute_spec.rb#L110)
216
- ## Input
217
- ```haml
218
- %span[Faml::TestStruct.new(123)] hello
219
- ```
220
-
221
- ## Faml, Haml
222
- ```html
223
- <span class='faml_test_struct' id='faml_test_struct_123'>hello</span>
224
-
225
- ```
226
-
227
- ## Hamlit
228
- ```html
229
- <span>[Faml::TestStruct.new(123)] hello</span>
230
-
231
- ```
232
-
233
- # [./spec/render/attribute_spec.rb:114](../../../spec/render/attribute_spec.rb#L114)
234
- ## Input
235
- ```haml
236
- %span[Faml::TestStruct.new(123), :hello] hello
237
- ```
238
-
239
- ## Faml, Haml
240
- ```html
241
- <span class='hello_faml_test_struct' id='hello_faml_test_struct_123'>hello</span>
242
-
243
- ```
244
-
245
- ## Hamlit
246
- ```html
247
- <span>[Faml::TestStruct.new(123), :hello] hello</span>
248
-
249
- ```
250
-
251
154
  # [./spec/render/attribute_spec.rb:118](../../../spec/render/attribute_spec.rb#L118)
252
155
  ## Input
253
156
  ```haml
@@ -262,155 +165,7 @@
262
165
 
263
166
  ## Hamlit
264
167
  ```html
265
- <span>[Faml::TestRefStruct.new(123)] hello</span>
266
-
267
- ```
268
-
269
- # [./spec/render/attribute_spec.rb:122](../../../spec/render/attribute_spec.rb#L122)
270
- ## Input
271
- ```haml
272
- %span#baz[Faml::TestStruct.new(123)]{id: "foo"} hello
273
- ```
274
-
275
- ## Faml, Haml
276
- ```html
277
- <span class='faml_test_struct' id='baz_foo_faml_test_struct_123'>hello</span>
278
-
279
- ```
280
-
281
- ## Hamlit
282
- ```html
283
- <span id='baz'>[Faml::TestStruct.new(123)]{id: "foo"} hello</span>
284
-
285
- ```
286
-
287
- # [./spec/render/attribute_spec.rb:128](../../../spec/render/attribute_spec.rb#L128)
288
- ## Input
289
- ```haml
290
- %span{foo: 1}(foo=2)
291
- ```
292
-
293
- ## Faml, Haml
294
- ```html
295
- <span foo='1'></span>
296
-
297
- ```
298
-
299
- ## Hamlit
300
- ```html
301
- <span foo='1' foo='2'></span>
302
-
303
- ```
304
-
305
- # [./spec/render/attribute_spec.rb:128](../../../spec/render/attribute_spec.rb#L128)
306
- ## Input
307
- ```haml
308
- %span(foo=2){foo: 1}
309
- ```
310
-
311
- ## Faml, Haml
312
- ```html
313
- <span foo='1'></span>
314
-
315
- ```
316
-
317
- ## Hamlit
318
- ```html
319
- <span foo='2' foo='1'></span>
320
-
321
- ```
322
-
323
- # [./spec/render/attribute_spec.rb:128](../../../spec/render/attribute_spec.rb#L128)
324
- ## Input
325
- ```haml
326
- - v = 2
327
- %span{foo: v-1}(foo=v)
328
- ```
329
-
330
- ## Faml, Haml
331
- ```html
332
- <span foo='1'></span>
333
-
334
- ```
335
-
336
- ## Hamlit
337
- ```html
338
- <span foo='1' foo='2'></span>
339
-
340
- ```
341
-
342
- # [./spec/render/attribute_spec.rb:128](../../../spec/render/attribute_spec.rb#L128)
343
- ## Input
344
- ```haml
345
- - v = 2
346
- %span(foo=v){foo: v-1}
347
- ```
348
-
349
- ## Faml, Haml
350
- ```html
351
- <span foo='1'></span>
352
-
353
- ```
354
-
355
- ## Hamlit
356
- ```html
357
- <span foo='2' foo='1'></span>
358
-
359
- ```
360
-
361
- # [./spec/render/attribute_spec.rb:128](../../../spec/render/attribute_spec.rb#L128)
362
- ## Input
363
- ```haml
364
- - h = {foo: 1}
365
- %span{h}(foo=2)
366
- ```
367
-
368
- ## Faml, Haml
369
- ```html
370
- <span foo='1'></span>
371
-
372
- ```
373
-
374
- ## Hamlit
375
- ```html
376
- <span foo='1' foo='2'></span>
377
-
378
- ```
379
-
380
- # [./spec/render/attribute_spec.rb:128](../../../spec/render/attribute_spec.rb#L128)
381
- ## Input
382
- ```haml
383
- - h = {foo: 1}
384
- %span(foo=2){h}
385
- ```
386
-
387
- ## Faml, Haml
388
- ```html
389
- <span foo='1'></span>
390
-
391
- ```
392
-
393
- ## Hamlit
394
- ```html
395
- <span foo='1' foo='2'></span>
396
-
397
- ```
398
-
399
- # [./spec/render/attribute_spec.rb:147](../../../spec/render/attribute_spec.rb#L147)
400
- ## Input
401
- ```haml
402
- %span{id: 1}(id=2)
403
- ```
404
-
405
- ## Faml, Haml
406
- ```html
407
- <span id='2_1'></span>
408
-
409
- ```
410
-
411
- ## Hamlit
412
- ```html
413
- <span id='1_2'></span>
168
+ <span class='faml_test_ref_struct' id='faml_test_ref_struct_123'>hello</span>
414
169
 
415
170
  ```
416
171
 
@@ -10,13 +10,8 @@
10
10
 
11
11
  ```
12
12
 
13
- ## Haml
13
+ ## Haml, Hamlit
14
14
  ```html
15
15
 
16
16
  ```
17
17
 
18
- ## Hamlit (Error)
19
- ```html
20
- Invalid xml directive in html mode
21
- ```
22
-
@@ -7,7 +7,7 @@
7
7
 
8
8
  ```
9
9
 
10
- ## Faml
10
+ ## Faml, Hamlit
11
11
  ```html
12
12
  <span>
13
13
  hello <span> &lt;/span&gt; </span>
@@ -15,7 +15,7 @@ hello <span> &lt;/span&gt; </span>
15
15
 
16
16
  ```
17
17
 
18
- ## Haml, Hamlit
18
+ ## Haml
19
19
  ```html
20
20
  <span>
21
21
  hello <span> #@var </span>
@@ -20,6 +20,6 @@
20
20
 
21
21
  ## Hamlit (Error)
22
22
  ```html
23
- Filter "cdata" is not defined.
23
+ uninitialized constant Hamlit::Compiler::Error
24
24
  ```
25
25
 
@@ -29,7 +29,7 @@
29
29
  ```html
30
30
  <div>
31
31
  <style>
32
-
32
+
33
33
  </style>
34
34
  <span>hello</span>
35
35
  </div>
@@ -29,7 +29,7 @@
29
29
  ```html
30
30
  <div>
31
31
  <script>
32
-
32
+
33
33
  </script>
34
34
  <span>world</span>
35
35
  </div>
@@ -1,3 +1,27 @@
1
+ # [./spec/render/filters/markdown_spec.rb:5](../../../../spec/render/filters/markdown_spec.rb#L5)
2
+ ## Input
3
+ ```haml
4
+ :markdown
5
+ # hello
6
+ world
7
+
8
+ ```
9
+
10
+ ## Faml, Haml
11
+ ```html
12
+ <h1>hello</h1>
13
+ world
14
+
15
+ ```
16
+
17
+ ## Hamlit
18
+ ```html
19
+ <h1>hello</h1>
20
+
21
+ world
22
+
23
+ ```
24
+
1
25
  # [./spec/render/filters/markdown_spec.rb:13](../../../../spec/render/filters/markdown_spec.rb#L13)
2
26
  ## Input
3
27
  ```haml
@@ -7,14 +31,14 @@ world
7
31
 
8
32
  ```
9
33
 
10
- ## Faml, Hamlit
34
+ ## Faml
11
35
  ```html
12
36
  <h1>hello</h1>
13
37
  world
14
38
 
15
39
  ```
16
40
 
17
- ## Haml
41
+ ## Haml, Hamlit
18
42
  ```html
19
43
  <h1>hello</h1>
20
44
 
@@ -21,9 +21,34 @@ hello&#x000A; <p>wor&#x000A;ld</p>&#x000A;<span>hello</span>
21
21
  ## Hamlit
22
22
  ```html
23
23
  <span>start</span>
24
- hello&#x000A; &lt;p&gt;wor
25
- ld&lt;/p&gt;&#x000A;<span>hello</span>
24
+ hello&#x000A; <p>wor
25
+ ld</p>&#x000A;<span>hello</span>&#x000A;
26
26
  <span>end</span>
27
27
 
28
28
  ```
29
29
 
30
+ # [./spec/render/filters/preserve_spec.rb:16](../../../../spec/render/filters/preserve_spec.rb#L16)
31
+ ## Input
32
+ ```haml
33
+ :preserve
34
+ hello
35
+
36
+
37
+ %p
38
+
39
+ ```
40
+
41
+ ## Faml, Haml
42
+ ```html
43
+ hello&#x000A;&#x000A;
44
+ <p></p>
45
+
46
+ ```
47
+
48
+ ## Hamlit
49
+ ```html
50
+ hello&#x000A;
51
+ <p></p>
52
+
53
+ ```
54
+
@@ -4,13 +4,13 @@
4
4
  %span{foo: {bar: 1+2}} hello
5
5
  ```
6
6
 
7
- ## Faml
7
+ ## Faml, Hamlit
8
8
  ```html
9
9
  <span foo='{:bar=&gt;3}'>hello</span>
10
10
 
11
11
  ```
12
12
 
13
- ## Haml, Hamlit
13
+ ## Haml
14
14
  ```html
15
15
  <span foo-bar='3'>hello</span>
16
16
 
@@ -38,7 +38,7 @@
38
38
 
39
39
  ## Hamlit
40
40
  ```html
41
- <span foo='1' bar-hoge='fuga' baz>hello</span>
41
+ <span bar='{:hoge=&gt;:fuga}' baz='true' foo='1'>hello</span>
42
42
 
43
43
  ```
44
44
 
@@ -50,92 +50,15 @@
50
50
 
51
51
  ```
52
52
 
53
- ## Faml
53
+ ## Faml, Hamlit
54
54
  ```html
55
55
  <span foo='{:bar=&gt;&quot;x1y&quot;}'>hello</span>
56
56
 
57
57
  ```
58
58
 
59
- ## Haml, Hamlit
59
+ ## Haml
60
60
  ```html
61
61
  <span foo-bar='x1y'>hello</span>
62
62
 
63
63
  ```
64
64
 
65
- # [./spec/render/hash_attribute_spec.rb:37](../../../spec/render/hash_attribute_spec.rb#L37)
66
- ## Input
67
- ```haml
68
- %span{data: {foo: 1, bar: 'baz', :hoge => :fuga, k1: { k2: 'v3' }}} hello
69
- ```
70
-
71
- ## Faml, Haml
72
- ```html
73
- <span data-bar='baz' data-foo='1' data-hoge='fuga' data-k1-k2='v3'>hello</span>
74
-
75
- ```
76
-
77
- ## Hamlit
78
- ```html
79
- <span data-foo='1' data-bar='baz' data-hoge='fuga' data-k1-k2='v3'>hello</span>
80
-
81
- ```
82
-
83
- # [./spec/render/hash_attribute_spec.rb:45](../../../spec/render/hash_attribute_spec.rb#L45)
84
- ## Input
85
- ```haml
86
- %span{data: {foo: 1, bar: 2+3}} hello
87
- ```
88
-
89
- ## Faml, Haml
90
- ```html
91
- <span data-bar='5' data-foo='1'>hello</span>
92
-
93
- ```
94
-
95
- ## Hamlit
96
- ```html
97
- <span data-foo='1' data-bar='5'>hello</span>
98
-
99
- ```
100
-
101
- # [./spec/render/hash_attribute_spec.rb:49](../../../spec/render/hash_attribute_spec.rb#L49)
102
- ## Input
103
- ```haml
104
- - data = { foo: 1, bar: 2 }
105
- %span{data: data} hello
106
-
107
- ```
108
-
109
- ## Faml, Haml
110
- ```html
111
- <span data-bar='2' data-foo='1'>hello</span>
112
-
113
- ```
114
-
115
- ## Hamlit
116
- ```html
117
- <span data-foo='1' data-bar='2'>hello</span>
118
-
119
- ```
120
-
121
- # [./spec/render/hash_attribute_spec.rb:61](../../../spec/render/hash_attribute_spec.rb#L61)
122
- ## Input
123
- ```haml
124
- - h1 = { new: true }
125
- - h2 = { data: { old: true } }
126
- %a(data=h1){ h2 , data: { new: nil, old: false } }
127
-
128
- ```
129
-
130
- ## Faml, Haml
131
- ```html
132
- <a></a>
133
-
134
- ```
135
-
136
- ## Hamlit
137
- ```html
138
- <a data-old data='{:new=&gt;true}'></a>
139
-
140
- ```
141
-
@@ -12,6 +12,6 @@
12
12
 
13
13
  ## Hamlit (Error)
14
14
  ```html
15
- undefined method `preserve' for #<Object:0x000000047293c8>
15
+ undefined method `preserve' for #<Object:0x00000003f80248>
16
16
  ```
17
17
 
@@ -31,7 +31,9 @@
31
31
 
32
32
  ## Hamlit
33
33
  ```html
34
- !~ "<p>hello\n<pre>pre\nworld</pre></p>"
34
+ <p>hello
35
+ <pre>pre
36
+ world</pre></p>
35
37
 
36
38
  ```
37
39
 
@@ -50,7 +52,9 @@
50
52
 
51
53
  ## Hamlit
52
54
  ```html
53
- <span>~ "<p>hello\n<pre>pre\nworld</pre></p>"</span>
55
+ <span><p>hello
56
+ <pre>pre
57
+ world</pre></p></span>
54
58
 
55
59
  ```
56
60
 
@@ -1,4 +1,4 @@
1
1
  # frozen-string-literal: true
2
2
  module Faml
3
- VERSION = '0.7.0'
3
+ VERSION = '0.7.1'
4
4
  end
@@ -2,7 +2,7 @@
2
2
  require 'simplecov'
3
3
  require 'coveralls'
4
4
 
5
- SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
5
+ SimpleCov.formatters = [
6
6
  SimpleCov::Formatter::HTMLFormatter,
7
7
  Coveralls::SimpleCov::Formatter,
8
8
  ]
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: faml
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.7.0
4
+ version: 0.7.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Kohei Suzuki
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-11-29 00:00:00.000000000 Z
11
+ date: 2015-12-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: escape_utils
@@ -268,14 +268,14 @@ dependencies:
268
268
  requirements:
269
269
  - - ">="
270
270
  - !ruby/object:Gem::Version
271
- version: '0'
271
+ version: 0.9.0
272
272
  type: :development
273
273
  prerelease: false
274
274
  version_requirements: !ruby/object:Gem::Requirement
275
275
  requirements:
276
276
  - - ">="
277
277
  - !ruby/object:Gem::Version
278
- version: '0'
278
+ version: 0.9.0
279
279
  - !ruby/object:Gem::Dependency
280
280
  name: slim
281
281
  requirement: !ruby/object:Gem::Requirement
@@ -521,7 +521,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
521
521
  version: '0'
522
522
  requirements: []
523
523
  rubyforge_project:
524
- rubygems_version: 2.5.0
524
+ rubygems_version: 2.4.5.1
525
525
  signing_key:
526
526
  specification_version: 4
527
527
  summary: Faster implementation of Haml template language.