nokogiri 1.10.10 → 1.12.5

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 (216) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +3 -0
  3. data/LICENSE-DEPENDENCIES.md +1173 -884
  4. data/LICENSE.md +1 -1
  5. data/README.md +176 -96
  6. data/dependencies.yml +12 -12
  7. data/ext/nokogiri/depend +38 -358
  8. data/ext/nokogiri/extconf.rb +716 -414
  9. data/ext/nokogiri/gumbo.c +584 -0
  10. data/ext/nokogiri/html4_document.c +166 -0
  11. data/ext/nokogiri/html4_element_description.c +294 -0
  12. data/ext/nokogiri/html4_entity_lookup.c +37 -0
  13. data/ext/nokogiri/html4_sax_parser_context.c +120 -0
  14. data/ext/nokogiri/html4_sax_push_parser.c +95 -0
  15. data/ext/nokogiri/libxml2_backwards_compat.c +121 -0
  16. data/ext/nokogiri/nokogiri.c +228 -91
  17. data/ext/nokogiri/nokogiri.h +191 -89
  18. data/ext/nokogiri/test_global_handlers.c +40 -0
  19. data/ext/nokogiri/xml_attr.c +15 -15
  20. data/ext/nokogiri/xml_attribute_decl.c +18 -18
  21. data/ext/nokogiri/xml_cdata.c +13 -18
  22. data/ext/nokogiri/xml_comment.c +19 -26
  23. data/ext/nokogiri/xml_document.c +267 -195
  24. data/ext/nokogiri/xml_document_fragment.c +13 -15
  25. data/ext/nokogiri/xml_dtd.c +54 -48
  26. data/ext/nokogiri/xml_element_content.c +31 -26
  27. data/ext/nokogiri/xml_element_decl.c +22 -22
  28. data/ext/nokogiri/xml_encoding_handler.c +28 -17
  29. data/ext/nokogiri/xml_entity_decl.c +32 -30
  30. data/ext/nokogiri/xml_entity_reference.c +16 -18
  31. data/ext/nokogiri/xml_namespace.c +60 -51
  32. data/ext/nokogiri/xml_node.c +493 -407
  33. data/ext/nokogiri/xml_node_set.c +174 -162
  34. data/ext/nokogiri/xml_processing_instruction.c +17 -19
  35. data/ext/nokogiri/xml_reader.c +197 -172
  36. data/ext/nokogiri/xml_relax_ng.c +52 -28
  37. data/ext/nokogiri/xml_sax_parser.c +112 -112
  38. data/ext/nokogiri/xml_sax_parser_context.c +105 -86
  39. data/ext/nokogiri/xml_sax_push_parser.c +36 -27
  40. data/ext/nokogiri/xml_schema.c +96 -46
  41. data/ext/nokogiri/xml_syntax_error.c +42 -21
  42. data/ext/nokogiri/xml_text.c +13 -17
  43. data/ext/nokogiri/xml_xpath_context.c +158 -73
  44. data/ext/nokogiri/xslt_stylesheet.c +158 -164
  45. data/gumbo-parser/CHANGES.md +63 -0
  46. data/gumbo-parser/Makefile +101 -0
  47. data/gumbo-parser/THANKS +27 -0
  48. data/gumbo-parser/src/Makefile +34 -0
  49. data/gumbo-parser/src/README.md +41 -0
  50. data/gumbo-parser/src/ascii.c +75 -0
  51. data/gumbo-parser/src/ascii.h +115 -0
  52. data/gumbo-parser/src/attribute.c +42 -0
  53. data/gumbo-parser/src/attribute.h +17 -0
  54. data/gumbo-parser/src/char_ref.c +22225 -0
  55. data/gumbo-parser/src/char_ref.h +29 -0
  56. data/gumbo-parser/src/char_ref.rl +2154 -0
  57. data/gumbo-parser/src/error.c +626 -0
  58. data/gumbo-parser/src/error.h +148 -0
  59. data/gumbo-parser/src/foreign_attrs.c +104 -0
  60. data/gumbo-parser/src/foreign_attrs.gperf +27 -0
  61. data/gumbo-parser/src/gumbo.h +943 -0
  62. data/gumbo-parser/src/insertion_mode.h +33 -0
  63. data/gumbo-parser/src/macros.h +91 -0
  64. data/gumbo-parser/src/parser.c +4886 -0
  65. data/gumbo-parser/src/parser.h +41 -0
  66. data/gumbo-parser/src/replacement.h +33 -0
  67. data/gumbo-parser/src/string_buffer.c +103 -0
  68. data/gumbo-parser/src/string_buffer.h +68 -0
  69. data/gumbo-parser/src/string_piece.c +48 -0
  70. data/gumbo-parser/src/svg_attrs.c +174 -0
  71. data/gumbo-parser/src/svg_attrs.gperf +77 -0
  72. data/gumbo-parser/src/svg_tags.c +137 -0
  73. data/gumbo-parser/src/svg_tags.gperf +55 -0
  74. data/gumbo-parser/src/tag.c +222 -0
  75. data/gumbo-parser/src/tag_lookup.c +382 -0
  76. data/gumbo-parser/src/tag_lookup.gperf +169 -0
  77. data/gumbo-parser/src/tag_lookup.h +13 -0
  78. data/gumbo-parser/src/token_buffer.c +79 -0
  79. data/gumbo-parser/src/token_buffer.h +71 -0
  80. data/gumbo-parser/src/token_type.h +17 -0
  81. data/gumbo-parser/src/tokenizer.c +3463 -0
  82. data/gumbo-parser/src/tokenizer.h +112 -0
  83. data/gumbo-parser/src/tokenizer_states.h +339 -0
  84. data/gumbo-parser/src/utf8.c +245 -0
  85. data/gumbo-parser/src/utf8.h +164 -0
  86. data/gumbo-parser/src/util.c +68 -0
  87. data/gumbo-parser/src/util.h +30 -0
  88. data/gumbo-parser/src/vector.c +111 -0
  89. data/gumbo-parser/src/vector.h +45 -0
  90. data/lib/nokogiri/css/node.rb +1 -0
  91. data/lib/nokogiri/css/parser.rb +64 -63
  92. data/lib/nokogiri/css/parser.y +3 -3
  93. data/lib/nokogiri/css/parser_extras.rb +39 -36
  94. data/lib/nokogiri/css/syntax_error.rb +2 -1
  95. data/lib/nokogiri/css/tokenizer.rb +1 -0
  96. data/lib/nokogiri/css/xpath_visitor.rb +73 -43
  97. data/lib/nokogiri/css.rb +15 -14
  98. data/lib/nokogiri/decorators/slop.rb +1 -0
  99. data/lib/nokogiri/extension.rb +31 -0
  100. data/lib/nokogiri/gumbo.rb +14 -0
  101. data/lib/nokogiri/html.rb +32 -27
  102. data/lib/nokogiri/{html → html4}/builder.rb +3 -2
  103. data/lib/nokogiri/{html → html4}/document.rb +17 -30
  104. data/lib/nokogiri/{html → html4}/document_fragment.rb +18 -17
  105. data/lib/nokogiri/{html → html4}/element_description.rb +2 -1
  106. data/lib/nokogiri/{html → html4}/element_description_defaults.rb +2 -1
  107. data/lib/nokogiri/{html → html4}/entity_lookup.rb +2 -1
  108. data/lib/nokogiri/{html → html4}/sax/parser.rb +12 -14
  109. data/lib/nokogiri/html4/sax/parser_context.rb +19 -0
  110. data/lib/nokogiri/{html → html4}/sax/push_parser.rb +6 -5
  111. data/lib/nokogiri/html4.rb +40 -0
  112. data/lib/nokogiri/html5/document.rb +74 -0
  113. data/lib/nokogiri/html5/document_fragment.rb +80 -0
  114. data/lib/nokogiri/html5/node.rb +93 -0
  115. data/lib/nokogiri/html5.rb +473 -0
  116. data/lib/nokogiri/jruby/dependencies.rb +20 -0
  117. data/lib/nokogiri/syntax_error.rb +1 -0
  118. data/lib/nokogiri/version/constant.rb +5 -0
  119. data/lib/nokogiri/version/info.rb +215 -0
  120. data/lib/nokogiri/version.rb +3 -109
  121. data/lib/nokogiri/xml/attr.rb +1 -0
  122. data/lib/nokogiri/xml/attribute_decl.rb +1 -0
  123. data/lib/nokogiri/xml/builder.rb +41 -2
  124. data/lib/nokogiri/xml/cdata.rb +1 -0
  125. data/lib/nokogiri/xml/character_data.rb +1 -0
  126. data/lib/nokogiri/xml/document.rb +138 -41
  127. data/lib/nokogiri/xml/document_fragment.rb +5 -6
  128. data/lib/nokogiri/xml/dtd.rb +1 -0
  129. data/lib/nokogiri/xml/element_content.rb +1 -0
  130. data/lib/nokogiri/xml/element_decl.rb +1 -0
  131. data/lib/nokogiri/xml/entity_decl.rb +1 -0
  132. data/lib/nokogiri/xml/entity_reference.rb +1 -0
  133. data/lib/nokogiri/xml/namespace.rb +1 -0
  134. data/lib/nokogiri/xml/node/save_options.rb +2 -1
  135. data/lib/nokogiri/xml/node.rb +629 -293
  136. data/lib/nokogiri/xml/node_set.rb +1 -0
  137. data/lib/nokogiri/xml/notation.rb +1 -0
  138. data/lib/nokogiri/xml/parse_options.rb +12 -3
  139. data/lib/nokogiri/xml/pp/character_data.rb +1 -0
  140. data/lib/nokogiri/xml/pp/node.rb +1 -0
  141. data/lib/nokogiri/xml/pp.rb +3 -2
  142. data/lib/nokogiri/xml/processing_instruction.rb +1 -0
  143. data/lib/nokogiri/xml/reader.rb +9 -12
  144. data/lib/nokogiri/xml/relax_ng.rb +7 -2
  145. data/lib/nokogiri/xml/sax/document.rb +25 -30
  146. data/lib/nokogiri/xml/sax/parser.rb +1 -0
  147. data/lib/nokogiri/xml/sax/parser_context.rb +1 -0
  148. data/lib/nokogiri/xml/sax/push_parser.rb +1 -0
  149. data/lib/nokogiri/xml/sax.rb +5 -4
  150. data/lib/nokogiri/xml/schema.rb +13 -4
  151. data/lib/nokogiri/xml/searchable.rb +25 -16
  152. data/lib/nokogiri/xml/syntax_error.rb +1 -0
  153. data/lib/nokogiri/xml/text.rb +1 -0
  154. data/lib/nokogiri/xml/xpath/syntax_error.rb +2 -1
  155. data/lib/nokogiri/xml/xpath.rb +4 -5
  156. data/lib/nokogiri/xml/xpath_context.rb +1 -0
  157. data/lib/nokogiri/xml.rb +36 -36
  158. data/lib/nokogiri/xslt/stylesheet.rb +2 -1
  159. data/lib/nokogiri/xslt.rb +17 -16
  160. data/lib/nokogiri.rb +32 -51
  161. data/lib/xsd/xmlparser/nokogiri.rb +1 -0
  162. data/patches/libxml2/{0002-Remove-script-macro-support.patch → 0001-Remove-script-macro-support.patch} +0 -0
  163. data/patches/libxml2/{0003-Update-entities-to-remove-handling-of-ssi.patch → 0002-Update-entities-to-remove-handling-of-ssi.patch} +0 -0
  164. data/patches/libxml2/{0004-libxml2.la-is-in-top_builddir.patch → 0003-libxml2.la-is-in-top_builddir.patch} +1 -1
  165. data/patches/libxml2/0004-use-glibc-strlen.patch +53 -0
  166. data/patches/libxml2/0005-avoid-isnan-isinf.patch +81 -0
  167. data/patches/libxml2/0006-update-automake-files-for-arm64.patch +2511 -0
  168. data/patches/libxml2/0007-Fix-XPath-recursion-limit.patch +31 -0
  169. data/patches/libxslt/0001-update-automake-files-for-arm64.patch +2511 -0
  170. data/patches/libxslt/0002-Fix-xml2-config-check-in-configure-script.patch +19 -0
  171. data/ports/archives/libxml2-2.9.12.tar.gz +0 -0
  172. metadata +139 -161
  173. data/ext/nokogiri/html_document.c +0 -170
  174. data/ext/nokogiri/html_document.h +0 -10
  175. data/ext/nokogiri/html_element_description.c +0 -279
  176. data/ext/nokogiri/html_element_description.h +0 -10
  177. data/ext/nokogiri/html_entity_lookup.c +0 -32
  178. data/ext/nokogiri/html_entity_lookup.h +0 -8
  179. data/ext/nokogiri/html_sax_parser_context.c +0 -116
  180. data/ext/nokogiri/html_sax_parser_context.h +0 -11
  181. data/ext/nokogiri/html_sax_push_parser.c +0 -87
  182. data/ext/nokogiri/html_sax_push_parser.h +0 -9
  183. data/ext/nokogiri/xml_attr.h +0 -9
  184. data/ext/nokogiri/xml_attribute_decl.h +0 -9
  185. data/ext/nokogiri/xml_cdata.h +0 -9
  186. data/ext/nokogiri/xml_comment.h +0 -9
  187. data/ext/nokogiri/xml_document.h +0 -23
  188. data/ext/nokogiri/xml_document_fragment.h +0 -10
  189. data/ext/nokogiri/xml_dtd.h +0 -10
  190. data/ext/nokogiri/xml_element_content.h +0 -10
  191. data/ext/nokogiri/xml_element_decl.h +0 -9
  192. data/ext/nokogiri/xml_encoding_handler.h +0 -8
  193. data/ext/nokogiri/xml_entity_decl.h +0 -10
  194. data/ext/nokogiri/xml_entity_reference.h +0 -9
  195. data/ext/nokogiri/xml_io.c +0 -61
  196. data/ext/nokogiri/xml_io.h +0 -11
  197. data/ext/nokogiri/xml_libxml2_hacks.c +0 -112
  198. data/ext/nokogiri/xml_libxml2_hacks.h +0 -12
  199. data/ext/nokogiri/xml_namespace.h +0 -14
  200. data/ext/nokogiri/xml_node.h +0 -13
  201. data/ext/nokogiri/xml_node_set.h +0 -12
  202. data/ext/nokogiri/xml_processing_instruction.h +0 -9
  203. data/ext/nokogiri/xml_reader.h +0 -10
  204. data/ext/nokogiri/xml_relax_ng.h +0 -9
  205. data/ext/nokogiri/xml_sax_parser.h +0 -39
  206. data/ext/nokogiri/xml_sax_parser_context.h +0 -10
  207. data/ext/nokogiri/xml_sax_push_parser.h +0 -9
  208. data/ext/nokogiri/xml_schema.h +0 -9
  209. data/ext/nokogiri/xml_syntax_error.h +0 -13
  210. data/ext/nokogiri/xml_text.h +0 -9
  211. data/ext/nokogiri/xml_xpath_context.h +0 -10
  212. data/ext/nokogiri/xslt_stylesheet.h +0 -14
  213. data/lib/nokogiri/html/sax/parser_context.rb +0 -16
  214. data/patches/libxml2/0001-Revert-Do-not-URI-escape-in-server-side-includes.patch +0 -78
  215. data/patches/libxml2/0005-Fix-infinite-loop-in-xmlStringLenDecodeEntities.patch +0 -32
  216. data/ports/archives/libxml2-2.9.10.tar.gz +0 -0
