nokogiri 1.11.0.rc2-java → 1.11.3-java

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (187) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +3 -0
  3. data/LICENSE-DEPENDENCIES.md +1015 -947
  4. data/LICENSE.md +1 -1
  5. data/README.md +171 -94
  6. data/ext/java/nokogiri/EncodingHandler.java +76 -89
  7. data/ext/java/nokogiri/HtmlDocument.java +135 -144
  8. data/ext/java/nokogiri/HtmlElementDescription.java +102 -117
  9. data/ext/java/nokogiri/HtmlEntityLookup.java +33 -60
  10. data/ext/java/nokogiri/HtmlSaxParserContext.java +218 -222
  11. data/ext/java/nokogiri/HtmlSaxPushParser.java +162 -169
  12. data/ext/java/nokogiri/NokogiriService.java +595 -556
  13. data/ext/java/nokogiri/XmlAttr.java +118 -126
  14. data/ext/java/nokogiri/XmlAttributeDecl.java +95 -106
  15. data/ext/java/nokogiri/XmlCdata.java +35 -58
  16. data/ext/java/nokogiri/XmlComment.java +46 -67
  17. data/ext/java/nokogiri/XmlDocument.java +645 -572
  18. data/ext/java/nokogiri/XmlDocumentFragment.java +125 -137
  19. data/ext/java/nokogiri/XmlDtd.java +448 -414
  20. data/ext/java/nokogiri/XmlElement.java +23 -48
  21. data/ext/java/nokogiri/XmlElementContent.java +343 -316
  22. data/ext/java/nokogiri/XmlElementDecl.java +124 -125
  23. data/ext/java/nokogiri/XmlEntityDecl.java +119 -127
  24. data/ext/java/nokogiri/XmlEntityReference.java +49 -72
  25. data/ext/java/nokogiri/XmlNamespace.java +175 -175
  26. data/ext/java/nokogiri/XmlNode.java +1843 -1622
  27. data/ext/java/nokogiri/XmlNodeSet.java +361 -331
  28. data/ext/java/nokogiri/XmlProcessingInstruction.java +47 -69
  29. data/ext/java/nokogiri/XmlReader.java +513 -450
  30. data/ext/java/nokogiri/XmlRelaxng.java +89 -101
  31. data/ext/java/nokogiri/XmlSaxParserContext.java +328 -310
  32. data/ext/java/nokogiri/XmlSaxPushParser.java +227 -220
  33. data/ext/java/nokogiri/XmlSchema.java +335 -242
  34. data/ext/java/nokogiri/XmlSyntaxError.java +113 -119
  35. data/ext/java/nokogiri/XmlText.java +55 -76
  36. data/ext/java/nokogiri/XmlXpathContext.java +242 -210
  37. data/ext/java/nokogiri/XsltStylesheet.java +280 -269
  38. data/ext/java/nokogiri/internals/ClosedStreamException.java +5 -2
  39. data/ext/java/nokogiri/internals/HtmlDomParserContext.java +201 -190
  40. data/ext/java/nokogiri/internals/IgnoreSchemaErrorsErrorHandler.java +17 -10
  41. data/ext/java/nokogiri/internals/NokogiriBlockingQueueInputStream.java +43 -16
  42. data/ext/java/nokogiri/internals/NokogiriDomParser.java +63 -80
  43. data/ext/java/nokogiri/internals/NokogiriEntityResolver.java +107 -88
  44. data/ext/java/nokogiri/internals/NokogiriErrorHandler.java +27 -52
  45. data/ext/java/nokogiri/internals/NokogiriHandler.java +316 -286
  46. data/ext/java/nokogiri/internals/NokogiriHelpers.java +736 -652
  47. data/ext/java/nokogiri/internals/NokogiriNamespaceCache.java +184 -173
  48. data/ext/java/nokogiri/internals/NokogiriNamespaceContext.java +79 -89
  49. data/ext/java/nokogiri/internals/NokogiriNonStrictErrorHandler.java +64 -79
  50. data/ext/java/nokogiri/internals/NokogiriNonStrictErrorHandler4NekoHtml.java +84 -99
  51. data/ext/java/nokogiri/internals/NokogiriStrictErrorHandler.java +48 -65
  52. data/ext/java/nokogiri/internals/NokogiriXPathFunction.java +119 -78
  53. data/ext/java/nokogiri/internals/NokogiriXPathFunctionResolver.java +34 -54
  54. data/ext/java/nokogiri/internals/NokogiriXPathVariableResolver.java +23 -46
  55. data/ext/java/nokogiri/internals/NokogiriXsltErrorListener.java +55 -72
  56. data/ext/java/nokogiri/internals/ParserContext.java +206 -211
  57. data/ext/java/nokogiri/internals/ReaderNode.java +478 -403
  58. data/ext/java/nokogiri/internals/SaveContextVisitor.java +822 -739
  59. data/ext/java/nokogiri/internals/SchemaErrorHandler.java +31 -54
  60. data/ext/java/nokogiri/internals/XalanDTMManagerPatch.java +129 -123
  61. data/ext/java/nokogiri/internals/XmlDeclHandler.java +3 -34
  62. data/ext/java/nokogiri/internals/XmlDomParserContext.java +206 -207
  63. data/ext/java/nokogiri/internals/XmlSaxParser.java +22 -47
  64. data/ext/java/nokogiri/internals/c14n/AttrCompare.java +71 -68
  65. data/ext/java/nokogiri/internals/c14n/C14nHelper.java +137 -118
  66. data/ext/java/nokogiri/internals/c14n/CanonicalFilter.java +27 -21
  67. data/ext/java/nokogiri/internals/c14n/CanonicalizationException.java +74 -61
  68. data/ext/java/nokogiri/internals/c14n/Canonicalizer.java +230 -205
  69. data/ext/java/nokogiri/internals/c14n/Canonicalizer11.java +572 -547
  70. data/ext/java/nokogiri/internals/c14n/Canonicalizer11_OmitComments.java +17 -10
  71. data/ext/java/nokogiri/internals/c14n/Canonicalizer11_WithComments.java +17 -10
  72. data/ext/java/nokogiri/internals/c14n/Canonicalizer20010315.java +323 -302
  73. data/ext/java/nokogiri/internals/c14n/Canonicalizer20010315Excl.java +232 -219
  74. data/ext/java/nokogiri/internals/c14n/Canonicalizer20010315ExclOmitComments.java +22 -15
  75. data/ext/java/nokogiri/internals/c14n/Canonicalizer20010315ExclWithComments.java +23 -16
  76. data/ext/java/nokogiri/internals/c14n/Canonicalizer20010315OmitComments.java +23 -16
  77. data/ext/java/nokogiri/internals/c14n/Canonicalizer20010315WithComments.java +22 -15
  78. data/ext/java/nokogiri/internals/c14n/CanonicalizerBase.java +575 -545
  79. data/ext/java/nokogiri/internals/c14n/CanonicalizerPhysical.java +141 -120
  80. data/ext/java/nokogiri/internals/c14n/CanonicalizerSpi.java +39 -38
  81. data/ext/java/nokogiri/internals/c14n/Constants.java +13 -10
  82. data/ext/java/nokogiri/internals/c14n/ElementProxy.java +279 -247
  83. data/ext/java/nokogiri/internals/c14n/HelperNodeList.java +66 -53
  84. data/ext/java/nokogiri/internals/c14n/IgnoreAllErrorHandler.java +44 -37
  85. data/ext/java/nokogiri/internals/c14n/InclusiveNamespaces.java +135 -120
  86. data/ext/java/nokogiri/internals/c14n/InvalidCanonicalizerException.java +59 -48
  87. data/ext/java/nokogiri/internals/c14n/NameSpaceSymbTable.java +384 -334
  88. data/ext/java/nokogiri/internals/c14n/NodeFilter.java +25 -24
  89. data/ext/java/nokogiri/internals/c14n/UtfHelpper.java +151 -140
  90. data/ext/java/nokogiri/internals/c14n/XMLUtils.java +456 -423
  91. data/ext/java/nokogiri/internals/dom2dtm/DOM2DTM.java +1466 -1500
  92. data/ext/java/nokogiri/internals/dom2dtm/DOM2DTMdefaultNamespaceDeclarationNode.java +626 -574
  93. data/ext/nokogiri/depend +37 -358
  94. data/ext/nokogiri/extconf.rb +581 -374
  95. data/ext/nokogiri/html_document.c +78 -82
  96. data/ext/nokogiri/html_element_description.c +84 -71
  97. data/ext/nokogiri/html_entity_lookup.c +21 -16
  98. data/ext/nokogiri/html_sax_parser_context.c +69 -66
  99. data/ext/nokogiri/html_sax_push_parser.c +42 -34
  100. data/ext/nokogiri/libxml2_backwards_compat.c +121 -0
  101. data/ext/nokogiri/nokogiri.c +192 -93
  102. data/ext/nokogiri/test_global_handlers.c +40 -0
  103. data/ext/nokogiri/xml_attr.c +15 -15
  104. data/ext/nokogiri/xml_attribute_decl.c +18 -18
  105. data/ext/nokogiri/xml_cdata.c +13 -18
  106. data/ext/nokogiri/xml_comment.c +19 -26
  107. data/ext/nokogiri/xml_document.c +250 -187
  108. data/ext/nokogiri/xml_document_fragment.c +13 -15
  109. data/ext/nokogiri/xml_dtd.c +54 -48
  110. data/ext/nokogiri/xml_element_content.c +30 -27
  111. data/ext/nokogiri/xml_element_decl.c +22 -22
  112. data/ext/nokogiri/xml_encoding_handler.c +17 -11
  113. data/ext/nokogiri/xml_entity_decl.c +32 -30
  114. data/ext/nokogiri/xml_entity_reference.c +16 -18
  115. data/ext/nokogiri/xml_namespace.c +56 -49
  116. data/ext/nokogiri/xml_node.c +371 -320
  117. data/ext/nokogiri/xml_node_set.c +168 -156
  118. data/ext/nokogiri/xml_processing_instruction.c +17 -19
  119. data/ext/nokogiri/xml_reader.c +191 -157
  120. data/ext/nokogiri/xml_relax_ng.c +52 -28
  121. data/ext/nokogiri/xml_sax_parser.c +118 -118
  122. data/ext/nokogiri/xml_sax_parser_context.c +103 -86
  123. data/ext/nokogiri/xml_sax_push_parser.c +36 -27
  124. data/ext/nokogiri/xml_schema.c +95 -47
  125. data/ext/nokogiri/xml_syntax_error.c +42 -21
  126. data/ext/nokogiri/xml_text.c +13 -17
  127. data/ext/nokogiri/xml_xpath_context.c +206 -123
  128. data/ext/nokogiri/xslt_stylesheet.c +158 -161
  129. data/lib/nokogiri.rb +4 -8
  130. data/lib/nokogiri/css/parser.rb +62 -62
  131. data/lib/nokogiri/css/parser.y +2 -2
  132. data/lib/nokogiri/css/xpath_visitor.rb +70 -42
  133. data/lib/nokogiri/extension.rb +26 -0
  134. data/lib/nokogiri/html/document.rb +12 -26
  135. data/lib/nokogiri/html/document_fragment.rb +15 -15
  136. data/lib/nokogiri/nokogiri.jar +0 -0
  137. data/lib/nokogiri/version.rb +2 -148
  138. data/lib/nokogiri/version/constant.rb +5 -0
  139. data/lib/nokogiri/version/info.rb +205 -0
  140. data/lib/nokogiri/xml/builder.rb +2 -2
  141. data/lib/nokogiri/xml/document.rb +91 -35
  142. data/lib/nokogiri/xml/document_fragment.rb +4 -6
  143. data/lib/nokogiri/xml/node.rb +89 -69
  144. data/lib/nokogiri/xml/parse_options.rb +6 -0
  145. data/lib/nokogiri/xml/reader.rb +2 -9
  146. data/lib/nokogiri/xml/relax_ng.rb +6 -2
  147. data/lib/nokogiri/xml/schema.rb +12 -4
  148. data/lib/nokogiri/xml/searchable.rb +3 -1
  149. data/lib/nokogiri/xml/xpath.rb +1 -3
  150. data/lib/nokogiri/xml/xpath/syntax_error.rb +1 -1
  151. metadata +87 -164
  152. data/ext/nokogiri/html_document.h +0 -10
  153. data/ext/nokogiri/html_element_description.h +0 -10
  154. data/ext/nokogiri/html_entity_lookup.h +0 -8
  155. data/ext/nokogiri/html_sax_parser_context.h +0 -11
  156. data/ext/nokogiri/html_sax_push_parser.h +0 -9
  157. data/ext/nokogiri/nokogiri.h +0 -134
  158. data/ext/nokogiri/xml_attr.h +0 -9
  159. data/ext/nokogiri/xml_attribute_decl.h +0 -9
  160. data/ext/nokogiri/xml_cdata.h +0 -9
  161. data/ext/nokogiri/xml_comment.h +0 -9
  162. data/ext/nokogiri/xml_document.h +0 -23
  163. data/ext/nokogiri/xml_document_fragment.h +0 -10
  164. data/ext/nokogiri/xml_dtd.h +0 -10
  165. data/ext/nokogiri/xml_element_content.h +0 -10
  166. data/ext/nokogiri/xml_element_decl.h +0 -9
  167. data/ext/nokogiri/xml_encoding_handler.h +0 -8
  168. data/ext/nokogiri/xml_entity_decl.h +0 -10
  169. data/ext/nokogiri/xml_entity_reference.h +0 -9
  170. data/ext/nokogiri/xml_io.c +0 -61
  171. data/ext/nokogiri/xml_io.h +0 -11
  172. data/ext/nokogiri/xml_libxml2_hacks.c +0 -112
  173. data/ext/nokogiri/xml_libxml2_hacks.h +0 -12
  174. data/ext/nokogiri/xml_namespace.h +0 -14
  175. data/ext/nokogiri/xml_node.h +0 -13
  176. data/ext/nokogiri/xml_node_set.h +0 -12
  177. data/ext/nokogiri/xml_processing_instruction.h +0 -9
  178. data/ext/nokogiri/xml_reader.h +0 -10
  179. data/ext/nokogiri/xml_relax_ng.h +0 -9
  180. data/ext/nokogiri/xml_sax_parser.h +0 -39
  181. data/ext/nokogiri/xml_sax_parser_context.h +0 -10
  182. data/ext/nokogiri/xml_sax_push_parser.h +0 -9
  183. data/ext/nokogiri/xml_schema.h +0 -9
  184. data/ext/nokogiri/xml_syntax_error.h +0 -13
  185. data/ext/nokogiri/xml_text.h +0 -9
  186. data/ext/nokogiri/xml_xpath_context.h +0 -10
  187. data/ext/nokogiri/xslt_stylesheet.h +0 -14
