libxml-ruby 2.9.0-x64-mingw32 → 3.0.0-x64-mingw32

Sign up to get free protection for your applications and to get access to all the features.
Files changed (143) hide show
  1. checksums.yaml +4 -4
  2. data/HISTORY +811 -790
  3. data/LICENSE +20 -20
  4. data/MANIFEST +166 -166
  5. data/README.rdoc +188 -184
  6. data/Rakefile +1 -1
  7. data/ext/libxml/libxml.c +80 -80
  8. data/ext/libxml/ruby_libxml.h +75 -75
  9. data/ext/libxml/ruby_xml.c +0 -84
  10. data/ext/libxml/ruby_xml.h +0 -10
  11. data/ext/libxml/ruby_xml_attr.h +12 -12
  12. data/ext/libxml/ruby_xml_attr_decl.c +153 -153
  13. data/ext/libxml/ruby_xml_attr_decl.h +11 -11
  14. data/ext/libxml/ruby_xml_attributes.c +275 -275
  15. data/ext/libxml/ruby_xml_attributes.h +15 -15
  16. data/ext/libxml/ruby_xml_document.c +21 -27
  17. data/ext/libxml/ruby_xml_document.h +11 -11
  18. data/ext/libxml/ruby_xml_dtd.c +2 -13
  19. data/ext/libxml/ruby_xml_dtd.h +9 -9
  20. data/ext/libxml/ruby_xml_error.c +996 -996
  21. data/ext/libxml/ruby_xml_error.h +12 -12
  22. data/ext/libxml/ruby_xml_html_parser.c +89 -92
  23. data/ext/libxml/ruby_xml_html_parser.h +10 -10
  24. data/ext/libxml/ruby_xml_html_parser_context.h +10 -10
  25. data/ext/libxml/ruby_xml_html_parser_options.c +46 -46
  26. data/ext/libxml/ruby_xml_html_parser_options.h +10 -10
  27. data/ext/libxml/ruby_xml_input_cbg.h +20 -20
  28. data/ext/libxml/ruby_xml_io.c +0 -1
  29. data/ext/libxml/ruby_xml_io.h +10 -10
  30. data/ext/libxml/ruby_xml_namespace.c +153 -153
  31. data/ext/libxml/ruby_xml_namespace.h +10 -10
  32. data/ext/libxml/ruby_xml_namespaces.c +293 -293
  33. data/ext/libxml/ruby_xml_namespaces.h +9 -9
  34. data/ext/libxml/ruby_xml_node.c +100 -143
  35. data/ext/libxml/ruby_xml_node.h +13 -11
  36. data/ext/libxml/ruby_xml_parser.c +91 -94
  37. data/ext/libxml/ruby_xml_parser.h +12 -12
  38. data/ext/libxml/ruby_xml_parser_context.h +10 -10
  39. data/ext/libxml/ruby_xml_parser_options.c +66 -66
  40. data/ext/libxml/ruby_xml_parser_options.h +12 -12
  41. data/ext/libxml/ruby_xml_reader.c +45 -37
  42. data/ext/libxml/ruby_xml_reader.h +17 -17
  43. data/ext/libxml/ruby_xml_relaxng.h +10 -10
  44. data/ext/libxml/ruby_xml_sax2_handler.c +3 -3
  45. data/ext/libxml/ruby_xml_sax2_handler.h +10 -10
  46. data/ext/libxml/ruby_xml_sax_parser.c +116 -120
  47. data/ext/libxml/ruby_xml_sax_parser.h +10 -10
  48. data/ext/libxml/ruby_xml_schema.h +809 -809
  49. data/ext/libxml/ruby_xml_schema_attribute.c +109 -109
  50. data/ext/libxml/ruby_xml_schema_attribute.h +15 -15
  51. data/ext/libxml/ruby_xml_schema_element.c +94 -94
  52. data/ext/libxml/ruby_xml_schema_element.h +14 -14
  53. data/ext/libxml/ruby_xml_schema_facet.c +52 -52
  54. data/ext/libxml/ruby_xml_schema_facet.h +13 -13
  55. data/ext/libxml/ruby_xml_schema_type.c +259 -259
  56. data/ext/libxml/ruby_xml_schema_type.h +9 -9
  57. data/ext/libxml/ruby_xml_version.h +9 -9
  58. data/ext/libxml/ruby_xml_writer.c +1136 -1136
  59. data/ext/libxml/ruby_xml_writer.h +10 -10
  60. data/ext/libxml/ruby_xml_xinclude.c +16 -16
  61. data/ext/libxml/ruby_xml_xinclude.h +11 -11
  62. data/ext/libxml/ruby_xml_xpath.c +42 -36
  63. data/ext/libxml/ruby_xml_xpath.h +13 -13
  64. data/ext/libxml/ruby_xml_xpath_context.c +1 -1
  65. data/ext/libxml/ruby_xml_xpath_context.h +9 -9
  66. data/ext/libxml/ruby_xml_xpath_expression.c +81 -81
  67. data/ext/libxml/ruby_xml_xpath_expression.h +10 -10
  68. data/ext/libxml/ruby_xml_xpath_object.c +5 -2
  69. data/ext/libxml/ruby_xml_xpath_object.h +17 -17
  70. data/ext/libxml/ruby_xml_xpointer.c +99 -99
  71. data/ext/libxml/ruby_xml_xpointer.h +11 -11
  72. data/ext/vc/libxml_ruby.sln +17 -15
  73. data/lib/2.4/libxml_ruby.so +0 -0
  74. data/lib/libs/libxml2-2.dll +0 -0
  75. data/lib/libs/zlib1.dll +0 -0
  76. data/lib/libxml.rb +1 -6
  77. data/lib/libxml/node.rb +2 -78
  78. data/lib/libxml/parser.rb +0 -266
  79. data/lib/libxml/sax_parser.rb +0 -17
  80. data/lib/libxml/schema.rb +66 -66
  81. data/lib/libxml/schema/attribute.rb +19 -19
  82. data/lib/libxml/schema/element.rb +27 -27
  83. data/lib/libxml/schema/type.rb +29 -29
  84. data/script/benchmark/depixelate +634 -634
  85. data/script/benchmark/hamlet.xml +9054 -9054
  86. data/script/benchmark/parsecount +170 -170
  87. data/script/benchmark/throughput +41 -41
  88. data/script/test +6 -6
  89. data/test/c14n/given/example-1.xml +14 -14
  90. data/test/c14n/given/example-2.xml +11 -11
  91. data/test/c14n/given/example-3.xml +18 -18
  92. data/test/c14n/given/example-4.xml +9 -9
  93. data/test/c14n/given/example-5.xml +12 -12
  94. data/test/c14n/given/example-6.xml +2 -2
  95. data/test/c14n/given/example-7.xml +11 -11
  96. data/test/c14n/given/example-8.xml +11 -11
  97. data/test/c14n/given/example-8.xpath +9 -9
  98. data/test/c14n/result/1-1-without-comments/example-1 +3 -3
  99. data/test/c14n/result/1-1-without-comments/example-2 +10 -10
  100. data/test/c14n/result/1-1-without-comments/example-3 +13 -13
  101. data/test/c14n/result/1-1-without-comments/example-4 +8 -8
  102. data/test/c14n/result/1-1-without-comments/example-5 +2 -2
  103. data/test/c14n/result/with-comments/example-1 +5 -5
  104. data/test/c14n/result/with-comments/example-2 +10 -10
  105. data/test/c14n/result/with-comments/example-3 +13 -13
  106. data/test/c14n/result/with-comments/example-4 +8 -8
  107. data/test/c14n/result/with-comments/example-5 +3 -3
  108. data/test/c14n/result/without-comments/example-1 +3 -3
  109. data/test/c14n/result/without-comments/example-2 +10 -10
  110. data/test/c14n/result/without-comments/example-3 +13 -13
  111. data/test/c14n/result/without-comments/example-4 +8 -8
  112. data/test/c14n/result/without-comments/example-5 +2 -2
  113. data/test/model/atom.xml +12 -12
  114. data/test/model/bands.iso-8859-1.xml +4 -4
  115. data/test/model/bands.utf-8.xml +4 -4
  116. data/test/model/bands.xml +4 -4
  117. data/test/model/books.xml +153 -153
  118. data/test/model/merge_bug_data.xml +58 -58
  119. data/test/model/ruby-lang.html +238 -238
  120. data/test/model/rubynet.xml +79 -79
  121. data/test/model/shiporder.rnc +28 -28
  122. data/test/model/shiporder.rng +86 -86
  123. data/test/model/shiporder.xml +22 -22
  124. data/test/model/shiporder.xsd +39 -39
  125. data/test/model/soap.xml +27 -27
  126. data/test/model/xinclude.xml +4 -4
  127. data/test/tc_attributes.rb +0 -6
  128. data/test/tc_error.rb +157 -158
  129. data/test/tc_node.rb +33 -17
  130. data/test/tc_node_edit.rb +0 -15
  131. data/test/tc_node_pi.rb +39 -39
  132. data/test/tc_parser.rb +0 -48
  133. data/test/tc_reader.rb +12 -53
  134. data/test/tc_writer.rb +447 -447
  135. data/test/tc_xpath.rb +1 -1
  136. data/test/test_helper.rb +2 -2
  137. metadata +4 -9
  138. data/ext/libxml/extconf.h +0 -4
  139. data/lib/2.3/libxml_ruby.so +0 -0
  140. data/lib/libxml/ns.rb +0 -22
  141. data/lib/libxml/properties.rb +0 -23
  142. data/lib/libxml/reader.rb +0 -29
  143. data/lib/libxml/xpath_object.rb +0 -16
