wp2txt 0.9.5 → 0.9.5.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/wp2txt/utils.rb +44 -40
- data/lib/wp2txt/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 2aa3c73ab9202aa22974bbb60dad95f10b8abb434cd923fe5f2f6e917f89ac18
|
4
|
+
data.tar.gz: 790d280ee298ff08c5dde80e355f69a1803b949abe14c81912ec6119f3371d59
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 39f16e5df3c22f60ef4c0f3c9fe05c5f9ee0732fa90dd9916dd7bf6ffdc05e991afd67425fa6fdb9661cd206e4e16e0db032c131cb59c9d71b7fd2b668635429
|
7
|
+
data.tar.gz: b7c700c667220e11b39fd25a91c76609d3f2608599223f8525e0c8b4b03e29fd1c9547ec2bf30117ca4d65aa0cb09db15f9841ce4790fbfe73a16bfeb5cebfc3
|
data/lib/wp2txt/utils.rb
CHANGED
@@ -134,47 +134,47 @@ module Wp2txt
|
|
134
134
|
def process_nested_structure(scanner, left, right, &block)
|
135
135
|
test = false
|
136
136
|
buffer = ""
|
137
|
-
|
138
|
-
|
139
|
-
|
140
|
-
|
141
|
-
|
142
|
-
|
143
|
-
|
144
|
-
|
145
|
-
|
146
|
-
|
147
|
-
|
148
|
-
|
149
|
-
|
150
|
-
|
151
|
-
|
152
|
-
|
153
|
-
|
154
|
-
buffer << str
|
155
|
-
has_left = true
|
156
|
-
when right
|
157
|
-
if has_left
|
158
|
-
buffer = buffer[0...-(left.size)]
|
159
|
-
contents = block.call(str[0...-(left.size)])
|
160
|
-
buffer << contents
|
161
|
-
break
|
162
|
-
else
|
137
|
+
begin
|
138
|
+
if left == "[" && right == "]"
|
139
|
+
regex = $single_square_bracket_regex
|
140
|
+
elsif left == "[[" && right == "]]"
|
141
|
+
regex = $double_square_bracket_regex
|
142
|
+
elsif left == "{" && right == "}"
|
143
|
+
regex = $single_curly_bracket_regex
|
144
|
+
elsif left == "{{" && right == "}}"
|
145
|
+
regex = $double_curly_bracket_regex
|
146
|
+
elsif left == "{|" && right == "|}"
|
147
|
+
regex = $curly_square_bracket_regex
|
148
|
+
else
|
149
|
+
regex = Regexp.new("(#{Regexp.escape(left)}|#{Regexp.escape(right)})")
|
150
|
+
end
|
151
|
+
while str = scanner.scan_until(regex)
|
152
|
+
case scanner[1]
|
153
|
+
when left
|
163
154
|
buffer << str
|
155
|
+
has_left = true
|
156
|
+
when right
|
157
|
+
if has_left
|
158
|
+
buffer = buffer[0...-(left.size)]
|
159
|
+
contents = block.call(str[0...-(left.size)])
|
160
|
+
buffer << contents
|
161
|
+
break
|
162
|
+
else
|
163
|
+
buffer << str
|
164
|
+
end
|
164
165
|
end
|
165
166
|
end
|
166
|
-
|
167
|
-
buffer << scanner.rest
|
167
|
+
buffer << scanner.rest
|
168
168
|
|
169
|
-
|
170
|
-
|
171
|
-
|
172
|
-
|
173
|
-
|
169
|
+
if buffer == scanner.string
|
170
|
+
return buffer
|
171
|
+
else
|
172
|
+
scanner.string = buffer
|
173
|
+
return process_nested_structure(scanner, left, right, &block) || ""
|
174
|
+
end
|
175
|
+
rescue => e
|
176
|
+
return scanner.string
|
174
177
|
end
|
175
|
-
# rescue => e
|
176
|
-
# return scanner.string
|
177
|
-
# end
|
178
178
|
end
|
179
179
|
|
180
180
|
#################### methods used from format_wiki ####################
|
@@ -347,10 +347,14 @@ module Wp2txt
|
|
347
347
|
if parts.size == 1
|
348
348
|
out = parts[0]
|
349
349
|
else
|
350
|
-
|
351
|
-
|
352
|
-
|
353
|
-
|
350
|
+
begin
|
351
|
+
keyval = parts[1].split("=")
|
352
|
+
if keyval.size > 1
|
353
|
+
out = keyval[1]
|
354
|
+
else
|
355
|
+
out = parts[1] || ""
|
356
|
+
end
|
357
|
+
rescue
|
354
358
|
out = parts[1] || ""
|
355
359
|
end
|
356
360
|
end
|
data/lib/wp2txt/version.rb
CHANGED