nokogiri 1.11.1-java → 1.11.6-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 (143) hide show
  1. checksums.yaml +4 -4
  2. data/LICENSE-DEPENDENCIES.md +12 -12
  3. data/LICENSE.md +1 -1
  4. data/README.md +21 -16
  5. data/dependencies.yml +12 -12
  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 -1620
  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 +85 -104
  31. data/ext/java/nokogiri/XmlSaxParserContext.java +328 -315
  32. data/ext/java/nokogiri/XmlSaxPushParser.java +227 -220
  33. data/ext/java/nokogiri/XmlSchema.java +328 -295
  34. data/ext/java/nokogiri/XmlSyntaxError.java +113 -115
  35. data/ext/java/nokogiri/XmlText.java +55 -76
  36. data/ext/java/nokogiri/XmlXpathContext.java +240 -238
  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 -202
  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 +81 -98
  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 +116 -131
  53. data/ext/java/nokogiri/internals/NokogiriXPathFunctionResolver.java +34 -56
  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 +34 -474
  94. data/ext/nokogiri/extconf.rb +253 -183
  95. data/ext/nokogiri/html_document.c +10 -15
  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 +66 -65
  99. data/ext/nokogiri/html_sax_push_parser.c +29 -27
  100. data/ext/nokogiri/libxml2_backwards_compat.c +121 -0
  101. data/ext/nokogiri/nokogiri.c +190 -63
  102. data/ext/nokogiri/test_global_handlers.c +3 -4
  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 +246 -188
  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 +385 -326
  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 +29 -23
  121. data/ext/nokogiri/xml_sax_parser.c +117 -112
  122. data/ext/nokogiri/xml_sax_parser_context.c +100 -85
  123. data/ext/nokogiri/xml_sax_push_parser.c +34 -27
  124. data/ext/nokogiri/xml_schema.c +48 -42
  125. data/ext/nokogiri/xml_syntax_error.c +21 -23
  126. data/ext/nokogiri/xml_text.c +13 -17
  127. data/ext/nokogiri/xml_xpath_context.c +134 -127
  128. data/ext/nokogiri/xslt_stylesheet.c +157 -157
  129. data/lib/nokogiri.rb +1 -22
  130. data/lib/nokogiri/css/parser.rb +1 -1
  131. data/lib/nokogiri/extension.rb +26 -0
  132. data/lib/nokogiri/html/document_fragment.rb +15 -15
  133. data/lib/nokogiri/nokogiri.jar +0 -0
  134. data/lib/nokogiri/version/constant.rb +1 -1
  135. data/lib/nokogiri/version/info.rb +32 -8
  136. data/lib/nokogiri/xml/document.rb +74 -28
  137. data/lib/nokogiri/xml/node.rb +39 -42
  138. data/lib/nokogiri/xml/reader.rb +2 -9
  139. data/lib/nokogiri/xml/xpath.rb +1 -3
  140. data/lib/nokogiri/xml/xpath/syntax_error.rb +1 -1
  141. metadata +7 -8
  142. data/ext/nokogiri/xml_io.c +0 -63
  143. data/ext/nokogiri/xml_libxml2_hacks.c +0 -112
@@ -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 java.util.List;
@@ -58,123 +26,140 @@ import static nokogiri.internals.NokogiriHelpers.nodeListToRubyArray;
58
26
 
59
27
  /**
60
28
  * Xpath function handler.
61
- *
29
+ *
62
30
  * @author sergio
63
31
  * @author Yoko Harada <yokolet@gmail.com>
64
32
  */
65
- public class NokogiriXPathFunction implements XPathFunction {
66
-
67
- private final IRubyObject handler;
68
- private final QName name;
69
- private final int arity;
70
-
71
- public static NokogiriXPathFunction create(IRubyObject handler, QName name, int arity) {
72
- 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");
73
59
  }
74
60
 
75
- private NokogiriXPathFunction(IRubyObject handler, QName name, int arity) {
76
- this.handler = handler;
77
- this.name = name;
78
- this.arity = arity;
61
+ if (name.getNamespaceURI().equals(NokogiriNamespaceContext.NOKOGIRI_BUILTIN_URI)) {
62
+ if (name.getLocalPart().equals("css-class")) {
63
+ return builtinCssClass(args);
64
+ }
79
65
  }
80
66
 
81
- public Object evaluate(List args) throws XPathFunctionException {
82
- if (args.size() != this.arity) {
83
- throw new XPathFunctionException("arity does not match");
84
- }
85
-
86
- if (name.getNamespaceURI().equals(NokogiriNamespaceContext.NOKOGIRI_BUILTIN_URI)) {
87
- if (name.getLocalPart().equals("css-class")) {
88
- return builtinCssClass(args);
89
- }
90
- }
91
-
92
- if (this.handler.isNil()) {
93
- throw new XPathFunctionException("no custom function handler declared for '" + name + "'");
94
- }
95
-
96
- final Ruby runtime = this.handler.getRuntime();
97
- ThreadContext context = runtime.getCurrentContext();
98
- IRubyObject result = Helpers.invoke(context, this.handler, this.name.getLocalPart(),
99
- fromObjectToRubyArgs(runtime, args));
100
- return fromRubyToObject(runtime, result);
67
+ if (this.handler.isNil()) {
68
+ throw new XPathFunctionException("no custom function handler declared for '" + name + "'");
101
69
  }
102
70
 
103
- private static IRubyObject[] fromObjectToRubyArgs(final Ruby runtime, List args) {
104
- IRubyObject[] newArgs = new IRubyObject[args.size()];
105
- for(int i = 0; i < args.size(); i++) {
106
- newArgs[i] = fromObjectToRuby(runtime, args.get(i));
107
- }
108
- return newArgs;
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
+ }
77
+
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));
109
84
  }
