nokogiri 1.5.0.beta.4 → 1.5.0

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 (107) hide show
  1. data/.gemtest +0 -0
  2. data/CHANGELOG.ja.rdoc +34 -0
  3. data/CHANGELOG.rdoc +40 -1
  4. data/Manifest.txt +11 -2
  5. data/README.rdoc +1 -1
  6. data/Rakefile +100 -104
  7. data/bin/nokogiri +1 -2
  8. data/ext/nokogiri/nokogiri.c +24 -1
  9. data/ext/nokogiri/xml_io.c +32 -7
  10. data/ext/nokogiri/xml_node.c +14 -13
  11. data/ext/nokogiri/xml_sax_parser.c +9 -4
  12. data/ext/nokogiri/xslt_stylesheet.c +7 -1
  13. data/lib/nokogiri.rb +3 -22
  14. data/lib/nokogiri/css.rb +4 -0
  15. data/lib/nokogiri/html/document.rb +10 -14
  16. data/lib/nokogiri/version.rb +76 -23
  17. data/lib/nokogiri/xml/builder.rb +7 -0
  18. data/lib/nokogiri/xml/document.rb +17 -1
  19. data/lib/nokogiri/xml/document_fragment.rb +14 -0
  20. data/lib/nokogiri/xml/node.rb +36 -28
  21. data/lib/nokogiri/xml/node/save_options.rb +17 -1
  22. data/lib/nokogiri/xml/node_set.rb +7 -0
  23. data/lib/nokogiri/xml/parse_options.rb +8 -0
  24. data/lib/nokogiri/xml/reader.rb +6 -6
  25. data/lib/nokogiri/xml/schema.rb +7 -1
  26. data/nokogiri_help_responses.md +40 -0
  27. data/tasks/cross_compile.rb +134 -159
  28. data/tasks/nokogiri.org.rb +18 -0
  29. data/tasks/test.rb +1 -1
  30. data/test/files/encoding.html +82 -0
  31. data/test/files/encoding.xhtml +84 -0
  32. data/test/files/metacharset.html +10 -0
  33. data/test/files/noencoding.html +47 -0
  34. data/test/helper.rb +2 -0
  35. data/test/html/test_document.rb +15 -0
  36. data/test/html/test_document_encoding.rb +13 -0
  37. data/test/test_memory_leak.rb +20 -0
  38. data/test/test_reader.rb +22 -0
  39. data/test/test_xslt_transforms.rb +6 -2
  40. data/test/xml/node/test_save_options.rb +10 -2
  41. data/test/xml/test_builder.rb +17 -0
  42. data/test/xml/test_document.rb +22 -0
  43. data/test/xml/test_node.rb +19 -1
  44. data/test/xml/test_node_reparenting.rb +16 -3
  45. data/test/xml/test_node_set.rb +34 -0
  46. data/test/xml/test_schema.rb +5 -0
  47. data/test/xslt/test_exception_handling.rb +37 -0
  48. metadata +185 -157
  49. data/deps.rip +0 -5
  50. data/ext/java/nokogiri/EncodingHandler.java +0 -124
  51. data/ext/java/nokogiri/HtmlDocument.java +0 -149
  52. data/ext/java/nokogiri/HtmlElementDescription.java +0 -145
  53. data/ext/java/nokogiri/HtmlEntityLookup.java +0 -79
  54. data/ext/java/nokogiri/HtmlSaxParserContext.java +0 -259
  55. data/ext/java/nokogiri/NokogiriService.java +0 -535
  56. data/ext/java/nokogiri/XmlAttr.java +0 -191
  57. data/ext/java/nokogiri/XmlAttributeDecl.java +0 -130
  58. data/ext/java/nokogiri/XmlCdata.java +0 -91
  59. data/ext/java/nokogiri/XmlComment.java +0 -86
  60. data/ext/java/nokogiri/XmlDocument.java +0 -529
  61. data/ext/java/nokogiri/XmlDocumentFragment.java +0 -217
  62. data/ext/java/nokogiri/XmlDtd.java +0 -467
  63. data/ext/java/nokogiri/XmlElement.java +0 -222
  64. data/ext/java/nokogiri/XmlElementContent.java +0 -382
  65. data/ext/java/nokogiri/XmlElementDecl.java +0 -148
  66. data/ext/java/nokogiri/XmlEntityDecl.java +0 -162
  67. data/ext/java/nokogiri/XmlEntityReference.java +0 -75
  68. data/ext/java/nokogiri/XmlNamespace.java +0 -128
  69. data/ext/java/nokogiri/XmlNode.java +0 -1399
  70. data/ext/java/nokogiri/XmlNodeSet.java +0 -311
  71. data/ext/java/nokogiri/XmlProcessingInstruction.java +0 -103
  72. data/ext/java/nokogiri/XmlReader.java +0 -411
  73. data/ext/java/nokogiri/XmlRelaxng.java +0 -144
  74. data/ext/java/nokogiri/XmlSaxParserContext.java +0 -367
  75. data/ext/java/nokogiri/XmlSaxPushParser.java +0 -184
  76. data/ext/java/nokogiri/XmlSchema.java +0 -319
  77. data/ext/java/nokogiri/XmlSyntaxError.java +0 -119
  78. data/ext/java/nokogiri/XmlText.java +0 -136
  79. data/ext/java/nokogiri/XmlXpathContext.java +0 -179
  80. data/ext/java/nokogiri/XsltStylesheet.java +0 -183
  81. data/ext/java/nokogiri/internals/HtmlDomParserContext.java +0 -206
  82. data/ext/java/nokogiri/internals/NokogiriDocumentCache.java +0 -73
  83. data/ext/java/nokogiri/internals/NokogiriErrorHandler.java +0 -86
  84. data/ext/java/nokogiri/internals/NokogiriHandler.java +0 -327
  85. data/ext/java/nokogiri/internals/NokogiriHelpers.java +0 -582
  86. data/ext/java/nokogiri/internals/NokogiriNamespaceCache.java +0 -171
  87. data/ext/java/nokogiri/internals/NokogiriNamespaceContext.java +0 -118
  88. data/ext/java/nokogiri/internals/NokogiriNonStrictErrorHandler.java +0 -74
  89. data/ext/java/nokogiri/internals/NokogiriNonStrictErrorHandler4NekoHtml.java +0 -121
  90. data/ext/java/nokogiri/internals/NokogiriStrictErrorHandler.java +0 -79
  91. data/ext/java/nokogiri/internals/NokogiriXPathFunction.java +0 -126
  92. data/ext/java/nokogiri/internals/NokogiriXPathFunctionResolver.java +0 -56
  93. data/ext/java/nokogiri/internals/ParserContext.java +0 -278
  94. data/ext/java/nokogiri/internals/PushInputStream.java +0 -411
  95. data/ext/java/nokogiri/internals/ReaderNode.java +0 -474
  96. data/ext/java/nokogiri/internals/SaveContext.java +0 -288
  97. data/ext/java/nokogiri/internals/SchemaErrorHandler.java +0 -76
  98. data/ext/java/nokogiri/internals/XmlDeclHandler.java +0 -42
  99. data/ext/java/nokogiri/internals/XmlDomParser.java +0 -77
  100. data/ext/java/nokogiri/internals/XmlDomParserContext.java +0 -238
  101. data/ext/java/nokogiri/internals/XmlSaxParser.java +0 -65
  102. data/ext/java/nokogiri/internals/XsltExtensionFunction.java +0 -72
  103. data/lib/isorelax.jar +0 -0
  104. data/lib/jing.jar +0 -0
  105. data/lib/nekodtd.jar +0 -0
  106. data/lib/nekohtml.jar +0 -0
  107. data/lib/xercesImpl.jar +0 -0
