nokogiri 1.11.0.rc4-java → 1.11.5-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 (144) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +3 -0
  3. data/LICENSE-DEPENDENCIES.md +12 -12
  4. data/LICENSE.md +1 -1
  5. data/README.md +168 -91
  6. data/dependencies.yml +12 -12
  7. data/ext/java/nokogiri/EncodingHandler.java +76 -89
  8. data/ext/java/nokogiri/HtmlDocument.java +135 -144
  9. data/ext/java/nokogiri/HtmlElementDescription.java +102 -117
  10. data/ext/java/nokogiri/HtmlEntityLookup.java +33 -60
  11. data/ext/java/nokogiri/HtmlSaxParserContext.java +218 -222
  12. data/ext/java/nokogiri/HtmlSaxPushParser.java +162 -169
  13. data/ext/java/nokogiri/NokogiriService.java +595 -556
  14. data/ext/java/nokogiri/XmlAttr.java +118 -126
  15. data/ext/java/nokogiri/XmlAttributeDecl.java +95 -106
  16. data/ext/java/nokogiri/XmlCdata.java +35 -58
  17. data/ext/java/nokogiri/XmlComment.java +46 -67
  18. data/ext/java/nokogiri/XmlDocument.java +645 -572
  19. data/ext/java/nokogiri/XmlDocumentFragment.java +125 -137
  20. data/ext/java/nokogiri/XmlDtd.java +448 -414
  21. data/ext/java/nokogiri/XmlElement.java +23 -48
  22. data/ext/java/nokogiri/XmlElementContent.java +343 -316
  23. data/ext/java/nokogiri/XmlElementDecl.java +124 -125
  24. data/ext/java/nokogiri/XmlEntityDecl.java +119 -127
  25. data/ext/java/nokogiri/XmlEntityReference.java +49 -72
  26. data/ext/java/nokogiri/XmlNamespace.java +175 -175
  27. data/ext/java/nokogiri/XmlNode.java +1843 -1620
  28. data/ext/java/nokogiri/XmlNodeSet.java +361 -331
  29. data/ext/java/nokogiri/XmlProcessingInstruction.java +47 -69
  30. data/ext/java/nokogiri/XmlReader.java +513 -450
  31. data/ext/java/nokogiri/XmlRelaxng.java +85 -104
  32. data/ext/java/nokogiri/XmlSaxParserContext.java +328 -315
  33. data/ext/java/nokogiri/XmlSaxPushParser.java +227 -220
  34. data/ext/java/nokogiri/XmlSchema.java +328 -295
  35. data/ext/java/nokogiri/XmlSyntaxError.java +113 -115
  36. data/ext/java/nokogiri/XmlText.java +55 -76
  37. data/ext/java/nokogiri/XmlXpathContext.java +240 -238
  38. data/ext/java/nokogiri/XsltStylesheet.java +280 -269
  39. data/ext/java/nokogiri/internals/ClosedStreamException.java +5 -2
  40. data/ext/java/nokogiri/internals/HtmlDomParserContext.java +201 -202
  41. data/ext/java/nokogiri/internals/IgnoreSchemaErrorsErrorHandler.java +17 -10
  42. data/ext/java/nokogiri/internals/NokogiriBlockingQueueInputStream.java +43 -16
  43. data/ext/java/nokogiri/internals/NokogiriDomParser.java +63 -80
  44. data/ext/java/nokogiri/internals/NokogiriEntityResolver.java +107 -88
  45. data/ext/java/nokogiri/internals/NokogiriErrorHandler.java +27 -52
  46. data/ext/java/nokogiri/internals/NokogiriHandler.java +316 -286
  47. data/ext/java/nokogiri/internals/NokogiriHelpers.java +736 -652
  48. data/ext/java/nokogiri/internals/NokogiriNamespaceCache.java +184 -173
  49. data/ext/java/nokogiri/internals/NokogiriNamespaceContext.java +81 -98
  50. data/ext/java/nokogiri/internals/NokogiriNonStrictErrorHandler.java +64 -79
  51. data/ext/java/nokogiri/internals/NokogiriNonStrictErrorHandler4NekoHtml.java +84 -99
  52. data/ext/java/nokogiri/internals/NokogiriStrictErrorHandler.java +48 -65
  53. data/ext/java/nokogiri/internals/NokogiriXPathFunction.java +116 -131
  54. data/ext/java/nokogiri/internals/NokogiriXPathFunctionResolver.java +34 -56
  55. data/ext/java/nokogiri/internals/NokogiriXPathVariableResolver.java +23 -46
  56. data/ext/java/nokogiri/internals/NokogiriXsltErrorListener.java +55 -72
  57. data/ext/java/nokogiri/internals/ParserContext.java +206 -211
  58. data/ext/java/nokogiri/internals/ReaderNode.java +478 -403
  59. data/ext/java/nokogiri/internals/SaveContextVisitor.java +822 -739
  60. data/ext/java/nokogiri/internals/SchemaErrorHandler.java +31 -54
  61. data/ext/java/nokogiri/internals/XalanDTMManagerPatch.java +129 -123
  62. data/ext/java/nokogiri/internals/XmlDeclHandler.java +3 -34
  63. data/ext/java/nokogiri/internals/XmlDomParserContext.java +206 -207
  64. data/ext/java/nokogiri/internals/XmlSaxParser.java +22 -47
  65. data/ext/java/nokogiri/internals/c14n/AttrCompare.java +71 -68
  66. data/ext/java/nokogiri/internals/c14n/C14nHelper.java +137 -118
  67. data/ext/java/nokogiri/internals/c14n/CanonicalFilter.java +27 -21
  68. data/ext/java/nokogiri/internals/c14n/CanonicalizationException.java +74 -61
  69. data/ext/java/nokogiri/internals/c14n/Canonicalizer.java +230 -205
  70. data/ext/java/nokogiri/internals/c14n/Canonicalizer11.java +572 -547
  71. data/ext/java/nokogiri/internals/c14n/Canonicalizer11_OmitComments.java +17 -10
  72. data/ext/java/nokogiri/internals/c14n/Canonicalizer11_WithComments.java +17 -10
  73. data/ext/java/nokogiri/internals/c14n/Canonicalizer20010315.java +323 -302
  74. data/ext/java/nokogiri/internals/c14n/Canonicalizer20010315Excl.java +232 -219
  75. data/ext/java/nokogiri/internals/c14n/Canonicalizer20010315ExclOmitComments.java +22 -15
  76. data/ext/java/nokogiri/internals/c14n/Canonicalizer20010315ExclWithComments.java +23 -16
  77. data/ext/java/nokogiri/internals/c14n/Canonicalizer20010315OmitComments.java +23 -16
  78. data/ext/java/nokogiri/internals/c14n/Canonicalizer20010315WithComments.java +22 -15
  79. data/ext/java/nokogiri/internals/c14n/CanonicalizerBase.java +575 -545
  80. data/ext/java/nokogiri/internals/c14n/CanonicalizerPhysical.java +141 -120
  81. data/ext/java/nokogiri/internals/c14n/CanonicalizerSpi.java +39 -38
  82. data/ext/java/nokogiri/internals/c14n/Constants.java +13 -10
  83. data/ext/java/nokogiri/internals/c14n/ElementProxy.java +279 -247
  84. data/ext/java/nokogiri/internals/c14n/HelperNodeList.java +66 -53
  85. data/ext/java/nokogiri/internals/c14n/IgnoreAllErrorHandler.java +44 -37
  86. data/ext/java/nokogiri/internals/c14n/InclusiveNamespaces.java +135 -120
  87. data/ext/java/nokogiri/internals/c14n/InvalidCanonicalizerException.java +59 -48
  88. data/ext/java/nokogiri/internals/c14n/NameSpaceSymbTable.java +384 -334
  89. data/ext/java/nokogiri/internals/c14n/NodeFilter.java +25 -24
  90. data/ext/java/nokogiri/internals/c14n/UtfHelpper.java +151 -140
  91. data/ext/java/nokogiri/internals/c14n/XMLUtils.java +456 -423
  92. data/ext/java/nokogiri/internals/dom2dtm/DOM2DTM.java +1466 -1500
  93. data/ext/java/nokogiri/internals/dom2dtm/DOM2DTMdefaultNamespaceDeclarationNode.java +626 -574
  94. data/ext/nokogiri/depend +34 -474
  95. data/ext/nokogiri/extconf.rb +270 -183
  96. data/ext/nokogiri/html_document.c +10 -15
  97. data/ext/nokogiri/html_element_description.c +84 -71
  98. data/ext/nokogiri/html_entity_lookup.c +21 -16
  99. data/ext/nokogiri/html_sax_parser_context.c +67 -64
  100. data/ext/nokogiri/html_sax_push_parser.c +42 -34
  101. data/ext/nokogiri/libxml2_backwards_compat.c +121 -0
  102. data/ext/nokogiri/nokogiri.c +190 -60
  103. data/ext/nokogiri/test_global_handlers.c +40 -0
  104. data/ext/nokogiri/xml_attr.c +15 -15
  105. data/ext/nokogiri/xml_attribute_decl.c +18 -18
  106. data/ext/nokogiri/xml_cdata.c +13 -18
  107. data/ext/nokogiri/xml_comment.c +19 -26
  108. data/ext/nokogiri/xml_document.c +246 -188
  109. data/ext/nokogiri/xml_document_fragment.c +13 -15
  110. data/ext/nokogiri/xml_dtd.c +54 -48
  111. data/ext/nokogiri/xml_element_content.c +30 -27
  112. data/ext/nokogiri/xml_element_decl.c +22 -22
  113. data/ext/nokogiri/xml_encoding_handler.c +17 -11
  114. data/ext/nokogiri/xml_entity_decl.c +32 -30
  115. data/ext/nokogiri/xml_entity_reference.c +16 -18
  116. data/ext/nokogiri/xml_namespace.c +56 -49
  117. data/ext/nokogiri/xml_node.c +371 -320
  118. data/ext/nokogiri/xml_node_set.c +168 -156
  119. data/ext/nokogiri/xml_processing_instruction.c +17 -19
  120. data/ext/nokogiri/xml_reader.c +191 -157
  121. data/ext/nokogiri/xml_relax_ng.c +29 -23
  122. data/ext/nokogiri/xml_sax_parser.c +117 -112
  123. data/ext/nokogiri/xml_sax_parser_context.c +101 -84
  124. data/ext/nokogiri/xml_sax_push_parser.c +36 -27
  125. data/ext/nokogiri/xml_schema.c +48 -42
  126. data/ext/nokogiri/xml_syntax_error.c +42 -21
  127. data/ext/nokogiri/xml_text.c +13 -17
  128. data/ext/nokogiri/xml_xpath_context.c +134 -127
  129. data/ext/nokogiri/xslt_stylesheet.c +157 -157
  130. data/lib/nokogiri.rb +2 -6
  131. data/lib/nokogiri/css/parser.rb +1 -1
  132. data/lib/nokogiri/extension.rb +26 -0
  133. data/lib/nokogiri/html/document_fragment.rb +15 -15
  134. data/lib/nokogiri/nokogiri.jar +0 -0
  135. data/lib/nokogiri/version/constant.rb +1 -1
  136. data/lib/nokogiri/version/info.rb +32 -8
  137. data/lib/nokogiri/xml/document.rb +74 -28
  138. data/lib/nokogiri/xml/node.rb +39 -42
  139. data/lib/nokogiri/xml/reader.rb +2 -9
  140. data/lib/nokogiri/xml/xpath.rb +1 -3
  141. data/lib/nokogiri/xml/xpath/syntax_error.rb +1 -1
  142. metadata +62 -127
  143. data/ext/nokogiri/xml_io.c +0 -63
  144. 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;
