libxml-ruby 0.3.6 → 0.3.8

data/ext/xml/ruby_xml_sax_parser.h

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_sax_parser.h,v 1.1 2006/02/21 20:40:16 roscopeco Exp $ */
+/* $Id: ruby_xml_sax_parser.h,v 1.2 2006/04/14 14:45:52 roscopeco Exp $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -7,9 +7,40 @@
 
 extern VALUE cXMLSaxParser;
 
+typedef struct ruby_xml_sax_parser_callbacks {
+    VALUE internalSubset;
+    VALUE isStandalone;
+    VALUE hasInternalSubset;
+    VALUE hasExternalSubset;
+    VALUE resolveEntity;
+    VALUE getEntity;
+    VALUE entityDecl;
+    VALUE notationDecl;
+    VALUE attributeDecl;
+    VALUE elementDecl;
+    VALUE unparsedEntityDecl;
+    VALUE setDocumentLocator;
+    VALUE startDocument;
+    VALUE endDocument;
+    VALUE startElement;
+    VALUE endElement;
+    VALUE reference;
+    VALUE characters;
+    VALUE ignorableWhitespace;
+    VALUE processingInstruction;
+    VALUE comment;
+    VALUE xmlParserWarning;
+    VALUE xmlParserError;
+    VALUE xmlParserFatalError;
+    VALUE getParameterEntity;
+    VALUE cdataBlock;
+    VALUE externalSubset;  
+} ruby_xml_sax_parser_callbacks;
+
 typedef struct ruby_xml_sax_parser {
   xmlParserCtxtPtr xpc;
   xmlSAXHandlerPtr xsh;
+  ruby_xml_sax_parser_callbacks *cbp;
   VALUE filename;
   VALUE str;
 } ruby_xml_sax_parser;

data/ext/xml/ruby_xml_schema.c

@@ -20,7 +20,7 @@ ruby_xml_schema_free(ruby_xml_schema *rxschema) {
 
 /*
  * call-seq:
- *    XML::Scheme.new(schema_uri) => schema
+ *    XML::Schema.new(schema_uri) => schema
  * 
  * Create a new schema from the specified URI.
  */

data/ext/xml/ruby_xml_schema.h

@@ -4,7 +4,7 @@
 #include <libxml/schemasInternals.h>
 #include <libxml/xmlschemas.h>
 