@@ -1,41 +1,10 @@
1
- /**
2
- * (The MIT License)
3
- *
4
- * Copyright (c) 2008 - 2011:
5
- *
6
- * * {Aaron Patterson}[http://tenderlovemaking.com]
7
- * * {Mike Dalessio}[http://mike.daless.io]
8
- * * {Charles Nutter}[http://blog.headius.com]
9
- * * {Sergio Arbeo}[http://www.serabe.com]
10
- * * {Patrick Mahoney}[http://polycrystal.org]
11
- * * {Yoko Harada}[http://yokolet.blogspot.com]
12
- *
13
- * Permission is hereby granted, free of charge, to any person obtaining
14
- * a copy of this software and associated documentation files (the
15
- * 'Software'), to deal in the Software without restriction, including
16
- * without limitation the rights to use, copy, modify, merge, publish,
17
- * distribute, sublicense, and/or sell copies of the Software, and to
18
- * permit persons to whom the Software is furnished to do so, subject to
19
- * the following conditions:
20
- *
21
- * The above copyright notice and this permission notice shall be
22
- * included in all copies or substantial portions of the Software.
23
- *
24
- * THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
25
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
26
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
27
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
28
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
29
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
30
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
31
- */
32
-
33
1
  package nokogiri.internals;
34
2
 