@@ -1,17 +1,17 @@
1
- #ifndef __RXML_XPATH_OBJECT__
2
- #define __RXML_XPATH_OBJECT__
3
-
4
- extern VALUE cXMLXPathObject;
5
-
6
- typedef struct rxml_xpath_object
7
- {
8
- xmlDocPtr xdoc;
9
- xmlXPathObjectPtr xpop;
10
- VALUE nsnodes;
11
- } rxml_xpath_object;
12
-
13
-
14
- void rxml_init_xpath_object(void);
15
- VALUE rxml_xpath_object_wrap(xmlDocPtr xdoc, xmlXPathObjectPtr xpop);
16
-
17
- #endif
1
+ #ifndef __RXML_XPATH_OBJECT__
2
+ #define __RXML_XPATH_OBJECT__
3
+
4
+ extern VALUE cXMLXPathObject;
5
+
6
+ typedef struct rxml_xpath_object
7
+ {
8
+ xmlDocPtr xdoc;
9
+ xmlXPathObjectPtr xpop;
10
+ VALUE nsnodes;
11
+ } rxml_xpath_object;
12
+
13
+
14
+ void rxml_init_xpath_object(void);
15
+ VALUE rxml_xpath_object_wrap(xmlDocPtr xdoc, xmlXPathObjectPtr xpop);
16
+
17
+ #endif
@@ -1,99 +1,99 @@
1
- /* Please see the LICENSE file for copyright and distribution information */
2
-
3
- #include "ruby_libxml.h"
4
- #include "ruby_xml_xpointer.h"
5
-
6
- VALUE cXMLXPointer;
7
-
8
- /*
9
- * Document-class: LibXML::XML::XPointer
10
- *
11
- * The XML::Pointer class provides a standards based API for searching an xml document.
12
- * XPointer is based on the XML Path Language (XML::XPath) and is documented
13
- * at http://www.w3.org/TR/WD-xptr.
14
- */
15
-
16
- static VALUE rxml_xpointer_point(VALUE class, VALUE rnode, VALUE xptr_str)
17
- {
18
- #ifdef LIBXML_XPTR_ENABLED
19
- xmlNodePtr xnode;
20
- xmlXPathContextPtr xctxt;
21
- xmlXPathObjectPtr xpop;
22
-
23
- VALUE context;
24
- VALUE result;
25
- VALUE argv[1];
26
-
27
- Check_Type(xptr_str, T_STRING);
28
- if (rb_obj_is_kind_of(rnode, cXMLNode) == Qfalse)
29
- rb_raise(rb_eTypeError, "require an XML::Node object");
30
-
31
- Data_Get_Struct(rnode, xmlNode, xnode);
32
-
33
- argv[0] = rb_funcall(rnode, rb_intern("doc"), 0);
34
- context = rb_class_new_instance(1, argv, cXMLXPathContext);
35
- Data_Get_Struct(context, xmlXPathContext, xctxt);
36
-
37
- xpop = xmlXPtrEval((xmlChar*)StringValuePtr(xptr_str), xctxt);
38
- if (!xpop)
39
- rxml_raise(&xmlLastError);
40
-
41
- result = rxml_xpath_object_wrap(xnode->doc, xpop);
42
- rb_iv_set(result, "@context", context);
43
-
44
- return(result);
45
- #else
46
- rb_warn("libxml was compiled without XPointer support");
47
- return (Qfalse);
48
- #endif
49
- }
50
-
51
- VALUE rxml_xpointer_point2(VALUE node, VALUE xptr_str)
52
- {
53
- return (rxml_xpointer_point(cXMLXPointer, node, xptr_str));
54
- }
55
-
56
- /*
57
- * call-seq:
58
- * XML::XPointer.range(start_node, end_node) -> xpath
59
- *
60
- * Create an xpath representing the range between the supplied
61
- * start and end node.
62
- */
63
- static VALUE rxml_xpointer_range(VALUE class, VALUE rstart, VALUE rend)
64
- {
65
- #ifdef LIBXML_XPTR_ENABLED
66
- xmlNodePtr start, end;
67
- VALUE rxxp;
68
- xmlXPathObjectPtr xpath;
69
-
70
- if (rb_obj_is_kind_of(rstart, cXMLNode) == Qfalse)
71
- rb_raise(rb_eTypeError, "require an XML::Node object as a starting point");
72
- if (rb_obj_is_kind_of(rend, cXMLNode) == Qfalse)
73
- rb_raise(rb_eTypeError, "require an XML::Node object as an ending point");
74
-
75
- Data_Get_Struct(rstart, xmlNode, start);
76
- if (start == NULL)
77
- return(Qnil);
78
-
79
- Data_Get_Struct(rend, xmlNode, end);
80
- if (end == NULL)
81
- return(Qnil);
82
-
83
- xpath = xmlXPtrNewRangeNodes(start, end);
84
- if (xpath == NULL)
85
- rb_fatal("You shouldn't be able to have this happen");
86
-
87
- rxxp = rxml_xpath_object_wrap(start->doc, xpath);
88
- return(rxxp);
89
- #else
90
- rb_warn("libxml was compiled without XPointer support");
91
- return (Qfalse);
92
- #endif
93
- }
94
-
95
- void rxml_init_xpointer(void)
96
- {
97
- cXMLXPointer = rb_define_class_under(mXML, "XPointer", rb_cObject);
98
- rb_define_singleton_method(cXMLXPointer, "range", rxml_xpointer_range, 2);
99
- }
1
+ /* Please see the LICENSE file for copyright and distribution information */
2
+
3
+ #include "ruby_libxml.h"
4
+ #include "ruby_xml_xpointer.h"
5
+
6
+ VALUE cXMLXPointer;
7
+
8
+ /*
9
+ * Document-class: LibXML::XML::XPointer
10
+ *
11
+ * The XML::Pointer class provides a standards based API for searching an xml document.
12
+ * XPointer is based on the XML Path Language (XML::XPath) and is documented
13
+ * at http://www.w3.org/TR/WD-xptr.
14
+ */
15
+
16
+ static VALUE rxml_xpointer_point(VALUE class, VALUE rnode, VALUE xptr_str)
17
+ {
18
+ #ifdef LIBXML_XPTR_ENABLED
19
+ xmlNodePtr xnode;
20
+ xmlXPathContextPtr xctxt;
21
+ xmlXPathObjectPtr xpop;
22
+
23
+ VALUE context;
24
+ VALUE result;
25
+ VALUE argv[1];
26
+
27
+ Check_Type(xptr_str, T_STRING);
28
+ if (rb_obj_is_kind_of(rnode, cXMLNode) == Qfalse)
29
+ rb_raise(rb_eTypeError, "require an XML::Node object");
30
+
31
+ Data_Get_Struct(rnode, xmlNode, xnode);
32
+
33
+ argv[0] = rb_funcall(rnode, rb_intern("doc"), 0);
34
+ context = rb_class_new_instance(1, argv, cXMLXPathContext);
35
+ Data_Get_Struct(context, xmlXPathContext, xctxt);
36
+
37
+ xpop = xmlXPtrEval((xmlChar*)StringValuePtr(xptr_str), xctxt);
38
+ if (!xpop)
39
+ rxml_raise(&xmlLastError);
40
+
41
+ result = rxml_xpath_object_wrap(xnode->doc, xpop);
42
+ rb_iv_set(result, "@context", context);
43
+
44
+ return(result);
45
+ #else
46
+ rb_warn("libxml was compiled without XPointer support");
47
+ return (Qfalse);
48
+ #endif
49
+ }
50
+
51
+ VALUE rxml_xpointer_point2(VALUE node, VALUE xptr_str)
52
+ {
53
+ return (rxml_xpointer_point(cXMLXPointer, node, xptr_str));
54
+ }
55
+
56
+ /*
57
+ * call-seq:
58
+ * XML::XPointer.range(start_node, end_node) -> xpath
59
+ *
60
+ * Create an xpath representing the range between the supplied
61
+ * start and end node.
62
+ */
63
+ static VALUE rxml_xpointer_range(VALUE class, VALUE rstart, VALUE rend)
64
+ {
65
+ #ifdef LIBXML_XPTR_ENABLED
66
+ xmlNodePtr start, end;
67
+ VALUE rxxp;
68
+ xmlXPathObjectPtr xpath;
69
+
70
+ if (rb_obj_is_kind_of(rstart, cXMLNode) == Qfalse)
71
+ rb_raise(rb_eTypeError, "require an XML::Node object as a starting point");
72
+ if (rb_obj_is_kind_of(rend, cXMLNode) == Qfalse)
73
+ rb_raise(rb_eTypeError, "require an XML::Node object as an ending point");
74
+
75
+ Data_Get_Struct(rstart, xmlNode, start);
76
+ if (start == NULL)
77
+ return(Qnil);
78
+
79
+ Data_Get_Struct(rend, xmlNode, end);
80
+ if (end == NULL)
81
+ return(Qnil);
82
+
83
+ xpath = xmlXPtrNewRangeNodes(start, end);
84
+ if (xpath == NULL)
85
+ rb_fatal("You shouldn't be able to have this happen");
86
+
87
+ rxxp = rxml_xpath_object_wrap(start->doc, xpath);
88
+ return(rxxp);
89
+ #else
90
+ rb_warn("libxml was compiled without XPointer support");
91
+ return (Qfalse);
92
+ #endif
93
+ }
94
+
95
+ void rxml_init_xpointer(void)
96
+ {
97
+ cXMLXPointer = rb_define_class_under(mXML, "XPointer", rb_cObject);
98
+ rb_define_singleton_method(cXMLXPointer, "range", rxml_xpointer_range, 2);
99
+ }
@@ -1,11 +1,11 @@
1
- /* Please see the LICENSE file for copyright and distribution information */
2
-
3
- #ifndef __RXML_XPOINTER__
4
- #define __RXML_XPOINTER__
5
-
6
- extern VALUE cXMLXPointer;
7
-
8
- void rxml_init_xpointer(void);
9
- VALUE rxml_xpointer_point2(VALUE node, VALUE xptr_str);
10
-
11
- #endif
1
+ /* Please see the LICENSE file for copyright and distribution information */
2
+
3
+ #ifndef __RXML_XPOINTER__
4
+ #define __RXML_XPOINTER__
5
+
6
+ extern VALUE cXMLXPointer;
7
+
8
+ void rxml_init_xpointer(void);
9
+ VALUE rxml_xpointer_point2(VALUE node, VALUE xptr_str);
10
+
11
+ #endif
@@ -1,24 +1,26 @@
1
1
  
