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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: bf8270b3488c0045a067f71c155db8d9ac6366a94d825eed9bc6d05c95598345
4
- data.tar.gz: 8802949a232c60d8b5ae6f93726154f7a6b40436b478919657f58f4bdc54add3
3
+ metadata.gz: 2aa3c73ab9202aa22974bbb60dad95f10b8abb434cd923fe5f2f6e917f89ac18
4
+ data.tar.gz: 790d280ee298ff08c5dde80e355f69a1803b949abe14c81912ec6119f3371d59
5
5
  SHA512:
6
- metadata.gz: 0a10804d78c33e035aaf429dd4613f84f3db0c6f22a6c36617a1fda25f03c0fd8fac224ec9e6009ab6ddddb475d73e6eda4c21606f89ef94950bc3749ce4f452
7
- data.tar.gz: 4a8ea2f0900c6f97d3dcaf6c6387b3543d23962ea064cf1b18a8c293b4664c16fcabca9230aa83b0f5685eacffed74968fe82529566080b7821fd944c7bf275d
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
- # 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
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
- end
167
- buffer << scanner.rest
167
+ buffer << scanner.rest
168
168
 
169
- if buffer == scanner.string
170
- return buffer
171
- else
172
- scanner.string = buffer
173
- return process_nested_structure(scanner, left, right, &block) || ""
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
- keyval = parts[1].split("=")
351
- if keyval.size > 1
352
- out = keyval[1]
353
- else
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
@@ -1,3 +1,3 @@
1
1
  module Wp2txt
2
- VERSION = "0.9.5"
2
+ VERSION = "0.9.5.1"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: wp2txt
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.5
4
+ version: 0.9.5.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Yoichiro Hasebe