libxml-ruby 2.8.0 → 3.2.1

data/ext/libxml/ruby_xml_xpath_object.h

@@ -1,17 +1,17 @@
-#ifndef __RXML_XPATH_OBJECT__
-#define __RXML_XPATH_OBJECT__
-
-extern VALUE cXMLXPathObject;
-
-typedef struct rxml_xpath_object
-{
-  xmlDocPtr xdoc;
-  xmlXPathObjectPtr xpop;
-  VALUE nsnodes;
-} rxml_xpath_object;
-
-
-void rxml_init_xpath_object(void);
-VALUE rxml_xpath_object_wrap(xmlDocPtr xdoc, xmlXPathObjectPtr xpop);
-
-#endif
+#ifndef __RXML_XPATH_OBJECT__
+#define __RXML_XPATH_OBJECT__
+
+extern VALUE cXMLXPathObject;
+
+typedef struct rxml_xpath_object
+{
+  xmlDocPtr xdoc;
+  xmlXPathObjectPtr xpop;
+  VALUE nsnodes;
+} rxml_xpath_object;
+
+
+void rxml_init_xpath_object(void);
+VALUE rxml_xpath_object_wrap(xmlDocPtr xdoc, xmlXPathObjectPtr xpop);
+
+#endif

data/ext/libxml/ruby_xml_xpointer.c

