libxml-ruby 0.8.1 → 0.8.2

data/ext/libxml/ruby_xml_xpath_object.c

@@ -302,11 +302,11 @@ ruby_xml_xpath_object_debug(VALUE self) {
 
 
 // Rdoc needs to know
-#ifdef RDOC_NEVER_DEFINED
-  mLibXML = rb_define_module("LibXML");
-  mXML = rb_define_module_under(mLibXML, "XML");
-  mXPath = rb_define_module_under(mXML, "XPath");
-#endif
+#ifdef RDOC_NEVER_DEFINED
+  mLibXML = rb_define_module("LibXML");
+  mXML = rb_define_module_under(mLibXML, "XML");
+  mXPath = rb_define_module_under(mXML, "XPath");
+#endif
 
 void
 ruby_init_xml_xpath_object(void) {

data/ext/libxml/ruby_xml_xpointer.c

@@ -1,104 +1,104 @@
-/* $Id: ruby_xml_xpointer.c 461 2008-07-15 21:35:56Z cfis $ */
-
-/* Please see the LICENSE file for copyright and distribution information */
-
-#include "ruby_libxml.h"
-#include "ruby_xml_xpointer.h"
-
-VALUE cXMLXPointer;
-VALUE eXMLXPointerInvalidExpression;
-
-VALUE
-ruby_xml_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)
-    rb_raise(eXMLXPointerInvalidExpression, "Invalid xpointer expression");
-
-  result = ruby_xml_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
-ruby_xml_xpointer_point2(VALUE node, VALUE xptr_str) {
-  return(ruby_xml_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.
- */
-VALUE
-ruby_xml_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 = ruby_xml_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);
-  eXMLXPointerInvalidExpression = rb_define_class_under(cXMLXPointer, "InvalidExpression", eXMLError);
-
-  rb_define_singleton_method(cXMLXPointer, "range", ruby_xml_xpointer_range, 2);
-}
+/* $Id: ruby_xml_xpointer.c 461 2008-07-15 21:35:56Z cfis $ */
+
+/* Please see the LICENSE file for copyright and distribution information */
+
+#include "ruby_libxml.h"
+#include "ruby_xml_xpointer.h"
+
+VALUE cXMLXPointer;
+VALUE eXMLXPointerInvalidExpression;
+
+VALUE
+ruby_xml_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)
+    rb_raise(eXMLXPointerInvalidExpression, "Invalid xpointer expression");
+
+  result = ruby_xml_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
+ruby_xml_xpointer_point2(VALUE node, VALUE xptr_str) {
+  return(ruby_xml_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.
+ */
+VALUE
+ruby_xml_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 = ruby_xml_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);
+  eXMLXPointerInvalidExpression = rb_define_class_under(cXMLXPointer, "InvalidExpression", eXMLError);
+
+  rb_define_singleton_method(cXMLXPointer, "range", ruby_xml_xpointer_range, 2);
+}

data/ext/libxml/ruby_xml_xpointer_context.c

@@ -1,22 +1,22 @@
-/* $Id: ruby_xml_xpointer_context.c 461 2008-07-15 21:35:56Z cfis $ */
-
-/* Please see the LICENSE file for copyright and distribution information */
-
-#include "ruby_libxml.h"
-#include "ruby_xml_xpointer_context.h"
-
-VALUE cXMLXPointerContext;
-VALUE eXMLXPointerContextInvalidPath;
-
-// Rdoc needs to know 
-#ifdef RDOC_NEVER_DEFINED
-  mLibXML = rb_define_module("LibXML");
-  mXML = rb_define_module_under(mLibXML, "XML");
-  cXMLXPointer = rb_define_class_under(mXML, "XPointer", rb_cObject);
-#endif
-
-void
-ruby_init_xml_xpointer_context(void) {
-  cXMLXPointerContext = rb_define_class_under(cXMLXPointer, "Context", cXMLXPathContext);
-  eXMLXPointerContextInvalidPath = rb_define_class_under(cXMLXPointerContext, "InvalidPath", eXMLError);
-}
+/* $Id: ruby_xml_xpointer_context.c 461 2008-07-15 21:35:56Z cfis $ */
+
+/* Please see the LICENSE file for copyright and distribution information */
+
+#include "ruby_libxml.h"
+#include "ruby_xml_xpointer_context.h"
+
+VALUE cXMLXPointerContext;
+VALUE eXMLXPointerContextInvalidPath;
+
+// Rdoc needs to know 
+#ifdef RDOC_NEVER_DEFINED
+  mLibXML = rb_define_module("LibXML");
+  mXML = rb_define_module_under(mLibXML, "XML");
+  cXMLXPointer = rb_define_class_under(mXML, "XPointer", rb_cObject);
+#endif
+
+void
+ruby_init_xml_xpointer_context(void) {
+  cXMLXPointerContext = rb_define_class_under(cXMLXPointer, "Context", cXMLXPathContext);
+  eXMLXPointerContextInvalidPath = rb_define_class_under(cXMLXPointerContext, "InvalidPath", eXMLError);
+}

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.8.1"
+#define RUBY_LIBXML_VERSION  "0.8.2"
 #define RUBY_LIBXML_VERNUM   0
 #define RUBY_LIBXML_VER_MAJ   0
 #define RUBY_LIBXML_VER_MIN   8
-#define RUBY_LIBXML_VER_MIC   1
+#define RUBY_LIBXML_VER_MIC   2
 #define RUBY_LIBXML_VER_PATCH 0

data/ext/libxml/version.h.rej

