nokogiri 1.11.7-x86-mingw32 → 1.12.0.rc1-x86-mingw32

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 (70) hide show
  1. checksums.yaml +4 -4
  2. data/LICENSE-DEPENDENCIES.md +243 -22
  3. data/LICENSE.md +1 -1
  4. data/README.md +6 -5
  5. data/ext/nokogiri/depend +35 -34
  6. data/ext/nokogiri/extconf.rb +181 -103
  7. data/ext/nokogiri/gumbo.c +611 -0
  8. data/ext/nokogiri/{html_document.c → html4_document.c} +8 -8
  9. data/ext/nokogiri/{html_element_description.c → html4_element_description.c} +20 -18
  10. data/ext/nokogiri/{html_entity_lookup.c → html4_entity_lookup.c} +7 -7
  11. data/ext/nokogiri/{html_sax_parser_context.c → html4_sax_parser_context.c} +5 -5
  12. data/ext/nokogiri/{html_sax_push_parser.c → html4_sax_push_parser.c} +4 -4
  13. data/ext/nokogiri/include/libxslt/xsltconfig.h +1 -1
  14. data/ext/nokogiri/libxml2_backwards_compat.c +30 -30
  15. data/ext/nokogiri/nokogiri.c +51 -38
  16. data/ext/nokogiri/nokogiri.h +16 -9
  17. data/ext/nokogiri/xml_document.c +13 -13
  18. data/ext/nokogiri/xml_element_content.c +2 -0
  19. data/ext/nokogiri/xml_encoding_handler.c +11 -6
  20. data/ext/nokogiri/xml_namespace.c +2 -0
  21. data/ext/nokogiri/xml_node.c +102 -102
  22. data/ext/nokogiri/xml_node_set.c +20 -20
  23. data/ext/nokogiri/xml_reader.c +2 -0
  24. data/ext/nokogiri/xml_sax_parser.c +6 -6
  25. data/ext/nokogiri/xml_sax_parser_context.c +2 -0
  26. data/ext/nokogiri/xml_schema.c +2 -0
  27. data/ext/nokogiri/xml_xpath_context.c +67 -65
  28. data/ext/nokogiri/xslt_stylesheet.c +2 -1
  29. data/gumbo-parser/CHANGES.md +63 -0
  30. data/gumbo-parser/Makefile +101 -0
  31. data/gumbo-parser/THANKS +27 -0
  32. data/lib/nokogiri.rb +31 -29
  33. data/lib/nokogiri/2.5/nokogiri.so +0 -0
  34. data/lib/nokogiri/2.6/nokogiri.so +0 -0
  35. data/lib/nokogiri/2.7/nokogiri.so +0 -0
  36. data/lib/nokogiri/3.0/nokogiri.so +0 -0
  37. data/lib/nokogiri/css.rb +14 -14
  38. data/lib/nokogiri/css/parser.rb +1 -1
  39. data/lib/nokogiri/css/parser.y +1 -1
  40. data/lib/nokogiri/css/syntax_error.rb +1 -1
  41. data/lib/nokogiri/extension.rb +2 -2
  42. data/lib/nokogiri/gumbo.rb +14 -0
  43. data/lib/nokogiri/html.rb +31 -27
  44. data/lib/nokogiri/html4.rb +40 -0
  45. data/lib/nokogiri/{html → html4}/builder.rb +2 -2
  46. data/lib/nokogiri/{html → html4}/document.rb +4 -4
  47. data/lib/nokogiri/{html → html4}/document_fragment.rb +3 -3
  48. data/lib/nokogiri/{html → html4}/element_description.rb +1 -1
  49. data/lib/nokogiri/{html → html4}/element_description_defaults.rb +1 -1
  50. data/lib/nokogiri/{html → html4}/entity_lookup.rb +1 -1
  51. data/lib/nokogiri/{html → html4}/sax/parser.rb +11 -14
  52. data/lib/nokogiri/html4/sax/parser_context.rb +19 -0
  53. data/lib/nokogiri/{html → html4}/sax/push_parser.rb +5 -5
  54. data/lib/nokogiri/html5.rb +473 -0
  55. data/lib/nokogiri/html5/document.rb +74 -0
  56. data/lib/nokogiri/html5/document_fragment.rb +80 -0
  57. data/lib/nokogiri/html5/node.rb +93 -0
  58. data/lib/nokogiri/version/constant.rb +1 -1
  59. data/lib/nokogiri/version/info.rb +11 -2
  60. data/lib/nokogiri/xml.rb +35 -36
  61. data/lib/nokogiri/xml/node.rb +6 -5
  62. data/lib/nokogiri/xml/parse_options.rb +2 -0
  63. data/lib/nokogiri/xml/pp.rb +2 -2
  64. data/lib/nokogiri/xml/sax.rb +4 -4
  65. data/lib/nokogiri/xml/sax/document.rb +24 -30
  66. data/lib/nokogiri/xml/xpath.rb +2 -2
  67. data/lib/nokogiri/xslt.rb +16 -16
  68. data/lib/nokogiri/xslt/stylesheet.rb +1 -1
  69. metadata +37 -37
  70. data/lib/nokogiri/html/sax/parser_context.rb +0 -17
