libxml-ruby 0.9.4 → 0.9.5

data/ext/libxml/ruby_xml_xpointer.c

@@ -1,109 +1,107 @@
-/* $Id: ruby_xml_xpointer.c 612 2008-11-21 08:01:29Z cfis $ */
-
-/* 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(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(xpath);
-  return(rxxp);
-#else
-  rb_warn("libxml was compiled without XPointer support");
-  return(Qfalse);
-#endif
-}
-
-// Rdoc needs to know 
-#ifdef RDOC_NEVER_DEFINED
-  mLibXML = rb_define_module("LibXML");
-  mXML = rb_define_module_under(mLibXML, "XML");
-#endif
-
-void
-ruby_init_xml_xpointer(void) {
-  cXMLXPointer = rb_define_class_under(mXML, "XPointer", rb_cObject);
-  rb_define_singleton_method(cXMLXPointer, "range", rxml_xpointer_range, 2);
-}
+/* $Id: ruby_xml_xpointer.c 650 2008-11-30 03:40:22Z cfis $ */
+
+/* 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(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(xpath);
+  return(rxxp);
+#else
+  rb_warn("libxml was compiled without XPointer support");
+  return (Qfalse);
+#endif
+}
+
+// Rdoc needs to know
+#ifdef RDOC_NEVER_DEFINED
+mLibXML = rb_define_module("LibXML");
+mXML = rb_define_module_under(mLibXML, "XML");
+#endif
+
+void ruby_init_xml_xpointer(void)
+{
+  cXMLXPointer = rb_define_class_under(mXML, "XPointer", rb_cObject);
+  rb_define_singleton_method(cXMLXPointer, "range", rxml_xpointer_range, 2);
+}

data/ext/libxml/ruby_xml_xpointer.h

@@ -1,13 +1,13 @@
-/* $Id: ruby_xml_xpointer.h 630 2008-11-24 06:53:01Z cfis $ */
-
-/* Please see the LICENSE file for copyright and distribution information */
-
-#ifndef __rxml_XPOINTER__
-#define __rxml_XPOINTER__
-
-extern VALUE cXMLXPointer;
-
-void ruby_init_xml_xpointer(void);
-VALUE rxml_xpointer_point2(VALUE node, VALUE xptr_str);
-
-#endif
+/* $Id: ruby_xml_xpointer.h 630 2008-11-24 06:53:01Z cfis $ */
+
+/* Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __rxml_XPOINTER__
+#define __rxml_XPOINTER__
+
+extern VALUE cXMLXPointer;
+
+void ruby_init_xml_xpointer(void);
+VALUE rxml_xpointer_point2(VALUE node, VALUE xptr_str);
+
+#endif

data/ext/libxml/version.h

@@ -1,9 +1,9 @@
 /* Don't nuke this block!  It is used for automatically updating the
  * versions below. VERSION = string formatting, VERNUM = numbered
  * version for inline testing: increment both or none at all.*/
-#define RUBY_LIBXML_VERSION  "0.9.4"
+#define RUBY_LIBXML_VERSION  "0.9.5"
 #define RUBY_LIBXML_VERNUM   0
 #define RUBY_LIBXML_VER_MAJ   0
 #define RUBY_LIBXML_VER_MIN   9
-#define RUBY_LIBXML_VER_MIC   4
+#define RUBY_LIBXML_VER_MIC   5
 #define RUBY_LIBXML_VER_PATCH 0

data/ext/mingw/Rakefile

@@ -25,7 +25,7 @@ task :install do
   # Copy the import library (used by libxslt)
   cp(EXTENSION_LIB_NAME, dest_path)
 
-  # Copy dllss
+  # Copy dlls
   Dir.glob('*.dll').each do |dll|
     cp(dll, dest_path)
   end

data/ext/vc/libxml_ruby.vcproj

@@ -63,7 +63,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="msvcrt-ruby18.lib libxml2.lib"
-				OutputFile="C:\Development\ruby\lib\ruby\gems\1.8\gems\libxml-ruby-0.9.4-x86-mswin32-60\lib\$(ProjectName).so"
+				OutputFile="C:\Development\ruby\lib\ruby\gems\1.8\gems\libxml-ruby-0.9.5-x86-mswin32-60\lib\$(ProjectName).so"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="C:\Development\ruby\lib;C:\Development\msys\local\lib"
 				GenerateDebugInformation="true"

data/lib/libxml/error.rb

@@ -33,13 +33,13 @@ module LibXML
 
       def level_to_s
         case self.level
-          when NONE:
+          when NONE
             ''
-          when WARNING:
+          when WARNING
             'Warning:'
-          when ERROR:
+          when ERROR
             'Error:'
-          when FATAL:
+          when FATAL
             'Fatal error:'
         end
       end

data/test/tc_node_edit.rb

@@ -1,4 +1,4 @@
-require "xml"
+require 'xml'
 require 'test/unit'
 
 class TestNodeEdit < Test::Unit::TestCase
@@ -60,12 +60,24 @@ class TestNodeEdit < Test::Unit::TestCase
       @doc.root.to_s.gsub(/\n\s*/,'')
   end
   
-  def test_remove_node()
+  def test_remove_node
     first_node.remove!
     assert_equal('<test><num>two</num><num>three</num></test>',
                  @doc.root.to_s.gsub(/\n\s*/,''))
   end
 
+  def test_reuse_removed_node
+    # Remove the node
+    node = @doc.root.first.remove!
+    assert_not_nil(node)
+
+    # Add it to the end of the documnet
+    @doc.root.last.next = node
+
+    assert_equal('<test><num>two</num><num>three</num><num>one</num></test>',
+                 @doc.root.to_s.gsub(/\n\s*/,''))
+  end
+
   # This test is to verify that an earlier reported bug has been fixed  
   def test_merge
     documents = []

data/test/tc_node_text.rb

@@ -1,17 +1,17 @@
 require 'xml'
 require 'test/unit'
 
-class TC_XML_Node_text < Test::Unit::TestCase
-  def setup
-    @t=XML::Node.new_text("testdata")
-    assert_instance_of(XML::Node,@t)
-  end
-
+class TestTextNode < Test::Unit::TestCase
   def test_content
-    assert_equal("testdata",@t.content)
+    node = XML::Node.new_text('testdata')
+    assert_instance_of(XML::Node, node)
+    assert_equal('testdata', node.content)
   end
 
-  def test_type
-    assert_equal(true,@t.text?)
+  def test_invalid_content
+    error = assert_raise(TypeError) do
+      node = XML::Node.new_text(nil)
+    end
+    assert_equal('wrong argument type nil (expected String)', error.to_s)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: libxml-ruby
 version: !ruby/object:Gem::Version 
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors: 
 - Charlie Savage
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-24 00:00:00 -07:00
+date: 2008-11-29 00:00:00 -07:00
 default_executable: 
 dependencies: []