2
- Microsoft Visual Studio Solution File, Format Version 11.00
3
- # Visual Studio 2010
4
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml_ruby", "libxml_ruby_18\libxml_ruby.vcxproj", "{0B65CD1D-EEB9-41AE-93BB-75496E504152}"
5
- EndProject
6
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml_ruby_19", "libxml_ruby_19\libxml_ruby_19.vcxproj", "{0E73156F-E619-4FD9-8327-113FE3CC942E}"
2
+ Microsoft Visual Studio Solution File, Format Version 12.00
3
+ # Visual Studio 14
4
+ VisualStudioVersion = 14.0.25420.1
5
+ MinimumVisualStudioVersion = 10.0.40219.1
6
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml_ruby", "libxml_ruby\libxml_ruby.vcxproj", "{0B65CD1D-EEB9-41AE-93BB-75496E504152}"
7
7
  EndProject
8
8
  Global
9
9
  GlobalSection(SolutionConfigurationPlatforms) = preSolution
10
- Debug|Win32 = Debug|Win32
11
- Release|Win32 = Release|Win32
10
+ Debug|x64 = Debug|x64
11
+ Debug|x86 = Debug|x86
12
+ Release|x64 = Release|x64
13
+ Release|x86 = Release|x86
12
14
  EndGlobalSection
