libxml-ruby 5.0.4 → 5.0.5

data/ext/libxml/ruby_xml_sax_parser.c

@@ -1,108 +1,108 @@
-/* Please see the LICENSE file for copyright and distribution information */
-
-#include "ruby_libxml.h"
-#include "ruby_xml_sax_parser.h"
-
-/*
- * Document-class: LibXML::XML::SaxParser
- *
- * XML::SaxParser provides a callback based API for parsing documents,
- * in contrast to XML::Parser's tree based API and XML::Reader's stream
- * based API.
- *
- * The XML::SaxParser API is fairly complex, not well standardized,
- * and does not directly support validation making entity, namespace and
- * base processing relatively hard.
- *
- * To use the XML::SaxParser, register a callback class via the
- * XML::SaxParser#callbacks=.  It is easiest to include the
- * XML::SaxParser::Callbacks module in your class and override
- * the methods as needed.
- *
- * Basic example:
- *
- *   class MyCallbacks
- *     include XML::SaxParser::Callbacks
- *     def on_start_element(element, attributes)
- *       puts #Element started: #{element}"
- *     end
- *   end
- *
- *   parser = XML::SaxParser.string(my_string)
- *   parser.callbacks = MyCallbacks.new
- *   parser.parse
- *
- * You can also parse strings (see XML::SaxParser.string) and
- * io objects (see XML::SaxParser.io).
- */
-
-VALUE cXMLSaxParser;
-static ID CALLBACKS_ATTR;
-static ID CONTEXT_ATTR;
-
-
-/* ======  Parser  =========== */
-
-/*
- * call-seq:
- *    parser.initialize(context) -> XML::Parser
- *
- * Creates a new XML::Parser from the specified 
- * XML::Parser::Context.
- */
-static VALUE rxml_sax_parser_initialize(int argc, VALUE *argv, VALUE self)
-{
-  VALUE context = Qnil;
-
-  rb_scan_args(argc, argv, "01", &context);
-
-  if (context == Qnil)
-  {
-    rb_raise(rb_eArgError, "An instance of a XML::Parser::Context must be passed to XML::SaxParser.new");
-  }
-
-  rb_ivar_set(self, CONTEXT_ATTR, context);
-  return self;
-}
-
-/*
- * call-seq:
- *    parser.parse -> (true|false)
- *
- * Parse the input XML, generating callbacks to the object
- * registered via the +callbacks+ attributesibute.
- */
-static VALUE rxml_sax_parser_parse(VALUE self)
-{
-  VALUE context = rb_ivar_get(self, CONTEXT_ATTR);
-  xmlParserCtxtPtr ctxt;
-  Data_Get_Struct(context, xmlParserCtxt, ctxt);
-
-  ctxt->sax2 = 1;
-	ctxt->userData = (void*)rb_ivar_get(self, CALLBACKS_ATTR);
-  memcpy(ctxt->sax, &rxml_sax_handler, sizeof(rxml_sax_handler));
-    
-  int status = xmlParseDocument(ctxt);
-
-  /* Now check the parsing result*/
-  if (status == -1 || !ctxt->wellFormed)
-  {
-    rxml_raise(&ctxt->lastError);
-  }
-  return Qtrue;
-}
-
-void rxml_init_sax_parser(void)
-{
-  /* SaxParser */
-  cXMLSaxParser = rb_define_class_under(mXML, "SaxParser", rb_cObject);
-
-  /* Atributes */
-  CALLBACKS_ATTR = rb_intern("@callbacks");
-  CONTEXT_ATTR = rb_intern("@context");
-  rb_define_attr(cXMLSaxParser, "callbacks", 1, 1);
-
-  /* Instance Methods */
-  rb_define_method(cXMLSaxParser, "initialize", rxml_sax_parser_initialize, -1);
-  rb_define_method(cXMLSaxParser, "parse", rxml_sax_parser_parse, 0);
-}
+/* Please see the LICENSE file for copyright and distribution information */
+
+#include "ruby_libxml.h"
+#include "ruby_xml_sax_parser.h"
+
+/*
+ * Document-class: LibXML::XML::SaxParser
+ *
+ * XML::SaxParser provides a callback based API for parsing documents,
+ * in contrast to XML::Parser's tree based API and XML::Reader's stream
+ * based API.
+ *
+ * The XML::SaxParser API is fairly complex, not well standardized,
+ * and does not directly support validation making entity, namespace and
+ * base processing relatively hard.
+ *
+ * To use the XML::SaxParser, register a callback class via the
+ * XML::SaxParser#callbacks=.  It is easiest to include the
+ * XML::SaxParser::Callbacks module in your class and override
+ * the methods as needed.
+ *
+ * Basic example:
+ *
+ *   class MyCallbacks
+ *     include XML::SaxParser::Callbacks
+ *     def on_start_element(element, attributes)
+ *       puts #Element started: #{element}"
+ *     end
+ *   end
+ *
+ *   parser = XML::SaxParser.string(my_string)
+ *   parser.callbacks = MyCallbacks.new
+ *   parser.parse
+ *
+ * You can also parse strings (see XML::SaxParser.string) and
+ * io objects (see XML::SaxParser.io).
+ */
+
+VALUE cXMLSaxParser;
+static ID CALLBACKS_ATTR;
+static ID CONTEXT_ATTR;
+
+
+/* ======  Parser  =========== */
+
+/*
+ * call-seq:
+ *    parser.initialize(context) -> XML::Parser
+ *
+ * Creates a new XML::Parser from the specified 
+ * XML::Parser::Context.
+ */
+static VALUE rxml_sax_parser_initialize(int argc, VALUE *argv, VALUE self)
+{
+  VALUE context = Qnil;
+
+  rb_scan_args(argc, argv, "01", &context);
+
+  if (context == Qnil)
+  {
+    rb_raise(rb_eArgError, "An instance of a XML::Parser::Context must be passed to XML::SaxParser.new");
+  }
+
+  rb_ivar_set(self, CONTEXT_ATTR, context);
+  return self;
+}
+
+/*
+ * call-seq:
+ *    parser.parse -> (true|false)
+ *
+ * Parse the input XML, generating callbacks to the object
+ * registered via the +callbacks+ attributesibute.
+ */
+static VALUE rxml_sax_parser_parse(VALUE self)
+{
+  VALUE context = rb_ivar_get(self, CONTEXT_ATTR);
+  xmlParserCtxtPtr ctxt;
+  Data_Get_Struct(context, xmlParserCtxt, ctxt);
+
+  ctxt->sax2 = 1;
+	ctxt->userData = (void*)rb_ivar_get(self, CALLBACKS_ATTR);
+  memcpy(ctxt->sax, &rxml_sax_handler, sizeof(rxml_sax_handler));
+    
+  int status = xmlParseDocument(ctxt);
+
+  /* Now check the parsing result*/
+  if (status == -1 || !ctxt->wellFormed)
+  {
+    rxml_raise(&ctxt->lastError);
+  }
+  return Qtrue;
+}
+
+void rxml_init_sax_parser(void)
+{
+  /* SaxParser */
+  cXMLSaxParser = rb_define_class_under(mXML, "SaxParser", rb_cObject);
+
+  /* Atributes */
+  CALLBACKS_ATTR = rb_intern("@callbacks");
+  CONTEXT_ATTR = rb_intern("@context");
+  rb_define_attr(cXMLSaxParser, "callbacks", 1, 1);
+
+  /* Instance Methods */
+  rb_define_method(cXMLSaxParser, "initialize", rxml_sax_parser_initialize, -1);
+  rb_define_method(cXMLSaxParser, "parse", rxml_sax_parser_parse, 0);
+}

