libxml-ruby 3.2.1 → 4.1.1

data/test/test_sax_parser.rb

@@ -181,7 +181,7 @@ class TestSaxParser < Minitest::Test
     xml = File.read(saxtest_file)
     io = StringIO.new(xml)
     parser = LibXML::XML::SaxParser.io(io)
-    
+
     parser.callbacks = TestCaseCallbacks.new
     parser.parse
     verify(parser)
@@ -250,25 +250,32 @@ EOS
     result = parser.callbacks.result
 
     i = -1
+
+    base_err_msg = "Fatal error: (Premature end of data in tag Results line 1|EndTag: '<\\/' not found) at :2\\."
+    re_err_msg1 = /\A(error: )#{base_err_msg}\z/
+    re_err_msg2 = /\A#{base_err_msg}\z/
+
     assert_equal("startdoc", result[i+=1])
     assert_equal("start_element: Results, attr: {}", result[i+=1])
     assert_equal("start_element_ns: Results, attr: {}, prefix: , uri: , ns: {}", result[i+=1])
     assert_equal("characters: \n", result[i+=1])
-    assert_equal("error: Fatal error: EndTag: '</' not found at :2.", result[i+=1])
+    assert_match(re_err_msg1, result[i+=1])
     assert_equal("end_document", result[i+=1])
 
     refute_nil(error)
     assert_kind_of(LibXML::XML::Error, error)
-    assert_equal("Fatal error: EndTag: '</' not found at :2.", error.message)
+    assert_match(re_err_msg2, error.message)
     assert_equal(LibXML::XML::Error::PARSER, error.domain)
-    assert_equal(LibXML::XML::Error::LTSLASH_REQUIRED, error.code)
+
+    assert([LibXML::XML::Error::TAG_NOT_FINISHED, LibXML::XML::Error::LTSLASH_REQUIRED].include?(error.code))
     assert_equal(LibXML::XML::Error::FATAL, error.level)
     assert_nil(error.file)
     assert_equal(2, error.line)
-    assert_nil(error.str1)
+    # Sometimes this is nil and sometimes its not depending on OS and libxlm version
+    # assert_nil(error.str1)
     assert_nil(error.str2)
     assert_nil(error.str3)
-    assert_equal(0, error.int1)
+    assert([0, 1].include?(error.int1))
     assert_equal(1, error.int2)
     assert_nil(error.node)
   end

data/test/test_schema.rb

@@ -3,18 +3,19 @@
 require_relative './test_helper'
 
 class TestSchema < Minitest::Test
+  Import_NS = 'http://xml4r.org/libxml-ruby/test/shiporder'.freeze
+
   def setup
     file = File.join(File.dirname(__FILE__), 'model/shiporder.xml')
     @doc = LibXML::XML::Document.file(file)
+    schema_file = File.join(File.dirname(__FILE__), 'model/shiporder.xsd')
+    schema_doc = LibXML::XML::Document.file(schema_file)
+    @schema = LibXML::XML::Schema.document(schema_doc)
   end
 
   def teardown
     @doc = nil
-  end
-
-  def schema
-    document = LibXML::XML::Document.file(File.join(File.dirname(__FILE__), 'model/shiporder.xsd'))
-    LibXML::XML::Schema.document(document)
+    @schema = nil
   end
 
   def check_error(error)
@@ -33,11 +34,50 @@ class TestSchema < Minitest::Test
   end
 
   def test_load_from_doc