@@ -1,222 +0,0 @@
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
- package nokogiri;
34
-
35
- import static nokogiri.internals.NokogiriHelpers.namedNodeMapToRubyArray;
36
- import static nokogiri.internals.NokogiriHelpers.rubyStringToString;
37
- import nokogiri.internals.SaveContext;
38
-
39
- import org.jruby.Ruby;
40
- import org.jruby.RubyArray;
41
- import org.jruby.RubyClass;
42
- import org.jruby.anno.JRubyClass;
43
- import org.jruby.anno.JRubyMethod;
44
- import org.jruby.javasupport.util.RuntimeHelpers;
45
- import org.jruby.runtime.ThreadContext;
46
- import org.jruby.runtime.Visibility;
47
- import org.jruby.runtime.builtin.IRubyObject;
48
- import org.w3c.dom.Attr;
49
- import org.w3c.dom.Element;
50
- import org.w3c.dom.NamedNodeMap;
51
- import org.w3c.dom.Node;
52
-
53
- /**
54
- * Class for Nokogiri::XML::Element
55
- *
56
- * @author sergio
57
- * @author Yoko Harada <yokolet@gamil.com>
58
- */
59
- @JRubyClass(name="Nokogiri::XML::Element", parent="Nokogiri::XML::Node")
60
- public class XmlElement extends XmlNode {
61
-
62
- public XmlElement(Ruby runtime, RubyClass klazz) {
63
- super(runtime, klazz);
64
- }
65
-
66
- public XmlElement(Ruby runtime, RubyClass klazz, Node element) {
67
- super(runtime, klazz, element);
68
- }
69
-
70
- @Override
71
- public void setNode(ThreadContext context, Node node) {
72
- this.node = node;
73
- if (node != null) {
74
- resetCache();
75
- if (node.getNodeType() != Node.DOCUMENT_NODE) {
76
- doc = document(context);
77
- setInstanceVariable("@document", doc);
78
- if (doc != null) {
79
- RuntimeHelpers.invoke(context, doc, "decorate", this);
80
- }
81
- }
82
- }
83
- }
84
-
85
- @Override
86
- @JRubyMethod(name = {"add_namespace_definition", "add_namespace"})
87
- public IRubyObject add_namespace_definition(ThreadContext context,
88
- IRubyObject prefix,
89
- IRubyObject href) {
90
- Element element = (Element) node;
91
-
92
- final String uri = "http://www.w3.org/2000/xmlns/";
93
- String qName =
94
- prefix.isNil() ? "xmlns" : "xmlns:" + rubyStringToString(prefix);
95
- element.setAttributeNS(uri, qName, rubyStringToString(href));
96
-
97
- XmlNamespace ns = (XmlNamespace)
98
- super.add_namespace_definition(context, prefix, href);
99
- updateNodeNamespaceIfNecessary(context, ns);
100
-
101
- return ns;
102
- }
103
-
104
- @Override
105
- public boolean isElement() { return true; }
106
-
107
- @Override
108
- @JRubyMethod(visibility = Visibility.PRIVATE)
109
- public IRubyObject get(ThreadContext context, IRubyObject rbkey) {
110
- if (rbkey == null || rbkey.isNil()) context.getRuntime().getNil();
111
- String key = rubyStringToString(rbkey);
112
- Element element = (Element) node;
113
- String value = element.getAttribute(key);
114
- if(!value.equals("")){
115
- return context.getRuntime().newString(value);
116
- }
117
- return context.getRuntime().getNil();
118
- }
119
-
120
- @Override
121
- public IRubyObject key_p(ThreadContext context, IRubyObject rbkey) {
122
- String key = rubyStringToString(rbkey);
123
- Element element = (Element) node;
124
- return context.getRuntime().newBoolean(element.hasAttribute(key));
125
- }
126
-
127
- @Override
128
- public IRubyObject op_aset(ThreadContext context,
129
- IRubyObject rbkey,
130
- IRubyObject rbval) {
131
- String key = rubyStringToString(rbkey);
132
- String val = rubyStringToString(rbval);
133
- Element element = (Element) node;
134
- element.setAttribute(key, val);
135
- return this;
136
- }
137
-
138
- @Override
139
- public IRubyObject remove_attribute(ThreadContext context, IRubyObject name) {
140
- String key = name.convertToString().asJavaString();
141
- Element element = (Element) node;
142
- element.removeAttribute(key);
143
- return this;
144
- }
145
-
146
- @Override
147
- public void relink_namespace(ThreadContext context) {
148
- Element e = (Element) node;
149
-
150
- e.getOwnerDocument().renameNode(e, e.lookupNamespaceURI(e.getPrefix()), e.getNodeName());
151
-
152
- if(e.hasAttributes()) {
153
- NamedNodeMap attrs = e.getAttributes();
154
-
155
- for(int i = 0; i < attrs.getLength(); i++) {
156
- Attr attr = (Attr) attrs.item(i);
157
- String nsUri = "";
158
- String prefix = attr.getPrefix();
159
- String nodeName = attr.getNodeName();
160
- if("xml".equals(prefix)) {
161
- nsUri = "http://www.w3.org/XML/1998/namespace";
162
- } else if("xmlns".equals(prefix) || nodeName.equals("xmlns")) {
163
- nsUri = "http://www.w3.org/2000/xmlns/";
164
- } else {
165
- nsUri = attr.lookupNamespaceURI(nodeName);
166
- }
167
-
168
- e.getOwnerDocument().renameNode(attr, nsUri, nodeName);
169
-
170
- }
171
- }
172
-
173
- if(e.hasChildNodes()) {
174
- ((XmlNodeSet) children(context)).relink_namespace(context);
175
- }
176
- }
177
-
178
- /**
179
- * TODO: previous code handled elements with parent 'p' differently?.
180
- */
181
- @Override
182
- public void saveContent(ThreadContext context, SaveContext ctx) {
183
- Node firstChild = node.getFirstChild();
184
- boolean empty = (firstChild == null);
185
- short type = -1;
186
- if (!empty) type = firstChild.getNodeType();
187
- boolean inline = (!empty &&
188
- (type == Node.TEXT_NODE ||
189
- type == Node.CDATA_SECTION_NODE ||
190
- type == Node.ENTITY_REFERENCE_NODE));
191
-
192
- if (empty) {
193
- ctx.emptyTagStart(node.getNodeName());
194
- } else if (inline) {
195
- ctx.openTagInlineStart(node.getNodeName());
196
- } else {
197
- ctx.openTagStart(node.getNodeName());
198
- }
199
-
200
- RubyArray attr_list = namedNodeMapToRubyArray(context.getRuntime(), node.getAttributes());
201
- saveNodeListContent(context, attr_list, ctx);
202
-
203
- if (empty) {
204
- ctx.emptyTagEnd(node.getNodeName());
205
- return;
206
- } else if (inline) {
207
- ctx.openTagInlineEnd();
208
- } else {
209
- ctx.openTagEnd();
210
- }
211
-
212
- saveNodeListContent(context, (XmlNodeSet) children(context), ctx);
213
-
214
- if (inline) {
215
- ctx.closeTagInline(node.getNodeName());
216
- } else {
217
- ctx.closeTag(node.getNodeName());
218
- }
219
-
220
- }
221
-
222
- }
@@ -1,382 +0,0 @@
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
- package nokogiri;
34
-
35
- import static nokogiri.internals.NokogiriHelpers.getLocalPart;
36
- import static nokogiri.internals.NokogiriHelpers.getNokogiriClass;
37
- import static nokogiri.internals.NokogiriHelpers.getPrefix;
38
- import static nokogiri.internals.NokogiriHelpers.nonEmptyStringOrNil;
39
-
40
- import org.cyberneko.dtd.DTDConfiguration;
41
- import org.jruby.Ruby;
42
- import org.jruby.RubyClass;
43
- import org.jruby.RubyObject;
44
- import org.jruby.anno.JRubyClass;
45
- import org.jruby.anno.JRubyMethod;
46
- import org.jruby.runtime.ThreadContext;
47
- import org.jruby.runtime.builtin.IRubyObject;
48
- import org.w3c.dom.Element;
49
- import org.w3c.dom.Node;
50
-
51
- /**
52
- * DTD element content model. This converts the nice tree of content
53
- * model declarations returned by NekoDTD into the convoluted binary
54
- * tree used by libxml.
55
- *
56
- * @author Patrick Mahoney <pat@polycrystal.org>
57
- */
58
- @JRubyClass(name="Nokogiri::XML::ElementContent")
59
- public class XmlElementContent extends RubyObject {
60
- protected String element_name = null;
61
-
62
- protected String name;
63
- protected Type type;
64
- protected Occur occur;
65
- protected IRubyObject left;
66
- protected IRubyObject right;
67
-
68
- /** values hardcoded from nokogiri/xml/element_content.rb; this
69
- * makes me uneasy, but it works */
70
- public enum Type {
71
- PCDATA (1),
72
- ELEMENT (2),
73
- SEQ (3),
74
- OR (4);
75
-
76
- private final int value;
77
- Type(int value) {
78
- this.value = value;
79
- }
80
- public IRubyObject value(Ruby runtime) {
81
- return runtime.newFixnum(value);
82
- }
83
- }
84
-
85
- public enum Occur {
86
- ONCE (1),
87
- OPT (2),
88
- MULT (3),
89
- PLUS (4);
90
-
91
- private final int value;
92
- Occur(int value) {
93
- this.value = value;
94
- }
95
- public IRubyObject value(Ruby runtime) {
96
- return runtime.newFixnum(value);
97
- }
98
- }
99
-
100
- public XmlElementContent(Ruby runtime, RubyClass klass,
101
- XmlDocument document, Node node) {
102
- this(runtime, klass, document, new NodeIter(node));
103
- element_name = ((Element)node).getAttribute("ename");
104
-
105
- /*
106
- * This is a bit of a hack to match libxml behavior.
107
- *
108
- * If the tree contains but a single group with a single
109
- * element, we can simply return the bare element without the
110
- * surrounding group.
111
- *
112
- * TODO: is SEQ/ONCE with a single child the only case for
113
- * reduction?
114
- *
115
- * - pmahoney
116
- */
117
- if (!this.left.isNil()) {
118
- XmlElementContent left = (XmlElementContent) this.left;
119
- if (type == Type.SEQ &&
120
- occur == Occur.ONCE &&
121
- left.type == Type.ELEMENT &&
122
- right.isNil()) {
123
- this.name = left.name;
124
- this.type = left.type;
125
- this.occur = left.occur;
126
- this.left = this.right; // both nil
127
- }
128
- }
129
- }
130
-
131
- public XmlElementContent(Ruby runtime, XmlDocument document, Node node) {
132
- this(runtime, getNokogiriClass(runtime, "Nokogiri::XML::ElementContent"), document, node);
133
- }
134
-
135
- public XmlElementContent(Ruby runtime, RubyClass klass,
136
- XmlDocument doc, NodeIter iter) {
137
- super(runtime, klass);
138
-
139
- setInstanceVariable("@document", doc);
140
-
141
- name = null;
142
- type = Type.SEQ;
143
- occur = Occur.ONCE;
144
- left = runtime.getNil();
145
- right = runtime.getNil();
146
-
147
- apply(runtime, klass, doc, iter);
148
- }
149
-
150
- protected XmlElementContent(Ruby runtime, RubyClass klass,
151
- Type type, XmlDocument doc, NodeIter iter,
152
- XmlElementContent left) {
153
- super(runtime, klass);
154
-
155
- setInstanceVariable("@document", doc);
156
-
157
- name = null;
158
- this.type = type;
159
- occur = Occur.ONCE;
160
- this.left = left;
161
- right = runtime.getNil();
162
-
163
- switch (type) {
164
- case SEQ:
165
- case OR:
166
- applyGroup(runtime, klass, doc, iter);
167
- default:
168
- // noop
169
- }
170
- }
171
-
172
- /**
173
- * Applies the current node in <code>iter</code> to this content
174
- * model. When finished, <code>iter</code> will point to the last
175
- * processed node.
176
- */
177
- protected void apply(Ruby runtime, RubyClass klass,
178
- XmlDocument doc,
179
- NodeIter iter) {
180
- if (iter.isNull()) return;
181
-
182
- Element elem = (Element) iter.current();
183
-
184
- if (isGroup(elem) && iter.hasChildren()) {
185
- iter.firstChild();
186
- applyGroup(runtime, klass, doc, iter);
187
- iter.parent();
188
- } else if (isElement(elem)) {
189
- name = elem.getAttribute("name");
190
- type = Type.ELEMENT;
191
- }
192
-
193
- iter.nextSibling();
194
- if (iter.isNull()) return;
195
- if (isOccurrence(iter.current())) {
196
- setOccur(((Element)iter.current()).getAttribute("type"));
197
- iter.nextSibling();
198
- }
199
- }
200
-
201
- protected void applyGroup(Ruby runtime, RubyClass klass,
202
- XmlDocument doc, NodeIter iter) {
203
- // LEFT branch
204
-
205
- if (iter.isNull()) return;
206
-
207
- if (left.isNil()) {
208
- left = new XmlElementContent(runtime, klass, doc, iter);
209
-
210
- if (iter.isNull()) return;
211
-
212
- if (isSeparator(iter.current())) {
213
- setType(((Element)iter.current()).getAttribute("type"));
214
- iter.nextSibling(); // skip separator
215
- }
216
- }
217
-
218
- // RIGHT branch
219
-
220
- if (iter.isNull()) return;
221
-
222
- right = new XmlElementContent(runtime, klass, doc, iter);
223
-
224
- if (iter.isNull()) return;
225
- if (isSeparator(iter.current()))
226
- iter.nextSibling(); // skip separator
227
- if (iter.isNull()) return;
228
-
229
- // binary tree can only hold two children. If we have more,
230
- // the right child is another tree with the same sequence
231
- // "type". The "left" of the new tree is what we've
232
- // currently consumed as our "right" branch of this tree.
233
- right = new XmlElementContent(runtime, klass, type, doc, iter,
234
- (XmlElementContent) right);
235
- }
236
-
237
- /**
238
- * Set the type based on the separator node type string.
239
- */
240
- protected void setType(String type) {
241
- if ("|".equals(type)) this.type = Type.OR;
242
- else if (",".equals(type)) this.type = Type.SEQ;
243
- }
244
-
245
- protected void setOccur(String type) {
246
- if ("*".equals(type)) this.occur = Occur.MULT;
247
- else if ("+".equals(type)) this.occur = Occur.PLUS;
248
- }
249
-
250
- public static boolean isGroup(Node node) {
251
- return XmlDtd.nameEquals(node, DTDConfiguration.E_GROUP);
252
- }
253
-
254
- // content model element, not Element node type
255
- public static boolean isElement(Node node) {
256
- return XmlDtd.nameEquals(node, DTDConfiguration.E_ELEMENT);
257
- }
258
-
259
- public static boolean isSeparator(Node node) {
260
- return XmlDtd.nameEquals(node, DTDConfiguration.E_SEPARATOR);
261
- }
262
-
263
- public static boolean isOccurrence(Node node) {
264
- return XmlDtd.nameEquals(node, DTDConfiguration.E_OCCURRENCE);
265
- }
266
-
267
- /**
268
- * Return the name of the element to which this content model
269
- * applies. Only works for the root of the tree.
270
- */
271
- public IRubyObject element_name(ThreadContext context) {
272
- return nonEmptyStringOrNil(context.getRuntime(), element_name);
273
- }
274
-
275
- @JRubyMethod
276
- public IRubyObject prefix(ThreadContext context) {
277
- return nonEmptyStringOrNil(context.getRuntime(), getPrefix(name));
278
- }
279
-
280
- @JRubyMethod
281
- public IRubyObject name(ThreadContext context) {
282
- return nonEmptyStringOrNil(context.getRuntime(), getLocalPart(name));
283
- }
284
-
285
- @JRubyMethod
286
- public IRubyObject type(ThreadContext context) {
287
- return type.value(context.getRuntime());
288
- }
289
-
290
- @JRubyMethod
291
- public IRubyObject occur(ThreadContext context) {
292
- return occur.value(context.getRuntime());
293
- }
294
-
295
- @JRubyMethod
296
- public IRubyObject c1(ThreadContext context) {
297
- return left;
298
- }
299
-
300
- @JRubyMethod
301
- public IRubyObject c2(ThreadContext context) {
302
- return right;
303
- }
304
-
305
- /**
306
- * Iterator for a tree of Nodes. Has a current position that
307
- * points to a given node. Calling nextSibling() on the last
308
- * sibling results in a current position of null. This position
309
- * is not fatal and can be escaped by calling parent() (which
310
- * moves to the parent of previous sibling). The null position is
311
- * used to indicate the end of a list.
312
- */
313
- protected static class NodeIter {
314
- protected Node pre;
315
- protected Node cur;
316
-
317
- /**
318
- * The first time, we fake a previous sibling element. Thus,
319
- * initially, current() is null, and the first call should be
320
- * nextSibling().
321
- */
322
- public NodeIter(Node node) {
323
- pre = null;
324
- cur = node.getFirstChild(); // skip root contentModel node
325
- }
326
-
327
- public Node current() {
328
- return cur;
329
- }
330
-
331
- public boolean isNull() {
332
- return (cur == null);
333
- }
334
-
335
- public boolean hasChildren() {
336
- return (cur != null && cur.hasChildNodes());
337
- }
338
-
339
- /**
340
- * Descend to the first child.
341
- */
342
- public Node firstChild() {
343
- if (cur == null) throw new RuntimeException("no children");
344
- Node ch = cur.getFirstChild();
345
- if (ch == null) throw new RuntimeException("no children");
346
-
347
- cur = ch;
348
- return cur;
349
- }
350
-
351
- /**
352
- * Move to the next sibling
353
- */
354
- public Node nextSibling() {
355
- if (cur == null) {
356
- throw new RuntimeException("no next sibling");
357
- } else {
358
- Node ns = cur.getNextSibling();
359
- if (ns == null) {
360
- pre = cur;
361
- cur = null;
362
- } else {
363
- cur = ns;
364
- }
365
- return cur;
366
- }
367
- }
368
-
369
- /**
370
- * Move to the parent.
371
- */
372
- public Node parent() {
373
- if (cur == null) cur = pre;
374
-
375
- Node p = cur.getParentNode();
376
- if (p == null) throw new RuntimeException("no parent");
377
-
378
- cur = p;
379
- return cur;
380
- }
381
- }
382
- }