data/ext/libxml/ruby_xml_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  "5.0.4"
-#define RUBY_LIBXML_VERNUM   504
-#define RUBY_LIBXML_VER_MAJ   5
-#define RUBY_LIBXML_VER_MIN   0
-#define RUBY_LIBXML_VER_MIC   4
-#define RUBY_LIBXML_VER_PATCH 0
+/* 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  "5.0.5"
+#define RUBY_LIBXML_VERNUM   505
+#define RUBY_LIBXML_VER_MAJ   5
+#define RUBY_LIBXML_VER_MIN   0
+#define RUBY_LIBXML_VER_MIC   5
+#define RUBY_LIBXML_VER_PATCH 0

data/lib/libxml/attr.rb

@@ -1,123 +1,123 @@
-# encoding: UTF-8
-
-module LibXML
-  module XML
-    class Attr 
-      include Enumerable
-
-      # call-seq:
-      #    attr.child? -> (true|false)
-      #
-      # Returns whether this attribute has child attributes.
-      #
-      def child?
-        not self.children.nil?
-      end
-
-      # call-seq:
-      #    attr.doc? -> (true|false)
-      #
-      # Determine whether this attribute is associated with an
-      # XML::Document.
-      def doc?
-        not self.doc.nil?
-      end
-
-      # call-seq:
-      #    attr.last? -> (true|false)
-      #
-      # Determine whether this is the last attribute.
-      def last?
-        self.last.nil?
-      end
-
-      # call-seq:
-      #    attr.next? -> (true|false)
-      #
-      # Determine whether there is a next attribute.
-      def next?
-        not self.next.nil?
-      end
-
-      # call-seq:
-      #    attr.ns? -> (true|false)
-      #
-      # Determine whether this attribute has an associated
-      # namespace.
-      def ns?
-        not self.ns.nil?
-      end
-
-      # call-seq:
-      #   attr.namespacess -> XML::Namespaces
-      #
-      # Returns this node's XML::Namespaces object,
-      # which is used to access the namespaces
-      # associated with this node.
-      def namespaces
-        @namespaces ||= XML::Namespaces.new(self)
-      end
-      
-      #
-      # call-seq:
-      #    attr.parent? -> (true|false)
-      #
-      # Determine whether this attribute has a parent.
-      def parent?
-        not self.parent.nil?
-      end
-
-      # call-seq:
-      #    attr.prev? -> (true|false)
-      #
-      # Determine whether there is a previous attribute.
-      def prev?
-        not self.prev.nil?
-      end
-
-      # Returns this node's type name
-      def node_type_name
-        if node_type == Node::ATTRIBUTE_NODE
-          'attribute'
-        else
-          raise(UnknownType, "Unknown node type: %n", node.node_type);
-        end
-      end
-
-      # Iterates nodes and attributes
-      def siblings(node, &blk)
-        if n = node
-          loop do
-            blk.call(n)
-            break unless n = n.next
-          end
-        end
-      end
-
-      def each_sibling(&blk)
-        siblings(self,&blk)
-      end
-  
-      alias :each_attr :each_sibling
-      alias :each :each_sibling
-  
-      def to_h
-        inject({}) do |h,a|
-          h[a.name] = a.value
-          h
-        end
-      end
-
-      def to_a
-        inject([]) do |ary,a| 
-          ary << [a.name, a.value]
-          ary
-        end
-      end
-  
-      def to_s
-        "#{name} = #{value}"
-      end
-    end
-  end
+# encoding: UTF-8
+
+module LibXML
+  module XML
+    class Attr 
+      include Enumerable
+
+      # call-seq:
+      #    attr.child? -> (true|false)
+      #
+      # Returns whether this attribute has child attributes.
+      #
+      def child?
+        not self.children.nil?
+      end
+
+      # call-seq:
+      #    attr.doc? -> (true|false)
+      #
+      # Determine whether this attribute is associated with an
+      # XML::Document.
+      def doc?
+        not self.doc.nil?
+      end
+
+      # call-seq:
+      #    attr.last? -> (true|false)
+      #
+      # Determine whether this is the last attribute.
+      def last?
+        self.last.nil?
+      end
+
+      # call-seq:
+      #    attr.next? -> (true|false)
+      #
+      # Determine whether there is a next attribute.
+      def next?
+        not self.next.nil?
+      end
+
+      # call-seq:
+      #    attr.ns? -> (true|false)
+      #
+      # Determine whether this attribute has an associated
+      # namespace.
+      def ns?
+        not self.ns.nil?
+      end
+
+      # call-seq:
+      #   attr.namespacess -> XML::Namespaces
+      #
+      # Returns this node's XML::Namespaces object,
+      # which is used to access the namespaces
+      # associated with this node.
+      def namespaces
+        @namespaces ||= XML::Namespaces.new(self)
+      end
+      
+      #
+      # call-seq:
+      #    attr.parent? -> (true|false)
+      #
+      # Determine whether this attribute has a parent.
+      def parent?
+        not self.parent.nil?
+      end
+
+      # call-seq:
+      #    attr.prev? -> (true|false)
+      #
+      # Determine whether there is a previous attribute.
+      def prev?
+        not self.prev.nil?
+      end
+
+      # Returns this node's type name
+      def node_type_name
+        if node_type == Node::ATTRIBUTE_NODE
+          'attribute'
+        else
+          raise(UnknownType, "Unknown node type: %n", node.node_type);
+        end
+      end
+
+      # Iterates nodes and attributes
+      def siblings(node, &blk)
+        if n = node
+          loop do
+            blk.call(n)
+            break unless n = n.next
+          end
+        end
+      end
+
+      def each_sibling(&blk)
+        siblings(self,&blk)
+      end
+  
+      alias :each_attr :each_sibling
+      alias :each :each_sibling
+  
+      def to_h
+        inject({}) do |h,a|
+          h[a.name] = a.value
+          h
+        end
+      end
+
+      def to_a
+        inject([]) do |ary,a| 
+          ary << [a.name, a.value]
+          ary
+        end
+      end
+  
+      def to_s
+        "#{name} = #{value}"
+      end
+    end
+  end
 end

data/lib/libxml/attr_decl.rb

@@ -1,80 +1,80 @@
-# encoding: UTF-8
-
-module LibXML
-  module XML
-    class AttrDecl
-      include Enumerable
-
-      # call-seq:
-      #   attr_decl.child -> nil
-      #
-      # Obtain this attribute declaration's child attribute(s).
-      # It will always be nil.
-      def child
-        nil
-      end
-
-      # call-seq:
-      #    attr_decl.child? -> (true|false)
-      #
-      # Returns whether this attribute declaration has child attributes.
-      #
-      def child?
-        not self.children.nil?
-      end
-
-      # call-seq:
-      #    attr_decl.doc? -> (true|false)
-      #
-      # Determine whether this attribute declaration is associated with an
-      # XML::Document.
-      def doc?
-        not self.doc.nil?
-      end
-
-      # call-seq:
-      #    attr_decl.next? -> (true|false)
-      #
-      # Determine whether there is a next attribute declaration.
-      def next?
-        not self.next.nil?
-      end
-
-      # call-seq:
-      #    attr_decl.parent? -> (true|false)
-      #
-      # Determine whether this attribute declaration has a parent .
-      def parent?
-        not self.parent.nil?
-      end
-
-      # call-seq:
-      #    attr_decl.prev? -> (true|false)
-      #
-      # Determine whether there is a previous attribute declaration.
-      def prev?
-        not self.prev.nil?
-      end
-
-      # call-seq:
-      #    attr_decl.node_type_name -> 'attribute declaration'
-      #
-      # Returns this attribute declaration's node type name.
-      def node_type_name
-        if node_type == Node::ATTRIBUTE_DECL
-          'attribute declaration'
-        else
-          raise(UnknownType, "Unknown node type: %n", node.node_type);
-        end
-      end
-
-      # call-seq:
-      #    attr_decl.to_s -> string
-      #
-      # Returns a string representation of this attribute declaration.
-      def to_s
-        "#{name} = #{value}"
-      end
-    end
-  end
-end
+# encoding: UTF-8
+
+module LibXML
+  module XML
+    class AttrDecl
+      include Enumerable
+
+      # call-seq:
+      #   attr_decl.child -> nil
+      #
+      # Obtain this attribute declaration's child attribute(s).
+      # It will always be nil.
+      def child
+        nil
+      end
+
+      # call-seq:
+      #    attr_decl.child? -> (true|false)
+      #
+      # Returns whether this attribute declaration has child attributes.
+      #
+      def child?
+        not self.children.nil?
+      end
+
+      # call-seq:
+      #    attr_decl.doc? -> (true|false)
+      #
+      # Determine whether this attribute declaration is associated with an
+      # XML::Document.
+      def doc?
+        not self.doc.nil?
+      end
+
+      # call-seq:
+      #    attr_decl.next? -> (true|false)
+      #
+      # Determine whether there is a next attribute declaration.
+      def next?
+        not self.next.nil?
+      end
+
+      # call-seq:
+      #    attr_decl.parent? -> (true|false)
+      #
+      # Determine whether this attribute declaration has a parent .
+      def parent?
+        not self.parent.nil?
+      end
+
+      # call-seq:
+      #    attr_decl.prev? -> (true|false)
+      #
+      # Determine whether there is a previous attribute declaration.
+      def prev?
+        not self.prev.nil?
+      end
+
+      # call-seq:
+      #    attr_decl.node_type_name -> 'attribute declaration'
+      #
+      # Returns this attribute declaration's node type name.
+      def node_type_name
+        if node_type == Node::ATTRIBUTE_DECL
+          'attribute declaration'
+        else
+          raise(UnknownType, "Unknown node type: %n", node.node_type);
+        end
+      end
+
+      # call-seq:
+      #    attr_decl.to_s -> string
+      #
+      # Returns a string representation of this attribute declaration.
+      def to_s
+        "#{name} = #{value}"
+      end
+    end
+  end
+end

data/lib/libxml/attributes.rb

@@ -1,14 +1,14 @@
-# encoding: UTF-8
-
-module LibXML
-  module XML
-    class Attributes
-      def to_h
-        inject({}) do |hash, attr|
-          hash[attr.name] = attr.value
-          hash
-        end
-      end
-    end
-  end
+# encoding: UTF-8
+
+module LibXML
+  module XML
+    class Attributes
+      def to_h
+        inject({}) do |hash, attr|
+          hash[attr.name] = attr.value
+          hash
+        end
+      end
+    end
+  end
 end