nokogiri 1.11.1-java → 1.11.2-java

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of nokogiri might be problematic. Click here for more details.

Files changed (142) hide show
  1. checksums.yaml +4 -4
  2. data/LICENSE-DEPENDENCIES.md +12 -12
  3. data/LICENSE.md +1 -1
  4. data/README.md +20 -15
  5. data/ext/java/nokogiri/EncodingHandler.java +78 -59
  6. data/ext/java/nokogiri/HtmlDocument.java +137 -114
  7. data/ext/java/nokogiri/HtmlElementDescription.java +104 -87
  8. data/ext/java/nokogiri/HtmlEntityLookup.java +31 -26
  9. data/ext/java/nokogiri/HtmlSaxParserContext.java +220 -192
  10. data/ext/java/nokogiri/HtmlSaxPushParser.java +164 -139
  11. data/ext/java/nokogiri/NokogiriService.java +597 -526
  12. data/ext/java/nokogiri/XmlAttr.java +120 -96
  13. data/ext/java/nokogiri/XmlAttributeDecl.java +97 -76
  14. data/ext/java/nokogiri/XmlCdata.java +35 -26
  15. data/ext/java/nokogiri/XmlComment.java +48 -37
  16. data/ext/java/nokogiri/XmlDocument.java +642 -540
  17. data/ext/java/nokogiri/XmlDocumentFragment.java +127 -107
  18. data/ext/java/nokogiri/XmlDtd.java +450 -384
  19. data/ext/java/nokogiri/XmlElement.java +25 -18
  20. data/ext/java/nokogiri/XmlElementContent.java +345 -286
  21. data/ext/java/nokogiri/XmlElementDecl.java +126 -95
  22. data/ext/java/nokogiri/XmlEntityDecl.java +121 -97
  23. data/ext/java/nokogiri/XmlEntityReference.java +51 -42
  24. data/ext/java/nokogiri/XmlNamespace.java +177 -145
  25. data/ext/java/nokogiri/XmlNode.java +1843 -1588
  26. data/ext/java/nokogiri/XmlNodeSet.java +361 -299
  27. data/ext/java/nokogiri/XmlProcessingInstruction.java +49 -39
  28. data/ext/java/nokogiri/XmlReader.java +513 -418
  29. data/ext/java/nokogiri/XmlRelaxng.java +91 -78
  30. data/ext/java/nokogiri/XmlSaxParserContext.java +330 -285
  31. data/ext/java/nokogiri/XmlSaxPushParser.java +229 -190
  32. data/ext/java/nokogiri/XmlSchema.java +328 -263
  33. data/ext/java/nokogiri/XmlSyntaxError.java +113 -83
  34. data/ext/java/nokogiri/XmlText.java +57 -46
  35. data/ext/java/nokogiri/XmlXpathContext.java +240 -206
  36. data/ext/java/nokogiri/XsltStylesheet.java +282 -239
  37. data/ext/java/nokogiri/internals/ClosedStreamException.java +5 -2
  38. data/ext/java/nokogiri/internals/HtmlDomParserContext.java +199 -168
  39. data/ext/java/nokogiri/internals/IgnoreSchemaErrorsErrorHandler.java +17 -10
  40. data/ext/java/nokogiri/internals/NokogiriBlockingQueueInputStream.java +43 -16
  41. data/ext/java/nokogiri/internals/NokogiriDomParser.java +65 -50
  42. data/ext/java/nokogiri/internals/NokogiriEntityResolver.java +107 -88
  43. data/ext/java/nokogiri/internals/NokogiriErrorHandler.java +25 -18
  44. data/ext/java/nokogiri/internals/NokogiriHandler.java +316 -254
  45. data/ext/java/nokogiri/internals/NokogiriHelpers.java +738 -622
  46. data/ext/java/nokogiri/internals/NokogiriNamespaceCache.java +186 -143
  47. data/ext/java/nokogiri/internals/NokogiriNamespaceContext.java +83 -68
  48. data/ext/java/nokogiri/internals/NokogiriNonStrictErrorHandler.java +66 -49
  49. data/ext/java/nokogiri/internals/NokogiriNonStrictErrorHandler4NekoHtml.java +86 -69
  50. data/ext/java/nokogiri/internals/NokogiriStrictErrorHandler.java +44 -29
  51. data/ext/java/nokogiri/internals/NokogiriXPathFunction.java +118 -101
  52. data/ext/java/nokogiri/internals/NokogiriXPathFunctionResolver.java +34 -24
  53. data/ext/java/nokogiri/internals/NokogiriXPathVariableResolver.java +25 -17
  54. data/ext/java/nokogiri/internals/NokogiriXsltErrorListener.java +57 -42
  55. data/ext/java/nokogiri/internals/ParserContext.java +206 -179
  56. data/ext/java/nokogiri/internals/ReaderNode.java +478 -371
  57. data/ext/java/nokogiri/internals/SaveContextVisitor.java +822 -707
  58. data/ext/java/nokogiri/internals/SchemaErrorHandler.java +28 -19
  59. data/ext/java/nokogiri/internals/XalanDTMManagerPatch.java +129 -123
  60. data/ext/java/nokogiri/internals/XmlDeclHandler.java +5 -4
  61. data/ext/java/nokogiri/internals/XmlDomParserContext.java +208 -177
  62. data/ext/java/nokogiri/internals/XmlSaxParser.java +24 -17
  63. data/ext/java/nokogiri/internals/c14n/AttrCompare.java +71 -68
  64. data/ext/java/nokogiri/internals/c14n/C14nHelper.java +137 -118
  65. data/ext/java/nokogiri/internals/c14n/CanonicalFilter.java +27 -21
  66. data/ext/java/nokogiri/internals/c14n/CanonicalizationException.java +74 -61
  67. data/ext/java/nokogiri/internals/c14n/Canonicalizer.java +230 -205
  68. data/ext/java/nokogiri/internals/c14n/Canonicalizer11.java +572 -547
  69. data/ext/java/nokogiri/internals/c14n/Canonicalizer11_OmitComments.java +17 -10
  70. data/ext/java/nokogiri/internals/c14n/Canonicalizer11_WithComments.java +17 -10
  71. data/ext/java/nokogiri/internals/c14n/Canonicalizer20010315.java +323 -302
  72. data/ext/java/nokogiri/internals/c14n/Canonicalizer20010315Excl.java +232 -219
  73. data/ext/java/nokogiri/internals/c14n/Canonicalizer20010315ExclOmitComments.java +22 -15
  74. data/ext/java/nokogiri/internals/c14n/Canonicalizer20010315ExclWithComments.java +23 -16
  75. data/ext/java/nokogiri/internals/c14n/Canonicalizer20010315OmitComments.java +23 -16
  76. data/ext/java/nokogiri/internals/c14n/Canonicalizer20010315WithComments.java +22 -15
  77. data/ext/java/nokogiri/internals/c14n/CanonicalizerBase.java +575 -545
  78. data/ext/java/nokogiri/internals/c14n/CanonicalizerPhysical.java +141 -120
  79. data/ext/java/nokogiri/internals/c14n/CanonicalizerSpi.java +39 -38
  80. data/ext/java/nokogiri/internals/c14n/Constants.java +13 -10
  81. data/ext/java/nokogiri/internals/c14n/ElementProxy.java +279 -247
  82. data/ext/java/nokogiri/internals/c14n/HelperNodeList.java +66 -53
  83. data/ext/java/nokogiri/internals/c14n/IgnoreAllErrorHandler.java +44 -37
  84. data/ext/java/nokogiri/internals/c14n/InclusiveNamespaces.java +135 -120
  85. data/ext/java/nokogiri/internals/c14n/InvalidCanonicalizerException.java +59 -48
  86. data/ext/java/nokogiri/internals/c14n/NameSpaceSymbTable.java +384 -334
  87. data/ext/java/nokogiri/internals/c14n/NodeFilter.java +25 -24
  88. data/ext/java/nokogiri/internals/c14n/UtfHelpper.java +151 -140
  89. data/ext/java/nokogiri/internals/c14n/XMLUtils.java +456 -423
  90. data/ext/java/nokogiri/internals/dom2dtm/DOM2DTM.java +1466 -1500
  91. data/ext/java/nokogiri/internals/dom2dtm/DOM2DTMdefaultNamespaceDeclarationNode.java +626 -570
  92. data/ext/nokogiri/depend +34 -474
  93. data/ext/nokogiri/extconf.rb +253 -183
  94. data/ext/nokogiri/html_document.c +10 -15
  95. data/ext/nokogiri/html_element_description.c +84 -71
  96. data/ext/nokogiri/html_entity_lookup.c +21 -16
  97. data/ext/nokogiri/html_sax_parser_context.c +66 -65
  98. data/ext/nokogiri/html_sax_push_parser.c +29 -27
  99. data/ext/nokogiri/libxml2_backwards_compat.c +121 -0
  100. data/ext/nokogiri/nokogiri.c +171 -63
  101. data/ext/nokogiri/test_global_handlers.c +3 -4
  102. data/ext/nokogiri/xml_attr.c +15 -15
  103. data/ext/nokogiri/xml_attribute_decl.c +18 -18
  104. data/ext/nokogiri/xml_cdata.c +13 -18
  105. data/ext/nokogiri/xml_comment.c +19 -26
  106. data/ext/nokogiri/xml_document.c +221 -164
  107. data/ext/nokogiri/xml_document_fragment.c +13 -15
  108. data/ext/nokogiri/xml_dtd.c +54 -48
  109. data/ext/nokogiri/xml_element_content.c +30 -27
  110. data/ext/nokogiri/xml_element_decl.c +22 -22
  111. data/ext/nokogiri/xml_encoding_handler.c +17 -11
  112. data/ext/nokogiri/xml_entity_decl.c +32 -30
  113. data/ext/nokogiri/xml_entity_reference.c +16 -18
  114. data/ext/nokogiri/xml_namespace.c +56 -49
  115. data/ext/nokogiri/xml_node.c +338 -286
  116. data/ext/nokogiri/xml_node_set.c +168 -156
  117. data/ext/nokogiri/xml_processing_instruction.c +17 -19
  118. data/ext/nokogiri/xml_reader.c +191 -157
  119. data/ext/nokogiri/xml_relax_ng.c +29 -23
  120. data/ext/nokogiri/xml_sax_parser.c +117 -112
  121. data/ext/nokogiri/xml_sax_parser_context.c +100 -85
  122. data/ext/nokogiri/xml_sax_push_parser.c +34 -27
  123. data/ext/nokogiri/xml_schema.c +48 -42
  124. data/ext/nokogiri/xml_syntax_error.c +21 -23
  125. data/ext/nokogiri/xml_text.c +13 -17
  126. data/ext/nokogiri/xml_xpath_context.c +134 -127
  127. data/ext/nokogiri/xslt_stylesheet.c +157 -157
  128. data/lib/nokogiri.rb +1 -22
  129. data/lib/nokogiri/css/parser.rb +1 -1
  130. data/lib/nokogiri/extension.rb +26 -0
  131. data/lib/nokogiri/html/document_fragment.rb +15 -15
  132. data/lib/nokogiri/nokogiri.jar +0 -0
  133. data/lib/nokogiri/version/constant.rb +1 -1
  134. data/lib/nokogiri/version/info.rb +31 -8
  135. data/lib/nokogiri/xml/document.rb +31 -11
  136. data/lib/nokogiri/xml/node.rb +38 -42
  137. data/lib/nokogiri/xml/reader.rb +2 -9
  138. data/lib/nokogiri/xml/xpath.rb +1 -3
  139. data/lib/nokogiri/xml/xpath/syntax_error.rb +1 -1
  140. metadata +7 -8
  141. data/ext/nokogiri/xml_io.c +0 -63
  142. data/ext/nokogiri/xml_libxml2_hacks.c +0 -112