110
-
111
- private static IRubyObject fromObjectToRuby(final Ruby runtime, Object obj) {
112
- // argument object type is one of NodeList, String, Boolean, or Double.
113
- if (obj instanceof NodeList) {
114
- IRubyObject[] nodes = nodeListToRubyArray(runtime, (NodeList) obj);
115
- return XmlNodeSet.newNodeSet(runtime, nodes);
116
- }
117
- return JavaUtil.convertJavaToUsableRubyObject(runtime, obj);
85
+ return newArgs;
86
+ }
87
+
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);
118
95
  }
119
-
120
- private static Object fromRubyToObject(final Ruby runtime, IRubyObject obj) {
121
- if (obj instanceof RubyString) return obj.asJavaString();
122
- if (obj instanceof RubyBoolean) return obj.toJava(Boolean.class);
123
- if (obj instanceof RubyFloat) return obj.toJava(Double.class);
124
- if (obj instanceof RubyInteger) {
125
- if ( obj instanceof RubyFixnum ) return RubyFixnum.fix2long(obj);
126
- return obj.toJava(java.math.BigInteger.class);
127
- }
128
- if (obj instanceof XmlNodeSet) return obj;
129
- if (obj instanceof RubyArray) {
130
- return XmlNodeSet.newNodeSet(runtime, ((RubyArray) obj).toJavaArray());
131
- }
132
- /*if (o instanceof XmlNode)*/ return ((XmlNode) obj).getNode();
96
+ return JavaUtil.convertJavaToUsableRubyObject(runtime, obj);
97
+ }
98
+
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");
133
121
  }
134
122
 
135
- private static boolean builtinCssClass(List args) throws XPathFunctionException {
136
- if (args.size() != 2) {
137
- throw new XPathFunctionException("builtin function nokogiri:css-class takes two arguments");
138
- }
123
+ String hay = args.get(0).toString();
124
+ String needle = args.get(1).toString();
139
125
 
140
- String hay = args.get(0).toString();
141
- String needle = args.get(1).toString();
126
+ if (needle.length() == 0) {
127
+ return true;
128
+ }
142
129
 
143
- if (needle.length() == 0) {
144
- return true;
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;
145
137
  }
146
-
147
- int j = 0;
148
- int j_lim = hay.length() - needle.length();
149
- while (j <= j_lim) {
150
- int k;
151
- for (k = 0; k < needle.length(); k++) {
152
- if (needle.charAt(k) != hay.charAt(j+k)) {
153
- break;
154
- }
155
- }
156
- if (k == needle.length()) {
157
- if ((hay.length() == (j+k)) || isWhitespace(hay.charAt(j+k))) {
158
- return true ;
159
- }
160
- }
161
-
162
- /* advance str to whitespace */
163
- while (j <= j_lim && !isWhitespace(hay.charAt(j))) {
164
- j++;
165
- }
166
-
167
- /* advance str to start of next word or end of string */
168
- while (j <= j_lim && isWhitespace(hay.charAt(j))) {
169
- j++;
170
- }
138
+ }
139
+ if (k == needle.length()) {
140
+ if ((hay.length() == (j + k)) || isWhitespace(hay.charAt(j + k))) {
141
+ return true ;
171
142
  }
143
+ }
172
144
 
173
- return false;
174
- }
145
+ /* advance str to whitespace */
146
+ while (j <= j_lim && !isWhitespace(hay.charAt(j))) {
147
+ j++;
148
+ }
175
149
 
176
- private static boolean isWhitespace(char subject) {
177
- // see libxml2's xmlIsBlank_ch()
178
- return ((subject == 0x09) || (subject == 0x0A) || (subject == 0x0D) || (subject == 0x20));
150
+ /* advance str to start of next word or end of string */
151
+ while (j <= j_lim && isWhitespace(hay.charAt(j))) {
152
+ j++;
153
+ }
179
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
+ }
180
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,34 +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
- if (!handler.isNil()) {
54
- freshResolver.setHandler(handler);
55
- }
56
- return freshResolver;
57
- }
58
-
59
- private NokogiriXPathFunctionResolver() {}
15
+ public final class NokogiriXPathFunctionResolver implements XPathFunctionResolver
16
+ {
60
17
 
61
- public final IRubyObject getHandler() {
62
- return handler;
63
- }
64
-
65
- public void setHandler(IRubyObject handler) {
66
- this.handler = handler;
67
- }
18
+ private IRubyObject handler;
68
19
 
69
- public XPathFunction resolveFunction(QName name, int arity) {
70
- return NokogiriXPathFunction.create(handler, name, arity);
20
+ public static NokogiriXPathFunctionResolver
21
+ create(IRubyObject handler)
22
+ {
23
+ NokogiriXPathFunctionResolver freshResolver = new NokogiriXPathFunctionResolver();
24
+ if (!handler.isNil()) {
25
+ freshResolver.setHandler(handler);
71
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
+ }
72
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
  }