faml 0.2.1 → 0.2.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +5 -0
- data/lib/faml/compiler.rb +3 -7
- data/lib/faml/helpers.rb +14 -0
- data/lib/faml/static_hash_parser.rb +10 -2
- data/lib/faml/version.rb +1 -1
- data/spec/render/attribute_spec.rb +6 -0
- data/spec/render/helpers_spec.rb +7 -0
- metadata +43 -40
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 4e1c28fc0f0730f266beae5f8070b209473124a1
|
4
|
+
data.tar.gz: e72a6459d73522e5c3f0ac8a6b08b3cb5ace6a52
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 459e08b4aec76e233eb8d2e2daedd2657dfd0a8c5b3aefeef7f672052f7c466d7474ad254c733ca25b7ef1c413984993e0628355b67364c44bae78923a6bc670
|
7
|
+
data.tar.gz: 73173ad82ac2fd1fbc3cf6e69045eb3e259d5fa56b1532d4434a3fdb97544a952d6e5f83a80a2e4f5b546117c12a7c33d0c57f6715f0e16c8727e25b496a7a65
|
data/CHANGELOG.md
CHANGED
data/lib/faml/compiler.rb
CHANGED
@@ -2,6 +2,7 @@ require 'parser/current'
|
|
2
2
|
require 'temple'
|
3
3
|
require 'faml/ast'
|
4
4
|
require 'faml/filter_compilers'
|
5
|
+
require 'faml/helpers'
|
5
6
|
require 'faml/static_hash_parser'
|
6
7
|
require 'faml/text_compiler'
|
7
8
|
|
@@ -36,15 +37,10 @@ module Faml
|
|
36
37
|
re = /<(#{options[:preserve].map(&Regexp.method(:escape)).join('|')})([^>]*)>(.*?)(<\/\1>)/im
|
37
38
|
input.to_s.gsub(re) do |s|
|
38
39
|
s =~ re # Can't rely on $1, etc. existing since Rails' SafeBuffer#gsub is incompatible
|
39
|
-
"<#{$1}#{$2}>#{preserve($3)}</#{$1}>"
|
40
|
+
"<#{$1}#{$2}>#{Helpers.preserve($3)}</#{$1}>"
|
40
41
|
end
|
41
42
|
end
|
42
43
|
|
43
|
-
def self.preserve(input)
|
44
|
-
# Taken from the original haml code
|
45
|
-
input.to_s.chomp("\n").gsub(/\n/, '
').gsub(/\r/, '')
|
46
|
-
end
|
47
|
-
|
48
44
|
private
|
49
45
|
|
50
46
|
def compile(ast)
|
@@ -75,7 +71,7 @@ module Faml
|
|
75
71
|
end
|
76
72
|
|
77
73
|
def compile_root(ast)
|
78
|
-
[:multi].tap do |temple|
|
74
|
+
[:multi, [:code, 'extend ::Faml::Helpers']].tap do |temple|
|
79
75
|
compile_children(ast, temple)
|
80
76
|
end
|
81
77
|
end
|
data/lib/faml/helpers.rb
ADDED
@@ -0,0 +1,14 @@
|
|
1
|
+
module Faml
|
2
|
+
# Don't use these methods!
|
3
|
+
|
4
|
+
module Helpers
|
5
|
+
def self.preserve(input)
|
6
|
+
# Taken from the original haml code
|
7
|
+
input.to_s.chomp("\n").gsub(/\n/, '
').gsub(/\r/, '')
|
8
|
+
end
|
9
|
+
|
10
|
+
def preserve(input)
|
11
|
+
Helpers.preserve(input)
|
12
|
+
end
|
13
|
+
end
|
14
|
+
end
|
@@ -56,10 +56,18 @@ module Faml
|
|
56
56
|
end
|
57
57
|
end
|
58
58
|
|
59
|
+
def eval_symbol(code)
|
60
|
+
if code.start_with?(':')
|
61
|
+
eval(code)
|
62
|
+
else
|
63
|
+
code.to_sym
|
64
|
+
end
|
65
|
+
end
|
66
|
+
|
59
67
|
def try_static_key(node)
|
60
68
|
case node.type
|
61
69
|
when :sym
|
62
|
-
node.location.expression.source
|
70
|
+
eval_symbol(node.location.expression.source)
|
63
71
|
when :int, :float, :str
|
64
72
|
eval(node.location.expression.source)
|
65
73
|
end
|
@@ -68,7 +76,7 @@ module Faml
|
|
68
76
|
def try_static_value(key_static, node)
|
69
77
|
case node.type
|
70
78
|
when :sym
|
71
|
-
@static_attributes[key_static] = node.location.expression.source
|
79
|
+
@static_attributes[key_static] = eval_symbol(node.location.expression.source)
|
72
80
|
when :true, :false, :nil, :int, :float, :str
|
73
81
|
@static_attributes[key_static] = eval(node.location.expression.source)
|
74
82
|
when :dstr
|
data/lib/faml/version.rb
CHANGED
@@ -13,6 +13,12 @@ RSpec.describe 'Attributes rendering', type: :render do
|
|
13
13
|
expect(render_string('#{1 + 2}')).to eq("3\n")
|
14
14
|
end
|
15
15
|
|
16
|
+
it 'renders attributes with symbol literal' do
|
17
|
+
expect(render_string("%span{foo: 'baz'}")).to eq("<span foo='baz'></span>\n")
|
18
|
+
expect(render_string("%span{:foo => 'baz'}")).to eq("<span foo='baz'></span>\n")
|
19
|
+
expect(render_string("%span{:'foo-bar' => 'baz'}")).to eq("<span foo-bar='baz'></span>\n")
|
20
|
+
end
|
21
|
+
|
16
22
|
it 'renders dynamic attributes' do
|
17
23
|
expect(render_string(%q|%span#main{class: "na#{'ni'}ka"} hello|)).to eq(%Q{<span class='nanika' id='main'>hello</span>\n})
|
18
24
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: faml
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.2.
|
4
|
+
version: 0.2.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Kohei Suzuki
|
@@ -14,224 +14,224 @@ dependencies:
|
|
14
14
|
name: escape_utils
|
15
15
|
requirement: !ruby/object:Gem::Requirement
|
16
16
|
requirements:
|
17
|
-
- -
|
17
|
+
- - '>='
|
18
18
|
- !ruby/object:Gem::Version
|
19
19
|
version: '0'
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
|
-
- -
|
24
|
+
- - '>='
|
25
25
|
- !ruby/object:Gem::Version
|
26
26
|
version: '0'
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: parser
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
30
30
|
requirements:
|
31
|
-
- -
|
31
|
+
- - '>='
|
32
32
|
- !ruby/object:Gem::Version
|
33
33
|
version: '0'
|
34
34
|
type: :runtime
|
35
35
|
prerelease: false
|
36
36
|
version_requirements: !ruby/object:Gem::Requirement
|
37
37
|
requirements:
|
38
|
-
- -
|
38
|
+
- - '>='
|
39
39
|
- !ruby/object:Gem::Version
|
40
40
|
version: '0'
|
41
41
|
- !ruby/object:Gem::Dependency
|
42
42
|
name: temple
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
44
44
|
requirements:
|
45
|
-
- -
|
45
|
+
- - '>='
|
46
46
|
- !ruby/object:Gem::Version
|
47
47
|
version: '0'
|
48
48
|
type: :runtime
|
49
49
|
prerelease: false
|
50
50
|
version_requirements: !ruby/object:Gem::Requirement
|
51
51
|
requirements:
|
52
|
-
- -
|
52
|
+
- - '>='
|
53
53
|
- !ruby/object:Gem::Version
|
54
54
|
version: '0'
|
55
55
|
- !ruby/object:Gem::Dependency
|
56
56
|
name: tilt
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
58
58
|
requirements:
|
59
|
-
- -
|
59
|
+
- - '>='
|
60
60
|
- !ruby/object:Gem::Version
|
61
61
|
version: '0'
|
62
62
|
type: :runtime
|
63
63
|
prerelease: false
|
64
64
|
version_requirements: !ruby/object:Gem::Requirement
|
65
65
|
requirements:
|
66
|
-
- -
|
66
|
+
- - '>='
|
67
67
|
- !ruby/object:Gem::Version
|
68
68
|
version: '0'
|
69
69
|
- !ruby/object:Gem::Dependency
|
70
70
|
name: appraisal
|
71
71
|
requirement: !ruby/object:Gem::Requirement
|
72
72
|
requirements:
|
73
|
-
- -
|
73
|
+
- - '>='
|
74
74
|
- !ruby/object:Gem::Version
|
75
75
|
version: '0'
|
76
76
|
type: :development
|
77
77
|
prerelease: false
|
78
78
|
version_requirements: !ruby/object:Gem::Requirement
|
79
79
|
requirements:
|
80
|
-
- -
|
80
|
+
- - '>='
|
81
81
|
- !ruby/object:Gem::Version
|
82
82
|
version: '0'
|
83
83
|
- !ruby/object:Gem::Dependency
|
84
84
|
name: benchmark-ips
|
85
85
|
requirement: !ruby/object:Gem::Requirement
|
86
86
|
requirements:
|
87
|
-
- -
|
87
|
+
- - '>='
|
88
88
|
- !ruby/object:Gem::Version
|
89
89
|
version: '0'
|
90
90
|
type: :development
|
91
91
|
prerelease: false
|
92
92
|
version_requirements: !ruby/object:Gem::Requirement
|
93
93
|
requirements:
|
94
|
-
- -
|
94
|
+
- - '>='
|
95
95
|
- !ruby/object:Gem::Version
|
96
96
|
version: '0'
|
97
97
|
- !ruby/object:Gem::Dependency
|
98
98
|
name: bundler
|
99
99
|
requirement: !ruby/object:Gem::Requirement
|
100
100
|
requirements:
|
101
|
-
- -
|
101
|
+
- - '>='
|
102
102
|
- !ruby/object:Gem::Version
|
103
103
|
version: '0'
|
104
104
|
type: :development
|
105
105
|
prerelease: false
|
106
106
|
version_requirements: !ruby/object:Gem::Requirement
|
107
107
|
requirements:
|
108
|
-
- -
|
108
|
+
- - '>='
|
109
109
|
- !ruby/object:Gem::Version
|
110
110
|
version: '0'
|
111
111
|
- !ruby/object:Gem::Dependency
|
112
112
|
name: coffee-script
|
113
113
|
requirement: !ruby/object:Gem::Requirement
|
114
114
|
requirements:
|
115
|
-
- -
|
115
|
+
- - '>='
|
116
116
|
- !ruby/object:Gem::Version
|
117
117
|
version: '0'
|
118
118
|
type: :development
|
119
119
|
prerelease: false
|
120
120
|
version_requirements: !ruby/object:Gem::Requirement
|
121
121
|
requirements:
|
122
|
-
- -
|
122
|
+
- - '>='
|
123
123
|
- !ruby/object:Gem::Version
|
124
124
|
version: '0'
|
125
125
|
- !ruby/object:Gem::Dependency
|
126
126
|
name: coveralls
|
127
127
|
requirement: !ruby/object:Gem::Requirement
|
128
128
|
requirements:
|
129
|
-
- -
|
129
|
+
- - '>='
|
130
130
|
- !ruby/object:Gem::Version
|
131
131
|
version: '0'
|
132
132
|
type: :development
|
133
133
|
prerelease: false
|
134
134
|
version_requirements: !ruby/object:Gem::Requirement
|
135
135
|
requirements:
|
136
|
-
- -
|
136
|
+
- - '>='
|
137
137
|
- !ruby/object:Gem::Version
|
138
138
|
version: '0'
|
139
139
|
- !ruby/object:Gem::Dependency
|
140
140
|
name: haml
|
141
141
|
requirement: !ruby/object:Gem::Requirement
|
142
142
|
requirements:
|
143
|
-
- -
|
143
|
+
- - '>='
|
144
144
|
- !ruby/object:Gem::Version
|
145
145
|
version: '0'
|
146
146
|
type: :development
|
147
147
|
prerelease: false
|
148
148
|
version_requirements: !ruby/object:Gem::Requirement
|
149
149
|
requirements:
|
150
|
-
- -
|
150
|
+
- - '>='
|
151
151
|
- !ruby/object:Gem::Version
|
152
152
|
version: '0'
|
153
153
|
- !ruby/object:Gem::Dependency
|
154
154
|
name: rake
|
155
155
|
requirement: !ruby/object:Gem::Requirement
|
156
156
|
requirements:
|
157
|
-
- -
|
157
|
+
- - '>='
|
158
158
|
- !ruby/object:Gem::Version
|
159
159
|
version: '0'
|
160
160
|
type: :development
|
161
161
|
prerelease: false
|
162
162
|
version_requirements: !ruby/object:Gem::Requirement
|
163
163
|
requirements:
|
164
|
-
- -
|
164
|
+
- - '>='
|
165
165
|
- !ruby/object:Gem::Version
|
166
166
|
version: '0'
|
167
167
|
- !ruby/object:Gem::Dependency
|
168
168
|
name: rake-compiler
|
169
169
|
requirement: !ruby/object:Gem::Requirement
|
170
170
|
requirements:
|
171
|
-
- -
|
171
|
+
- - '>='
|
172
172
|
- !ruby/object:Gem::Version
|
173
173
|
version: '0'
|
174
174
|
type: :development
|
175
175
|
prerelease: false
|
176
176
|
version_requirements: !ruby/object:Gem::Requirement
|
177
177
|
requirements:
|
178
|
-
- -
|
178
|
+
- - '>='
|
179
179
|
- !ruby/object:Gem::Version
|
180
180
|
version: '0'
|
181
181
|
- !ruby/object:Gem::Dependency
|
182
182
|
name: redcarpet
|
183
183
|
requirement: !ruby/object:Gem::Requirement
|
184
184
|
requirements:
|
185
|
-
- -
|
185
|
+
- - '>='
|
186
186
|
- !ruby/object:Gem::Version
|
187
187
|
version: '0'
|
188
188
|
type: :development
|
189
189
|
prerelease: false
|
190
190
|
version_requirements: !ruby/object:Gem::Requirement
|
191
191
|
requirements:
|
192
|
-
- -
|
192
|
+
- - '>='
|
193
193
|
- !ruby/object:Gem::Version
|
194
194
|
version: '0'
|
195
195
|
- !ruby/object:Gem::Dependency
|
196
196
|
name: rspec
|
197
197
|
requirement: !ruby/object:Gem::Requirement
|
198
198
|
requirements:
|
199
|
-
- -
|
199
|
+
- - '>='
|
200
200
|
- !ruby/object:Gem::Version
|
201
201
|
version: '3'
|
202
202
|
type: :development
|
203
203
|
prerelease: false
|
204
204
|
version_requirements: !ruby/object:Gem::Requirement
|
205
205
|
requirements:
|
206
|
-
- -
|
206
|
+
- - '>='
|
207
207
|
- !ruby/object:Gem::Version
|
208
208
|
version: '3'
|
209
209
|
- !ruby/object:Gem::Dependency
|
210
210
|
name: sass
|
211
211
|
requirement: !ruby/object:Gem::Requirement
|
212
212
|
requirements:
|
213
|
-
- -
|
213
|
+
- - '>='
|
214
214
|
- !ruby/object:Gem::Version
|
215
215
|
version: '0'
|
216
216
|
type: :development
|
217
217
|
prerelease: false
|
218
218
|
version_requirements: !ruby/object:Gem::Requirement
|
219
219
|
requirements:
|
220
|
-
- -
|
220
|
+
- - '>='
|
221
221
|
- !ruby/object:Gem::Version
|
222
222
|
version: '0'
|
223
223
|
- !ruby/object:Gem::Dependency
|
224
224
|
name: simplecov
|
225
225
|
requirement: !ruby/object:Gem::Requirement
|
226
226
|
requirements:
|
227
|
-
- -
|
227
|
+
- - '>='
|
228
228
|
- !ruby/object:Gem::Version
|
229
229
|
version: '0'
|
230
230
|
type: :development
|
231
231
|
prerelease: false
|
232
232
|
version_requirements: !ruby/object:Gem::Requirement
|
233
233
|
requirements:
|
234
|
-
- -
|
234
|
+
- - '>='
|
235
235
|
- !ruby/object:Gem::Version
|
236
236
|
version: '0'
|
237
237
|
description: Faster implementation of Haml template language.
|
@@ -243,10 +243,10 @@ extensions:
|
|
243
243
|
- ext/attribute_builder/extconf.rb
|
244
244
|
extra_rdoc_files: []
|
245
245
|
files:
|
246
|
-
-
|
247
|
-
-
|
248
|
-
-
|
249
|
-
-
|
246
|
+
- .gitignore
|
247
|
+
- .gitmodules
|
248
|
+
- .rspec
|
249
|
+
- .travis.yml
|
250
250
|
- Appraisals
|
251
251
|
- CHANGELOG.md
|
252
252
|
- Gemfile
|
@@ -285,6 +285,7 @@ files:
|
|
285
285
|
- lib/faml/filter_compilers/scss.rb
|
286
286
|
- lib/faml/filter_compilers/tilt_base.rb
|
287
287
|
- lib/faml/filter_parser.rb
|
288
|
+
- lib/faml/helpers.rb
|
288
289
|
- lib/faml/html.rb
|
289
290
|
- lib/faml/indent_tracker.rb
|
290
291
|
- lib/faml/line_parser.rb
|
@@ -371,6 +372,7 @@ files:
|
|
371
372
|
- spec/render/filters/scss_spec.rb
|
372
373
|
- spec/render/filters_spec.rb
|
373
374
|
- spec/render/haml_comment_spec.rb
|
375
|
+
- spec/render/helpers_spec.rb
|
374
376
|
- spec/render/multiline_spec.rb
|
375
377
|
- spec/render/newline_spec.rb
|
376
378
|
- spec/render/plain_spec.rb
|
@@ -391,17 +393,17 @@ require_paths:
|
|
391
393
|
- lib
|
392
394
|
required_ruby_version: !ruby/object:Gem::Requirement
|
393
395
|
requirements:
|
394
|
-
- -
|
396
|
+
- - '>='
|
395
397
|
- !ruby/object:Gem::Version
|
396
398
|
version: '0'
|
397
399
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
398
400
|
requirements:
|
399
|
-
- -
|
401
|
+
- - '>='
|
400
402
|
- !ruby/object:Gem::Version
|
401
403
|
version: '0'
|
402
404
|
requirements: []
|
403
405
|
rubyforge_project:
|
404
|
-
rubygems_version: 2.
|
406
|
+
rubygems_version: 2.0.14
|
405
407
|
signing_key:
|
406
408
|
specification_version: 4
|
407
409
|
summary: Faster implementation of Haml template language.
|
@@ -477,6 +479,7 @@ test_files:
|
|
477
479
|
- spec/render/filters/scss_spec.rb
|
478
480
|
- spec/render/filters_spec.rb
|
479
481
|
- spec/render/haml_comment_spec.rb
|
482
|
+
- spec/render/helpers_spec.rb
|
480
483
|
- spec/render/multiline_spec.rb
|
481
484
|
- spec/render/newline_spec.rb
|
482
485
|
- spec/render/plain_spec.rb
|