@@ -1,99 +1,99 @@
-/* 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);
-}
+/* 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);
+}

data/ext/libxml/ruby_xml_xpointer.h

@@ -1,11 +1,11 @@
-/* Please see the LICENSE file for copyright and distribution information */
-
-#ifndef __RXML_XPOINTER__
-#define __RXML_XPOINTER__
-
-extern VALUE cXMLXPointer;
-
-void rxml_init_xpointer(void);
-VALUE rxml_xpointer_point2(VALUE node, VALUE xptr_str);
-
-#endif
+/* Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __RXML_XPOINTER__
+#define __RXML_XPOINTER__
+
+extern VALUE cXMLXPointer;
+
+void rxml_init_xpointer(void);
+VALUE rxml_xpointer_point2(VALUE node, VALUE xptr_str);
+
+#endif

data/ext/vc/libxml_ruby.sln

@@ -1,24 +1,26 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml_ruby", "libxml_ruby_18\libxml_ruby.vcxproj", "{0B65CD1D-EEB9-41AE-93BB-75496E504152}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml_ruby_19", "libxml_ruby_19\libxml_ruby_19.vcxproj", "{0E73156F-E619-4FD9-8327-113FE3CC942E}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml_ruby", "libxml_ruby\libxml_ruby.vcxproj", "{0B65CD1D-EEB9-41AE-93BB-75496E504152}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0B65CD1D-EEB9-41AE-93BB-75496E504152}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0B65CD1D-EEB9-41AE-93BB-75496E504152}.Debug|Win32.Build.0 = Debug|Win32
-		{0B65CD1D-EEB9-41AE-93BB-75496E504152}.Release|Win32.ActiveCfg = Release|Win32
-		{0B65CD1D-EEB9-41AE-93BB-75496E504152}.Release|Win32.Build.0 = Release|Win32
-		{0E73156F-E619-4FD9-8327-113FE3CC942E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0E73156F-E619-4FD9-8327-113FE3CC942E}.Debug|Win32.Build.0 = Debug|Win32
-		{0E73156F-E619-4FD9-8327-113FE3CC942E}.Release|Win32.ActiveCfg = Release|Win32
-		{0E73156F-E619-4FD9-8327-113FE3CC942E}.Release|Win32.Build.0 = Release|Win32
+		{0B65CD1D-EEB9-41AE-93BB-75496E504152}.Debug|x64.ActiveCfg = Debug|x64
+		{0B65CD1D-EEB9-41AE-93BB-75496E504152}.Debug|x64.Build.0 = Debug|x64
+		{0B65CD1D-EEB9-41AE-93BB-75496E504152}.Debug|x86.ActiveCfg = Debug|x64
+		{0B65CD1D-EEB9-41AE-93BB-75496E504152}.Debug|x86.Build.0 = Debug|x64
+		{0B65CD1D-EEB9-41AE-93BB-75496E504152}.Release|x64.ActiveCfg = Release|x64
+		{0B65CD1D-EEB9-41AE-93BB-75496E504152}.Release|x64.Build.0 = Release|x64
+		{0B65CD1D-EEB9-41AE-93BB-75496E504152}.Release|x86.ActiveCfg = Release|Win32
+		{0B65CD1D-EEB9-41AE-93BB-75496E504152}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

data/lib/libxml-ruby.rb

@@ -0,0 +1,30 @@
+# encoding: UTF-8
+
+# Load the C-based binding.
+begin
+  RUBY_VERSION =~ /(\d+.\d+)/
+  require "#{$1}/libxml_ruby"
+rescue LoadError
+  require "libxml_ruby"
+end
+
+# Load Ruby supporting code.
+require 'libxml/error'
+require 'libxml/parser'
+require 'libxml/document'
+require 'libxml/namespaces'
+require 'libxml/namespace'
+require 'libxml/node'
+require 'libxml/attributes'
+require 'libxml/attr'
+require 'libxml/attr_decl'
+require 'libxml/tree'
+require 'libxml/html_parser'
+require 'libxml/sax_parser'
+require 'libxml/sax_callbacks'
+
+#Schema Interface
+require 'libxml/schema'
+require 'libxml/schema/type'
+require 'libxml/schema/element'
+require 'libxml/schema/attribute'

data/lib/libxml.rb

@@ -1,35 +1,5 @@
 # encoding: UTF-8
+#
+# This include is deprecated, use libxml-ruby instead!
 
-# Load the C-based binding.
-begin
-  RUBY_VERSION =~ /(\d+.\d+)/
-  require "#{$1}/libxml_ruby"
-rescue LoadError
-  require "libxml_ruby"
-end
-# Load Ruby supporting code.
-require 'libxml/error'
-require 'libxml/parser'
-require 'libxml/document'
-require 'libxml/namespaces'
-require 'libxml/namespace'
-require 'libxml/node'
-require 'libxml/ns'
-require 'libxml/attributes'
-require 'libxml/attr'
-require 'libxml/attr_decl'
-require 'libxml/tree'
-require 'libxml/reader'
-require 'libxml/html_parser'
-require 'libxml/sax_parser'
-require 'libxml/sax_callbacks'
-require 'libxml/xpath_object'
-
-#Schema Interface
-require 'libxml/schema'
-require 'libxml/schema/type'
-require 'libxml/schema/element'
-require 'libxml/schema/attribute'
-
-# Deprecated
-require 'libxml/properties'
+require 'libxml-ruby'

data/lib/libxml/node.rb

@@ -20,7 +20,7 @@ module LibXML
       #    node.inner_xml -> "string"
       #    node.inner_xml(:indent => true, :encoding => 'UTF-8', :level => 0) -> "string"
       #
-      # Converts a node's children, to a string representation.  To include
+      # Converts a node's children to a string representation.  To include
       # the node, use XML::Node#to_s.  For more information about
       # the supported options, see XML::Node#to_s.
       def inner_xml(options = Hash.new)
@@ -309,82 +309,6 @@ module LibXML
       alias :child :first
       alias :each_child :each
 
-      # --- Deprecated Output ---
-      # :stopdoc:
-      def dump
-        warn('Node#dump is deprecated.  Use Node#to_s instead.')
-        self.to_s
-      end
-
-      # --- Deprecated DOM Manipulation ---
-      def child_add(node)
-        warn('Node#child_add is deprecated.  Use Node#<< instead.')
-        self << node
-      end
-
-      def child=(node)
-        warn('Node#child= is deprecated.  Use Node#<< instead.')
-        self << node
-      end
-
-      # --- Deprecated Namespaces ---
-      def namespace
-        warn('Node#namespace is deprecated.  Use Node#namespaces instead.')
-        self.namespaces.entries
-      end
-
-      def namespace=(value)
-        warn('Node#namespace= is deprecated.  Use Node#namespaces.namespace= instead.')
-        self.namespaces.namespace = value
-      end
-
-      def namespace_node
-        warn('Node#namespace_node is deprecated.  Use Node#namespaces.namespace instead.')
-        self.namespaces.namespace
-      end
-
-      def ns
-        warn('Node#ns is deprecated.  Use Node#namespaces.namespace instead.')
-        self.namespaces.namespace
-      end
-
-      def ns?
-        warn('Node#ns? is deprecated.  Use !Node#namespaces.namespace.nil? instead.')
-        !self.namespaces.namespace.nil?
-      end
-
-      def ns_def
-        warn('Node#ns_def is deprecated.  Use Node#namespaces.definitions instead.')
-        self.namespaces.definitions
-      end
-
-      def ns_def?
-        warn('Node#ns_def? is deprecated.  Use !Node#namespaces.definitions.nil? instead.')
-        !self.namespaces.definitions.nil?
-      end
-
-      def base
-        warn('Node#base is deprecated.  Use Node#base_uri.')
-        self.base_uri
-      end
-
-      def base=(value)
-        warn('Node#base= is deprecated.  Use Node#base_uri=.')
-        self.base_uri = value
-      end
-
-      def search_ns(prefix)
-        warn('Node#search_ns is deprecated.  Use Node#namespaces.find_by_prefix instead.')
-        self.namespaces.find_by_prefix(prefix)
-      end
-
-      def search_href(href)
-        warn('Node#search_href is deprecated.  Use Node#namespaces.find_by_href instead.')
-        self.namespaces.find_by_href(href)
-      end
-
-      # :startdoc:
-
       private
 
       def create_string_io(xml)
@@ -396,4 +320,4 @@ module LibXML
       end
     end
   end
-end
+end