@@ -0,0 +1,17 @@
+***************
+*** 1,7 ****
+  /* 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.8.0"
+  #define RUBY_LIBXML_VERNUM   0
+  #define RUBY_LIBXML_VER_MAJ   0
+  #define RUBY_LIBXML_VER_MIN   8
+--- 1,7 ----
+  /* 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.8.1.1"
+  #define RUBY_LIBXML_VERNUM   0
+  #define RUBY_LIBXML_VER_MAJ   0
+  #define RUBY_LIBXML_VER_MIN   8

data/ext/mingw/Rakefile

@@ -0,0 +1,41 @@
+# We can't use Ruby's standard build procedures
+# on Windows because the Ruby executable is
+# built with VC++ while here we want to build
+# with MingW.  So just roll our own...
+
+require 'rake/clean'
+require 'rbconfig'
+
+RUBY_INCLUDE_DIR = Config::CONFIG["archdir"]
+RUBY_BIN_DIR = Config::CONFIG["bindir"]
+RUBY_LIB_DIR = Config::CONFIG["libdir"]
+RUBY_SHARED_LIB = Config::CONFIG["LIBRUBY"]
+RUBY_SHARED_DLL = RUBY_SHARED_LIB.gsub(/lib$/, 'dll')
+
+EXTENSION_NAME = "libxml_ruby.#{Config::CONFIG["DLEXT"]}"
+# MingW insists the import library is .dll.a
+EXTENSION_LIB_NAME = "libxml_ruby.dll.a"
+
+CLEAN.include('*.o')
+CLOBBER.include(EXTENSION_NAME)
+CLOBBER.include(EXTENSION_LIB_NAME)
+
+task :default => "libxml"
+
+SRC = FileList['../libxml/*.c']
+OBJ = SRC.collect do |file_name|
+  File.basename(file_name).ext('o')
+end
+
+SRC.each do |srcfile|
+  objfile = File.basename(srcfile).ext('o')
+  file objfile => srcfile do
+    command = "gcc -c -fPIC -O2 -Wall -o #{objfile} -I/usr/local/include #{srcfile} -I#{RUBY_INCLUDE_DIR}"
+    sh "sh -c '#{command}'" 
+  end
+end
+
+file "libxml" => OBJ do
+  command = "gcc -shared -o #{EXTENSION_NAME} -Wl,--out-implib,#{EXTENSION_LIB_NAME} -L/usr/local/lib #{OBJ} -lxml2 #{RUBY_BIN_DIR}/#{RUBY_SHARED_DLL}" 
+  sh "sh -c '#{command}'" 
+end

data/lib/libxml.rb

@@ -1,8 +1,17 @@
-# $Id: libxml.rb 458 2008-07-15 21:10:55Z cfis $ 
+# $Id: libxml.rb 509 2008-07-22 02:11:00Z cfis $ 
 # Please see the LICENSE file for copyright and distribution information 
 
+# If running on Windows, then add the current directory to the PATH
+# for the current process so it can find the pre-built libxml2 and 
+# iconv2 shared libraries (dlls).
+if RUBY_PLATFORM.match(/mswin/i)
+  ENV['PATH'] += ";#{File.dirname(__FILE__)}"
+end
+
+# Load the C-based binding.
 require 'libxml_ruby'
 
+# Load Ruby supporting code.
 require 'libxml/parser'
 require 'libxml/parser_options'
 require 'libxml/document'
@@ -17,6 +26,8 @@ require 'libxml/properties'
 
 # Map the LibXML module into the XML module for both backwards
 # compatibility and ease of use.
-module XML
-  include LibXML::XML
-end
+# 
+# DEPRECATED: Use require 'xml' instead!
+#
+# include LibXML
+

data/lib/xml.rb

@@ -0,0 +1,14 @@
+# This file loads libxml and adds the LibXML namespace
+# to the toplevel for conveneience. The end result
+# is to have XML:: universally exposed.
+#
+# It is recommend that you only load this file for libs
+# that do not have their own namespace, eg. administrative
+# scripts, personal programs, etc. For other applications
+# require 'libxml' instead and include LibXML into your 
+# app/libs namespace.
+
+require 'libxml'
+
+include LibXML
+

data/lib/xml/libxml.rb

@@ -1,5 +1,8 @@
 # This is here for backward compatibility.
-# Ultimately we can deprecate it.
+#
+# TODO: DEPRECATE!
 
 require 'libxml.rb'
 
+include LibXML
+

data/test/etc_doc_to_s.rb

@@ -1,4 +1,4 @@
-require 'libxml'
+require 'xml'
 
 1.times do |count|
 

data/test/ets_copy_bug.rb

@@ -1,4 +1,4 @@
-require 'libxml'
+require 'xml'
 
 def test( doc2 )
   doc = XML::Document.new('1.0')

data/test/ets_copy_bug3.rb

@@ -1,4 +1,4 @@
-require 'libxml'
+require 'xml'
 
 str = <<-STR
   <html>

data/test/ets_doc_file.rb

@@ -1,4 +1,4 @@
-require 'libxml'
+require 'xml'
 
 # This is related to bug 8337, complaint is on amd64/fbsd
 # unknown if it happens on other amd64/os combos

data/test/ets_doc_to_s.rb

@@ -1,4 +1,4 @@
-require 'libxml'
+require 'xml'
 
 100.times do |count|
 

data/test/ets_node_gc.rb

@@ -1,4 +1,4 @@
-require 'libxml'
+require 'xml'
 
 # test of bug 13310, clears MEM2
 

data/test/ets_tsr.rb

@@ -1,4 +1,4 @@
-require 'libxml'
+require 'xml'
 
 10_000.times {|n|
 j=XML::Node.new2(nil,"happy#{n}")