libxml-ruby 0.5.1.0 → 0.5.2.0

data/ext/xml/ruby_xml_xpointer.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_xpointer.c 138 2007-08-29 18:00:35Z danj $ */
+/* $Id: ruby_xml_xpointer.c 188 2007-09-24 01:43:21Z danj $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -12,7 +12,7 @@ VALUE
 ruby_xml_xpointer_point(VALUE class, VALUE rnode, VALUE xptr_str) {
 #ifdef LIBXML_XPTR_ENABLED
   ruby_xml_node *node;
-  ruby_xml_xpath_context *xxpc;
+  xmlXPathContextPtr ctxt;
   VALUE rxptr_xpth_ctxt, rxxp;
   xmlXPathObjectPtr xpath;
 
@@ -22,21 +22,17 @@ ruby_xml_xpointer_point(VALUE class, VALUE rnode, VALUE xptr_str) {
 
   Data_Get_Struct(rnode, ruby_xml_node, node);
 
-  rxptr_xpth_ctxt = ruby_xml_xpath_context_new(cXMLXPathContext,
-					       ruby_xml_document_wrap(cXMLDocument,node->node->doc),
-					       xmlXPtrNewContext(node->node->doc, node->node, NULL));
+  rxptr_xpth_ctxt =
+    ruby_xml_xpath_context_wrap(ctxt=xmlXPtrNewContext(node->node->doc, node->node, NULL));
+
   if (NIL_P(rxptr_xpth_ctxt))
     return(Qnil);
-  Data_Get_Struct(rxptr_xpth_ctxt, ruby_xml_xpath_context, xxpc);
 
-  xpath = xmlXPtrEval((xmlChar*)StringValuePtr(xptr_str), xxpc->ctxt);
+  xpath = xmlXPtrEval((xmlChar*)StringValuePtr(xptr_str), ctxt);
   if (xpath == NULL)
     rb_raise(eXMLXPointerInvalidExpression, "invalid xpointer expression");
 
-  rxxp = ruby_xml_xpath_new(cXMLXPath,
-			    ruby_xml_document_wrap(cXMLDocument,node->node->doc),
-			    rxptr_xpth_ctxt
-			    , xpath);
+  rxxp = ruby_xml_xpath_object_wrap(xpath);
   return(rxxp);
 #else
   rb_warn("libxml was compiled without XPointer support");
@@ -82,9 +78,7 @@ ruby_xml_xpointer_range(VALUE class, VALUE rstart, VALUE rend) {
   if (xpath == NULL)
     rb_fatal("You shouldn't be able to have this happen");
 
-  rxxp = ruby_xml_xpath_new(cXMLXPath,
-			    ruby_xml_document_wrap(cXMLDocument,start->node->doc),
-			    Qnil, xpath);
+  rxxp = ruby_xml_xpath_object_wrap(xpath);
   return(rxxp);
 #else
   rb_warn("libxml was compiled without XPointer support");

data/ext/xml/ruby_xml_xpointer.h

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_xpointer.h 39 2006-02-21 20:40:16Z roscopeco $ */
+/* $Id: ruby_xml_xpointer.h 134 2007-08-29 17:30:19Z danj $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 

data/ext/xml/ruby_xml_xpointer_context.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_xpointer_context.c 120 2006-11-26 12:57:56Z roscopeco $ */
+/* $Id: ruby_xml_xpointer_context.c 134 2007-08-29 17:30:19Z danj $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 

data/ext/xml/ruby_xml_xpointer_context.h

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_xpointer_context.h 39 2006-02-21 20:40:16Z roscopeco $ */
+/* $Id: ruby_xml_xpointer_context.h 134 2007-08-29 17:30:19Z danj $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 

data/ext/xml/sax_parser_callbacks.inc

@@ -1,4 +1,4 @@
-/* $Id: sax_parser_callbacks.inc 120 2006-11-26 12:57:56Z roscopeco $ */
+/* $Id: sax_parser_callbacks.inc 134 2007-08-29 17:30:19Z danj $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 

data/tests/tc_xml_document.rb

@@ -1,4 +1,4 @@
-# $Id: tc_xml_document.rb 67 2006-04-17 13:30:22Z roscopeco $
+# $Id: tc_xml_document.rb 183 2007-09-21 14:09:52Z danj $
 require 'test/unit'
 require "libxml_test"
 
@@ -18,9 +18,10 @@ class TC_XML_Document < Test::Unit::TestCase
 
   def test_libxml_document_find()
     set = @doc.find('/ruby_array/fixnum')
-    assert_instance_of(XML::Node::Set, set)
-    xpt = set.xpath
-    assert_instance_of(XML::XPath, xpt)
+    assert_instance_of(XML::XPath::Object, set)
+    assert_raise(NoMethodError) {
+      xpt = set.xpath
+    }
   end
 
   def test_ruby_xml_document_compression()

data/tests/tc_xml_html_parser.rb

@@ -1,4 +1,4 @@
-# $Id: tc_xml_html_parser.rb 168 2007-09-05 12:51:04Z danj $
+# $Id: tc_xml_html_parser.rb 182 2007-09-12 14:47:09Z danj $
 require "libxml_test"
 require 'test/unit'
 
@@ -33,13 +33,16 @@ class TC_XML_HTMLParser < Test::Unit::TestCase
     assert_equal 'meta', meta.name
     assert_equal 'keywords', meta[:name]
     assert_equal 'nasty', meta[:content]
-    
+
     body = head.next
     assert_instance_of XML::Node, body
     assert_equal 'body', body.name
     
-    hello = body.child.child
-    puts hello.next.to_s
+    hello = body.child
+    # It appears that some versions of libxml2 add a layer of <p>
+    # cant figure our why or how, so this skips it if there
+    hello = hello.child if hello.name == "p"
+
     assert_instance_of XML::Node, hello
     assert_equal 'Hello', hello.content
     

data/tests/tc_xml_node.rb

@@ -1,4 +1,4 @@
-# $Id: tc_xml_node.rb 67 2006-04-17 13:30:22Z roscopeco $
+# $Id: tc_xml_node.rb 191 2007-10-05 14:56:49Z danj $
 require "libxml_test"
 require 'test/unit'
 
@@ -12,9 +12,10 @@ class TC_XML_Node < Test::Unit::TestCase
     @root = doc.root
     assert_instance_of(XML::Node, @root)
     set = doc.find('/ruby_array/fixnum')
-    assert_instance_of(XML::Node::Set, set)
-    xpt = set.xpath
-    assert_instance_of(XML::XPath, xpt)
+    assert_instance_of(XML::XPath::Object, set)
+    assert_raise(NoMethodError) {
+      xpt = set.xpath
+    }
     @nodes = []
     set.each do |n|
       @nodes.push(n)
@@ -50,7 +51,7 @@ class TC_XML_Node < Test::Unit::TestCase
   end
 
   def test_libxml_node_find()
-    set = @root.find('./fixnum')
+    set = @root.find('./fixnum').set
     assert_instance_of(XML::Node::Set, set)
     for node in set
       assert_instance_of(XML::Node, node)

data/tests/tc_xml_node_set.rb

@@ -1,4 +1,4 @@
-# $Id: tc_xml_node_set.rb 67 2006-04-17 13:30:22Z roscopeco $
+# $Id: tc_xml_node_set.rb 183 2007-09-21 14:09:52Z danj $
 require "libxml_test"
 require 'test/unit'
 
@@ -9,7 +9,7 @@ class TC_XML_Node_Set < Test::Unit::TestCase
     assert_equal(str, xp.string = str)
     doc = xp.parse
     assert_instance_of(XML::Document, doc)
-    @set = doc.find('/ruby_array/fixnum')
+    @set = doc.find('/ruby_array/fixnum').set
     assert_instance_of(XML::Node::Set, @set)    
   end
 

data/tests/tc_xml_node_set2.rb

@@ -1,4 +1,4 @@
-# $Id: tc_xml_node_set2.rb 107 2006-11-20 01:22:08Z roscopeco $
+# $Id: tc_xml_node_set2.rb 183 2007-09-21 14:09:52Z danj $
 require "libxml_test"
 require 'test/unit'
 
@@ -11,8 +11,8 @@ class TC_XML_Node_Set2 < Test::Unit::TestCase
     assert_instance_of(XML::Document, doc)
     @one = doc.root.child
     @two = @one.next    
-    @set = doc.find('/ruby_array/fixnum')
-    @emptyset = doc.find('/fixnum')
+    @set = doc.find('/ruby_array/fixnum').set
+    @emptyset = doc.find('/fixnum').set
     assert_instance_of(XML::Node::Set, @set)    
   end
 

data/tests/tc_xml_xpath.rb

@@ -1,4 +1,4 @@
-# $Id: tc_xml_xpath.rb 67 2006-04-17 13:30:22Z roscopeco $
+# $Id: tc_xml_xpath.rb 183 2007-09-21 14:09:52Z danj $
 require "libxml_test"
 require "test/unit"
 
@@ -9,8 +9,8 @@ class TC_XML_XPath < Test::Unit::TestCase
     assert_equal(str, xp.string = str)
     doc = xp.parse
     assert_instance_of(XML::Document, doc)
-    @xpt = doc.find('/ruby_array/fixnum').xpath
-    assert_instance_of(XML::XPath, @xpt)
+    @xpt = doc.find('/ruby_array/fixnum')
+    assert_instance_of(XML::XPath::Object, @xpt)
   end
 
   def teardown()

data/tests/tc_xml_xpointer.rb

@@ -1,4 +1,4 @@
-# $Id: tc_xml_xpointer.rb 67 2006-04-17 13:30:22Z roscopeco $
+# $Id: tc_xml_xpointer.rb 183 2007-09-21 14:09:52Z danj $
 require "libxml_test"
 require "test/unit"
 
@@ -21,7 +21,7 @@ class TC_XML_XPointer < Test::Unit::TestCase
 
   def test_libxml_xpointer_id()
     @xptr = @root.pointer('xpointer(id("two"))')
-    assert_instance_of(XML::XPath, @xptr)
+    assert_instance_of(XML::XPath::Object, @xptr)
     set = @xptr.set
     assert_instance_of(XML::Node::Set, set)
     for n in set

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.4
 specification_version: 1
 name: libxml-ruby
 version: !ruby/object:Gem::Version 
-  version: 0.5.1.0
-date: 2007-09-05 00:00:00 -04:00
+  version: 0.5.2.0
+date: 2007-10-10 00:00:00 -04:00
 summary: LibXML2 bindings for Ruby
 require_paths: 
 - lib
@@ -52,10 +52,12 @@ files:
 - ext/xml/ruby_xml_reader.c
 - ext/xml/ruby_xml_sax_parser.c
 - ext/xml/ruby_xml_schema.c
+- ext/xml/ruby_xml_state.c
 - ext/xml/ruby_xml_tree.c
 - ext/xml/ruby_xml_xinclude.c
 - ext/xml/ruby_xml_xpath.c
 - ext/xml/ruby_xml_xpath_context.c
+- ext/xml/ruby_xml_xpath_object.c
 - ext/xml/ruby_xml_xpointer.c
 - ext/xml/ruby_xml_xpointer_context.c
 - ext/xml/sax_parser_callbacks.inc
@@ -72,10 +74,12 @@ files:
 - ext/xml/ruby_xml_reader.h
 - ext/xml/ruby_xml_sax_parser.h
 - ext/xml/ruby_xml_schema.h
+- ext/xml/ruby_xml_state.h
 - ext/xml/ruby_xml_tree.h
 - ext/xml/ruby_xml_xinclude.h
 - ext/xml/ruby_xml_xpath.h
 - ext/xml/ruby_xml_xpath_context.h
+- ext/xml/ruby_xml_xpath_object.h
 - ext/xml/ruby_xml_xpointer.h
 - ext/xml/ruby_xml_xpointer_context.h
 - ext/xml/libxml.h
@@ -83,6 +87,13 @@ files:
 - tests/libxml_test.rb
 - tests/merge_bug.rb
 - tests/model
+- tests/model/default_validation_bug.rb
+- tests/model/merge_bug_data.xml
+- tests/model/rubynet.xml
+- tests/model/rubynet_project
+- tests/model/saxtest.xml
+- tests/model/simple.xml
+- tests/model/xinclude.xml
 - tests/runner.rb
 - tests/schema-test.rb
 - tests/tc_xml_document.rb
@@ -116,13 +127,6 @@ files:
 - tests/tc_xml_xinclude.rb
 - tests/tc_xml_xpath.rb
 - tests/tc_xml_xpointer.rb
-- tests/model/default_validation_bug.rb
-- tests/model/merge_bug_data.xml
-- tests/model/rubynet.xml
-- tests/model/rubynet_project
-- tests/model/saxtest.xml
-- tests/model/simple.xml
-- tests/model/xinclude.xml
 test_files: 
 - tests/runner.rb
 rdoc_options: 
@@ -147,10 +151,12 @@ extra_rdoc_files:
 - ext/xml/ruby_xml_reader.c
 - ext/xml/ruby_xml_sax_parser.c
 - ext/xml/ruby_xml_schema.c
+- ext/xml/ruby_xml_state.c
 - ext/xml/ruby_xml_tree.c
 - ext/xml/ruby_xml_xinclude.c
 - ext/xml/ruby_xml_xpath.c
 - ext/xml/ruby_xml_xpath_context.c
+- ext/xml/ruby_xml_xpath_object.c
 - ext/xml/ruby_xml_xpointer.c
 - ext/xml/ruby_xml_xpointer_context.c
 - ext/xml/libxml.rb