-    assert_instance_of(LibXML::XML::Schema, schema)
+    assert_instance_of(LibXML::XML::Schema, @schema)
+  end
+
+  def test_schema_load_from_uri
+    xlink_schema = LibXML::XML::Schema.new('http://www.w3.org/1999/xlink.xsd')
+    assert_instance_of(LibXML::XML::Schema, xlink_schema)
+    assert_instance_of(LibXML::XML::Schema::Element, xlink_schema.elements['title'])
+    assert_instance_of(LibXML::XML::Schema::Type, xlink_schema.types['titleEltType'])
+    assert_equal('http://www.w3.org/1999/xlink', xlink_schema.target_namespace)
+  end
+
+  def test_schema_from_string
+    schema_file = File.join(File.dirname(__FILE__), 'model/shiporder.xsd')
+    schema_from_str = LibXML::XML::Schema.from_string(File.read(schema_file))
+    assert_instance_of(LibXML::XML::Schema, schema_from_str)
+  end
+
+  def test_invalid_schema_doc
+    bad_schema_file = File.join(File.dirname(__FILE__), 'model/shiporder_bad.xsd')
+    bad_schema_doc = LibXML::XML::Document.file(bad_schema_file)
+    bad_schema = nil
+    ## Note: this type of error throws
+    begin
+      bad_schema = LibXML::XML::Schema.document(bad_schema_doc)
+    rescue LibXML::XML::Error => error
+      bad_schema = error
+      assert(error.message.match(/Error: Element '.*': The content is not valid. Expected is \(/))
+      assert_kind_of(LibXML::XML::Error, error)
+      assert_equal(LibXML::XML::Error::SCHEMASP, error.domain)
+      assert_equal(LibXML::XML::Error::SCHEMAP_S4S_ELEM_NOT_ALLOWED, error.code)
+      assert_equal(LibXML::XML::Error::ERROR, error.level)
+      assert(error.file.match(/shiporder_bad.xsd/))
+      assert_equal("Element '{http://www.w3.org/2001/XMLSchema}complexType'", error.str1)
+      refute_nil(error.str2)
+      assert_nil(error.str3)
+      assert_equal(0, error.int1)
+      assert_equal(0, error.int2)
+    end
+    ## Last but not least, make sure we threw an error
+    assert_instance_of(LibXML::XML::Error, bad_schema)
   end
 
   def test_doc_valid
-    assert(@doc.validate_schema(schema))
+    assert(@doc.validate_schema(@schema))
   end
 
   def test_doc_invalid
@@ -45,7 +85,7 @@ class TestSchema < Minitest::Test
     @doc.root << new_node
 
     error = assert_raises(LibXML::XML::Error) do
-      @doc.validate_schema(schema)
+      @doc.validate_schema(@schema)
     end
 
     check_error(error)
@@ -56,7 +96,7 @@ class TestSchema < Minitest::Test
 
   def test_reader_valid
     reader = LibXML::XML::Reader.string(@doc.to_s)
-    assert(reader.schema_validate(schema))
+    assert(reader.schema_validate(@schema))
 
     while reader.read
     end
@@ -74,7 +114,7 @@ class TestSchema < Minitest::Test
     reader = LibXML::XML::Reader.string(@doc.to_s)
 
     # Set a schema
-    assert(reader.schema_validate(schema))
+    assert(reader.schema_validate(@schema))
 
     while reader.read
     end
@@ -91,32 +131,55 @@ class TestSchema < Minitest::Test
 
   # Schema meta-data tests
   def test_elements
-    assert_instance_of(Hash, schema.elements)
-    assert_equal(1, schema.elements.length)
-    assert_instance_of(LibXML::XML::Schema::Element, schema.elements['shiporder'])
+    assert_instance_of(Hash, @schema.elements)
+    assert_equal(1, @schema.elements.length)
+    assert_instance_of(LibXML::XML::Schema::Element, @schema.elements['shiporder'])
   end
 
   def test_types
-    assert_instance_of(Hash, schema.types)
-    assert_equal(1, schema.types.length)
-    assert_instance_of(LibXML::XML::Schema::Type, schema.types['shiporder'])
+    assert_instance_of(Hash, @schema.types)
+    assert_equal(1, @schema.types.length)
+    assert_instance_of(LibXML::XML::Schema::Type, @schema.types['shiporderType'])
   end
 
   def test_imported_types
-    assert_instance_of(Hash, schema.imported_types)
-    assert_equal(1, schema.imported_types.length)
-    assert_instance_of(LibXML::XML::Schema::Type, schema.types['shiporder'])
+    assert_instance_of(Hash, @schema.imported_types)
+    assert_equal(2, @schema.imported_types.length)
+    assert_instance_of(LibXML::XML::Schema::Type, @schema.imported_types['shiporderType'])
+    assert_instance_of(LibXML::XML::Schema::Type, @schema.imported_types['shiporderFooType'])
+  end
+
+  def test_imported_ns_types
+    assert_instance_of(Hash, @schema.imported_ns_types)
+    assert_equal(2, @schema.imported_ns_types.length)
+    assert_equal(1, @schema.imported_ns_types[nil].length)
+    assert_equal(1, @schema.imported_ns_types[Import_NS].length)
+    assert_instance_of(LibXML::XML::Schema::Type, @schema.imported_ns_types[nil]['shiporderType'])
+    assert_instance_of(LibXML::XML::Schema::Type, @schema.imported_ns_types[Import_NS]['shiporderFooType'])
+  end
+
+  def test_imported_ns_elements
+    assert_instance_of(Hash, @schema.imported_ns_elements)
+    assert_equal(2, @schema.imported_ns_elements.length)
+    assert_equal(1, @schema.imported_ns_elements[nil].length)
+    assert_equal(1, @schema.imported_ns_elements[Import_NS].length)
+    assert_instance_of(LibXML::XML::Schema::Element, @schema.imported_ns_elements[nil]['shiporder'])
+    assert_instance_of(LibXML::XML::Schema::Element, @schema.imported_ns_elements[Import_NS]['shiporder'])
+    assert_equal('shiporderType', @schema.imported_ns_elements[nil]['shiporder'].type.name)
+    assert_equal('shiporderFooType', @schema.imported_ns_elements[Import_NS]['shiporder'].type.name)
   end
 
   def test_namespaces
-    assert_instance_of(Array, schema.namespaces)
-    assert_equal(1, schema.namespaces.length)
+    assert_instance_of(Array, @schema.namespaces)
+    ## For some reason, when importing another schema we end up with two xs->http://www.w3.org/2001/XMLSchema namespaces.
+    ## So, we expect 3 here (one for Import_NS and then two for the schema namespace.
+    assert_equal(3, @schema.namespaces.length)
   end
 
   def test_schema_type
-    type = schema.types['shiporder']
+    type = @schema.types['shiporderType']
 
-    assert_equal('shiporder', type.name)
+    assert_equal('shiporderType', type.name)
     assert_nil(type.namespace)
     assert_equal("Shiporder type documentation", type.annotation)
     assert_instance_of(LibXML::XML::Node, type.node)
@@ -130,22 +193,22 @@ class TestSchema < Minitest::Test
   end
 
   def test_schema_element
-    element = schema.types['shiporder'].elements['orderperson']
+    element = @schema.types['shiporderType'].elements['orderperson']
 
     assert_equal('orderperson', element.name)
     assert_nil(element.namespace)
     assert_equal("orderperson element documentation", element.annotation)
 
-    element = schema.types['shiporder'].elements['item']
+    element = @schema.types['shiporderType'].elements['item']
     assert_equal('item', element.name)
 
-    element = schema.types['shiporder'].elements['item'].type.elements['note']
+    element = @schema.types['shiporderType'].elements['item'].type.elements['note']
     assert_equal('note', element.name)
     assert_equal('string', element.type.name)
   end
 
   def test_schema_attributes
-    type = schema.types['shiporder']
+    type = @schema.types['shiporderType']
 
     assert_instance_of(Array, type.attributes)
     assert_equal(2, type.attributes.length)
@@ -153,14 +216,14 @@ class TestSchema < Minitest::Test
   end
 
   def test_schema_attribute
-    attribute = schema.types['shiporder'].attributes.first
+    attribute = @schema.types['shiporderType'].attributes.first
 
     assert_equal("orderid", attribute.name)
     assert_nil(attribute.namespace)
     assert_equal(1, attribute.occurs)
     assert_equal('string', attribute.type.name)
 
-    attribute = schema.types['shiporder'].attributes[1]
+    attribute = @schema.types['shiporderType'].attributes[1]
     assert_equal(2, attribute.occurs)
     assert_equal('1', attribute.default)
     assert_equal('integer', attribute.type.name)

data/test/test_xml.rb

@@ -167,11 +167,19 @@ class TestXml < Minitest::Test
   end
 
   def test_enabled_docbook
-    assert(LibXML::XML.enabled_docbook?)
+    if windows?
+      refute(LibXML::XML.enabled_docbook?)
+    else
+      assert(LibXML::XML.enabled_docbook?)
+    end
   end
 
   def test_enabled_ftp
-    assert(LibXML::XML.enabled_ftp?)
+    if windows?
+      refute(LibXML::XML.enabled_ftp?)
+    else
+      assert(LibXML::XML.enabled_ftp?)
+    end
   end
 
   def test_enabled_http
@@ -183,7 +191,8 @@ class TestXml < Minitest::Test
   end
 
   def test_enabled_iconv
-    assert(LibXML::XML.enabled_iconv?)
+    iconv_enabled = RUBY_PLATFORM !~ /darwin/
+    assert_equal(iconv_enabled, LibXML::XML.enabled_iconv?)
   end
 
   def test_enabled_memory_debug
@@ -240,10 +249,6 @@ class TestXml < Minitest::Test
     assert_instance_of(Integer, LibXML::XML::VERNUM)
   end
 
-  def test_libxml_parser_features
-    assert_instance_of(Array, LibXML::XML.features)
-  end
-
   def test_default_options
     assert_equal(0, LibXML::XML.default_options)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libxml-ruby
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 4.1.1
 platform: ruby
 authors:
 - Ross Bamform
@@ -11,10 +11,10 @@ authors:
 - Anurag Priyam
 - Charlie Savage
 - Ryan Johnson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-05 00:00:00.000000000 Z
+date: 2023-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -50,7 +50,7 @@ description: |2
       Libxml-ruby's primary advantage over REXML is performance - if speed
       is your need, these are good libraries to consider, as demonstrated
       by the informal benchmark below.
-email: 
+email:
 executables: []
 extensions:
 - ext/libxml/extconf.rb
@@ -58,7 +58,6 @@ extra_rdoc_files: []
 files:
 - HISTORY
 - LICENSE
-- MANIFEST
 - README.rdoc
 - Rakefile
 - ext/libxml/extconf.h
@@ -136,8 +135,6 @@ files:
 - ext/libxml/ruby_xml_xpath_expression.h
 - ext/libxml/ruby_xml_xpath_object.c
 - ext/libxml/ruby_xml_xpath_object.h
-- ext/libxml/ruby_xml_xpointer.c
-- ext/libxml/ruby_xml_xpointer.h
 - ext/vc/libxml_ruby.sln
 - lib/libxml-ruby.rb
 - lib/libxml.rb
@@ -168,7 +165,6 @@ files:
 - script/benchmark/sock_entries.xml
 - script/benchmark/throughput
 - script/test
-- setup.rb
 - test/c14n/given/doc.dtd
 - test/c14n/given/example-1.xml
 - test/c14n/given/example-2.xml
@@ -216,9 +212,10 @@ files:
 - test/model/shiporder.rng
 - test/model/shiporder.xml
 - test/model/shiporder.xsd
+- test/model/shiporder_bad.xsd
+- test/model/shiporder_import.xsd
 - test/model/soap.xml
 - test/model/xinclude.xml
-- test/test.xml
 - test/test_attr.rb
 - test/test_attr_decl.rb
 - test/test_attributes.rb
@@ -251,7 +248,6 @@ files:
 - test/test_relaxng.rb
 - test/test_sax_parser.rb
 - test/test_schema.rb
-- test/test_suite.rb
 - test/test_traversal.rb
 - test/test_writer.rb
 - test/test_xinclude.rb
@@ -259,12 +255,11 @@ files:
 - test/test_xpath.rb
 - test/test_xpath_context.rb
 - test/test_xpath_expression.rb
-- test/test_xpointer.rb
-homepage: http://xml4r.github.com/libxml-ruby
+homepage: https://xml4r.github.io/libxml-ruby/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -279,14 +274,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.3.26
+signing_key:
 specification_version: 4
 summary: Ruby Bindings for LibXML2
 test_files:
 - test/test_attr.rb
-- test/test_attributes.rb
 - test/test_attr_decl.rb
+- test/test_attributes.rb
 - test/test_canonicalize.rb
 - test/test_deprecated_require.rb
 - test/test_document.rb
@@ -316,7 +311,6 @@ test_files:
 - test/test_relaxng.rb
 - test/test_sax_parser.rb
 - test/test_schema.rb
-- test/test_suite.rb
 - test/test_traversal.rb
 - test/test_writer.rb
 - test/test_xinclude.rb
@@ -324,4 +318,3 @@ test_files:
 - test/test_xpath.rb
 - test/test_xpath_context.rb
 - test/test_xpath_expression.rb
-- test/test_xpointer.rb

data/MANIFEST

@@ -1,166 +0,0 @@
-#!mast -x doc/libxml-ruby/rdoc -i .gitignore ext doc lib script test [A-Z]*
-ext/libxml/extconf.rb
-ext/libxml/libxml.c
-ext/libxml/ruby_libxml.h
-ext/libxml/ruby_xml.c
-ext/libxml/ruby_xml.h
-ext/libxml/ruby_xml_attr.c
-ext/libxml/ruby_xml_attr.h
-ext/libxml/ruby_xml_attr_decl.c
-ext/libxml/ruby_xml_attr_decl.h
-ext/libxml/ruby_xml_attributes.c
-ext/libxml/ruby_xml_attributes.h
-ext/libxml/ruby_xml_cbg.c
-ext/libxml/ruby_xml_document.c
-ext/libxml/ruby_xml_document.h
-ext/libxml/ruby_xml_dtd.c
-ext/libxml/ruby_xml_dtd.h
-ext/libxml/ruby_xml_encoding.c
-ext/libxml/ruby_xml_encoding.h
-ext/libxml/ruby_xml_error.c
-ext/libxml/ruby_xml_error.h
-ext/libxml/ruby_xml_html_parser.c
-ext/libxml/ruby_xml_html_parser.h
-ext/libxml/ruby_xml_html_parser_context.c
-ext/libxml/ruby_xml_html_parser_context.h
-ext/libxml/ruby_xml_html_parser_options.c
-ext/libxml/ruby_xml_html_parser_options.h
-ext/libxml/ruby_xml_input_cbg.c
-ext/libxml/ruby_xml_input_cbg.h
-ext/libxml/ruby_xml_io.c
-ext/libxml/ruby_xml_io.h
-ext/libxml/ruby_xml_namespace.c
-ext/libxml/ruby_xml_namespace.h
-ext/libxml/ruby_xml_namespaces.c
-ext/libxml/ruby_xml_namespaces.h
-ext/libxml/ruby_xml_node.c
-ext/libxml/ruby_xml_node.h
-ext/libxml/ruby_xml_parser.c
-ext/libxml/ruby_xml_parser.h
-ext/libxml/ruby_xml_parser_context.c
-ext/libxml/ruby_xml_parser_context.h
-ext/libxml/ruby_xml_parser_options.c
-ext/libxml/ruby_xml_parser_options.h
-ext/libxml/ruby_xml_reader.c
-ext/libxml/ruby_xml_reader.h
-ext/libxml/ruby_xml_relaxng.c
-ext/libxml/ruby_xml_relaxng.h
-ext/libxml/ruby_xml_sax2_handler.c
-ext/libxml/ruby_xml_sax2_handler.h
-ext/libxml/ruby_xml_sax_parser.c
-ext/libxml/ruby_xml_sax_parser.h
-ext/libxml/ruby_xml_schema.c
-ext/libxml/ruby_xml_schema.h
-ext/libxml/ruby_xml_version.h
-ext/libxml/ruby_xml_xinclude.c
-ext/libxml/ruby_xml_xinclude.h
-ext/libxml/ruby_xml_xpath.c
-ext/libxml/ruby_xml_xpath.h
-ext/libxml/ruby_xml_xpath_context.c
-ext/libxml/ruby_xml_xpath_context.h
-ext/libxml/ruby_xml_xpath_expression.c
-ext/libxml/ruby_xml_xpath_expression.h
-ext/libxml/ruby_xml_xpath_object.c
-ext/libxml/ruby_xml_xpath_object.h
-ext/libxml/ruby_xml_xpointer.c
-ext/libxml/ruby_xml_xpointer.h
-ext/mingw/Rakefile
-ext/mingw/build.rake
-ext/mingw/libiconv-2.dll
-ext/mingw/libxml2-2.dll
-ext/mingw/libxml_ruby.dll.a
-ext/mingw/libxml_ruby.so
-ext/vc/libxml_ruby.sln
-ext/vc/libxml_ruby_18/libxml_ruby.vcproj
-ext/vc/libxml_ruby_19/libxml_ruby_19.vcproj
-doc/.htaccess
-doc/.rsync-filter
-lib/libxml/attr.rb
-lib/libxml/attr_decl.rb
-lib/libxml/attributes.rb
-lib/libxml/document.rb
-lib/libxml/error.rb
-lib/libxml/hpricot.rb
-lib/libxml/html_parser.rb
-lib/libxml/namespace.rb
-lib/libxml/namespaces.rb
-lib/libxml/node.rb
-lib/libxml/ns.rb
-lib/libxml/parser.rb
-lib/libxml/properties.rb
-lib/libxml/reader.rb
-lib/libxml/sax_callbacks.rb
-lib/libxml/sax_parser.rb
-lib/libxml/tree.rb
-lib/libxml/xpath_object.rb
-lib/libxml.rb
-lib/xml/libxml.rb
-lib/xml.rb
-script/benchmark/depixelate
-script/benchmark/hamlet.xml
-script/benchmark/parsecount
-script/benchmark/sock_entries.xml
-script/benchmark/throughput
-script/test
-test/etc_doc_to_s.rb
-test/ets_doc_file.rb
-test/ets_doc_to_s.rb
-test/ets_gpx.rb
-test/ets_node_gc.rb
-test/ets_test.xml
-test/ets_tsr.rb
-test/model/atom.xml
-test/model/bands.xml
-test/model/books.xml
-test/model/merge_bug_data.xml
-test/model/ruby-lang.html
-test/model/rubynet.xml
-test/model/rubynet_project
-test/model/shiporder.rnc
-test/model/shiporder.rng
-test/model/shiporder.xml
-test/model/shiporder.xsd
-test/model/soap.xml
-test/model/xinclude.xml
-test/test_attr.rb
-test/test_attr_decl.rb
-test/test_attributes.rb
-test/test_deprecated_require.rb
-test/test_document.rb
-test/test_document_write.rb
-test/test_dtd.rb
-test/test_error.rb
-test/test_html_parser.rb
-test/test_namespace.rb
-test/test_namespaces.rb
-test/test_node.rb
-test/test_node_cdata.rb
-test/test_node_comment.rb
-test/test_node_copy.rb
-test/test_node_edit.rb
-test/test_node_pi.rb
-test/test_node_text.rb
-test/test_node_write.rb
-test/test_node_xlink.rb
-test/test_parser.rb
-test/test_parser_context.rb
-test/test_properties.rb
-test/test_reader.rb
-test/test_relaxng.rb
-test/test_sax_parser.rb
-test/test_schema.rb
-test/test_traversal.rb
-test/test_xinclude.rb
-test/test_xml.rb
-test/test_xpath.rb
-test/test_xpath_context.rb
-test/test_xpath_expression.rb
-test/test_xpointer.rb
-test/test_suite.rb
-Rakefile
-HISTORY.rdoc
-PROFILE
-TODO
-LICENSE
-README.rdoc
-VERSION

data/ext/libxml/ruby_xml_xpointer.c

@@ -1,99 +0,0 @@
-/* Please see the LICENSE file for copyright and distribution information */
-
-#include "ruby_libxml.h"
-#include "ruby_xml_xpointer.h"
-
-VALUE cXMLXPointer;
-
-/*
- * Document-class: LibXML::XML::XPointer
- *
- * The XML::Pointer class provides a standards based API for searching an xml document.
- * XPointer is based on the XML Path Language (XML::XPath) and is documented
- * at http://www.w3.org/TR/WD-xptr.
- */
-
-static VALUE rxml_xpointer_point(VALUE class, VALUE rnode, VALUE xptr_str)
-{
-#ifdef LIBXML_XPTR_ENABLED
-  xmlNodePtr xnode;
-  xmlXPathContextPtr xctxt;
-  xmlXPathObjectPtr xpop;
-
-  VALUE context;
-  VALUE result;
-  VALUE argv[1];
-
-  Check_Type(xptr_str, T_STRING);
-  if (rb_obj_is_kind_of(rnode, cXMLNode) == Qfalse)
-  rb_raise(rb_eTypeError, "require an XML::Node object");
-
-  Data_Get_Struct(rnode, xmlNode, xnode);
-
-  argv[0] = rb_funcall(rnode, rb_intern("doc"), 0);
-  context = rb_class_new_instance(1, argv, cXMLXPathContext);
-  Data_Get_Struct(context, xmlXPathContext, xctxt);
-
-  xpop = xmlXPtrEval((xmlChar*)StringValuePtr(xptr_str), xctxt);
-  if (!xpop)
-  rxml_raise(&xmlLastError);
-
-  result = rxml_xpath_object_wrap(xnode->doc, xpop);
-  rb_iv_set(result, "@context", context);
-
-  return(result);
-#else
-  rb_warn("libxml was compiled without XPointer support");
-  return (Qfalse);
-#endif
-}
-
-VALUE rxml_xpointer_point2(VALUE node, VALUE xptr_str)
-{
-  return (rxml_xpointer_point(cXMLXPointer, node, xptr_str));
-}
-
-/*
- * call-seq:
- *    XML::XPointer.range(start_node, end_node) -> xpath
- *
- * Create an xpath representing the range between the supplied
- * start and end node.
- */
-static VALUE rxml_xpointer_range(VALUE class, VALUE rstart, VALUE rend)
-{
-#ifdef LIBXML_XPTR_ENABLED
-  xmlNodePtr start, end;
-  VALUE rxxp;
-  xmlXPathObjectPtr xpath;
-
-  if (rb_obj_is_kind_of(rstart, cXMLNode) == Qfalse)
-  rb_raise(rb_eTypeError, "require an XML::Node object as a starting point");
-  if (rb_obj_is_kind_of(rend, cXMLNode) == Qfalse)
-  rb_raise(rb_eTypeError, "require an XML::Node object as an ending point");
-
-  Data_Get_Struct(rstart, xmlNode, start);
-  if (start == NULL)
-  return(Qnil);
-
-  Data_Get_Struct(rend, xmlNode, end);
-  if (end == NULL)
-  return(Qnil);
-
-  xpath = xmlXPtrNewRangeNodes(start, end);
-  if (xpath == NULL)
-  rb_fatal("You shouldn't be able to have this happen");
-
-  rxxp = rxml_xpath_object_wrap(start->doc, xpath);
-  return(rxxp);
-#else
-  rb_warn("libxml was compiled without XPointer support");
-  return (Qfalse);
-#endif
-}
-
-void rxml_init_xpointer(void)
-{
-  cXMLXPointer = rb_define_class_under(mXML, "XPointer", rb_cObject);
-  rb_define_singleton_method(cXMLXPointer, "range", rxml_xpointer_range, 2);
-}