13
15
  GlobalSection(ProjectConfigurationPlatforms) = postSolution
14
- {0B65CD1D-EEB9-41AE-93BB-75496E504152}.Debug|Win32.ActiveCfg = Debug|Win32
15
- {0B65CD1D-EEB9-41AE-93BB-75496E504152}.Debug|Win32.Build.0 = Debug|Win32
16
- {0B65CD1D-EEB9-41AE-93BB-75496E504152}.Release|Win32.ActiveCfg = Release|Win32
17
- {0B65CD1D-EEB9-41AE-93BB-75496E504152}.Release|Win32.Build.0 = Release|Win32
18
- {0E73156F-E619-4FD9-8327-113FE3CC942E}.Debug|Win32.ActiveCfg = Debug|Win32
19
- {0E73156F-E619-4FD9-8327-113FE3CC942E}.Debug|Win32.Build.0 = Debug|Win32
20
- {0E73156F-E619-4FD9-8327-113FE3CC942E}.Release|Win32.ActiveCfg = Release|Win32
21
- {0E73156F-E619-4FD9-8327-113FE3CC942E}.Release|Win32.Build.0 = Release|Win32
16
+ {0B65CD1D-EEB9-41AE-93BB-75496E504152}.Debug|x64.ActiveCfg = Debug|x64
17
+ {0B65CD1D-EEB9-41AE-93BB-75496E504152}.Debug|x64.Build.0 = Debug|x64
18
+ {0B65CD1D-EEB9-41AE-93BB-75496E504152}.Debug|x86.ActiveCfg = Debug|x64
19
+ {0B65CD1D-EEB9-41AE-93BB-75496E504152}.Debug|x86.Build.0 = Debug|x64
20
+ {0B65CD1D-EEB9-41AE-93BB-75496E504152}.Release|x64.ActiveCfg = Release|x64
21
+ {0B65CD1D-EEB9-41AE-93BB-75496E504152}.Release|x64.Build.0 = Release|x64
22
+ {0B65CD1D-EEB9-41AE-93BB-75496E504152}.Release|x86.ActiveCfg = Release|Win32
23
+ {0B65CD1D-EEB9-41AE-93BB-75496E504152}.Release|x86.Build.0 = Release|Win32
22
24
  EndGlobalSection