@@ -1,6 +1,6 @@
1
1
  #include <nokogiri.h>
2
2
 
3
- VALUE cNokogiriHtmlDocument ;
3
+ VALUE cNokogiriHtml4Document ;
4
4
 
5
5
  static ID id_encoding_found;
6
6
  static ID id_to_s;
@@ -34,7 +34,7 @@ rb_html_document_s_new(int argc, VALUE *argv, VALUE klass)
34
34
  * read_io(io, url, encoding, options)
35
35
  *
36
36
  * Read the HTML document from +io+ with given +url+, +encoding+,
37
- * and +options+. See Nokogiri::HTML.parse
37
+ * and +options+. See Nokogiri::HTML4.parse
38
38
  */
39
39
  static VALUE
40
40
  rb_html_document_s_read_io(VALUE klass, VALUE rb_io, VALUE rb_url, VALUE rb_encoding, VALUE rb_options)
@@ -92,7 +92,7 @@ rb_html_document_s_read_io(VALUE klass, VALUE rb_io, VALUE rb_url, VALUE rb_enco
92
92
  * read_memory(string, url, encoding, options)
93
93
  *
94
94
  * Read the HTML document contained in +string+ with given +url+, +encoding+,
95
- * and +options+. See Nokogiri::HTML.parse
95
+ * and +options+. See Nokogiri::HTML4.parse
96
96
  */
97
97
  static VALUE
98
98
  rb_html_document_s_read_memory(VALUE klass, VALUE rb_html, VALUE rb_url, VALUE rb_encoding, VALUE rb_options)
@@ -153,13 +153,13 @@ void
153
153
  noko_init_html_document()
154
154
  {
155
155
  assert(cNokogiriXmlDocument);
156
- cNokogiriHtmlDocument = rb_define_class_under(mNokogiriHtml, "Document", cNokogiriXmlDocument);
156
+ cNokogiriHtml4Document = rb_define_class_under(mNokogiriHtml4, "Document", cNokogiriXmlDocument);
157
157
 
158
- rb_define_singleton_method(cNokogiriHtmlDocument, "read_memory", rb_html_document_s_read_memory, 4);
159
- rb_define_singleton_method(cNokogiriHtmlDocument, "read_io", rb_html_document_s_read_io, 4);
160
- rb_define_singleton_method(cNokogiriHtmlDocument, "new", rb_html_document_s_new, -1);
158
+ rb_define_singleton_method(cNokogiriHtml4Document, "read_memory", rb_html_document_s_read_memory, 4);
159
+ rb_define_singleton_method(cNokogiriHtml4Document, "read_io", rb_html_document_s_read_io, 4);
160
+ rb_define_singleton_method(cNokogiriHtml4Document, "new", rb_html_document_s_new, -1);
161
161
 
162
- rb_define_method(cNokogiriHtmlDocument, "type", rb_html_document_type, 0);
162
+ rb_define_method(cNokogiriHtml4Document, "type", rb_html_document_type, 0);
163
163
 
164
164
  id_encoding_found = rb_intern("encoding_found");
165
165
  id_to_s = rb_intern("to_s");
@@ -1,6 +1,6 @@
1
1
  #include <nokogiri.h>
2
2
 
3
- VALUE cNokogiriHtmlElementDescription ;
3
+ VALUE cNokogiriHtml4ElementDescription ;
4
4
 
5
5
  /*
6
6
  * call-seq:
@@ -272,21 +272,23 @@ get_description(VALUE klass, VALUE tag_name)
272
272
  void
273
273
  noko_init_html_element_description()
274
274
  {
275
- cNokogiriHtmlElementDescription = rb_define_class_under(mNokogiriHtml, "ElementDescription", rb_cObject);
276
-
277
- rb_define_singleton_method(cNokogiriHtmlElementDescription, "[]", get_description, 1);
278
-
279
- rb_define_method(cNokogiriHtmlElementDescription, "name", name, 0);
280
- rb_define_method(cNokogiriHtmlElementDescription, "implied_start_tag?", implied_start_tag_eh, 0);
281
- rb_define_method(cNokogiriHtmlElementDescription, "implied_end_tag?", implied_end_tag_eh, 0);
282
- rb_define_method(cNokogiriHtmlElementDescription, "save_end_tag?", save_end_tag_eh, 0);
283
- rb_define_method(cNokogiriHtmlElementDescription, "empty?", empty_eh, 0);
284
- rb_define_method(cNokogiriHtmlElementDescription, "deprecated?", deprecated_eh, 0);
285
- rb_define_method(cNokogiriHtmlElementDescription, "inline?", inline_eh, 0);
286
- rb_define_method(cNokogiriHtmlElementDescription, "description", description, 0);
287
- rb_define_method(cNokogiriHtmlElementDescription, "sub_elements", sub_elements, 0);
288
- rb_define_method(cNokogiriHtmlElementDescription, "default_sub_element", default_sub_element, 0);
289
- rb_define_method(cNokogiriHtmlElementDescription, "optional_attributes", optional_attributes, 0);
290
- rb_define_method(cNokogiriHtmlElementDescription, "deprecated_attributes", deprecated_attributes, 0);
291
- rb_define_method(cNokogiriHtmlElementDescription, "required_attributes", required_attributes, 0);
275
+ cNokogiriHtml4ElementDescription = rb_define_class_under(mNokogiriHtml4, "ElementDescription", rb_cObject);
276
+
277
+ rb_undef_alloc_func(cNokogiriHtml4ElementDescription);
278
+
279
+ rb_define_singleton_method(cNokogiriHtml4ElementDescription, "[]", get_description, 1);
280
+
281
+ rb_define_method(cNokogiriHtml4ElementDescription, "name", name, 0);
282
+ rb_define_method(cNokogiriHtml4ElementDescription, "implied_start_tag?", implied_start_tag_eh, 0);
283
+ rb_define_method(cNokogiriHtml4ElementDescription, "implied_end_tag?", implied_end_tag_eh, 0);
284
+ rb_define_method(cNokogiriHtml4ElementDescription, "save_end_tag?", save_end_tag_eh, 0);
285
+ rb_define_method(cNokogiriHtml4ElementDescription, "empty?", empty_eh, 0);
286
+ rb_define_method(cNokogiriHtml4ElementDescription, "deprecated?", deprecated_eh, 0);
287
+ rb_define_method(cNokogiriHtml4ElementDescription, "inline?", inline_eh, 0);
288
+ rb_define_method(cNokogiriHtml4ElementDescription, "description", description, 0);
289
+ rb_define_method(cNokogiriHtml4ElementDescription, "sub_elements", sub_elements, 0);
290
+ rb_define_method(cNokogiriHtml4ElementDescription, "default_sub_element", default_sub_element, 0);
291
+ rb_define_method(cNokogiriHtml4ElementDescription, "optional_attributes", optional_attributes, 0);
292
+ rb_define_method(cNokogiriHtml4ElementDescription, "deprecated_attributes", deprecated_attributes, 0);
293
+ rb_define_method(cNokogiriHtml4ElementDescription, "required_attributes", required_attributes, 0);
292
294
  }
@@ -1,17 +1,17 @@
1
1
  #include <nokogiri.h>
2
2
 
3
- static VALUE cNokogiriHtmlEntityLookup;
3
+ static VALUE cNokogiriHtml4EntityLookup;
4
4
 
5
5
  /*
6
6
  * call-seq:
7
7
  * get(key)
8
8
  *
9
- * Get the HTML::EntityDescription for +key+
9
+ * Get the HTML4::EntityDescription for +key+
10
10
  */
11
11
  static VALUE
12
12
  get(VALUE _, VALUE rb_entity_name)
13
13
  {
14
- VALUE cNokogiriHtmlEntityDescription;
14
+ VALUE cNokogiriHtml4EntityDescription;
15
15
  const htmlEntityDesc *c_entity_desc;
16
16
  VALUE rb_constructor_args[3];
17
17
 
@@ -24,14 +24,14 @@ get(VALUE _, VALUE rb_entity_name)
24
24
  rb_constructor_args[1] = NOKOGIRI_STR_NEW2(c_entity_desc->name);
25
25
  rb_constructor_args[2] = NOKOGIRI_STR_NEW2(c_entity_desc->desc);
26
26
 
27
- cNokogiriHtmlEntityDescription = rb_const_get_at(mNokogiriHtml, rb_intern("EntityDescription"));
28
- return rb_class_new_instance(3, rb_constructor_args, cNokogiriHtmlEntityDescription);
27
+ cNokogiriHtml4EntityDescription = rb_const_get_at(mNokogiriHtml4, rb_intern("EntityDescription"));
28
+ return rb_class_new_instance(3, rb_constructor_args, cNokogiriHtml4EntityDescription);
29
29
  }
30
30
 
31
31
  void
32
32
  noko_init_html_entity_lookup()
33
33
  {
34
- cNokogiriHtmlEntityLookup = rb_define_class_under(mNokogiriHtml, "EntityLookup", rb_cObject);
34
+ cNokogiriHtml4EntityLookup = rb_define_class_under(mNokogiriHtml4, "EntityLookup", rb_cObject);
35
35
 
36
- rb_define_method(cNokogiriHtmlEntityLookup, "get", get, 1);
36
+ rb_define_method(cNokogiriHtml4EntityLookup, "get", get, 1);
37
37
  }
@@ -1,6 +1,6 @@
1
1
  #include <nokogiri.h>
2
2
 
3
- VALUE cNokogiriHtmlSaxParserContext ;
3
+ VALUE cNokogiriHtml4SaxParserContext ;
4
4
 
5
5
  static void
6
6
  deallocate(xmlParserCtxtPtr ctxt)
@@ -110,10 +110,10 @@ void
110
110
  noko_init_html_sax_parser_context()
111
111
  {
112
112
  assert(cNokogiriXmlSaxParserContext);
113
- cNokogiriHtmlSaxParserContext = rb_define_class_under(mNokogiriHtmlSax, "ParserContext", cNokogiriXmlSaxParserContext);
113
+ cNokogiriHtml4SaxParserContext = rb_define_class_under(mNokogiriHtml4Sax, "ParserContext", cNokogiriXmlSaxParserContext);
114
114
 
115
- rb_define_singleton_method(cNokogiriHtmlSaxParserContext, "memory", parse_memory, 2);
116
- rb_define_singleton_method(cNokogiriHtmlSaxParserContext, "file", parse_file, 2);
115
+ rb_define_singleton_method(cNokogiriHtml4SaxParserContext, "memory", parse_memory, 2);
116
+ rb_define_singleton_method(cNokogiriHtml4SaxParserContext, "file", parse_file, 2);
117
117
 
118
- rb_define_method(cNokogiriHtmlSaxParserContext, "parse_with", parse_with, 1);
118
+ rb_define_method(cNokogiriHtml4SaxParserContext, "parse_with", parse_with, 1);
119
119
  }
@@ -1,6 +1,6 @@
1
1
  #include <nokogiri.h>
2
2
 
3
- VALUE cNokogiriHtmlSaxPushParser;
3
+ VALUE cNokogiriHtml4SaxPushParser;
4
4
 
5
5
  /*
6
6
  * call-seq:
@@ -88,8 +88,8 @@ void
88
88
  noko_init_html_sax_push_parser()
89
89
  {
90
90
  assert(cNokogiriXmlSaxPushParser);
91
- cNokogiriHtmlSaxPushParser = rb_define_class_under(mNokogiriHtmlSax, "PushParser", cNokogiriXmlSaxPushParser);
91
+ cNokogiriHtml4SaxPushParser = rb_define_class_under(mNokogiriHtml4Sax, "PushParser", cNokogiriXmlSaxPushParser);
92
92
 
93
- rb_define_private_method(cNokogiriHtmlSaxPushParser, "initialize_native", initialize_native, 3);
94
- rb_define_private_method(cNokogiriHtmlSaxPushParser, "native_write", native_write, 2);
93
+ rb_define_private_method(cNokogiriHtml4SaxPushParser, "initialize_native", initialize_native, 3);
94
+ rb_define_private_method(cNokogiriHtml4SaxPushParser, "native_write", native_write, 2);
95
95
  }
@@ -133,7 +133,7 @@ extern "C" {
133
133
  #ifndef WITH_MODULES
134
134
  #define WITH_MODULES
135
135
  #endif
136
- #define LIBXSLT_DEFAULT_PLUGINS_PATH() "/home/flavorjones/code/oss/nokogiri/ports/i686-w64-mingw32/libxslt/1.1.34/lib/libxslt-plugins"
136
+ #define LIBXSLT_DEFAULT_PLUGINS_PATH() "/home/flavorjones/code/oss/nokogiri/ports/x86_64-w64-mingw32/libxslt/1.1.34/lib/libxslt-plugins"
137
137
  #endif
138
138
 
139
139
  /**
@@ -20,14 +20,14 @@ xmlFirstElementChild(xmlNodePtr parent)
20
20
  return (NULL);
21
21
  }
22
22
  switch (parent->type) {
23
- case XML_ELEMENT_NODE:
24
- case XML_ENTITY_NODE:
25
- case XML_DOCUMENT_NODE:
26
- case XML_HTML_DOCUMENT_NODE:
27
- cur = parent->children;
28
- break;
29
- default:
30
- return (NULL);
23
+ case XML_ELEMENT_NODE:
24
+ case XML_ENTITY_NODE:
25
+ case XML_DOCUMENT_NODE:
26
+ case XML_HTML_DOCUMENT_NODE:
27
+ cur = parent->children;
28
+ break;
29
+ default:
30
+ return (NULL);
31
31
  }
32
32
  while (cur != NULL) {
33
33
  if (cur->type == XML_ELEMENT_NODE) {
@@ -57,20 +57,20 @@ xmlNextElementSibling(xmlNodePtr node)
57
57
  return (NULL);
58
58
  }
59
59
  switch (node->type) {
60
- case XML_ELEMENT_NODE:
61
- case XML_TEXT_NODE:
62
- case XML_CDATA_SECTION_NODE:
63
- case XML_ENTITY_REF_NODE:
64
- case XML_ENTITY_NODE:
65
- case XML_PI_NODE:
66
- case XML_COMMENT_NODE:
67
- case XML_DTD_NODE:
68
- case XML_XINCLUDE_START:
69
- case XML_XINCLUDE_END:
70
- node = node->next;
71
- break;
72
- default:
73
- return (NULL);
60
+ case XML_ELEMENT_NODE:
61
+ case XML_TEXT_NODE:
62
+ case XML_CDATA_SECTION_NODE:
63
+ case XML_ENTITY_REF_NODE:
64
+ case XML_ENTITY_NODE:
65
+ case XML_PI_NODE:
66
+ case XML_COMMENT_NODE:
67
+ case XML_DTD_NODE:
68
+ case XML_XINCLUDE_START:
69
+ case XML_XINCLUDE_END:
70
+ node = node->next;
71
+ break;
72
+ default:
73
+ return (NULL);
74
74
  }
75
75
  while (node != NULL) {
76
76
  if (node->type == XML_ELEMENT_NODE) {
@@ -101,14 +101,14 @@ xmlLastElementChild(xmlNodePtr parent)
101
101
  return (NULL);
102
102
  }
103
103
  switch (parent->type) {
104
- case XML_ELEMENT_NODE:
105
- case XML_ENTITY_NODE:
106
- case XML_DOCUMENT_NODE:
107
- case XML_HTML_DOCUMENT_NODE:
108
- cur = parent->last;
109
- break;
110
- default:
111
- return (NULL);
104
+ case XML_ELEMENT_NODE:
105
+ case XML_ENTITY_NODE:
106
+ case XML_DOCUMENT_NODE:
107
+ case XML_HTML_DOCUMENT_NODE:
108
+ cur = parent->last;
109
+ break;
110
+ default:
111
+ return (NULL);
112
112
  }
113
113
  while (cur != NULL) {
114
114
  if (cur->type == XML_ELEMENT_NODE) {
@@ -1,8 +1,10 @@
1
1
  #include <nokogiri.h>
2
2
 
3
3
  VALUE mNokogiri ;
4
- VALUE mNokogiriHtml ;
5
- VALUE mNokogiriHtmlSax ;
4
+ VALUE mNokogiriGumbo ;
5
+ VALUE mNokogiriHtml4 ;
6
+ VALUE mNokogiriHtml4Sax ;
7
+ VALUE mNokogiriHtml5 ;
6
8
  VALUE mNokogiriXml ;
7
9
  VALUE mNokogiriXmlSax ;
8
10
  VALUE mNokogiriXmlXpath ;
@@ -13,38 +15,39 @@ VALUE cNokogiriXmlCharacterData;
13
15
  VALUE cNokogiriXmlElement;
14
16
  VALUE cNokogiriXmlXpathSyntaxError;
15
17
 
16
- void noko_init_xml_attr();
17
- void noko_init_xml_attribute_decl();
18
- void noko_init_xml_cdata();
19
- void noko_init_xml_comment();
20
- void noko_init_xml_document();
21
- void noko_init_xml_document_fragment();
22
- void noko_init_xml_dtd();
23
- void noko_init_xml_element_content();
24
- void noko_init_xml_element_decl();
25
- void noko_init_xml_encoding_handler();
26
- void noko_init_xml_entity_decl();
27
- void noko_init_xml_entity_reference();
28
- void noko_init_xml_namespace();
29
- void noko_init_xml_node();
30
- void noko_init_xml_node_set();
31
- void noko_init_xml_processing_instruction();
32
- void noko_init_xml_reader();
33
- void noko_init_xml_relax_ng();
34
- void noko_init_xml_sax_parser();
35
- void noko_init_xml_sax_parser_context();
36
- void noko_init_xml_sax_push_parser();
37
- void noko_init_xml_schema();
38
- void noko_init_xml_syntax_error();
39
- void noko_init_xml_text();
40
- void noko_init_xml_xpath_context();
41
- void noko_init_xslt_stylesheet();
42
- void noko_init_html_document();
43
- void noko_init_html_element_description();
44
- void noko_init_html_entity_lookup();
45
- void noko_init_html_sax_parser_context();
46
- void noko_init_html_sax_push_parser();
47
- void noko_init_test_global_handlers();
18
+ void noko_init_xml_attr(void);
19
+ void noko_init_xml_attribute_decl(void);
20
+ void noko_init_xml_cdata(void);
21
+ void noko_init_xml_comment(void);
22
+ void noko_init_xml_document(void);
23
+ void noko_init_xml_document_fragment(void);
24
+ void noko_init_xml_dtd(void);
25
+ void noko_init_xml_element_content(void);
26
+ void noko_init_xml_element_decl(void);
27
+ void noko_init_xml_encoding_handler(void);
28
+ void noko_init_xml_entity_decl(void);
29
+ void noko_init_xml_entity_reference(void);
30
+ void noko_init_xml_namespace(void);
31
+ void noko_init_xml_node(void);
32
+ void noko_init_xml_node_set(void);
33
+ void noko_init_xml_processing_instruction(void);
34
+ void noko_init_xml_reader(void);
35
+ void noko_init_xml_relax_ng(void);
36
+ void noko_init_xml_sax_parser(void);
37
+ void noko_init_xml_sax_parser_context(void);
38
+ void noko_init_xml_sax_push_parser(void);
39
+ void noko_init_xml_schema(void);
40
+ void noko_init_xml_syntax_error(void);
41
+ void noko_init_xml_text(void);
42
+ void noko_init_xml_xpath_context(void);
43
+ void noko_init_xslt_stylesheet(void);
44
+ void noko_init_html_document(void);
45
+ void noko_init_html_element_description(void);
46
+ void noko_init_html_entity_lookup(void);
47
+ void noko_init_html_sax_parser_context(void);
48
+ void noko_init_html_sax_push_parser(void);
49
+ void noko_init_gumbo(void);
50
+ void noko_init_test_global_handlers(void);
48
51
 
49
52
  static ID id_read, id_write;
50
53
 
@@ -152,12 +155,14 @@ void
152
155
  Init_nokogiri()
153
156
  {
154
157
  mNokogiri = rb_define_module("Nokogiri");
158
+ mNokogiriGumbo = rb_define_module_under(mNokogiri, "Gumbo");
159
+ mNokogiriHtml4 = rb_define_module_under(mNokogiri, "HTML4");
160
+ mNokogiriHtml4Sax = rb_define_module_under(mNokogiriHtml4, "SAX");
161
+ mNokogiriHtml5 = rb_define_module_under(mNokogiri, "HTML5");
155
162
  mNokogiriXml = rb_define_module_under(mNokogiri, "XML");
156
- mNokogiriHtml = rb_define_module_under(mNokogiri, "HTML");
157
- mNokogiriXslt = rb_define_module_under(mNokogiri, "XSLT");
158
- mNokogiriXmlXpath = rb_define_module_under(mNokogiriXml, "XPath");
159
163
  mNokogiriXmlSax = rb_define_module_under(mNokogiriXml, "SAX");
160
- mNokogiriHtmlSax = rb_define_module_under(mNokogiriHtml, "SAX");
164
+ mNokogiriXmlXpath = rb_define_module_under(mNokogiriXml, "XPath");
165
+ mNokogiriXslt = rb_define_module_under(mNokogiri, "XSLT");
161
166
 
162
167
  rb_const_set(mNokogiri, rb_intern("LIBXML_COMPILED_VERSION"), NOKOGIRI_STR_NEW2(LIBXML_DOTTED_VERSION));
163
168
  rb_const_set(mNokogiri, rb_intern("LIBXML_LOADED_VERSION"), NOKOGIRI_STR_NEW2(xmlParserVersion));
@@ -213,6 +218,13 @@ Init_nokogiri()
213
218
  #endif
214
219
 
215
220
  xmlInitParser();
221
+ exsltRegisterAll();
222
+
223
+ if (xsltExtModuleFunctionLookup((xmlChar*)"date-time", EXSLT_DATE_NAMESPACE)) {
224
+ rb_const_set(mNokogiri, rb_intern("LIBXSLT_DATETIME_ENABLED"), Qtrue);
225
+ } else {
226
+ rb_const_set(mNokogiri, rb_intern("LIBXSLT_DATETIME_ENABLED"), Qfalse);
227
+ }
216
228
 
217
229
  cNokogiriSyntaxError = rb_define_class_under(mNokogiri, "SyntaxError", rb_eStandardError);
218
230
  noko_init_xml_syntax_error();
@@ -257,6 +269,7 @@ Init_nokogiri()
257
269
  noko_init_xml_document_fragment();
258
270
  noko_init_xml_document();
259
271
  noko_init_html_document();
272
+ noko_init_gumbo();
260
273
 
261
274
  noko_init_test_global_handlers();
262
275
 
@@ -1,7 +1,7 @@
1
1
  #ifndef NOKOGIRI_NATIVE
2
2
  #define NOKOGIRI_NATIVE
3
3
 
4
- #if _MSC_VER
4
+ #ifdef _MSC_VER
5
5
  # ifndef WIN32_LEAN_AND_MEAN
6
6
  # define WIN32_LEAN_AND_MEAN
7
7
  # endif /* WIN32_LEAN_AND_MEAN */
@@ -15,7 +15,7 @@
15
15
  # include <windows.h>
16
16
  #endif
17
17
 
18
- #if _WIN32
18
+ #ifdef _WIN32
19
19
  # define NOKOPUBFUN __declspec(dllexport)
20
20
  # define NOKOPUBVAR __declspec(dllexport) extern
21
21
  #else
@@ -69,6 +69,7 @@ xmlNodePtr xmlLastElementChild(xmlNodePtr parent);
69
69
  #include <ruby/st.h>
70
70
  #include <ruby/encoding.h>
71
71
  #include <ruby/util.h>
72
+ #include <ruby/version.h>
72
73
 
73
74
  #define NOKOGIRI_STR_NEW2(str) NOKOGIRI_STR_NEW(str, strlen((const char *)(str)))
74
75
  #define NOKOGIRI_STR_NEW(str, len) rb_external_str_new_with_enc((const char *)(str), (long)(len), rb_utf8_encoding())
@@ -92,12 +93,16 @@ xmlNodePtr xmlLastElementChild(xmlNodePtr parent);
92
93
 
93
94
 
94
95
  NOKOPUBVAR VALUE mNokogiri ;
95
- NOKOPUBVAR VALUE mNokogiriHtml ;
96
- NOKOPUBVAR VALUE mNokogiriHtmlSax ;
96
+ NOKOPUBVAR VALUE mNokogiriGumbo ;
97
+ NOKOPUBVAR VALUE mNokogiriHtml4 ;
98
+ NOKOPUBVAR VALUE mNokogiriHtml4Sax ;
99
+ NOKOPUBVAR VALUE mNokogiriHtml5 ;
97
100
  NOKOPUBVAR VALUE mNokogiriXml ;
98
101
  NOKOPUBVAR VALUE mNokogiriXmlSax ;
102
+ NOKOPUBVAR VALUE mNokogiriXmlXpath ;
99
103
  NOKOPUBVAR VALUE mNokogiriXslt ;
100
104
 
105
+ NOKOPUBVAR VALUE cNokogiriEncodingHandler;
101
106
  NOKOPUBVAR VALUE cNokogiriSyntaxError;
102
107
  NOKOPUBVAR VALUE cNokogiriXmlAttr;
103
108
  NOKOPUBVAR VALUE cNokogiriXmlAttributeDecl;
@@ -128,10 +133,11 @@ NOKOPUBVAR VALUE cNokogiriXmlXpathContext;
128
133
  NOKOPUBVAR VALUE cNokogiriXmlXpathSyntaxError;
129
134
  NOKOPUBVAR VALUE cNokogiriXsltStylesheet ;
130
135
 
131
- NOKOPUBVAR VALUE cNokogiriHtmlDocument ;
132
- NOKOPUBVAR VALUE cNokogiriHtmlSaxPushParser ;
133
- NOKOPUBVAR VALUE cNokogiriHtmlElementDescription ;
134
- NOKOPUBVAR VALUE cNokogiriHtmlSaxParserContext;
136
+ NOKOPUBVAR VALUE cNokogiriHtml4Document ;
137
+ NOKOPUBVAR VALUE cNokogiriHtml4SaxPushParser ;
138
+ NOKOPUBVAR VALUE cNokogiriHtml4ElementDescription ;
139
+ NOKOPUBVAR VALUE cNokogiriHtml4SaxParserContext;
140
+ NOKOPUBVAR VALUE cNokogiriHtml5Document ;
135
141
 
136
142
  typedef struct _nokogiriTuple {
137
143
  VALUE doc;
@@ -177,7 +183,8 @@ VALUE noko_xml_node_set_wrap(xmlNodeSetPtr node_set, VALUE document) ;
177
183
 
178
184
  VALUE noko_xml_document_wrap_with_init_args(VALUE klass, xmlDocPtr doc, int argc, VALUE *argv);
179
185
  VALUE noko_xml_document_wrap(VALUE klass, xmlDocPtr doc);
180
- NOKOPUBFUN VALUE Nokogiri_wrap_xml_document(VALUE klass, xmlDocPtr doc); /* deprecated. use noko_xml_document_wrap() instead. */
186
+ NOKOPUBFUN VALUE Nokogiri_wrap_xml_document(VALUE klass,
187
+ xmlDocPtr doc); /* deprecated. use noko_xml_document_wrap() instead. */
181
188
 
182
189
  #define DOC_RUBY_OBJECT_TEST(x) ((nokogiriTuplePtr)(x->_private))
183
190
  #define DOC_RUBY_OBJECT(x) (((nokogiriTuplePtr)(x->_private))->doc)