34
2
 
35
3
  import static nokogiri.internals.NokogiriHelpers.getLocalPart;
@@ -51,97 +19,128 @@ import org.w3c.dom.Node;
51
19
  * @author Patrick Mahoney <pat@polycrystal.org>
52
20
  * @author Yoko Harada <yokolet@gmail.com>
53
21
  */
54
- @JRubyClass(name="Nokogiri::XML::ElementDecl", parent="Nokogiri::XML::Node")
55
- public class XmlElementDecl extends XmlNode {
56
- RubyArray attrDecls;
57
- IRubyObject contentModel;
58
-
59
- public XmlElementDecl(Ruby runtime, RubyClass klazz) {
60
- super(runtime, klazz);
61
- attrDecls = RubyArray.newArray(runtime);
62
- contentModel = runtime.getNil();
63
- }
64
-
65
- /**
66
- * Initialize based on an elementDecl node from a NekoDTD parsed DTD.
67
- */
68
- public XmlElementDecl(Ruby ruby, RubyClass klass, Node elemDeclNode) {
69
- super(ruby, klass, elemDeclNode);
70
- }
71
-
72
- @Override // gets called from constructor ^^^
73
- public void setNode(Ruby runtime, Node node) {
74
- super.setNode(runtime, node);
75
- attrDecls = RubyArray.newArray(runtime);
76
- contentModel = runtime.getNil();
77
- }
78
-
79
- static XmlElementDecl create(ThreadContext context, Node elemDeclNode) {
80
- return new XmlElementDecl(context.runtime,
81
- getNokogiriClass(context.runtime, "Nokogiri::XML::ElementDecl"),
82
- elemDeclNode
83
- );
84
- }
85
-
86
- public IRubyObject element_name(ThreadContext context) {
87
- return getAttribute(context, "ename");
88
- }
89
-
90
- public void setContentModel(IRubyObject cm) {
91
- contentModel = cm;
92
- }
93
-
94
- @Override
95
- @JRubyMethod
96
- public IRubyObject content(ThreadContext context) {
97
- return contentModel;
98
- }
99
-
100
- public boolean isEmpty() {
101
- return "EMPTY".equals(getAttribute("model"));
102
- }
103
-
104
- @JRubyMethod
105
- public IRubyObject prefix(ThreadContext context) {
106
- String enamePrefix = getPrefix(getAttribute("ename"));
107
- if (enamePrefix == null) return context.nil;
108
- return context.runtime.newString(enamePrefix);
109
- }
110
-
111
- /**
112
- * Returns the local part of the element name.
113
- */
114
- @Override
115
- @JRubyMethod
116
- public IRubyObject node_name(ThreadContext context) {
117
- String ename = getLocalPart(getAttribute("ename"));
118
- return context.runtime.newString(ename);
119
- }
120
-
121
- @Override
122
- @JRubyMethod(name = "node_name=")
123
- public IRubyObject node_name_set(ThreadContext context, IRubyObject name) {
124
- throw context.runtime.newRuntimeError("cannot change name of DTD decl");
125
- }
126
-
127
- @Override
128
- @JRubyMethod
129
- public IRubyObject attribute_nodes(ThreadContext context) {
130
- return attrDecls;
131
- }
132
-
133
- @Override
134
- @JRubyMethod
135
- public IRubyObject attribute(ThreadContext context, IRubyObject name) {
136
- throw context.runtime.newRuntimeError("attribute by name not implemented");
137
- }
138
-
139
- public void appendAttrDecl(XmlAttributeDecl decl) {
140
- attrDecls.append(decl);
141
- }
142
-
143
- @JRubyMethod
144
- public IRubyObject element_type(ThreadContext context) {
145
- return context.runtime.newFixnum(node.getNodeType());
146
- }
22
+ @JRubyClass(name = "Nokogiri::XML::ElementDecl", parent = "Nokogiri::XML::Node")
23
+ public class XmlElementDecl extends XmlNode
24
+ {
25
+ RubyArray attrDecls;
26
+ IRubyObject contentModel;
27
+
28
+ public
29
+ XmlElementDecl(Ruby runtime, RubyClass klazz)
30
+ {
31
+ super(runtime, klazz);
32
+ attrDecls = RubyArray.newArray(runtime);
33
+ contentModel = runtime.getNil();
34
+ }
35
+
36
+ /**
37
+ * Initialize based on an elementDecl node from a NekoDTD parsed DTD.
38
+ */
39
+ public
40
+ XmlElementDecl(Ruby ruby, RubyClass klass, Node elemDeclNode)
41
+ {
42
+ super(ruby, klass, elemDeclNode);
43
+ }
44
+
45
+ @Override // gets called from constructor ^^^
46
+ public void
47
+ setNode(Ruby runtime, Node node)
48
+ {
49
+ super.setNode(runtime, node);
50
+ attrDecls = RubyArray.newArray(runtime);
51
+ contentModel = runtime.getNil();
52
+ }
53
+
54
+ static XmlElementDecl
55
+ create(ThreadContext context, Node elemDeclNode)
56
+ {
57
+ return new XmlElementDecl(context.runtime,
58
+ getNokogiriClass(context.runtime, "Nokogiri::XML::ElementDecl"),
59
+ elemDeclNode
60
+ );
61
+ }
62
+
63
+ public IRubyObject
64
+ element_name(ThreadContext context)
65
+ {
66
+ return getAttribute(context, "ename");
67
+ }
68
+
69
+ public void
70
+ setContentModel(IRubyObject cm)
71
+ {
72
+ contentModel = cm;
73
+ }
74
+
75
+ @Override
76
+ @JRubyMethod
77
+ public IRubyObject
78
+ content(ThreadContext context)
79
+ {
80
+ return contentModel;
81
+ }
82
+
83
+ public boolean
84
+ isEmpty()
85
+ {
86
+ return "EMPTY".equals(getAttribute("model"));
87
+ }
88
+
89
+ @JRubyMethod
90
+ public IRubyObject
91
+ prefix(ThreadContext context)
92
+ {
93
+ String enamePrefix = getPrefix(getAttribute("ename"));
94
+ if (enamePrefix == null) { return context.nil; }
95
+ return context.runtime.newString(enamePrefix);
96
+ }
97
+
98
+ /**
99
+ * Returns the local part of the element name.
100
+ */
101
+ @Override
102
+ @JRubyMethod
103
+ public IRubyObject
104
+ node_name(ThreadContext context)
105
+ {
106
+ String ename = getLocalPart(getAttribute("ename"));
107
+ return context.runtime.newString(ename);
108
+ }
109
+
110
+ @Override
111
+ @JRubyMethod(name = "node_name=")
112
+ public IRubyObject
113
+ node_name_set(ThreadContext context, IRubyObject name)
114
+ {
115
+ throw context.runtime.newRuntimeError("cannot change name of DTD decl");
116
+ }
117
+
118
+ @Override
119
+ @JRubyMethod
120
+ public IRubyObject
121
+ attribute_nodes(ThreadContext context)
122
+ {
123
+ return attrDecls;
124
+ }
125
+
126
+ @Override
127
+ @JRubyMethod
128
+ public IRubyObject
129
+ attribute(ThreadContext context, IRubyObject name)
130
+ {
131
+ throw context.runtime.newRuntimeError("attribute by name not implemented");
132
+ }
133
+
134
+ public void
135
+ appendAttrDecl(XmlAttributeDecl decl)
136
+ {
137
+ attrDecls.append(decl);
138
+ }
139
+
140
+ @JRubyMethod
141
+ public IRubyObject
142
+ element_type(ThreadContext context)
143
+ {
144
+ return context.runtime.newFixnum(node.getNodeType());
145
+ }
147
146
  }
@@ -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;
34
2
 
35
3
  import static nokogiri.internals.NokogiriHelpers.getNokogiriClass;
@@ -49,109 +17,133 @@ import org.w3c.dom.Node;
49
17
  * @author Patrick Mahoney <pat@polycrystal.org>
50
18
  * @author Yoko Harada <yokolet@gmail.com>
51
19
  */
52
- @JRubyClass(name="Nokogiri::XML::EntityDecl", parent="Nokogiri::XML::Node")
53
- public class XmlEntityDecl extends XmlNode {
54
- public static final int INTERNAL_GENERAL = 1;
55
- public static final int EXTERNAL_GENERAL_PARSED = 2;
56
- public static final int EXTERNAL_GENERAL_UNPARSED = 3;
57
- public static final int INTERNAL_PARAMETER = 4;
58
- public static final int EXTERNAL_PARAMETER = 5;
59
- public static final int INTERNAL_PREDEFINED = 6;
60
-
61
- private IRubyObject entityType;
62
- private IRubyObject name;
63
- private IRubyObject external_id;
64
- private IRubyObject system_id;
65
- private IRubyObject content;
66
-
67
- XmlEntityDecl(Ruby runtime, RubyClass klass) {
68
- super(runtime, klass);
69
- }
20
+ @JRubyClass(name = "Nokogiri::XML::EntityDecl", parent = "Nokogiri::XML::Node")
21
+ public class XmlEntityDecl extends XmlNode
22
+ {
23
+ public static final int INTERNAL_GENERAL = 1;
24
+ public static final int EXTERNAL_GENERAL_PARSED = 2;
25
+ public static final int EXTERNAL_GENERAL_UNPARSED = 3;
26
+ public static final int INTERNAL_PARAMETER = 4;
27
+ public static final int EXTERNAL_PARAMETER = 5;
28
+ public static final int INTERNAL_PREDEFINED = 6;
70
29
 
71
- /**
72
- * Initialize based on an entityDecl node from a NekoDTD parsed DTD.
73
- */
74
- public XmlEntityDecl(Ruby runtime, RubyClass klass, Node entDeclNode) {
75
- super(runtime, klass, entDeclNode);
76
- entityType = RubyFixnum.newFixnum(runtime, XmlEntityDecl.INTERNAL_GENERAL);
77
- name = external_id = system_id = content = runtime.getNil();
78
- }
79
-
80
- public XmlEntityDecl(Ruby runtime, RubyClass klass, Node entDeclNode, IRubyObject[] argv) {
81
- super(runtime, klass, entDeclNode);
82
- name = argv[0];
83
- entityType = RubyFixnum.newFixnum(runtime, XmlEntityDecl.INTERNAL_GENERAL);
84
- external_id = system_id = content = runtime.getNil();
85
-
86
- if (argv.length > 1) entityType = argv[1];
87
- if (argv.length > 4) {
88
- external_id = argv[2];
89
- system_id = argv[3];
90
- content = argv[4];
91
- }
92
- }
30
+ private IRubyObject entityType;
31
+ private IRubyObject name;
32
+ private IRubyObject external_id;
33
+ private IRubyObject system_id;
34
+ private IRubyObject content;
93
35
 
94
- static XmlEntityDecl create(ThreadContext context, Node entDeclNode) {
95
- return new XmlEntityDecl(context.runtime,
96
- getNokogiriClass(context.runtime, "Nokogiri::XML::EntityDecl"),
97
- entDeclNode
98
- );
99
- }
100
-
101
- // when entity is created by create_entity method
102
- static XmlEntityDecl create(ThreadContext context, Node entDeclNode, IRubyObject... argv) {
103
- return new XmlEntityDecl(context.runtime,
104
- getNokogiriClass(context.runtime, "Nokogiri::XML::EntityDecl"),
105
- entDeclNode, argv
106
- );
107
- }
36
+ XmlEntityDecl(Ruby runtime, RubyClass klass)
37
+ {
38
+ super(runtime, klass);
39
+ }
108
40
 
109
- /**
110
- * Returns the local part of the element name.
111
- */
112
- @Override
113
- @JRubyMethod
114
- public IRubyObject node_name(ThreadContext context) {
115
- IRubyObject value = getAttribute(context, "name");
116
- if (value.isNil()) value = name;
117
- return value;
118
- }
41
+ /**
42
+ * Initialize based on an entityDecl node from a NekoDTD parsed DTD.
43
+ */
44
+ public
45
+ XmlEntityDecl(Ruby runtime, RubyClass klass, Node entDeclNode)
46
+ {
47
+ super(runtime, klass, entDeclNode);
48
+ entityType = RubyFixnum.newFixnum(runtime, XmlEntityDecl.INTERNAL_GENERAL);
49
+ name = external_id = system_id = content = runtime.getNil();
50
+ }
119
51
 
120
- @Override
121
- @JRubyMethod(name = "node_name=")
122
- public IRubyObject node_name_set(ThreadContext context, IRubyObject name) {
123
- throw context.runtime.newRuntimeError("cannot change name of DTD decl");
124
- }
52
+ public
53
+ XmlEntityDecl(Ruby runtime, RubyClass klass, Node entDeclNode, IRubyObject[] argv)
54
+ {
55
+ super(runtime, klass, entDeclNode);
56
+ name = argv[0];
57
+ entityType = RubyFixnum.newFixnum(runtime, XmlEntityDecl.INTERNAL_GENERAL);
58
+ external_id = system_id = content = runtime.getNil();
125
59
 
126
- @JRubyMethod
127
- public IRubyObject content(ThreadContext context) {
128
- IRubyObject value = getAttribute(context, "value");
129
- if (value.isNil()) value = content;
130
- return value;
60
+ if (argv.length > 1) { entityType = argv[1]; }
61
+ if (argv.length > 4) {
62
+ external_id = argv[2];
63
+ system_id = argv[3];
64
+ content = argv[4];
131
65
  }
66
+ }
132
67
 
133
- // TODO: what is content vs. original_content?
134
- @JRubyMethod
135
- public IRubyObject original_content(ThreadContext context) {
136
- return getAttribute(context, "value");
137
- }
68
+ static XmlEntityDecl
69
+ create(ThreadContext context, Node entDeclNode)
70
+ {
71
+ return new XmlEntityDecl(context.runtime,
72
+ getNokogiriClass(context.runtime, "Nokogiri::XML::EntityDecl"),
73
+ entDeclNode
74
+ );
75
+ }
138
76
 
139
- @JRubyMethod
140
- public IRubyObject system_id(ThreadContext context) {
141
- IRubyObject value = getAttribute(context, "sysid");
142
- if (value.isNil()) value = system_id;
143
- return value;
144
- }
77
+ // when entity is created by create_entity method
78
+ static XmlEntityDecl
79
+ create(ThreadContext context, Node entDeclNode, IRubyObject... argv)
80
+ {
81
+ return new XmlEntityDecl(context.runtime,
82
+ getNokogiriClass(context.runtime, "Nokogiri::XML::EntityDecl"),
83
+ entDeclNode, argv
84
+ );
85
+ }
145
86
 
146
- @JRubyMethod
147
- public IRubyObject external_id(ThreadContext context) {
148
- IRubyObject value = getAttribute(context, "pubid");
149
- if (value.isNil()) value = external_id;
150
- return value;
151
- }
87
+ /**
88
+ * Returns the local part of the element name.
89
+ */
90
+ @Override
91
+ @JRubyMethod
92
+ public IRubyObject
93
+ node_name(ThreadContext context)
94
+ {
95
+ IRubyObject value = getAttribute(context, "name");
96
+ if (value.isNil()) { value = name; }
97
+ return value;
98
+ }
152
99
 
153
- @JRubyMethod
154
- public IRubyObject entity_type(ThreadContext context) {
155
- return entityType;
156
- }
100
+ @Override
101
+ @JRubyMethod(name = "node_name=")
102
+ public IRubyObject
103
+ node_name_set(ThreadContext context, IRubyObject name)
104
+ {
105
+ throw context.runtime.newRuntimeError("cannot change name of DTD decl");
106
+ }
107
+
108
+ @JRubyMethod
109
+ public IRubyObject
110
+ content(ThreadContext context)
111
+ {
112
+ IRubyObject value = getAttribute(context, "value");
113
+ if (value.isNil()) { value = content; }
114
+ return value;
115
+ }
116
+
117
+ // TODO: what is content vs. original_content?
118
+ @JRubyMethod
119
+ public IRubyObject
120
+ original_content(ThreadContext context)
121
+ {
122
+ return getAttribute(context, "value");
123
+ }
124
+
125
+ @JRubyMethod
126
+ public IRubyObject
127
+ system_id(ThreadContext context)
128
+ {
129
+ IRubyObject value = getAttribute(context, "sysid");
130
+ if (value.isNil()) { value = system_id; }
131
+ return value;
132
+ }
133
+
134
+ @JRubyMethod
135
+ public IRubyObject
136
+ external_id(ThreadContext context)
137
+ {
138
+ IRubyObject value = getAttribute(context, "pubid");
139
+ if (value.isNil()) { value = external_id; }
140
+ return value;
141
+ }
142
+
143
+ @JRubyMethod
144
+ public IRubyObject
145
+ entity_type(ThreadContext context)
146
+ {
147
+ return entityType;
148
+ }
157
149
  }