23
25
  GlobalSection(SolutionProperties) = preSolution
24
26
  HideSolutionNode = FALSE
Binary file
Binary file
Binary file
@@ -7,6 +7,7 @@ begin
7
7
  rescue LoadError
8
8
  require "libxml_ruby"
9
9
  end
10
+
10
11
  # Load Ruby supporting code.
11
12
  require 'libxml/error'
12
13
  require 'libxml/parser'
@@ -14,22 +15,16 @@ require 'libxml/document'
14
15
  require 'libxml/namespaces'
15
16
  require 'libxml/namespace'
16
17
  require 'libxml/node'
17
- require 'libxml/ns'
18
18
  require 'libxml/attributes'
19
19
  require 'libxml/attr'
20
20
  require 'libxml/attr_decl'
21
21
  require 'libxml/tree'
22
- require 'libxml/reader'
23
22
  require 'libxml/html_parser'
24
23
  require 'libxml/sax_parser'
25
24
  require 'libxml/sax_callbacks'
26
- require 'libxml/xpath_object'
27
25
 
28
26
  #Schema Interface
29
27
  require 'libxml/schema'
30
28
  require 'libxml/schema/type'
31
29
  require 'libxml/schema/element'
32
30
  require 'libxml/schema/attribute'
33
-
34
- # Deprecated
35
- require 'libxml/properties'
@@ -20,7 +20,7 @@ module LibXML
20
20
  # node.inner_xml -> "string"