@@ -1,12 +1,11 @@
1
- #include <xml_node_set.h>
2
- #include <xml_namespace.h>
3
- #include <libxml/xpathInternals.h>
1
+ #include <nokogiri.h>
4
2
 
5
- static ID decorate ;
6
- static void xpath_node_set_del(xmlNodeSetPtr cur, xmlNodePtr val);
3
+ VALUE cNokogiriXmlNodeSet ;
7
4
 
5
+ static ID decorate ;
8
6
 
9
- static void Check_Node_Set_Node_Type(VALUE node)
7
+ static void
8
+ Check_Node_Set_Node_Type(VALUE node)
10
9
  {
11
10
  if (!(rb_obj_is_kind_of(node, cNokogiriXmlNode) ||
12
11
  rb_obj_is_kind_of(node, cNokogiriXmlNamespace))) {
@@ -15,34 +14,94 @@ static void Check_Node_Set_Node_Type(VALUE node)
15
14
  }
16
15
 
17
16
 
18
- static void deallocate(xmlNodeSetPtr node_set)
17
+ static
18
+ VALUE
19
+ ruby_object_get(xmlNodePtr c_node)
20
+ {
21
+ /* see xmlElementType in libxml2 tree.h */
22
+ switch (c_node->type) {
23
+ case XML_NAMESPACE_DECL:
24
+ /* _private is later in the namespace struct */
25
+ return (VALUE)(((xmlNsPtr)c_node)->_private);
26
+
27
+ case XML_DOCUMENT_NODE:
28
+ case XML_HTML_DOCUMENT_NODE:
29
+ /* in documents we use _private to store a tuple */
30
+ if (DOC_RUBY_OBJECT_TEST(((xmlDocPtr)c_node))) {
31
+ return DOC_RUBY_OBJECT((xmlDocPtr)c_node);
32
+ }
33
+ return (VALUE)NULL;
34
+
35
+ default:
36
+ return (VALUE)(c_node->_private);
37
+ }
38
+ }
39
+
40
+
41
+ static void
42
+ mark(xmlNodeSetPtr node_set)
43
+ {
44
+ VALUE rb_node;
45
+ int jnode;
46
+
47
+ for (jnode = 0; jnode < node_set->nodeNr; jnode++) {
48
+ rb_node = ruby_object_get(node_set->nodeTab[jnode]);
49
+ if (rb_node) {
50
+ rb_gc_mark(rb_node);
51
+ }
52
+ }
53
+ }
54
+
55
+ static void
56
+ xpath_node_set_del(xmlNodeSetPtr cur, xmlNodePtr val)
57
+ {
58
+ /*
59
+ * For reasons outlined in xml_namespace.c, here we reproduce xmlXPathNodeSetDel() except for the
60
+ * offending call to xmlXPathNodeSetFreeNs().
61
+ */
62
+ int i;
63
+
64
+ if (cur == NULL) { return; }
65
+ if (val == NULL) { return; }
66
+
67
+ /*
68
+ * find node in nodeTab
69
+ */
70
+ for (i = 0; i < cur->nodeNr; i++)
71
+ if (cur->nodeTab[i] == val) { break; }
72
+
73
+ if (i >= cur->nodeNr) { /* not found */
74
+ return;
75
+ }
76
+ cur->nodeNr--;
77
+ for (; i < cur->nodeNr; i++) {
78
+ cur->nodeTab[i] = cur->nodeTab[i + 1];
79
+ }
80
+ cur->nodeTab[cur->nodeNr] = NULL;
81
+ }
82
+
83
+
84
+ static void
85
+ deallocate(xmlNodeSetPtr node_set)
19
86
  {
20
87
  /*
21
- *
22
- * since xpath queries return copies of the xmlNs structs,
23
- * xmlXPathFreeNodeSet() frees those xmlNs structs that are in the
24
- * NodeSet.
25
- *
26
- * this is bad if someone is still trying to use the Namespace object wrapped
27
- * around the xmlNs, so we need to avoid that.
28
- *
29
- * here we reproduce xmlXPathFreeNodeSet() without the xmlNs logic.
30
- *
31
- * this doesn't cause a leak because Namespace objects that are in an XPath
32
- * query NodeSet are given their own lifecycle in
33
- * Nokogiri_wrap_xml_namespace().
88
+ * For reasons outlined in xml_namespace.c, here we reproduce xmlXPathFreeNodeSet() except for the
89
+ * offending call to xmlXPathNodeSetFreeNs().
34
90
  */
35
91
  NOKOGIRI_DEBUG_START(node_set) ;
36
- if (node_set->nodeTab != NULL)
92
+ if (node_set->nodeTab != NULL) {
37
93
  xmlFree(node_set->nodeTab);
94
+ }
38
95
 
39
96
  xmlFree(node_set);
40
97
  NOKOGIRI_DEBUG_END(node_set) ;
41
98
  }
42
99
 
43
- static VALUE allocate(VALUE klass)
100
+
101
+ static VALUE
102
+ allocate(VALUE klass)
44
103
  {
45
- return Nokogiri_wrap_xml_node_set(xmlXPathNodeSetCreate(NULL), Qnil);
104
+ return noko_xml_node_set_wrap(xmlXPathNodeSetCreate(NULL), Qnil);
46
105
  }
47
106
 
48
107
 
@@ -53,7 +112,8 @@ static VALUE allocate(VALUE klass)
53
112
  * Duplicate this NodeSet. Note that the Nodes contained in the NodeSet are not
54
113
  * duplicated (similar to how Array and other Enumerable classes work).
55
114
  */
56
- static VALUE duplicate(VALUE self)
115
+ static VALUE
116
+ duplicate(VALUE self)
57
117
  {
58
118
  xmlNodeSetPtr node_set;
59
119
  xmlNodeSetPtr dupl;
@@ -62,7 +122,7 @@ static VALUE duplicate(VALUE self)
62
122
 
63
123
  dupl = xmlXPathNodeSetMerge(NULL, node_set);
64
124
 
65
- return Nokogiri_wrap_xml_node_set(dupl, rb_iv_get(self, "@document"));
125
+ return noko_xml_node_set_wrap(dupl, rb_iv_get(self, "@document"));
66
126
  }
67
127
 
68
128
  /*
@@ -71,7 +131,8 @@ static VALUE duplicate(VALUE self)
71
131
  *
72
132
  * Get the length of the node set
73
133
  */
74
- static VALUE length(VALUE self)
134
+ static VALUE
135
+ length(VALUE self)
75
136
  {
76
137
  xmlNodeSetPtr node_set;
77
138
 
@@ -86,7 +147,8 @@ static VALUE length(VALUE self)
86
147
  *
87
148
  * Append +node+ to the NodeSet.
88
149
  */
89
- static VALUE push(VALUE self, VALUE rb_node)
150
+ static VALUE
151
+ push(VALUE self, VALUE rb_node)
90
152
  {
91
153
  xmlNodeSetPtr node_set;
92
154
  xmlNodePtr node;
@@ -109,7 +171,7 @@ static VALUE push(VALUE self, VALUE rb_node)
109
171
  * if found, otherwise returns nil.
110
172
  */
111
173
  static VALUE
112
- delete(VALUE self, VALUE rb_node)
174
+ delete (VALUE self, VALUE rb_node)
113
175
  {
114
176
  xmlNodeSetPtr node_set;
115
177
  xmlNodePtr node;
@@ -133,19 +195,21 @@ delete(VALUE self, VALUE rb_node)
133
195
  *
134
196
  * Set Intersection — Returns a new NodeSet containing nodes common to the two NodeSets.
135
197
  */
136
- static VALUE intersection(VALUE self, VALUE rb_other)
198
+ static VALUE
199
+ intersection(VALUE self, VALUE rb_other)
137
200
  {
138
201
  xmlNodeSetPtr node_set, other ;
139
202
  xmlNodeSetPtr intersection;
140
203
 
141
- if(!rb_obj_is_kind_of(rb_other, cNokogiriXmlNodeSet))
204
+ if (!rb_obj_is_kind_of(rb_other, cNokogiriXmlNodeSet)) {
142
205
  rb_raise(rb_eArgError, "node_set must be a Nokogiri::XML::NodeSet");
206
+ }
143
207
 
144
208
  Data_Get_Struct(self, xmlNodeSet, node_set);
145
209
  Data_Get_Struct(rb_other, xmlNodeSet, other);
146
210
 
147
211
  intersection = xmlXPathIntersection(node_set, other);
148
- return Nokogiri_wrap_xml_node_set(intersection, rb_iv_get(self, "@document"));
212
+ return noko_xml_node_set_wrap(intersection, rb_iv_get(self, "@document"));
149
213
  }
150
214
 
151
215
 
@@ -155,7 +219,8 @@ static VALUE intersection(VALUE self, VALUE rb_other)
155
219
  *
156
220
  * Returns true if any member of node set equals +node+.
157
221
  */
158
- static VALUE include_eh(VALUE self, VALUE rb_node)
222
+ static VALUE
223
+ include_eh(VALUE self, VALUE rb_node)
159
224
  {
160
225
  xmlNodeSetPtr node_set;
161
226
  xmlNodePtr node;
@@ -176,21 +241,23 @@ static VALUE include_eh(VALUE self, VALUE rb_node)
176
241
  * Returns a new set built by merging the set and the elements of the given
177
242
  * set.
178
243
  */
179
- static VALUE set_union(VALUE self, VALUE rb_other)
244
+ static VALUE
245
+ rb_xml_node_set_union(VALUE rb_node_set, VALUE rb_other)
180
246
  {
181
- xmlNodeSetPtr node_set, other;
182
- xmlNodeSetPtr new;
247
+ xmlNodeSetPtr c_node_set, c_other;
248
+ xmlNodeSetPtr c_new_node_set;
183
249
 
184
- if(!rb_obj_is_kind_of(rb_other, cNokogiriXmlNodeSet))
250
+ if (!rb_obj_is_kind_of(rb_other, cNokogiriXmlNodeSet)) {
185
251
  rb_raise(rb_eArgError, "node_set must be a Nokogiri::XML::NodeSet");
252
+ }
186
253
 
187
- Data_Get_Struct(self, xmlNodeSet, node_set);
188
- Data_Get_Struct(rb_other, xmlNodeSet, other);
254
+ Data_Get_Struct(rb_node_set, xmlNodeSet, c_node_set);
255
+ Data_Get_Struct(rb_other, xmlNodeSet, c_other);
189
256
 
190
- new = xmlXPathNodeSetMerge(NULL, node_set);
191
- new = xmlXPathNodeSetMerge(new, other);
257
+ c_new_node_set = xmlXPathNodeSetMerge(NULL, c_node_set);
258
+ c_new_node_set = xmlXPathNodeSetMerge(c_new_node_set, c_other);
192
259
 
193
- return Nokogiri_wrap_xml_node_set(new, rb_iv_get(self, "@document"));
260
+ return noko_xml_node_set_wrap(c_new_node_set, rb_iv_get(rb_node_set, "@document"));
194
261
  }
195
262
 
196
263
  /*
@@ -200,14 +267,16 @@ static VALUE set_union(VALUE self, VALUE rb_other)
200
267
  * Difference - returns a new NodeSet that is a copy of this NodeSet, removing
201
268
  * each item that also appears in +node_set+
202
269
  */
203
- static VALUE minus(VALUE self, VALUE rb_other)
270
+ static VALUE
271
+ minus(VALUE self, VALUE rb_other)
204
272
  {
205
273
  xmlNodeSetPtr node_set, other;
206
274
  xmlNodeSetPtr new;
207
275
  int j ;
208
276
 
209
- if(!rb_obj_is_kind_of(rb_other, cNokogiriXmlNodeSet))
277
+ if (!rb_obj_is_kind_of(rb_other, cNokogiriXmlNodeSet)) {
210
278
  rb_raise(rb_eArgError, "node_set must be a Nokogiri::XML::NodeSet");
279
+ }
211
280
 
212
281
  Data_Get_Struct(self, xmlNodeSet, node_set);
213
282
  Data_Get_Struct(rb_other, xmlNodeSet, other);
@@ -217,11 +286,12 @@ static VALUE minus(VALUE self, VALUE rb_other)
217
286
  xpath_node_set_del(new, other->nodeTab[j]);
218
287
  }
219
288
 
220
- return Nokogiri_wrap_xml_node_set(new, rb_iv_get(self, "@document"));
289
+ return noko_xml_node_set_wrap(new, rb_iv_get(self, "@document"));
221
290
  }
222
291
 
223
292
 
224
- static VALUE index_at(VALUE self, long offset)
293
+ static VALUE
294
+ index_at(VALUE self, long offset)
225
295
  {
226
296
  xmlNodeSetPtr node_set;
227
297
 
@@ -233,10 +303,11 @@ static VALUE index_at(VALUE self, long offset)
233
303
 
234
304
  if (offset < 0) { offset += node_set->nodeNr ; }
235
305
 
236
- return Nokogiri_wrap_xml_node_set_node(node_set->nodeTab[offset], self);
306
+ return noko_xml_node_wrap_node_set_result(node_set->nodeTab[offset], self);
237
307
  }
238
308
 
239
- static VALUE subseq(VALUE self, long beg, long len)
309
+ static VALUE
310
+ subseq(VALUE self, long beg, long len)
240
311
  {
241
312
  long j;
242
313
  xmlNodeSetPtr node_set;
@@ -244,18 +315,18 @@ static VALUE subseq(VALUE self, long beg, long len)
244
315
 
245
316
  Data_Get_Struct(self, xmlNodeSet, node_set);
246
317
 
247
- if (beg > node_set->nodeNr) return Qnil ;
248
- if (beg < 0 || len < 0) return Qnil ;
318
+ if (beg > node_set->nodeNr) { return Qnil ; }
319
+ if (beg < 0 || len < 0) { return Qnil ; }
249
320
 
250
321
  if ((beg + len) > node_set->nodeNr) {
251
322
  len = node_set->nodeNr - beg ;
252
323
  }
253
324
 
254
325
  new_set = xmlXPathNodeSetCreate(NULL);
255
- for (j = beg ; j < beg+len ; ++j) {
326
+ for (j = beg ; j < beg + len ; ++j) {
256
327
  xmlXPathNodeSetAddUnique(new_set, node_set->nodeTab[j]);
257
328
  }
258
- return Nokogiri_wrap_xml_node_set(new_set, rb_iv_get(self, "@document"));
329
+ return noko_xml_node_set_wrap(new_set, rb_iv_get(self, "@document"));
259
330
  }
260
331
 
261
332
  /*
@@ -273,7 +344,8 @@ static VALUE subseq(VALUE self, long beg, long len)
273
344
  * count backward from the end of the +node_set+ (-1 is the last node). Returns
274
345
  * nil if the +index+ (or +start+) are out of range.
275
346
  */
276
- static VALUE slice(int argc, VALUE *argv, VALUE self)
347
+ static VALUE
348
+ slice(int argc, VALUE *argv, VALUE self)
277
349
  {
278
350
  VALUE arg ;
279
351
  long beg, len ;
@@ -301,12 +373,12 @@ static VALUE slice(int argc, VALUE *argv, VALUE self)
301
373
 
302
374
  /* if arg is Range */
303
375
  switch (rb_range_beg_len(arg, &beg, &len, (long)node_set->nodeNr, 0)) {
304
- case Qfalse:
305
- break;
306
- case Qnil:
307
- return Qnil;
308
- default:
309
- return subseq(self, beg, len);
376
+ case Qfalse:
377
+ break;
378
+ case Qnil:
379
+ return Qnil;
380
+ default:
381
+ return subseq(self, beg, len);
310
382
  }
311
383
 
312
384
  return index_at(self, NUM2LONG(arg));
@@ -319,7 +391,8 @@ static VALUE slice(int argc, VALUE *argv, VALUE self)
319
391
  *
320
392
  * Return this list as an Array
321
393
  */
322
- static VALUE to_array(VALUE self, VALUE rb_node)
394
+ static VALUE
395
+ to_array(VALUE self)
323
396
  {
324
397
  xmlNodeSetPtr node_set ;
325
398
  VALUE list;
@@ -328,9 +401,9 @@ static VALUE to_array(VALUE self, VALUE rb_node)
328
401
  Data_Get_Struct(self, xmlNodeSet, node_set);
329
402
 
330
403
  list = rb_ary_new2(node_set->nodeNr);
331
- for(i = 0; i < node_set->nodeNr; i++) {
332
- VALUE elt = Nokogiri_wrap_xml_node_set_node(node_set->nodeTab[i], self);
333
- rb_ary_push( list, elt );
404
+ for (i = 0; i < node_set->nodeNr; i++) {
405
+ VALUE elt = noko_xml_node_wrap_node_set_result(node_set->nodeTab[i], self);
406
+ rb_ary_push(list, elt);
334
407
  }
335
408
 
336
409
  return list;
@@ -342,7 +415,8 @@ static VALUE to_array(VALUE self, VALUE rb_node)
342
415
  *
343
416
  * Unlink this NodeSet and all Node objects it contains from their current context.
344
417
  */
345
- static VALUE unlink_nodeset(VALUE self)
418
+ static VALUE
419
+ unlink_nodeset(VALUE self)
346
420
  {
347
421
  xmlNodeSetPtr node_set;
348
422
  int j, nodeNr ;
@@ -354,7 +428,7 @@ static VALUE unlink_nodeset(VALUE self)
354
428
  if (! NOKOGIRI_NAMESPACE_EH(node_set->nodeTab[j])) {
355
429
  VALUE node ;
356
430
  xmlNodePtr node_ptr;
357
- node = Nokogiri_wrap_xml_node(Qnil, node_set->nodeTab[j]);
431
+ node = noko_xml_node_wrap(Qnil, node_set->nodeTab[j]);
358
432
  rb_funcall(node, rb_intern("unlink"), 0); /* modifies the C struct out from under the object */
359
433
  Data_Get_Struct(node, xmlNode, node_ptr);
360
434
  node_set->nodeTab[j] = node_ptr ;
@@ -364,123 +438,61 @@ static VALUE unlink_nodeset(VALUE self)
364
438
  }
365
439
 
366
440
 
367
- static void reify_node_set_namespaces(VALUE self)
441
+ VALUE
442
+ noko_xml_node_set_wrap(xmlNodeSetPtr c_node_set, VALUE document)
368
443
  {
369
- /*
370
- * as mentioned in deallocate() above, xmlNs structs returned in an XPath
371
- * NodeSet are duplicates, and we don't clean them up at deallocate() time.
372
- *
373
- * as a result, we need to make sure the Ruby manages this memory. we do this
374
- * by forcing the creation of a Ruby object wrapped around the xmlNs.
375
- *
376
- * we also have to make sure that the NodeSet has a reference to the
377
- * Namespace object, otherwise GC will kick in and the Namespace won't be
378
- * marked.
379
- *
380
- * we *could* do this safely with *all* the nodes in the NodeSet, but we only
381
- * *need* to do it for xmlNs structs, and so you get the code we have here.
382
- */
383
- int j ;
384
- xmlNodeSetPtr node_set ;
385
- VALUE namespace_cache ;
386
-
387
- Data_Get_Struct(self, xmlNodeSet, node_set);
388
-
389
- namespace_cache = rb_iv_get(self, "@namespace_cache");
444
+ int j;
445
+ VALUE rb_node_set ;
390
446
 
391
- for (j = 0 ; j < node_set->nodeNr ; j++) {
392
- if (NOKOGIRI_NAMESPACE_EH(node_set->nodeTab[j])) {
393
- rb_ary_push(namespace_cache, Nokogiri_wrap_xml_node_set_node(node_set->nodeTab[j], self));
394
- }
447
+ if (c_node_set == NULL) {
448
+ c_node_set = xmlXPathNodeSetCreate(NULL);
395
449
  }
396
- }
397
-
398
450
 
399
- VALUE Nokogiri_wrap_xml_node_set(xmlNodeSetPtr node_set, VALUE document)
400
- {
401
- VALUE new_set ;
402
-
403
- if (node_set == NULL) {
404
- node_set = xmlXPathNodeSetCreate(NULL);
405
- }
406
-
407
- new_set = Data_Wrap_Struct(cNokogiriXmlNodeSet, 0, deallocate, node_set);
451
+ rb_node_set = Data_Wrap_Struct(cNokogiriXmlNodeSet, mark, deallocate, c_node_set);
408
452
 
409
453
  if (!NIL_P(document)) {
410
- rb_iv_set(new_set, "@document", document);
411
- rb_funcall(document, decorate, 1, new_set);
454
+ rb_iv_set(rb_node_set, "@document", document);
455
+ rb_funcall(document, decorate, 1, rb_node_set);
412
456
  }
413
457
 
414
- rb_iv_set(new_set, "@namespace_cache", rb_ary_new());
415
- reify_node_set_namespaces(new_set);
458
+ /* make sure we create ruby objects for all the results, so they'll be marked during the GC mark phase */
459
+ for (j = 0 ; j < c_node_set->nodeNr ; j++) {
460
+ noko_xml_node_wrap_node_set_result(c_node_set->nodeTab[j], rb_node_set);
461
+ }
416
462
 
417
- return new_set ;
463
+ return rb_node_set ;
418
464
  }
419
465
 
420
- VALUE Nokogiri_wrap_xml_node_set_node(xmlNodePtr node, VALUE node_set)
466
+ VALUE
467
+ noko_xml_node_wrap_node_set_result(xmlNodePtr node, VALUE node_set)
421
468
  {
422
- xmlDocPtr document ;
423
-
424
469
  if (NOKOGIRI_NAMESPACE_EH(node)) {
425
- Data_Get_Struct(rb_iv_get(node_set, "@document"), xmlDoc, document);
426
- return Nokogiri_wrap_xml_namespace(document, (xmlNsPtr)node);
470
+ return noko_xml_namespace_wrap_xpath_copy((xmlNsPtr)node);
427
471
  } else {
428
- return Nokogiri_wrap_xml_node(Qnil, node);
472
+ return noko_xml_node_wrap(Qnil, node);
429
473
  }
430
474
  }
431
475
 
432
476
 
433
- static void xpath_node_set_del(xmlNodeSetPtr cur, xmlNodePtr val)
434
- {
435
- /*
436
- * as mentioned a few times above, we do not want to free xmlNs structs
437
- * outside of the Namespace lifecycle.
438
- *
439
- * xmlXPathNodeSetDel() frees xmlNs structs, and so here we reproduce that
440
- * function with the xmlNs logic.
441
- */
442
- int i;
443
-
444
- if (cur == NULL) return;
445
- if (val == NULL) return;
446
-
447
- /*
448
- * find node in nodeTab
449
- */
450
- for (i = 0;i < cur->nodeNr;i++)
451
- if (cur->nodeTab[i] == val) break;
452
-
453
- if (i >= cur->nodeNr) { /* not found */
454
- return;
455
- }
456
- cur->nodeNr--;
457
- for (;i < cur->nodeNr;i++)
458
- cur->nodeTab[i] = cur->nodeTab[i + 1];
459
- cur->nodeTab[cur->nodeNr] = NULL;
460
- }
461
-
462
-
463
- VALUE cNokogiriXmlNodeSet ;
464
- void init_xml_node_set(void)
477
+ void
478
+ noko_init_xml_node_set(void)
465
479
  {
466
- VALUE nokogiri = rb_define_module("Nokogiri");
467
- VALUE xml = rb_define_module_under(nokogiri, "XML");
468
- VALUE klass = rb_define_class_under(xml, "NodeSet", rb_cObject);
469
- cNokogiriXmlNodeSet = klass;
470
-
471
- rb_define_alloc_func(klass, allocate);
472
- rb_define_method(klass, "length", length, 0);
473
- rb_define_method(klass, "[]", slice, -1);
474
- rb_define_method(klass, "slice", slice, -1);
475
- rb_define_method(klass, "push", push, 1);
476
- rb_define_method(klass, "|", set_union, 1);
477
- rb_define_method(klass, "-", minus, 1);
478
- rb_define_method(klass, "unlink", unlink_nodeset, 0);
479
- rb_define_method(klass, "to_a", to_array, 0);
480
- rb_define_method(klass, "dup", duplicate, 0);
481
- rb_define_method(klass, "delete", delete, 1);
482
- rb_define_method(klass, "&", intersection, 1);
483
- rb_define_method(klass, "include?", include_eh, 1);
480
+ cNokogiriXmlNodeSet = rb_define_class_under(mNokogiriXml, "NodeSet", rb_cObject);
481
+
482
+ rb_define_alloc_func(cNokogiriXmlNodeSet, allocate);
483
+
484
+ rb_define_method(cNokogiriXmlNodeSet, "length", length, 0);
485
+ rb_define_method(cNokogiriXmlNodeSet, "[]", slice, -1);
486
+ rb_define_method(cNokogiriXmlNodeSet, "slice", slice, -1);
487
+ rb_define_method(cNokogiriXmlNodeSet, "push", push, 1);
488
+ rb_define_method(cNokogiriXmlNodeSet, "|", rb_xml_node_set_union, 1);
489
+ rb_define_method(cNokogiriXmlNodeSet, "-", minus, 1);
490
+ rb_define_method(cNokogiriXmlNodeSet, "unlink", unlink_nodeset, 0);
491
+ rb_define_method(cNokogiriXmlNodeSet, "to_a", to_array, 0);
492
+ rb_define_method(cNokogiriXmlNodeSet, "dup", duplicate, 0);
493
+ rb_define_method(cNokogiriXmlNodeSet, "delete", delete, 1);
494
+ rb_define_method(cNokogiriXmlNodeSet, "&", intersection, 1);
495
+ rb_define_method(cNokogiriXmlNodeSet, "include?", include_eh, 1);
484
496
 
485
497
  decorate = rb_intern("decorate");
486
498
  }
@@ -1,4 +1,6 @@
1
- #include <xml_processing_instruction.h>
1
+ #include <nokogiri.h>
2
+
3
+ VALUE cNokogiriXmlProcessingInstruction;
2
4
 
3
5
  /*
4
6
  * call-seq:
@@ -7,7 +9,8 @@
7
9
  * Create a new ProcessingInstruction element on the +document+ with +name+
8
10
  * and +content+
9
11
  */
10
- static VALUE new(int argc, VALUE *argv, VALUE klass)
12
+ static VALUE
13
+ new (int argc, VALUE *argv, VALUE klass)
11
14
  {
12
15
  xmlDocPtr xml_doc;
13
16
  xmlNodePtr node;
@@ -22,35 +25,30 @@ static VALUE new(int argc, VALUE *argv, VALUE klass)
22
25
  Data_Get_Struct(document, xmlDoc, xml_doc);
23
26
 
24
27
  node = xmlNewDocPI(
25
- xml_doc,
26
- (const xmlChar *)StringValueCStr(name),
27
- (const xmlChar *)StringValueCStr(content)
28
- );
28
+ xml_doc,
29
+ (const xmlChar *)StringValueCStr(name),
30
+ (const xmlChar *)StringValueCStr(content)
31
+ );
29
32
 
30
- nokogiri_root_node(node);
33
+ noko_xml_document_pin_node(node);
31
34
 
32
- rb_node = Nokogiri_wrap_xml_node(klass, node);
35
+ rb_node = noko_xml_node_wrap(klass, node);
33
36
  rb_obj_call_init(rb_node, argc, argv);
34
37
 
35
- if(rb_block_given_p()) rb_yield(rb_node);
38
+ if (rb_block_given_p()) { rb_yield(rb_node); }
36
39
 
37
40
  return rb_node;
38
41
  }
39
42
 
40
- VALUE cNokogiriXmlProcessingInstruction;
41
- void init_xml_processing_instruction()
43
+ void
44
+ noko_init_xml_processing_instruction()
42
45
  {
43
- VALUE nokogiri = rb_define_module("Nokogiri");
44
- VALUE xml = rb_define_module_under(nokogiri, "XML");
45
- VALUE node = rb_define_class_under(xml, "Node", rb_cObject);
46
-
46
+ assert(cNokogiriXmlNode);
47
47
  /*
48
48
  * ProcessingInstruction represents a ProcessingInstruction node in an xml
49
49
  * document.
50
50
  */
51
- VALUE klass = rb_define_class_under(xml, "ProcessingInstruction", node);
52
-
53
- cNokogiriXmlProcessingInstruction = klass;
51
+ cNokogiriXmlProcessingInstruction = rb_define_class_under(mNokogiriXml, "ProcessingInstruction", cNokogiriXmlNode);
54
52
 
55
- rb_define_singleton_method(klass, "new", new, -1);
53
+ rb_define_singleton_method(cNokogiriXmlProcessingInstruction, "new", new, -1);
56
54
  }