markus 4.0.10 → 4.0.11
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/markus.rb +32 -30
- data/markus.gemspec +1 -1
- data/test/change.mt_ +1 -1
- data/test/change_include_common.mt_ +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 61a7c81d7d3fa8cc762d85264060c00867f3ba14
|
4
|
+
data.tar.gz: b2aad643efe380b28666b614dc4eb25f0e8fe649
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 8a35d5910a5570c831f275e7e8d59ec42eded484b5efae6e8fe0ee160edf5fdf71b92e8c80a1d216b4f553d27f9e3b887dc812b71ad75e4bbc3384b851cd231d
|
7
|
+
data.tar.gz: 73b80f9b9be6f43e442aeda89cf06951b24af39d871212856638925492295ea6e4d0872efe546da90700e2f8282869b26aea2af35a09ebe46ec4acf6744ff6c5
|
data/lib/markus.rb
CHANGED
@@ -29,10 +29,10 @@ class MarkUS
|
|
29
29
|
|
30
30
|
attr_reader :__markus_indent, :__markus_reload
|
31
31
|
def __markus_indent=(value) #{{{
|
32
|
-
self.class.__markus_indent = value == true ? true : false
|
32
|
+
self.class.__markus_indent = value == true ? true : false
|
33
33
|
end #}}}
|
34
34
|
def __markus_reload=(value) #{{{
|
35
|
-
self.class.__markus_reload = value == true ? true : false
|
35
|
+
self.class.__markus_reload = value == true ? true : false
|
36
36
|
end #}}}
|
37
37
|
|
38
38
|
def json_!(name,params={}) #{{{
|
@@ -59,7 +59,7 @@ class MarkUS
|
|
59
59
|
self.class.__markus_includes.each do |some|
|
60
60
|
if some.__markus_do_reload
|
61
61
|
self.class.__markus_templates.merge! some.__markus_templates
|
62
|
-
end
|
62
|
+
end
|
63
63
|
end
|
64
64
|
@__markus_mode = type
|
65
65
|
|
@@ -68,7 +68,7 @@ class MarkUS
|
|
68
68
|
self.class.__markus_indent ? @__markus_buffer.join("\n") : @__markus_buffer.join
|
69
69
|
end
|
70
70
|
#}}}
|
71
|
-
|
71
|
+
|
72
72
|
def element_!(name=nil, *args, &blk) #{{{
|
73
73
|
__markus_method_missing name, *args, &blk
|
74
74
|
end #}}}
|
@@ -81,7 +81,7 @@ class MarkUS
|
|
81
81
|
__markus_method_missing $1, *args, &blk
|
82
82
|
else
|
83
83
|
super
|
84
|
-
end
|
84
|
+
end
|
85
85
|
end #}}}
|
86
86
|
def __markus_method_missing(name,*args, &blk) #{{{ # :nodoc:
|
87
87
|
if @__markus_mode == :json
|
@@ -99,18 +99,20 @@ class MarkUS
|
|
99
99
|
attrs << " " + a.collect { |key,value|
|
100
100
|
value.nil? ? nil : "#{key}=\"#{value.to_s.gsub(/"/,""")}\""
|
101
101
|
}.compact.join(" ")
|
102
|
-
when String
|
102
|
+
when String
|
103
|
+
content = a.gsub(/\&(?!amp;|quot;|apos;|gt;|lt;)/,"&").gsub(/\"/,""").gsub(/>/,">").gsub(/</,"<").gsub(/'/,"'")
|
104
|
+
when Integer
|
103
105
|
content = a
|
104
|
-
end
|
106
|
+
end
|
105
107
|
end
|
106
108
|
attrs = '' if attrs == ' '
|
107
109
|
if block_given?
|
108
110
|
@__markus_level += 1
|
109
111
|
if self.class.__markus_indent
|
110
112
|
@__markus_buffer << "#{" " * @__markus_level}<#{tname}#{attrs}>"
|
111
|
-
else
|
113
|
+
else
|
112
114
|
@__markus_buffer << "<#{tname}#{attrs}>"
|
113
|
-
end
|
115
|
+
end
|
114
116
|
unless content.nil?
|
115
117
|
if self.class.__markus_indent
|
116
118
|
@__markus_buffer << "#{" " * (@__markus_level+1)}#{content}"
|
@@ -124,7 +126,7 @@ class MarkUS
|
|
124
126
|
@__markus_buffer << "#{" " * @__markus_level}</#{tname}>"
|
125
127
|
else
|
126
128
|
@__markus_buffer << "</#{tname}>"
|
127
|
-
end
|
129
|
+
end
|
128
130
|
@__markus_level -= 1
|
129
131
|
else
|
130
132
|
if @__markus_mode == :xml && content.nil?
|
@@ -135,12 +137,12 @@ class MarkUS
|
|
135
137
|
end
|
136
138
|
else
|
137
139
|
if self.class.__markus_indent
|
138
|
-
@__markus_buffer << "#{" " * (@__markus_level+1)}<#{tname}#{attrs}>#{content}</#{tname}>"
|
140
|
+
@__markus_buffer << "#{" " * (@__markus_level+1)}<#{tname}#{attrs}>#{content}</#{tname}>"
|
139
141
|
else
|
140
|
-
@__markus_buffer << "<#{tname}#{attrs}>#{content}</#{tname}>"
|
142
|
+
@__markus_buffer << "<#{tname}#{attrs}>#{content}</#{tname}>"
|
141
143
|
end
|
142
|
-
end
|
143
|
-
end
|
144
|
+
end
|
145
|
+
end
|
144
146
|
end #}}}
|
145
147
|
def __markus_json(tname,*args,&blk) #{{{ # :nodoc:
|
146
148
|
attrs = nil
|
@@ -173,7 +175,7 @@ class MarkUS
|
|
173
175
|
content = a
|
174
176
|
else
|
175
177
|
content = "\"#{a.to_s}\""
|
176
|
-
end
|
178
|
+
end
|
177
179
|
end
|
178
180
|
if blk
|
179
181
|
@__markus_level += 1
|
@@ -182,38 +184,38 @@ class MarkUS
|
|
182
184
|
@__markus_parent = nil
|
183
185
|
if self.class.__markus_indent
|
184
186
|
@__markus_buffer << "#{" " * @__markus_level}{"
|
185
|
-
else
|
187
|
+
else
|
186
188
|
@__markus_buffer << "{"
|
187
189
|
end
|
188
190
|
__markus_json tname, *args, &blk
|
189
191
|
@__markus_buffer.last.chomp!(',')
|
190
192
|
if self.class.__markus_indent
|
191
193
|
@__markus_buffer << "#{" " * @__markus_level}},"
|
192
|
-
else
|
194
|
+
else
|
193
195
|
@__markus_buffer << "},"
|
194
196
|
end
|
195
|
-
else
|
197
|
+
else
|
196
198
|
@__markus_parent = type = blk.parameters.length == 1 && blk.parameters[0][1] == :array ? :a : :h
|
197
199
|
if self.class.__markus_indent
|
198
200
|
@__markus_buffer << "#{" " * @__markus_level}#{tname.nil? ? '' : "\"#{tname}\": "}#{type == :a ? '[' : '{'}"
|
199
|
-
else
|
201
|
+
else
|
200
202
|
@__markus_buffer << "#{tname.nil? ? '' : "\"#{tname}\": "}#{type == :a ? '[' : '{'}"
|
201
203
|
end
|
202
204
|
|
203
205
|
c1 = @__markus_buffer.length
|
204
206
|
res = blk.call
|
205
207
|
c2 = @__markus_buffer.length
|
206
|
-
if c1 == c2
|
208
|
+
if c1 == c2
|
207
209
|
@__markus_buffer.last << "#{type == :a ? ']' : '}'},"
|
208
|
-
else
|
210
|
+
else
|
209
211
|
@__markus_buffer << res + ',' if type == :a && res.is_a?(String)
|
210
212
|
@__markus_buffer.last.chomp!(',')
|
211
213
|
if self.class.__markus_indent
|
212
214
|
@__markus_buffer << "#{" " * @__markus_level}#{type == :a ? ']' : '}'},"
|
213
215
|
else
|
214
216
|
@__markus_buffer << "#{type == :a ? ']' : '}'},"
|
215
|
-
end
|
216
|
-
end
|
217
|
+
end
|
218
|
+
end
|
217
219
|
end
|
218
220
|
@__markus_level -= 1
|
219
221
|
@__markus_parent = mpsic
|
@@ -222,7 +224,7 @@ class MarkUS
|
|
222
224
|
@__markus_level += 1
|
223
225
|
if self.class.__markus_indent
|
224
226
|
@__markus_buffer << "#{" " * @__markus_level}{"
|
225
|
-
else
|
227
|
+
else
|
226
228
|
@__markus_buffer << "{"
|
227
229
|
end
|
228
230
|
if self.class.__markus_indent
|
@@ -232,18 +234,18 @@ class MarkUS
|
|
232
234
|
end
|
233
235
|
if self.class.__markus_indent
|
234
236
|
@__markus_buffer << "#{" " * @__markus_level}},"
|
235
|
-
else
|
237
|
+
else
|
236
238
|
@__markus_buffer << "},"
|
237
239
|
end
|
238
240
|
@__markus_level -= 1
|
239
|
-
else
|
241
|
+
else
|
240
242
|
if self.class.__markus_indent
|
241
|
-
@__markus_buffer << "#{" " * (@__markus_level+1)}\"#{tname}\": #{attrs || content},"
|
243
|
+
@__markus_buffer << "#{" " * (@__markus_level+1)}\"#{tname}\": #{attrs || content},"
|
242
244
|
else
|
243
|
-
@__markus_buffer << "\"#{tname}\": #{attrs || content},"
|
245
|
+
@__markus_buffer << "\"#{tname}\": #{attrs || content},"
|
244
246
|
end
|
245
|
-
end
|
246
|
-
end
|
247
|
+
end
|
248
|
+
end
|
247
249
|
end #}}}
|
248
250
|
|
249
251
|
def self::inherited(subclass) #{{{ # :nodoc:
|
data/markus.gemspec
CHANGED
data/test/change.mt_
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: markus
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 4.0.
|
4
|
+
version: 4.0.11
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Juergen eTM Mangler
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2016-01-
|
11
|
+
date: 2016-01-16 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: minitest
|