-extern VALUE cXMLDtd;
+extern VALUE cXMLSchema;
 
 typedef struct rxp_schema {
   xmlSchemaPtr schema;   /* Schema interface */

data/ext/xml/ruby_xml_xpath.c

@@ -1,10 +1,15 @@
-/* $Id: ruby_xml_xpath.c,v 1.1 2006/02/21 20:40:16 roscopeco Exp $ */
+/* $Id: ruby_xml_xpath.c,v 1.2 2006/04/14 14:45:25 roscopeco Exp $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
 #include "libxml.h"
 #include "ruby_xml_xpath.h"
 
+/*
+ * Document-class: XML::XPath
+ * 
+ * Includes Enumerable.
+ */
 VALUE cXMLXPath;
 VALUE eXMLXPathInvalidPath;
 
@@ -330,6 +335,7 @@ ruby_xml_xpath_string(VALUE self) {
 void
 ruby_init_xml_xpath(void) {
   cXMLXPath = rb_define_class_under(mXML, "XPath", rb_cObject);
+  rb_include_module(cXMLNode, rb_const_get(rb_cObject, rb_intern("Enumerable")));
 
   eXMLXPathInvalidPath = rb_define_class_under(cXMLXPath,
 					       "InvalidPath", rb_eException);

data/ext/xml/ruby_xml_xpath_context.c

@@ -1,10 +1,11 @@
-/* $Id: ruby_xml_xpath_context.c,v 1.1 2006/02/21 20:40:16 roscopeco Exp $ */
+/* $Id: ruby_xml_xpath_context.c,v 1.2 2006/02/27 12:55:32 roscopeco Exp $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
 #include "libxml.h"
 #include "ruby_xml_xpath_context.h"
 
+VALUE cXMLXPathContext;
 
 /*
  * call-seq:

data/ext/xml/ruby_xml_xpath_context.h

@@ -1,11 +1,11 @@
-/* $Id: ruby_xml_xpath_context.h,v 1.1 2006/02/21 20:40:16 roscopeco Exp $ */
+/* $Id: ruby_xml_xpath_context.h,v 1.2 2006/02/27 12:55:32 roscopeco Exp $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
 #ifndef __RUBY_XML_XPATH_CONTEXT__
 #define __RUBY_XML_XPATH_CONTEXT__
 
-VALUE cXMLXPathContext;
+extern VALUE cXMLXPathContext;
 
 typedef struct ruby_xml_xpath_context {
   VALUE xd;

data/ext/xml/ruby_xml_xpointer_context.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_xpointer_context.c,v 1.1 2006/02/21 20:40:16 roscopeco Exp $ */
+/* $Id: ruby_xml_xpointer_context.c,v 1.2 2006/02/27 12:55:32 roscopeco Exp $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -6,7 +6,6 @@
 #include "ruby_xml_xpointer_context.h"
 
 VALUE cXMLXPointerContext;
-VALUE eXMLXPointehContextInvalidPath;
 VALUE eXMLXPointerContextInvalidPath;
 
 // Rdoc needs to know 

data/ext/xml/sax_parser_callbacks.inc

@@ -0,0 +1,202 @@
+/* $Id: sax_parser_callbacks.inc,v 1.1 2006/04/14 14:50:58 roscopeco Exp $ */
+
+/* Please see the LICENSE file for copyright and distribution information */
+
+/*
+ * SAX CALLBACK HANDLERS
+ */ 
+static void internal_subset_func(ruby_xml_sax_parser_callbacks *cbp, 
+       const char *name,
+       const char *extid,
+       const char *sysid) {
+  VALUE handler = cbp->internalSubset;
+  
+  if (handler && handler != Qnil) {
+    rb_funcall(handler, callsym, 3, rb_str_new2(name),
+        rb_str_new2(extid), rb_str_new2(sysid));
+  }    
+}
+
+static void is_standalone_func(ruby_xml_sax_parser_callbacks *cbp) {
+  VALUE handler = cbp->isStandalone;
+  
+  if (handler && handler != Qnil) {
+    rb_funcall(handler,callsym,0);
+  }    
+}
+
+static void has_internal_subset_func(ruby_xml_sax_parser_callbacks *cbp) {
+  VALUE handler = cbp->hasInternalSubset;
+  
+  if (handler && handler != Qnil) {
+    rb_funcall(handler,callsym,0);
+  }    
+}
+
+static void has_external_subset_func(ruby_xml_sax_parser_callbacks *cbp) {
+  VALUE handler = cbp->hasExternalSubset;
+  
+  if (handler && handler != Qnil) {
+    rb_funcall(handler,callsym,0);
+  }    
+}
+
+static void start_document_func(ruby_xml_sax_parser_callbacks *cbp) {
+  VALUE handler = cbp->startDocument;
+  
+  if (handler && handler != Qnil) {
+    rb_funcall(handler,callsym,0);
+  }    
+}
+
+static void end_document_func(ruby_xml_sax_parser_callbacks *cbp) {
+  VALUE handler = cbp->endDocument;
+  
+  if (handler && handler != Qnil) {
+    rb_funcall(handler,callsym,0);
+  }    
+}
+
+static void start_element_func(ruby_xml_sax_parser_callbacks *cbp, 
+       const char *name, const char **attrs) {  
+  VALUE handler = cbp->startElement;
+  VALUE ahsh = rb_hash_new();
+  const char *attr, *value;
+  
+  if (attrs) {
+    while ((attr = *(attrs++))) {
+      value = *(attrs++);            
+      rb_hash_aset(ahsh, rb_str_new2(attr), rb_str_new2(value));
+    }
+  }    
+  
+  if (handler && handler != Qnil) {
+    rb_funcall(handler,callsym,2,rb_str_new2(name),ahsh);
+  }    
+}        
+
+static void end_element_func(ruby_xml_sax_parser_callbacks *cbp, 
+       const char *name) {
+  VALUE handler = cbp->endElement;
+  
+  if (handler && handler != Qnil) {
+    rb_funcall(handler,callsym,1,rb_str_new2(name));
+  }    
+}
+
+static void reference_func(ruby_xml_sax_parser_callbacks *cbp, 
+       const char *name) {
+  VALUE handler = cbp->reference;
+  
+  if (handler && handler != Qnil) {
+    rb_funcall(handler,callsym,1,rb_str_new2(name));
+  }    
+}
+
+static void characters_func(ruby_xml_sax_parser_callbacks *cbp, 
+       const char *chars, int len) {
+  VALUE handler = cbp->characters;
+  
+  if (handler && handler != Qnil) {
+    rb_funcall(handler,callsym,1,rb_str_new(chars, len));
+  }    
+}
+
+static void processing_instruction_func(ruby_xml_sax_parser_callbacks *cbp, 
+       const char *target, const char *data) {
+  VALUE handler = cbp->processingInstruction;
+  
+  if (handler && handler != Qnil) {
+    rb_funcall(handler, callsym, 2,
+        rb_str_new2(target),rb_str_new2(data));
+  }    
+}
+
+static void comment_func(ruby_xml_sax_parser_callbacks *cbp, 
+       const char *msg) {
+  VALUE handler = cbp->comment;
+  
+  if (handler && handler != Qnil) {
+    rb_funcall(handler,callsym,1,rb_str_new2(msg));
+  }    
+}
+
+// TODO these next three should actually be formatting messages.
+static void warning_func(ruby_xml_sax_parser_callbacks *cbp, 
+       const char *msg, ...) {
+  VALUE handler = cbp->xmlParserWarning;
+  
+  if (handler && handler != Qnil) {
+    rb_funcall(handler,callsym,1,rb_str_new2(msg));
+  }    
+}
+
+static void error_func(ruby_xml_sax_parser_callbacks *cbp, 
+       const char *msg, ...) {
+  VALUE handler = cbp->xmlParserError;
+  
+  if (handler && handler != Qnil) {
+    rb_funcall(handler,callsym,1,rb_str_new2(msg));
+  }    
+}
+
+static void fatal_error_func(ruby_xml_sax_parser_callbacks *cbp, 
+       const char *msg, ...) {
+  VALUE handler = cbp->xmlParserFatalError;
+  
+  if (handler && handler != Qnil) {
+    rb_funcall(handler,callsym,1,rb_str_new2(msg));
+  }    
+}
+
+static void cdata_block_func(ruby_xml_sax_parser_callbacks *cbp, 
+       const char *value, int len) {
+  VALUE handler = cbp->cdataBlock;
+  
+  if (handler && handler != Qnil) {
+    rb_funcall(handler,callsym,1,rb_str_new(value, len));
+  }    
+}
+
+static void external_subset_func(ruby_xml_sax_parser_callbacks *cbp, 
+       const char *name,
+       const char *extid,
+       const char *sysid) {
+  VALUE handler = cbp->externalSubset;
+  
+  if (handler && handler != Qnil) {
+    rb_funcall(handler, callsym, 3, rb_str_new2(name),
+        rb_str_new2(extid), rb_str_new2(sysid));
+  }    
+}
+
+static xmlSAXHandler rubySAXHandlerStruct = {
+  (internalSubsetSAXFunc)internal_subset_func,
+  (isStandaloneSAXFunc)is_standalone_func,
+  (hasInternalSubsetSAXFunc)has_internal_subset_func,
+  (hasExternalSubsetSAXFunc)has_external_subset_func,
+  0, /* resolveEntity */
+  0, /* getEntity */
+  0, /* entityDecl */
+  0, /* notationDecl */
+  0, /* attributeDecl */
+  0, /* elementDecl */
+  0, /* unparsedEntityDecl */
+  0, /* setDocumentLocator */
+  (startDocumentSAXFunc)start_document_func, 
+  (endDocumentSAXFunc)end_document_func, 
+  (startElementSAXFunc)start_element_func, 
+  (endElementSAXFunc)end_element_func, 
+  (referenceSAXFunc)reference_func,
+  (charactersSAXFunc)characters_func,
+  0, /* ignorableWhitespace */
+  (processingInstructionSAXFunc)processing_instruction_func,
+  (commentSAXFunc)comment_func,
+  (warningSAXFunc)warning_func,
+  (errorSAXFunc)error_func,
+  (fatalErrorSAXFunc)fatal_error_func,
+  0, /* xmlGetParameterEntity */
+  (cdataBlockSAXFunc)cdata_block_func,
+  (externalSubsetSAXFunc)external_subset_func,
+  1
+};

data/tests/copy_bug.rb

@@ -1,6 +1,5 @@
 #!/usr/bin/ruby -w -I.
-
-require "#{File.dirname(__FILE__)}/../ext/xml/libxml" unless defined?(XML)
+require "libxml_test"
 
 def test( doc2 )
   doc = XML::Document.new('1.0')

data/tests/dtd-test.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../ext/xml/libxml" unless defined?(XML)
+require "libxml_test"
 
 xp = XML::Parser.new
 xp.string = '<?xml version="1.0" encoding="utf-8"?>

data/tests/libxml_test.rb

@@ -0,0 +1,2 @@
+$LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../ext")
+require "xml/libxml_so" unless defined?(XML)

data/tests/model/saxtest.xml

@@ -0,0 +1,5 @@
+<test uga="booga" foo="bar"><fixnum>one</fixnum><fixnum>two</fixnum>
+  <!-- msg -->
+  <?custom foo="bar"?>
+  <![CDATA[here it goes]]>
+</test>

data/tests/runner.rb

@@ -1,13 +1,11 @@
 #!/usr/bin/env ruby
 #
 # Allsuite for Eclipse and GEM.
+$LOAD_PATH.unshift File.dirname(__FILE__)
+require "libxml_test"
 
 ALL_TESTS = true
 TESTS = File.expand_path(File.dirname(__FILE__))
-HOME = File.expand_path(File.join(TESTS,'../ext/xml'))
-
-#$LOAD_PATH.unshift(HOME)
-require "#{HOME}/libxml"
 
 glob = File.join(TESTS, ENV['TESTS'] || 'tc_*.rb')
 Dir[glob].each { |fn| require fn }

data/tests/schema-test.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../ext/xml/libxml" unless defined?(XML)
+require "libxml_test"
 
 xp = XML::Parser.new
 xp.string = '<?xml version="1.0" encoding="utf-8"?>

data/tests/tc_xml_document.rb

@@ -1,6 +1,6 @@
-# $Id: tc_xml_document.rb,v 1.2 2006/02/21 20:40:16 roscopeco Exp $
+# $Id: tc_xml_document.rb,v 1.3 2006/04/17 13:30:20 roscopeco Exp $
 require 'test/unit'
-require "#{File.dirname(__FILE__)}/../ext/xml/libxml" unless defined?(XML)
+require "libxml_test"
 
 class TC_XML_Document < Test::Unit::TestCase
   def setup()

data/tests/tc_xml_document_write.rb

@@ -1,5 +1,5 @@
-# $Id: tc_xml_document_write.rb,v 1.2 2006/02/21 20:40:16 roscopeco Exp $
-require "#{File.dirname(__FILE__)}/../ext/xml/libxml" unless defined?(XML)
+# $Id: tc_xml_document_write.rb,v 1.3 2006/04/17 13:30:19 roscopeco Exp $
+require "libxml_test"
 require 'test/unit'
 
 class TC_XML_Document_Write < Test::Unit::TestCase

data/tests/tc_xml_document_write2.rb

@@ -1,5 +1,5 @@
-# $Id: tc_xml_document_write2.rb,v 1.2 2006/02/21 20:40:16 roscopeco Exp $
-require "#{File.dirname(__FILE__)}/../ext/xml/libxml" unless defined?(XML)
+# $Id: tc_xml_document_write2.rb,v 1.3 2006/04/17 13:30:18 roscopeco Exp $
+require "libxml_test"
 require 'test/unit'
 
 class TC_XML_Document_Write2 < Test::Unit::TestCase

data/tests/tc_xml_document_write3.rb

@@ -1,5 +1,5 @@
-# $Id: tc_xml_document_write3.rb,v 1.2 2006/02/21 20:40:16 roscopeco Exp $
-require "#{File.dirname(__FILE__)}/../ext/xml/libxml" unless defined?(XML)
+# $Id: tc_xml_document_write3.rb,v 1.3 2006/04/17 13:30:22 roscopeco Exp $
+require "libxml_test"
 require 'test/unit'
 
 class TC_XML_Document_Write3 < Test::Unit::TestCase

data/tests/tc_xml_node.rb

@@ -1,5 +1,5 @@
-# $Id: tc_xml_node.rb,v 1.2 2006/02/21 20:40:16 roscopeco Exp $
-require "#{File.dirname(__FILE__)}/../ext/xml/libxml" unless defined?(XML)
+# $Id: tc_xml_node.rb,v 1.3 2006/04/17 13:30:19 roscopeco Exp $
+require "libxml_test"
 require 'test/unit'
 
 class TC_XML_Node < Test::Unit::TestCase

data/tests/tc_xml_node2.rb

@@ -1,5 +1,5 @@
-# $Id: tc_xml_node2.rb,v 1.2 2006/02/21 20:40:16 roscopeco Exp $
-require "#{File.dirname(__FILE__)}/../ext/xml/libxml" unless defined?(XML)
+# $Id: tc_xml_node2.rb,v 1.3 2006/04/17 13:30:19 roscopeco Exp $
+require "libxml_test"
 require 'test/unit'
 
 class TC_XML_Node2 < Test::Unit::TestCase

data/tests/tc_xml_node3.rb

@@ -0,0 +1,28 @@
+# $Id: tc_xml_node3.rb,v 1.2 2006/04/17 13:30:22 roscopeco Exp $
+require "libxml_test"
+require 'test/unit'
+
+class TC_XML_Node2 < Test::Unit::TestCase
+  def setup()
+    xp = XML::Parser.new()
+    str = '<ruby_array uga="booga" foo="bar"><fixnum>one</fixnum><fixnum>two</fixnum></ruby_array>'
+    assert_equal(str, xp.string = str)
+    doc = xp.parse
+    assert_instance_of(XML::Document, doc)
+    assert_instance_of(XML::Node, doc.root)
+    @root = doc.root
+    assert_instance_of(XML::Node, @root)
+  end
+
+  def teardown()
+    @root = nil
+  end
+
+  def test_xml_node_doc_content()
+    assert_equal 'onetwo', @root.content
+    first = @root.child
+    
+    assert_equal 'one', first.content
+    assert_equal 'two', first.next.content
+  end
+end