21
21
  # node.inner_xml(:indent => true, :encoding => 'UTF-8', :level => 0) -> "string"
22
22
  #
23
- # Converts a node's children, to a string representation. To include
23
+ # Converts a node's children to a string representation. To include
24
24
  # the node, use XML::Node#to_s. For more information about
25
25
  # the supported options, see XML::Node#to_s.
26
26
  def inner_xml(options = Hash.new)
@@ -309,82 +309,6 @@ module LibXML
309
309
  alias :child :first
310
310
  alias :each_child :each
311
311
 
312
- # --- Deprecated Output ---
313
- # :stopdoc:
314
- def dump
315
- warn('Node#dump is deprecated. Use Node#to_s instead.')
316
- self.to_s
317
- end
318
-
319
- # --- Deprecated DOM Manipulation ---
320
- def child_add(node)
321
- warn('Node#child_add is deprecated. Use Node#<< instead.')
322
- self << node
323
- end
324
-
325
- def child=(node)
326
- warn('Node#child= is deprecated. Use Node#<< instead.')
327
- self << node
328
- end
329
-
330
- # --- Deprecated Namespaces ---
331
- def namespace
332
- warn('Node#namespace is deprecated. Use Node#namespaces instead.')
333
- self.namespaces.entries
334
- end
335
-
336
- def namespace=(value)
337
- warn('Node#namespace= is deprecated. Use Node#namespaces.namespace= instead.')
338
- self.namespaces.namespace = value
339
- end
340
-
341
- def namespace_node
342
- warn('Node#namespace_node is deprecated. Use Node#namespaces.namespace instead.')
343
- self.namespaces.namespace
344
- end
345
-
346
- def ns
347
- warn('Node#ns is deprecated. Use Node#namespaces.namespace instead.')
348
- self.namespaces.namespace
349
- end
350
-
351
- def ns?
352
- warn('Node#ns? is deprecated. Use !Node#namespaces.namespace.nil? instead.')
353
- !self.namespaces.namespace.nil?
354
- end
355
-
356
- def ns_def
357
- warn('Node#ns_def is deprecated. Use Node#namespaces.definitions instead.')
358
- self.namespaces.definitions
359
- end
360
-
361
- def ns_def?
362
- warn('Node#ns_def? is deprecated. Use !Node#namespaces.definitions.nil? instead.')
363
- !self.namespaces.definitions.nil?
364
- end
365
-
366
- def base
367
- warn('Node#base is deprecated. Use Node#base_uri.')
368
- self.base_uri
369
- end
370
-
371
- def base=(value)
372
- warn('Node#base= is deprecated. Use Node#base_uri=.')
373
- self.base_uri = value
374
- end
375
-
376
- def search_ns(prefix)
377
- warn('Node#search_ns is deprecated. Use Node#namespaces.find_by_prefix instead.')
378
- self.namespaces.find_by_prefix(prefix)
379
- end
380
-
381
- def search_href(href)
382
- warn('Node#search_href is deprecated. Use Node#namespaces.find_by_href instead.')
383
- self.namespaces.find_by_href(href)
384
- end
385
-
386
- # :startdoc:
387
-
388
312
  private
389
313
 
390
314
  def create_string_io(xml)
@@ -396,4 +320,4 @@ module LibXML
396
320
  end
397
321
  end
398
322
  end
399
- end
323
+ end
@@ -96,272 +96,6 @@ module LibXML
96
96
  Error.set_handler(&proc)
97
97
  end
98
98
  end