35
3
  import java.util.List;
36
4
 
37
5
  import javax.xml.xpath.XPathFunction;
38
6
  import javax.xml.xpath.XPathFunctionException;
7
+ import javax.xml.namespace.QName;
39
8
 
40
9
  import org.jruby.Ruby;
41
10
  import org.jruby.RubyArray;
@@ -57,68 +26,140 @@ import static nokogiri.internals.NokogiriHelpers.nodeListToRubyArray;
57
26
 
58
27
  /**
59
28
  * Xpath function handler.
60
- *
29
+ *
61
30
  * @author sergio
62
31
  * @author Yoko Harada <yokolet@gmail.com>
63
32
  */
64
- public class NokogiriXPathFunction implements XPathFunction {
65
-
66
- private final IRubyObject handler;
67
- private final String name;
68
- private final int arity;
69
-
70
- public static NokogiriXPathFunction create(IRubyObject handler, String name, int arity) {
71
- return new NokogiriXPathFunction(handler, name, arity);
33
+ public class NokogiriXPathFunction implements XPathFunction
34
+ {
35
+
36
+ private final IRubyObject handler;
37
+ private final QName name;
38
+ private final int arity;
39
+
40
+ public static NokogiriXPathFunction
41
+ create(IRubyObject handler, QName name, int arity)
42
+ {
43
+ return new NokogiriXPathFunction(handler, name, arity);
44
+ }
45
+
46
+ private
47
+ NokogiriXPathFunction(IRubyObject handler, QName name, int arity)
48
+ {
49
+ this.handler = handler;
50
+ this.name = name;
51
+ this.arity = arity;
52
+ }
53
+
54
+ public Object
55
+ evaluate(List args) throws XPathFunctionException
56
+ {
57
+ if (args.size() != this.arity) {
58
+ throw new XPathFunctionException("arity does not match");
72
59
  }
73
60
 
74
- private NokogiriXPathFunction(IRubyObject handler, String name, int arity) {
75
- this.handler = handler;
76
- this.name = name;
77
- this.arity = arity;
61
+ if (name.getNamespaceURI().equals(NokogiriNamespaceContext.NOKOGIRI_BUILTIN_URI)) {
62
+ if (name.getLocalPart().equals("css-class")) {
63
+ return builtinCssClass(args);
64
+ }
78
65
  }
79
66
 
80
- public Object evaluate(List args) throws XPathFunctionException {
81
- if (args.size() != this.arity) {
82
- throw new XPathFunctionException("arity does not match");
83
- }
84
-
85
- final Ruby runtime = this.handler.getRuntime();
86
- ThreadContext context = runtime.getCurrentContext();
67
+ if (this.handler.isNil()) {
68
+ throw new XPathFunctionException("no custom function handler declared for '" + name + "'");
69
+ }
87
70
 
88
- IRubyObject result = Helpers.invoke(context, this.handler, this.name, fromObjectToRubyArgs(runtime, args));
71
+ final Ruby runtime = this.handler.getRuntime();
72
+ ThreadContext context = runtime.getCurrentContext();
73
+ IRubyObject result = Helpers.invoke(context, this.handler, this.name.getLocalPart(),
74
+ fromObjectToRubyArgs(runtime, args));
75
+ return fromRubyToObject(runtime, result);
76
+ }
89
77
 
90
- return fromRubyToObject(runtime, result);
78
+ private static IRubyObject[]
79
+ fromObjectToRubyArgs(final Ruby runtime, List args)
80
+ {
81
+ IRubyObject[] newArgs = new IRubyObject[args.size()];
82
+ for (int i = 0; i < args.size(); i++) {
83
+ newArgs[i] = fromObjectToRuby(runtime, args.get(i));
91
84
  }
85
+ return newArgs;
86
+ }
92
87
 
93
- private static IRubyObject[] fromObjectToRubyArgs(final Ruby runtime, List args) {
94
- IRubyObject[] newArgs = new IRubyObject[args.size()];
95
- for(int i = 0; i < args.size(); i++) {
96
- newArgs[i] = fromObjectToRuby(runtime, args.get(i));
97
- }
98
- return newArgs;
88
+ private static IRubyObject
89
+ fromObjectToRuby(final Ruby runtime, Object obj)
90
+ {
91
+ // argument object type is one of NodeList, String, Boolean, or Double.
92
+ if (obj instanceof NodeList) {
93
+ IRubyObject[] nodes = nodeListToRubyArray(runtime, (NodeList) obj);
94
+ return XmlNodeSet.newNodeSet(runtime, nodes);
99
95
  }
96
+ return JavaUtil.convertJavaToUsableRubyObject(runtime, obj);
97
+ }
100
98
 
101
- private static IRubyObject fromObjectToRuby(final Ruby runtime, Object obj) {
102
- // argument object type is one of NodeList, String, Boolean, or Double.
103
- if (obj instanceof NodeList) {
104
- IRubyObject[] nodes = nodeListToRubyArray(runtime, (NodeList) obj);
105
- return XmlNodeSet.newNodeSet(runtime, nodes);
106
- }
107
- return JavaUtil.convertJavaToUsableRubyObject(runtime, obj);
99
+ private static Object
100
+ fromRubyToObject(final Ruby runtime, IRubyObject obj)
101
+ {
102
+ if (obj instanceof RubyString) { return obj.asJavaString(); }
103
+ if (obj instanceof RubyBoolean) { return obj.toJava(Boolean.class); }
104
+ if (obj instanceof RubyFloat) { return obj.toJava(Double.class); }
105
+ if (obj instanceof RubyInteger) {
106
+ if (obj instanceof RubyFixnum) { return RubyFixnum.fix2long(obj); }
107
+ return obj.toJava(java.math.BigInteger.class);
108
+ }
109
+ if (obj instanceof XmlNodeSet) { return obj; }
110
+ if (obj instanceof RubyArray) {
111
+ return XmlNodeSet.newNodeSet(runtime, ((RubyArray) obj).toJavaArray());
112
+ }
113
+ /*if (o instanceof XmlNode)*/ return ((XmlNode) obj).getNode();
114
+ }
115
+
116
+ private static boolean
117
+ builtinCssClass(List args) throws XPathFunctionException
118
+ {
119
+ if (args.size() != 2) {
120
+ throw new XPathFunctionException("builtin function nokogiri:css-class takes two arguments");
121
+ }
122
+
123
+ String hay = args.get(0).toString();
124
+ String needle = args.get(1).toString();
125
+
126
+ if (needle.length() == 0) {
127
+ return true;
108
128
  }
109
129
 
110
- private static Object fromRubyToObject(final Ruby runtime, IRubyObject obj) {
111
- if (obj instanceof RubyString) return obj.asJavaString();
112
- if (obj instanceof RubyBoolean) return obj.toJava(Boolean.class);
113
- if (obj instanceof RubyFloat) return obj.toJava(Double.class);
114
- if (obj instanceof RubyInteger) {
115
- if ( obj instanceof RubyFixnum ) return RubyFixnum.fix2long(obj);
116
- return obj.toJava(java.math.BigInteger.class);
130
+ int j = 0;
131
+ int j_lim = hay.length() - needle.length();
132
+ while (j <= j_lim) {
133
+ int k;
134
+ for (k = 0; k < needle.length(); k++) {
135
+ if (needle.charAt(k) != hay.charAt(j + k)) {
136
+ break;
117
137
  }
118
- if (obj instanceof XmlNodeSet) return obj;
119
- if (obj instanceof RubyArray) {
120
- return XmlNodeSet.newNodeSet(runtime, ((RubyArray) obj).toJavaArray());
138
+ }
139
+ if (k == needle.length()) {
140
+ if ((hay.length() == (j + k)) || isWhitespace(hay.charAt(j + k))) {
141
+ return true ;
121
142
  }
122
- /*if (o instanceof XmlNode)*/ return ((XmlNode) obj).getNode();
143
+ }
144
+
145
+ /* advance str to whitespace */
146
+ while (j <= j_lim && !isWhitespace(hay.charAt(j))) {
147
+ j++;
148
+ }
149
+
150
+ /* advance str to start of next word or end of string */
151
+ while (j <= j_lim && isWhitespace(hay.charAt(j))) {
152
+ j++;
153
+ }
123
154
  }
155
+
156
+ return false;
157
+ }
158
+
159
+ private static boolean
160
+ isWhitespace(char subject)
161
+ {
162
+ // see libxml2's xmlIsBlank_ch()
163
+ return ((subject == 0x09) || (subject == 0x0A) || (subject == 0x0D) || (subject == 0x20));
164
+ }
124
165
  }
@@ -1,35 +1,3 @@
1
- /**
2
- * (The MIT License)
3
- *
4
- * Copyright (c) 2008 - 2011:
5
- *
6
- * * {Aaron Patterson}[http://tenderlovemaking.com]
7
- * * {Mike Dalessio}[http://mike.daless.io]
8
- * * {Charles Nutter}[http://blog.headius.com]
9
- * * {Sergio Arbeo}[http://www.serabe.com]
10
- * * {Patrick Mahoney}[http://polycrystal.org]
11
- * * {Yoko Harada}[http://yokolet.blogspot.com]
12
- *
13
- * Permission is hereby granted, free of charge, to any person obtaining
14
- * a copy of this software and associated documentation files (the
15
- * 'Software'), to deal in the Software without restriction, including
16
- * without limitation the rights to use, copy, modify, merge, publish,
17
- * distribute, sublicense, and/or sell copies of the Software, and to
18
- * permit persons to whom the Software is furnished to do so, subject to
19
- * the following conditions:
20
- *
21
- * The above copyright notice and this permission notice shall be
22
- * included in all copies or substantial portions of the Software.
23
- *
24
- * THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
25
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
26
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
27
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
28
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
29
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
30
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
31
- */
32
-
33
1
  package nokogiri.internals;
34
2
 
35
3
  import javax.xml.namespace.QName;
@@ -39,32 +7,44 @@ import javax.xml.xpath.XPathFunctionResolver;
39
7
  import org.jruby.runtime.builtin.IRubyObject;
40
8
 
41
9
  /**
42
- * Xpath function resolver class, which is used in XmlXpathContext.
43
- *
10
+ * Xpath function resolver class, which is used in XmlXpathContext.
11
+ *
44
12
  * @author sergio
45
13
  * @author Yoko Harada <yokolet@gmail.com>
46
14
  */
47
- public final class NokogiriXPathFunctionResolver implements XPathFunctionResolver {
48
-
49
- private IRubyObject handler;
50
-
51
- public static NokogiriXPathFunctionResolver create(IRubyObject handler) {
52
- NokogiriXPathFunctionResolver freshResolver = new NokogiriXPathFunctionResolver();
53
- freshResolver.setHandler(handler);
54
- return freshResolver;
55
- }
56
-
57
- private NokogiriXPathFunctionResolver() {}
15
+ public final class NokogiriXPathFunctionResolver implements XPathFunctionResolver
16
+ {
58
17
 
59
- public final IRubyObject getHandler() {
60
- return handler;
61
- }
62
-
63
- public void setHandler(IRubyObject handler) {
64
- this.handler = handler;
65
- }
18
+ private IRubyObject handler;
66
19
 
67
- public XPathFunction resolveFunction(QName name, int arity) {
68
- return NokogiriXPathFunction.create(handler, name.getLocalPart(), arity);
20
+ public static NokogiriXPathFunctionResolver
21
+ create(IRubyObject handler)
22
+ {
23
+ NokogiriXPathFunctionResolver freshResolver = new NokogiriXPathFunctionResolver();
24
+ if (!handler.isNil()) {
25
+ freshResolver.setHandler(handler);
69
26
  }
27
+ return freshResolver;
28
+ }
29
+
30
+ private
31
+ NokogiriXPathFunctionResolver() {}
32
+
33
+ public final IRubyObject
34
+ getHandler()
35
+ {
36
+ return handler;
37
+ }
38
+
39
+ public void
40
+ setHandler(IRubyObject handler)
41
+ {
42
+ this.handler = handler;
43
+ }
44
+
45
+ public XPathFunction
46
+ resolveFunction(QName name, int arity)
47
+ {
48
+ return NokogiriXPathFunction.create(handler, name, arity);
49
+ }
70
50
  }
@@ -1,34 +1,3 @@
1
- /**
2
- * (The MIT License)
3
- *
4
- * Copyright (c) 2008 - 2012:
5
- *
6
- * * {Aaron Patterson}[http://tenderlovemaking.com]
7
- * * {Mike Dalessio}[http://mike.daless.io]
8
- * * {Charles Nutter}[http://blog.headius.com]
9
- * * {Sergio Arbeo}[http://www.serabe.com]
10
- * * {Patrick Mahoney}[http://polycrystal.org]
11
- * * {Yoko Harada}[http://yokolet.blogspot.com]
12
- *
13
- * Permission is hereby granted, free of charge, to any person obtaining
14
- * a copy of this software and associated documentation files (the
15
- * 'Software'), to deal in the Software without restriction, including
16
- * without limitation the rights to use, copy, modify, merge, publish,
17
- * distribute, sublicense, and/or sell copies of the Software, and to
18
- * permit persons to whom the Software is furnished to do so, subject to
19
- * the following conditions:
20
- *
21
- * The above copyright notice and this permission notice shall be
22
- * included in all copies or substantial portions of the Software.
23
- *
24
- * THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
25
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
26
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
27
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
28
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
29
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
30
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
31
- */
32
1
  package nokogiri.internals;
33
2
 
34
3
  import java.util.HashMap;
@@ -37,24 +6,32 @@ import javax.xml.xpath.XPathVariableResolver;
37
6
 
38
7
  /**
39
8
  * XPath variable support
40
- *
9
+ *
41
10
  * @author Ken Bloom <kbloom@gmail.com>
42
11
  * @author Yoko Harada <yokolet@gmail.com>
43
12
  */
44
- public class NokogiriXPathVariableResolver implements XPathVariableResolver {
13
+ public class NokogiriXPathVariableResolver implements XPathVariableResolver
14
+ {
15
+
16
+ private final HashMap<QName, String> variables = new HashMap<QName, String>();
17
+
18
+ public static NokogiriXPathVariableResolver
19
+ create()
20
+ {
21
+ return new NokogiriXPathVariableResolver();
22
+ }
45
23
 
46
- private final HashMap<QName,String> variables = new HashMap<QName,String>();
24
+ private
25
+ NokogiriXPathVariableResolver() {}
47
26
 
48
- public static NokogiriXPathVariableResolver create() {
49
- return new NokogiriXPathVariableResolver();
50
- }
51
-
52
- private NokogiriXPathVariableResolver() {}
53
-
54
- public Object resolveVariable(QName variableName){
55
- return variables.get(variableName);
56
- }
57
- public void registerVariable(String name,String value){
58
- variables.put(new QName(name),value);
59
- }
27
+ public Object
28
+ resolveVariable(QName variableName)
29
+ {
30
+ return variables.get(variableName);
31
+ }
32
+ public void
33
+ registerVariable(String name, String value)
34
+ {
35
+ variables.put(new QName(name), value);
36
+ }
60
37
  }
@@ -1,35 +1,3 @@
1
- /**
2
- * (The MIT License)
3
- *
4
- * Copyright (c) 2008 - 2012:
5
- *
6
- * * {Aaron Patterson}[http://tenderlovemaking.com]
7
- * * {Mike Dalessio}[http://mike.daless.io]
8
- * * {Charles Nutter}[http://blog.headius.com]
9
- * * {Sergio Arbeo}[http://www.serabe.com]
10
- * * {Patrick Mahoney}[http://polycrystal.org]
11
- * * {Yoko Harada}[http://yokolet.blogspot.com]
12
- *
13
- * Permission is hereby granted, free of charge, to any person obtaining
14
- * a copy of this software and associated documentation files (the
15
- * 'Software'), to deal in the Software without restriction, including
16
- * without limitation the rights to use, copy, modify, merge, publish,
17
- * distribute, sublicense, and/or sell copies of the Software, and to
18
- * permit persons to whom the Software is furnished to do so, subject to
19
- * the following conditions:
20
- *
21
- * The above copyright notice and this permission notice shall be
22
- * included in all copies or substantial portions of the Software.
23
- *
24
- * THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
25
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
26
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
27
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
28
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
29
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
30
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
31
- */
32
-
33
1
  package nokogiri.internals;
34
2
 
35
3
  import javax.xml.transform.ErrorListener;
@@ -37,51 +5,66 @@ import javax.xml.transform.TransformerException;
37
5
 
38
6
  /**
39
7
  * Error Listener for XSLT transformer
40
- *
8
+ *
41
9
  * @author Yoko Harada <yokolet@gmail.com>
42
10
  */
43
- public class NokogiriXsltErrorListener implements ErrorListener {
44
- public enum ErrorType {
45
- SUCCESS,
46
- WARNING,
47
- ERROR,
48
- FATAL
49
- }
11
+ public class NokogiriXsltErrorListener implements ErrorListener
12
+ {
13
+ public enum ErrorType {
14
+ SUCCESS,
15
+ WARNING,
16
+ ERROR,
17
+ FATAL
18
+ }
19
+
20
+ private ErrorType type = ErrorType.SUCCESS;
21
+ private String errorMessage = null;
22
+ private Exception exception = null;
23
+
24
+ public void
25
+ warning(TransformerException ex)
26
+ {
27
+ type = ErrorType.WARNING;
28
+ setError(ex);
29
+ }
30
+
31
+ public void
32
+ error(TransformerException ex)
33
+ {
34
+ type = ErrorType.ERROR;
35
+ setError(ex);
36
+ }
37
+
38
+ public void
39
+ fatalError(TransformerException ex)
40
+ {
41
+ type = ErrorType.FATAL;
42
+ setError(ex);
43
+ }
50
44
 
51
- private ErrorType type = ErrorType.SUCCESS;
52
- private String errorMessage = null;
53
- private Exception exception = null;
45
+ private void
46
+ setError(TransformerException ex)
47
+ {
48
+ errorMessage = ex.getMessage();
49
+ exception = ex;
50
+ }
54
51
 
55
- public void warning(TransformerException ex) {
56
- type = ErrorType.WARNING;
57
- setError(ex);
58
- }
52
+ public String
53
+ getErrorMessage()
54
+ {
55
+ return errorMessage;
56
+ }
59
57
 
60
- public void error(TransformerException ex) {
61
- type = ErrorType.ERROR;
62
- setError(ex);
63
- }
58
+ public ErrorType
59
+ getErrorType()
60
+ {
61
+ return type;
62
+ }
64
63
 
65
- public void fatalError(TransformerException ex) {
66
- type = ErrorType.FATAL;
67
- setError(ex);
68
- }
69
-
70
- private void setError(TransformerException ex) {
71
- errorMessage = ex.getMessage();
72
- exception = ex;
73
- }
74
-
75
- public String getErrorMessage() {
76
- return errorMessage;
77
- }
78
-
79
- public ErrorType getErrorType() {
80
- return type;
81
- }
82
-
83
- public Exception getException() {
84
- return exception;
85
- }
64
+ public Exception
65
+ getException()
66
+ {
67
+ return exception;
68
+ }
86
69
 
87
70
  }