@@ -17,10 +17,10 @@
17
17
  * distribute, sublicense, and/or sell copies of the Software, and to
18
18
  * permit persons to whom the Software is furnished to do so, subject to
19
19
  * the following conditions:
20
- *
20
+ *
21
21
  * The above copyright notice and this permission notice shall be
22
22
  * included in all copies or substantial portions of the Software.
23
- *
23
+ *
24
24
  * THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
25
25
  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
26
26
  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
@@ -66,221 +66,260 @@ import nokogiri.internals.ParserContext;
66
66
  * @author Patrick Mahoney <pat@polycrystal.org>
67
67
  * @author Yoko Harada <yokolet@gmail.com>
68
68
  */
69
- @JRubyClass(name="Nokogiri::XML::SAX::PushParser")
70
- public class XmlSaxPushParser extends RubyObject {
71
- ParserContext.Options options;
72
- IRubyObject saxParser;
73
-
74
- NokogiriBlockingQueueInputStream stream;
75
-
76
- private ParserTask parserTask = null;
77
- private FutureTask<XmlSaxParserContext> futureTask = null;
78
- private ExecutorService executor = null;
79
- RaiseException ex = null;
80
-
81
- public XmlSaxPushParser(Ruby ruby, RubyClass rubyClass) {
82
- super(ruby, rubyClass);
69
+ @JRubyClass(name = "Nokogiri::XML::SAX::PushParser")
70
+ public class XmlSaxPushParser extends RubyObject
71
+ {
72
+ ParserContext.Options options;
73
+ IRubyObject saxParser;
74
+
75
+ NokogiriBlockingQueueInputStream stream;
76
+
77
+ private ParserTask parserTask = null;
78
+ private FutureTask<XmlSaxParserContext> futureTask = null;
79
+ private ExecutorService executor = null;
80
+ RaiseException ex = null;
81
+
82
+ public
83
+ XmlSaxPushParser(Ruby ruby, RubyClass rubyClass)
84
+ {
85
+ super(ruby, rubyClass);
86
+ }
87
+
88
+ @Override
89
+ public void
90
+ finalize()
91
+ {
92
+ try {
93
+ terminateImpl();
94
+ } catch (Exception e) { /* ignored */ }
95
+ }
96
+
97
+ @JRubyMethod
98
+ public IRubyObject
99
+ initialize_native(final ThreadContext context, IRubyObject saxParser, IRubyObject fileName)
100
+ {
101
+ options = new ParserContext.Options(0);
102
+ this.saxParser = saxParser;
103
+ return this;
104
+ }
105
+
106
+ private transient IRubyObject parse_options;
107
+
108
+ private IRubyObject
109
+ parse_options(final ThreadContext context)
110
+ {
111
+ if (parse_options == null) {
112
+ parse_options = invoke(context, context.runtime.getClassFromPath("Nokogiri::XML::ParseOptions"), "new");
83
113
  }
84
-
85
- @Override
86
- public void finalize() {
87
- try {
88
- terminateImpl();
89
- }
90
- catch (Exception e) { /* ignored */ }
114
+ return parse_options;
115
+ }
116
+
117
+ @JRubyMethod(name = "options")
118
+ public IRubyObject
119
+ getOptions(ThreadContext context)
120
+ {
121
+ return invoke(context, parse_options(context), "options");
122
+ }
123
+
124
+ @JRubyMethod(name = "options=")
125
+ public IRubyObject
126
+ setOptions(ThreadContext context, IRubyObject opts)
127
+ {
128
+ invoke(context, parse_options(context), "options=", opts);
129
+ options = new ParserContext.Options(opts.convertToInteger().getLongValue());
130
+ return getOptions(context);
131
+ }
132
+
133
+ /**
134
+ * Can take a boolean assignment.
135
+ *
136
+ * @param context
137
+ * @param value
138
+ * @return
139
+ */
140
+ @JRubyMethod(name = "replace_entities=")
141
+ public IRubyObject
142
+ setReplaceEntities(ThreadContext context, IRubyObject value)
143
+ {
144
+ // Ignore the value.
145
+ return this;
146
+ }
147
+
148
+ @JRubyMethod(name = "replace_entities")
149
+ public IRubyObject
150
+ getReplaceEntities(ThreadContext context)
151
+ {
152
+ // The java parser always replaces entities.
153
+ return context.getRuntime().getTrue();
154
+ }
155
+
156
+ @JRubyMethod
157
+ public IRubyObject
158
+ native_write(ThreadContext context, IRubyObject chunk,
159
+ IRubyObject isLast)
160
+ {
161
+ if (ex != null) {
162
+ // parser has already errored, rethrow the exception
163
+ throw ex;
91
164
  }
92
165
 
93
- @JRubyMethod
94
- public IRubyObject initialize_native(final ThreadContext context, IRubyObject saxParser, IRubyObject fileName) {
95
- options = new ParserContext.Options(0);
96
- this.saxParser = saxParser;
97
- return this;
166
+ try {
167
+ initialize_task(context);
168
+ } catch (IOException e) {
169
+ throw context.runtime.newRuntimeError(e.getMessage());
98
170
  }
99
-
100
- private transient IRubyObject parse_options;
101
-
102
- private IRubyObject parse_options(final ThreadContext context) {
103
- if (parse_options == null) {
104
- parse_options = invoke(context, context.runtime.getClassFromPath("Nokogiri::XML::ParseOptions"), "new");
105
- }
106
- return parse_options;
171
+ final ByteArrayInputStream data = NokogiriHelpers.stringBytesToStream(chunk);
172
+ if (data == null) {
173
+ return this;
107
174
  }
108
175
 
109
- @JRubyMethod(name="options")
110
- public IRubyObject getOptions(ThreadContext context) {
111
- return invoke(context, parse_options(context), "options");
112
- }
176
+ int errorCount0 = parserTask.getErrorCount();
113
177
 
114
- @JRubyMethod(name="options=")
115
- public IRubyObject setOptions(ThreadContext context, IRubyObject opts) {
116
- invoke(context, parse_options(context), "options=", opts);
117
- options = new ParserContext.Options(opts.convertToInteger().getLongValue());
118
- return getOptions(context);
178
+ try {
179
+ Future<Void> task = stream.addChunk(data);
180
+ task.get();
181
+ } catch (ClosedStreamException ex) {
182
+ // this means the stream is closed, ignore this exception
183
+ } catch (Exception e) {
184
+ throw context.runtime.newRuntimeError(e.toString());
119
185
  }
120
186
 
121
- /**
122
- * Can take a boolean assignment.
123
- *
124
- * @param context
125
- * @param value
126
- * @return
127
- */
128
- @JRubyMethod(name = "replace_entities=")
129
- public IRubyObject setReplaceEntities(ThreadContext context, IRubyObject value) {
130
- // Ignore the value.
131
- return this;
187
+ if (isLast.isTrue()) {
188
+ parserTask.getNokogiriHandler().endDocument();
189
+ terminateTask(context.runtime);
132
190
  }
133
191
 
134
- @JRubyMethod(name="replace_entities")
135
- public IRubyObject getReplaceEntities(ThreadContext context) {
136
- // The java parser always replaces entities.
137
- return context.getRuntime().getTrue();
192
+ if (!options.recover && parserTask.getErrorCount() > errorCount0) {
193
+ terminateTask(context.runtime);
194
+ throw ex = parserTask.getLastError();
138
195
  }
139
196
 
140
- @JRubyMethod
141
- public IRubyObject native_write(ThreadContext context, IRubyObject chunk,
142
- IRubyObject isLast) {
143
- if (ex != null) {
144
- // parser has already errored, rethrow the exception
145
- throw ex;
146
- }
147
-
148
- try {
149
- initialize_task(context);
150
- } catch (IOException e) {
151
- throw context.runtime.newRuntimeError(e.getMessage());
152
- }
153
- final ByteArrayInputStream data = NokogiriHelpers.stringBytesToStream(chunk);
154
- if (data == null) {
155
- return this;
156
- }
157
-
158
- int errorCount0 = parserTask.getErrorCount();
197
+ return this;
198
+ }
159
199
 
160
- try {
161
- Future<Void> task = stream.addChunk(data);
162
- task.get();
163
- } catch (ClosedStreamException ex) {
164
- // this means the stream is closed, ignore this exception
165
- } catch (Exception e) {
166
- throw context.runtime.newRuntimeError(e.toString());
167
- }
168
-
169
- if (isLast.isTrue()) {
170
- parserTask.getNokogiriHandler().endDocument();
171
- terminateTask(context.runtime);
172
- }
200
+ private void
201
+ initialize_task(ThreadContext context) throws IOException
202
+ {
203
+ if (futureTask == null || stream == null) {
204
+ stream = new NokogiriBlockingQueueInputStream();
173
205
 
174
- if (!options.recover && parserTask.getErrorCount() > errorCount0) {
175
- terminateTask(context.runtime);
176
- throw ex = parserTask.getLastError();
206
+ assert saxParser != null : "saxParser null";
207
+ parserTask = new ParserTask(context, saxParser, stream);
208
+ futureTask = new FutureTask<XmlSaxParserContext>(parserTask);
209
+ executor = Executors.newSingleThreadExecutor(new ThreadFactory() {
210
+ @Override
211
+ public Thread newThread(Runnable r) {
212
+ Thread t = new Thread(r);
213
+ t.setName("XmlSaxPushParser");
214
+ t.setDaemon(true);
215
+ return t;
177
216
  }
178
-
179
- return this;
217
+ });
218
+ executor.submit(futureTask);
180
219
  }
181
-
182
- private void initialize_task(ThreadContext context) throws IOException {
183
- if (futureTask == null || stream == null) {
184
- stream = new NokogiriBlockingQueueInputStream();
185
-
186
- assert saxParser != null : "saxParser null";
187
- parserTask = new ParserTask(context, saxParser, stream);
188
- futureTask = new FutureTask<XmlSaxParserContext>(parserTask);
189
- executor = Executors.newSingleThreadExecutor(new ThreadFactory() {
190
- @Override
191
- public Thread newThread(Runnable r) {
192
- Thread t = new Thread(r);
193
- t.setName("XmlSaxPushParser");
194
- t.setDaemon(true);
195
- return t;
196
- }
197
- });
198
- executor.submit(futureTask);
199
- }
220
+ }
221
+
222
+ private void
223
+ terminateTask(final Ruby runtime)
224
+ {
225
+ if (executor == null) { return; }
226
+
227
+ try {
228
+ terminateImpl();
229
+ } catch (InterruptedException e) {
230
+ throw runtime.newRuntimeError(e.toString());
231
+ } catch (Exception e) {
232
+ throw runtime.newRuntimeError(e.toString());
200
233
  }
201
-
202
- private void terminateTask(final Ruby runtime) {
203
- if (executor == null) return;
204
-
205
- try {
206
- terminateImpl();
207
- }
208
- catch (InterruptedException e) {
209
- throw runtime.newRuntimeError(e.toString());
210
- }
211
- catch (Exception e) {
212
- throw runtime.newRuntimeError(e.toString());
213
- }
234
+ }
235
+
236
+ private synchronized void
237
+ terminateImpl() throws InterruptedException, ExecutionException
238
+ {
239
+ terminateExecution(executor, stream, futureTask);
240
+
241
+ executor = null;
242
+ stream = null;
243
+ futureTask = null;
244
+ }
245
+
246
+ // SHARED for HtmlSaxPushParser
247
+ static void
248
+ terminateExecution(final ExecutorService executor, final NokogiriBlockingQueueInputStream stream,
249
+ final FutureTask<?> futureTask)
250
+ throws InterruptedException, ExecutionException
251
+ {
252
+
253
+ if (executor == null) { return; }
254
+
255
+ try {
256
+ Future<Void> task = stream.addChunk(NokogiriBlockingQueueInputStream.END);
257
+ task.get();
258
+ } catch (ClosedStreamException ex) {
259
+ // ignore this exception, it means the stream was closed
214
260
  }
215
-
216
- private synchronized void terminateImpl() throws InterruptedException, ExecutionException {
217
- terminateExecution(executor, stream, futureTask);
218
-
219
- executor = null; stream = null; futureTask = null;
261
+ futureTask.cancel(true);
262
+ executor.shutdown();
263
+ }
264
+
265
+ private static XmlSaxParserContext
266
+ parse(final Ruby runtime, final InputStream stream)
267
+ {
268
+ RubyClass klazz = getNokogiriClass(runtime, "Nokogiri::XML::SAX::ParserContext");
269
+ return XmlSaxParserContext.parse_stream(runtime, klazz, stream);
270
+ }
271
+
272
+ static class ParserTask extends ParserContext.ParserTask<XmlSaxParserContext>
273
+ {
274
+
275
+ final InputStream stream;
276
+
277
+ private
278
+ ParserTask(ThreadContext context, IRubyObject handler, InputStream stream)
279
+ {
280
+ this(context, handler, parse(context.runtime, stream), stream);
220
281
  }
221
282
 
222
- // SHARED for HtmlSaxPushParser
223
- static void terminateExecution(final ExecutorService executor, final NokogiriBlockingQueueInputStream stream,
224
- final FutureTask<?> futureTask)
225
- throws InterruptedException, ExecutionException {
226
-
227
- if (executor == null) return;
228
-
229
- try {
230
- Future<Void> task = stream.addChunk(NokogiriBlockingQueueInputStream.END);
231
- task.get();
232
- }
233
- catch (ClosedStreamException ex) {
234
- // ignore this exception, it means the stream was closed
235
- }
236
- futureTask.cancel(true);
237
- executor.shutdown();
283
+ // IMPL with HtmlSaxPushParser
284
+ protected
285
+ ParserTask(ThreadContext context, IRubyObject handler, XmlSaxParserContext parser, InputStream stream)
286
+ {
287
+ super(context, handler, parser);
288
+ this.stream = stream;
238
289
  }
239
290
 
240
- private static XmlSaxParserContext parse(final Ruby runtime, final InputStream stream) {
241
- RubyClass klazz = getNokogiriClass(runtime, "Nokogiri::XML::SAX::ParserContext");
242
- return XmlSaxParserContext.parse_stream(runtime, klazz, stream);
291
+ @Override
292
+ public XmlSaxParserContext
293
+ call() throws Exception
294
+ {
295
+ try {
296
+ parser.parse_with(context, handler);
297
+ } finally { stream.close(); }
298
+ // we have to close the stream before exiting, otherwise someone
299
+ // can add a chunk and block on task.get() forever.
300
+ return parser;
243
301
  }
244
302
 
245
- static class ParserTask extends ParserContext.ParserTask<XmlSaxParserContext> {
246
-
247
- final InputStream stream;
248
-
249
- private ParserTask(ThreadContext context, IRubyObject handler, InputStream stream) {
250
- this(context, handler, parse(context.runtime, stream), stream);
251
- }
252
-
253
- // IMPL with HtmlSaxPushParser
254
- protected ParserTask(ThreadContext context, IRubyObject handler, XmlSaxParserContext parser, InputStream stream) {
255
- super(context, handler, parser);
256
- this.stream = stream;
257
- }
258
-
259
- @Override
260
- public XmlSaxParserContext call() throws Exception {
261
- try {
262
- parser.parse_with(context, handler);
263
- }
264
- finally { stream.close(); }
265
- // we have to close the stream before exiting, otherwise someone
266
- // can add a chunk and block on task.get() forever.
267
- return parser;
268
- }
269
-
270
- final NokogiriHandler getNokogiriHandler() {
271
- return parser.getNokogiriHandler();
272
- }
273
-
274
- synchronized final int getErrorCount() {
275
- // check for null because thread may not have started yet
276
- if (parser.getNokogiriHandler() == null) return 0;
277
- return parser.getNokogiriHandler().getErrorCount();
278
- }
303
+ final NokogiriHandler
304
+ getNokogiriHandler()
305
+ {
306
+ return parser.getNokogiriHandler();
307
+ }
279
308
 
280
- synchronized final RaiseException getLastError() {
281
- return parser.getNokogiriHandler().getLastError();
282
- }
309
+ synchronized final int
310
+ getErrorCount()
311
+ {
312
+ // check for null because thread may not have started yet
313
+ if (parser.getNokogiriHandler() == null) { return 0; }
314
+ return parser.getNokogiriHandler().getErrorCount();
315
+ }
283
316
 
317
+ synchronized final RaiseException
318
+ getLastError()
319
+ {
320
+ return parser.getNokogiriHandler().getLastError();
284
321
  }
285
322
 
323
+ }
324
+
286
325
  }