99
-
100
- # :enddoc:
101
-
102
- # Bunch of deprecated methods that have moved to the XML module
103
- VERSION = XML::VERSION
104
- VERNUM = XML::VERNUM
105
-
106
- def document=(value)
107
- warn("XML::Parser#document= is deprecated. Use XML::Parser.document= instead")
108
- @context = XML::Parser::Context.document(value)
109
- end
110
-
111
- def file=(value)
112
- warn("XML::Parser#file is deprecated. Use XML::Parser.file instead")
113
- @context = XML::Parser::Context.file(value)
114
- end
115
-
116
- def filename=(value)
117
- warn("XML::Parser#filename is deprecated. Use XML::Parser.file instead")
118
- self.file = value
119
- end
120
-
121
- def io=(value)
122
- warn("XML::Parser#io is deprecated. Use XML::Parser.io instead")
123
- @context = XML::Parser::Context.io(value)
124
- end
125
-
126
- def string=(value)
127
- warn("XML::Parser#string is deprecated. Use XML::Parser.string instead")
128
- @context = XML::Parser::Context.string(value)
129
- end
130
-
131
- def self.enabled_automata?
132
- warn("XML::Parser.enabled_automata? has been deprecated. Use XML.enabled_automata? instead")
133
- XML.enabled_automata?
134
- end
135
-
136
- def self.enabled_c14n?
137
- warn("XML::Parser.enabled_c14n? has been deprecated. Use XML.enabled_c14n? instead")
138
- XML.enabled_c14n?
139
- end
140
-
141
- def self.enabled_catalog?
142
- warn("XML::Parser.enabled_catalog? has been deprecated. Use XML.enabled_catalog? instead")
143
- XML.enabled_catalog?
144
- end
145
-
146
- def self.enabled_debug?
147
- warn("XML::Parser.enabled_debug? has been deprecated. Use XML.enabled_debug? instead")
148
- XML.enabled_debug?
149
- end
150
-
151
- def self.enabled_docbook?
152
- warn("XML::Parser.enabled_docbook? has been deprecated. Use XML.enabled_docbook? instead")
153
- XML.enabled_docbook?
154
- end
155
-
156
- def self.enabled_ftp?
157
- warn("XML::Parser.enabled_ftp? has been deprecated. Use XML.enabled_ftp? instead")
158
- XML.enabled_ftp?
159
- end
160
-
161
- def self.enabled_http?
162
- warn("XML::Parser.enabled_http? has been deprecated. Use XML.enabled_http? instead")
163
- XML.enabled_http?
164
- end
165
-
166
- def self.enabled_html?
167
- warn("XML::Parser.enabled_html? has been deprecated. Use XML.enabled_html? instead")
168
- XML.enabled_html?
169
- end
170
-
171
- def self.enabled_iconv?
172
- warn("XML::Parser.enabled_iconv? has been deprecated. Use XML.enabled_iconv? instead")
173
- XML.enabled_iconv?
174
- end
175
-
176
- def self.enabled_memory_debug?
177
- warn("XML::Parser.enabled_memory_debug_location? has been deprecated. Use XML.enabled_memory_debug_location? instead")
178
- XML.enabled_memory_debug_location?
179
- end
180
-
181
- def self.enabled_regexp?
182
- warn("XML::Parser.enabled_regexp? has been deprecated. Use XML.enabled_regexp? instead")
183
- XML.enabled_regexp?
184
- end
185
-
186
- def self.enabled_schemas?
187
- warn("XML::Parser.enabled_schemas? has been deprecated. Use XML.enabled_schemas? instead")
188
- XML.enabled_schemas?
189
- end
190
-
191
- def self.enabled_thread?
192
- warn("XML::Parser.enabled_thread? has been deprecated. Use XML.enabled_thread? instead")
193
- XML.enabled_thread?
194
- end
195
-
196
- def self.enabled_unicode?
197
- warn("XML::Parser.enabled_unicode? has been deprecated. Use XML.enabled_unicode? instead")
198
- XML.enabled_unicode?
199
- end
200
-
201
- def self.enabled_xinclude?
202
- warn("XML::Parser.enabled_xinclude? has been deprecated. Use XML.enabled_xinclude? instead")
203
- XML.enabled_xinclude?
204
- end
205
-
206
- def self.enabled_xpath?
207
- warn("XML::Parser.enabled_xpath? has been deprecated. Use XML.enabled_xpath? instead")
208
- XML.enabled_xpath?
209
- end
210
-
211
- def self.enabled_xpointer?
212
- warn("XML::Parser.enabled_xpointer? has been deprecated. Use XML.enabled_xpointer? instead")
213
- XML.enabled_xpointer?
214
- end
215
-
216
- def self.enabled_zlib?
217
- warn("XML::Parser.enabled_zlib? has been deprecated. Use XML.enabled_zlib? instead")
218
- XML.enabled_zlib?
219
- end
220
-
221
- def self.catalog_dump
222
- warn("XML::Parser.catalog_dump has been deprecated. Use XML.catalog_dump instead")
223
- XML.catalog_dump
224
- end
225
-
226
- def self.catalog_remove
227
- warn("XML::Parser.catalog_remove has been deprecated. Use XML.catalog_remove instead")
228
- XML.catalog_remove
229
- end
230
-
231
- def self.check_lib_versions
232
- warn("XML::Parser.check_lib_versions has been deprecated. Use XML.check_lib_versions instead")
233
- XML.check_lib_versions
234
- end
235
-
236
- def self.debug_entities
237
- warn("XML::Parser.debug_entities has been deprecated. Use XML.debug_entities instead")
238
- XML.debug_entities
239
- end
240
-
241
- def self.debug_entities=(value)
242
- warn("XML::Parser.debug_entities_set has been deprecated. Use XML.debug_entities= value instead")
243
- XML.debug_entities= value
244
- end
245
-
246
- def self.default_compression
247
- warn("XML::Parser.default_compression has been deprecated. Use XML.default_compression instead")
248
- XML.default_compression
249
- end
250
-
251
- def self.default_compression=(value)
252
- warn("XML::Parser.default_compression= value has been deprecated. Use XML.default_compression= value instead")
253
- XML.default_compression= value
254
- end
255
-
256
- def self.default_keep_blanks
257
- warn("XML::Parser.default_keep_blanks has been deprecated. Use XML.default_keep_blanks instead")
258
- XML.default_keep_blanks
259
- end
260
-
261
- def self.default_keep_blanks=(value)
262
- warn("XML::Parser.default_keep_blanks= value has been deprecated. Use XML.default_keep_blanks= value instead")
263
- XML.default_keep_blanks= value
264
- end
265
-
266
- def self.default_load_external_dtd
267
- warn("XML::Parser.default_load_external_dtd has been deprecated. Use XML.default_load_external_dtd instead")
268
- XML.default_load_external_dtd
269
- end
270
-
271
- def self.default_load_external_dtd=(value)
272
- warn("XML::Parser.default_load_external_dtd= value has been deprecated. Use XML.default_load_external_dtd= value instead")
273
- XML.default_load_external_dtd= value
274
- end
275
-
276
- def self.default_line_numbers
277
- warn("XML::Parser.default_line_numbers has been deprecated. Use XML.default_line_numbers instead")
278
- XML.default_line_numbers
279
- end
280
-
281
- def self.default_line_numbers=(value)
282
- warn("XML::Parser.default_line_numbers= value has been deprecated. Use XML.default_line_numbers= value instead")
283
- XML.default_line_numbers= value
284
- end
285
-
286
- def self.default_pedantic_parser
287
- warn("XML::Parser.default_pedantic_parser has been deprecated. Use XML.default_pedantic_parser instead")
288
- XML.default_pedantic_parser
289
- end
290
-
291
- def self.default_pedantic_parser=(value)
292
- warn("XML::Parser.default_pedantic_parser= value has been deprecated. Use XML.default_pedantic_parser= value instead")
293
- XML.default_pedantic_parser= value
294
- end
295
-
296
- def self.default_substitute_entities
297
- warn("XML::Parser.default_substitute_entities has been deprecated. Use XML.default_substitute_entities instead")
298
- XML.default_substitute_entities
299
- end
300
-
301
- def self.default_substitute_entities=(value)
302
- warn("XML::Parser.default_substitute_entities= value has been deprecated. Use XML.default_substitute_entities= value instead")
303
- XML.default_substitute_entities= value
304
- end
305
-
306
- def self.default_tree_indent_string
307
- warn("XML::Parser.default_tree_indent_string has been deprecated. Use XML.default_tree_indent_string instead")
308
- XML.default_tree_indent_string
309
- end
310
-
311
- def self.default_tree_indent_string=(value)
312
- warn("XML::Parser.default_tree_indent_string= value has been deprecated. Use XML.default_tree_indent_string= value instead")
313
- XML.default_tree_indent_string= value
314
- end
315
-
316
- def self.default_validity_checking
317
- warn("XML::Parser.default_validity_checking has been deprecated. Use XML.default_validity_checking instead")
318
- XML.default_validity_checking
319
- end
320
-
321
- def self.default_validity_checking=(value)
322
- warn("XML::Parser.default_validity_checking= value has been deprecated. Use XML.default_validity_checking= value instead")
323
- XML.default_validity_checking= value
324
- end
325
-
326
- def self.default_warnings
327
- warn("XML::Parser.default_warnings has been deprecated. Use XML.default_warnings instead")
328
- XML.default_warnings
329
- end
330
-
331
- def self.default_warnings=(value)
332
- warn("XML::Parser.default_warnings= value has been deprecated. Use XML.default_warnings= value instead")
333
- XML.default_warnings= value
334
- end
335
-
336
- def self.features
337
- warn("XML::Parser.features has been deprecated. Use XML.features instead")
338
- XML.features
339
- end
340
-
341
- def self.indent_tree_output
342
- warn("XML::Parser.indent_tree_output has been deprecated. Use XML.indent_tree_output instead")
343
- XML.indent_tree_output
344
- end
345
-
346
- def self.indent_tree_output=(value)
347
- warn("XML::Parser.indent_tree_output= value has been deprecated. Use XML.indent_tree_output= value instead")
348
- XML.indent_tree_output= value
349
- end
350
-
351
- def self.filename(value)
352
- warn("Parser.filename is deprecated. Use Parser.file instead")
353
- self.file(value)
354
- end
355
-
356
- def self.memory_dump
357
- warn("XML::Parser.memory_dump has been deprecated. Use XML.memory_dump instead")
358
- XML.memory_dump
359
- end
360
-
361
- def self.memory_used
362
- warn("XML::Parser.memory_used has been deprecated. Use XML.memory_used instead")
363
- XML.memory_used
364
- end
365
99
  end
366
100
  end
367
101
  end