nokogiri 1.3.3 → 1.4.0

data/ext/nokogiri/xml_attr.c

@@ -66,7 +66,7 @@ static VALUE new(int argc, VALUE *argv, VALUE klass)
   NOKOGIRI_ROOT_NODE((xmlNodePtr)node);
 
   VALUE rb_node = Nokogiri_wrap_xml_node(klass, (xmlNodePtr)node);
-  rb_funcall2(rb_node, rb_intern("initialize"), argc, argv);
+  rb_obj_call_init(rb_node, argc, argv);
 
   if(rb_block_given_p()) rb_yield(rb_node);
 

data/ext/nokogiri/xml_attribute_decl.c

@@ -0,0 +1,67 @@
+#include <xml_attribute_decl.h>
+
+/*
+ * call-seq:
+ *  attribute_type
+ *
+ * The attribute_type for this AttributeDecl
+ */
+static VALUE attribute_type(VALUE self)
+{
+  xmlAttributePtr node;
+  Data_Get_Struct(self, xmlAttribute, node);
+  return INT2NUM((long)node->atype);
+}
+
+/*
+ * call-seq:
+ *  default
+ *
+ * The default value
+ */
+static VALUE default_value(VALUE self)
+{
+  xmlAttributePtr node;
+  Data_Get_Struct(self, xmlAttribute, node);
+
+  if(node->defaultValue) return NOKOGIRI_STR_NEW2(node->defaultValue);
+  return Qnil;
+}
+
+/*
+ * call-seq:
+ *  enumeration
+ *
+ * An enumeration of possible values
+ */
+static VALUE enumeration(VALUE self)
+{
+  xmlAttributePtr node;
+  Data_Get_Struct(self, xmlAttribute, node);
+
+  VALUE list = rb_ary_new();
+  xmlEnumerationPtr enm = node->tree;
+
+  while(enm) {
+    rb_ary_push(list, NOKOGIRI_STR_NEW2(enm->name));
+    enm = enm->next;
+  }
+
+  return list;
+}
+
+VALUE cNokogiriXmlAttributeDecl;
+
+void init_xml_attribute_decl()
+{
+  VALUE nokogiri = rb_define_module("Nokogiri");
+  VALUE xml = rb_define_module_under(nokogiri, "XML");
+  VALUE node = rb_define_class_under(xml, "Node", rb_cObject);
+  VALUE klass = rb_define_class_under(xml, "AttributeDecl", node);
+
+  cNokogiriXmlAttributeDecl = klass;
+
+  rb_define_method(klass, "attribute_type", attribute_type, 0);
+  rb_define_method(klass, "default", default_value, 0);
+  rb_define_method(klass, "enumeration", enumeration, 0);
+}

data/ext/nokogiri/xml_attribute_decl.h

@@ -0,0 +1,9 @@
+#ifndef NOKOGIRI_XML_ATTRIBUTE_DECL
+#define NOKOGIRI_XML_ATTRIBUTE_DECL
+
+#include <nokogiri.h>
+
+void init_xml_attribute_decl();
+
+extern VALUE cNokogiriXmlAttributeDecl;
+#endif

data/ext/nokogiri/xml_cdata.c

@@ -4,7 +4,7 @@
  * call-seq:
  *  new(document, content)
  *
- * Create a new CData element on the +document+ with +content+
+ * Create a new CDATA element on the +document+ with +content+
  */
 static VALUE new(int argc, VALUE *argv, VALUE klass)
 {
@@ -19,14 +19,14 @@ static VALUE new(int argc, VALUE *argv, VALUE klass)
 
   xmlNodePtr node = xmlNewCDataBlock(
       xml_doc->doc,
-      Qnil == content ? NULL : (const xmlChar *)StringValuePtr(content),
-      Qnil == content ? 0 : RSTRING_LEN(content)
+      NIL_P(content) ? NULL : (const xmlChar *)StringValuePtr(content),
+      NIL_P(content) ? 0 : (int)RSTRING_LEN(content)
   );
 
   NOKOGIRI_ROOT_NODE(node);
 
   VALUE rb_node = Nokogiri_wrap_xml_node(klass, node);
-  rb_funcall2(rb_node, rb_intern("initialize"), argc, argv);
+  rb_obj_call_init(rb_node, argc, argv);
 
   if(rb_block_given_p()) rb_yield(rb_node);
 
@@ -39,7 +39,8 @@ void init_xml_cdata()
   VALUE nokogiri = rb_define_module("Nokogiri");
   VALUE xml = rb_define_module_under(nokogiri, "XML");
   VALUE node = rb_define_class_under(xml, "Node", rb_cObject);
-  VALUE text = rb_define_class_under(xml, "Text", node);
+  VALUE char_data = rb_define_class_under(xml, "CharacterData", node);
+  VALUE text = rb_define_class_under(xml, "Text", char_data);
 
   /*
    * CData represents a CData node in an xml document.

data/ext/nokogiri/xml_comment.c

@@ -23,7 +23,7 @@ static VALUE new(int argc, VALUE *argv, VALUE klass)
   );
 
   VALUE rb_node = Nokogiri_wrap_xml_node(klass, node);
-  rb_funcall2(rb_node, rb_intern("initialize"), argc, argv);
+  rb_obj_call_init(rb_node, argc, argv);
 
   NOKOGIRI_ROOT_NODE(node);
 
@@ -38,11 +38,12 @@ void init_xml_comment()
   VALUE nokogiri = rb_define_module("Nokogiri");
   VALUE xml = rb_define_module_under(nokogiri, "XML");
   VALUE node = rb_define_class_under(xml, "Node", rb_cObject);
+  VALUE char_data = rb_define_class_under(xml, "CharacterData", node);
 
   /*
    * Comment represents a comment node in an xml document.
    */
-  VALUE klass = rb_define_class_under(xml, "Comment", node);
+  VALUE klass = rb_define_class_under(xml, "Comment", char_data);
 
 
   cNokogiriXmlComment = klass;

data/ext/nokogiri/xml_document.c

@@ -34,6 +34,16 @@ static void dealloc(xmlDocPtr doc)
   NOKOGIRI_DEBUG_END(doc);
 }
 
+static void recursively_remove_namespaces_from_node(xmlNodePtr node)
+{
+  xmlNodePtr child ;
+
+  xmlSetNs(node, NULL);
+
+  for (child = node->children ; child ; child = child->next)
+    recursively_remove_namespaces_from_node(child);
+}
+
 /*
  * call-seq:
  *  url
@@ -45,8 +55,7 @@ static VALUE url(VALUE self)
   xmlDocPtr doc;
   Data_Get_Struct(self, xmlDoc, doc);
 
-  if(doc->URL)
-    return NOKOGIRI_STR_NEW2(doc->URL, doc->encoding);
+  if(doc->URL) return NOKOGIRI_STR_NEW2(doc->URL);
 
   return Qnil;
 }
@@ -126,7 +135,22 @@ static VALUE encoding(VALUE self)
   Data_Get_Struct(self, xmlDoc, doc);
 
   if(!doc->encoding) return Qnil;
-  return NOKOGIRI_STR_NEW2(doc->encoding, doc->encoding);
+  return NOKOGIRI_STR_NEW2(doc->encoding);
+}
+
+/*
+ * call-seq:
+ *  version
+ *
+ * Get the XML version for this Document
+ */
+static VALUE version(VALUE self)
+{
+  xmlDocPtr doc;
+  Data_Get_Struct(self, xmlDoc, doc);
+
+  if(!doc->version) return Qnil;
+  return NOKOGIRI_STR_NEW2(doc->version);
 }
 
 /*
@@ -141,8 +165,8 @@ static VALUE read_io( VALUE klass,
                       VALUE encoding,
                       VALUE options )
 {
-  const char * c_url    = (url == Qnil) ? NULL : StringValuePtr(url);
-  const char * c_enc    = (encoding == Qnil) ? NULL : StringValuePtr(encoding);
+  const char * c_url    = NIL_P(url)      ? NULL : StringValuePtr(url);
+  const char * c_enc    = NIL_P(encoding) ? NULL : StringValuePtr(encoding);
   VALUE error_list      = rb_ary_new();
 
   xmlResetLastError();
@@ -154,7 +178,7 @@ static VALUE read_io( VALUE klass,
       (void *)io,
       c_url,
       c_enc,
-      NUM2INT(options)
+      (int)NUM2INT(options)
   );
   xmlSetStructuredErrorFunc(NULL, NULL);
 
@@ -163,9 +187,7 @@ static VALUE read_io( VALUE klass,
 
     xmlErrorPtr error = xmlGetLastError();
     if(error)
-      rb_funcall(rb_mKernel, rb_intern("raise"), 1,
-          Nokogiri_wrap_xml_syntax_error((VALUE)NULL, error)
-      );
+      rb_exc_raise(Nokogiri_wrap_xml_syntax_error((VALUE)NULL, error));
     else
       rb_raise(rb_eRuntimeError, "Could not parse document");
 
@@ -173,7 +195,7 @@ static VALUE read_io( VALUE klass,
   }
 
   VALUE document = Nokogiri_wrap_xml_document(klass, doc);
-  rb_funcall(document, rb_intern("errors="), 1, error_list);
+  rb_iv_set(document, "@errors", error_list);
   return document;
 }
 
@@ -190,14 +212,14 @@ static VALUE read_memory( VALUE klass,
                           VALUE options )
 {
   const char * c_buffer = StringValuePtr(string);
-  const char * c_url    = (url == Qnil) ? NULL : StringValuePtr(url);
-  const char * c_enc    = (encoding == Qnil) ? NULL : StringValuePtr(encoding);
+  const char * c_url    = NIL_P(url)      ? NULL : StringValuePtr(url);
+  const char * c_enc    = NIL_P(encoding) ? NULL : StringValuePtr(encoding);
   int len               = RSTRING_LEN(string);
   VALUE error_list      = rb_ary_new();
 
   xmlResetLastError();
   xmlSetStructuredErrorFunc((void *)error_list, Nokogiri_error_array_pusher);
-  xmlDocPtr doc = xmlReadMemory(c_buffer, len, c_url, c_enc, NUM2INT(options));
+  xmlDocPtr doc = xmlReadMemory(c_buffer, len, c_url, c_enc, (int)NUM2INT(options));
   xmlSetStructuredErrorFunc(NULL, NULL);
 
   if(doc == NULL) {
@@ -205,9 +227,7 @@ static VALUE read_memory( VALUE klass,
 
     xmlErrorPtr error = xmlGetLastError();
     if(error)
-      rb_funcall(rb_mKernel, rb_intern("raise"), 1,
-          Nokogiri_wrap_xml_syntax_error((VALUE)NULL, error)
-      );
+      rb_exc_raise(Nokogiri_wrap_xml_syntax_error((VALUE)NULL, error));
     else
       rb_raise(rb_eRuntimeError, "Could not parse document");
 
@@ -215,7 +235,7 @@ static VALUE read_memory( VALUE klass,
   }
 
   VALUE document = Nokogiri_wrap_xml_document(klass, doc);
-  rb_funcall(document, rb_intern("errors="), 1, error_list);
+  rb_iv_set(document, "@errors", error_list);
   return document;
 }
 
@@ -231,12 +251,12 @@ static VALUE duplicate_node(int argc, VALUE *argv, VALUE self)
   VALUE level;
 
   if(rb_scan_args(argc, argv, "01", &level) == 0)
-    level = INT2NUM(1);
+    level = INT2NUM((long)1);
 
   xmlDocPtr doc, dup;
   Data_Get_Struct(self, xmlDoc, doc);
 
-  dup = xmlCopyDoc(doc, NUM2INT(level));
+  dup = xmlCopyDoc(doc, (int)NUM2INT(level));
   if(dup == NULL) return Qnil;
 
   dup->type = doc->type;
@@ -254,17 +274,64 @@ static VALUE new(int argc, VALUE *argv, VALUE klass)
   VALUE version, rest, rb_doc ;
 
   rb_scan_args(argc, argv, "0*", &rest);
-  version = rb_ary_entry(rest, 0);
-  if (version == Qnil) {
+  version = rb_ary_entry(rest, (long)0);
+  if (NIL_P(Qnil)) {
     version = rb_str_new2("1.0");
   }
 
   xmlDocPtr doc = xmlNewDoc((xmlChar *)StringValuePtr(version));
   rb_doc = Nokogiri_wrap_xml_document(klass, doc);
-  rb_funcall2(rb_doc, rb_intern("initialize"), argc, argv);
+  rb_obj_call_init(rb_doc, argc, argv);
   return rb_doc ;
 }
 
+/*
+ *  call-seq:
+ *    remove_namespaces!
+ *
+ *  Remove all namespaces from all nodes in the document.
+ *
+ *  This could be useful for developers who either don't understand namespaces
+ *  or don't care about them.
+ *
+ *  The following example shows a use case, and you can decide for yourself
+ *  whether this is a good thing or not:
+ *
+ *    doc = Nokogiri::XML <<-EOXML
+ *       <root>
+ *         <car xmlns:part="http://general-motors.com/">
+ *           <part:tire>Michelin Model XGV</part:tire>
+ *         </car>
+ *         <bicycle xmlns:part="http://schwinn.com/">
+ *           <part:tire>I'm a bicycle tire!</part:tire>
+ *         </bicycle>
+ *       </root>
+ *       EOXML
+ *    
+ *    doc.xpath("//tire").to_s # => ""
+ *    doc.xpath("//part:tire", "part" => "http://general-motors.com/").to_s # => "<part:tire>Michelin Model XGV</part:tire>"
+ *    doc.xpath("//part:tire", "part" => "http://schwinn.com/").to_s # => "<part:tire>I'm a bicycle tire!</part:tire>"
+ *    
+ *    doc.remove_namespaces!
+ *    
+ *    doc.xpath("//tire").to_s # => "<tire>Michelin Model XGV</tire><tire>I'm a bicycle tire!</tire>"
+ *    doc.xpath("//part:tire", "part" => "http://general-motors.com/").to_s # => ""
+ *    doc.xpath("//part:tire", "part" => "http://schwinn.com/").to_s # => ""
+ *
+ *  For more information on why this probably is *not* a good thing in general,
+ *  please direct your browser to
+ *  http://tenderlovemaking.com/2009/04/23/namespaces-in-xml/
+ */
+VALUE remove_namespaces_bang(VALUE self)
+{
+  xmlDocPtr doc ;
+  Data_Get_Struct(self, xmlDoc, doc);
+
+  recursively_remove_namespaces_from_node(doc);
+  return self;
+}
+
+
 VALUE cNokogiriXmlDocument ;
 void init_xml_document()
 {
@@ -287,8 +354,10 @@ void init_xml_document()
   rb_define_method(klass, "root=", set_root, 1);
   rb_define_method(klass, "encoding", encoding, 0);
   rb_define_method(klass, "encoding=", set_encoding, 1);
+  rb_define_method(klass, "version", version, 0);
   rb_define_method(klass, "dup", duplicate_node, -1);
   rb_define_method(klass, "url", url, 0);
+  rb_define_method(klass, "remove_namespaces!", remove_namespaces_bang, 0);
 }
 
 
@@ -307,12 +376,13 @@ VALUE Nokogiri_wrap_xml_document(VALUE klass, xmlDocPtr doc)
   VALUE cache = rb_ary_new();
   rb_iv_set(rb_doc, "@decorators", Qnil);
   rb_iv_set(rb_doc, "@node_cache", cache);
-  rb_funcall(rb_doc, rb_intern("initialize"), 0);
 
   tuple->doc = (void *)rb_doc;
   tuple->unlinkedNodes = st_init_numtable_with_size(128);
   tuple->node_cache = cache;
   doc->_private = tuple ;
 
+  rb_obj_call_init(rb_doc, 0, NULL);
+
   return rb_doc ;
 }

data/ext/nokogiri/xml_document_fragment.c

@@ -17,13 +17,11 @@ static VALUE new(int argc, VALUE *argv, VALUE klass)
   Data_Get_Struct(document, xmlDoc, xml_doc);
 
   xmlNodePtr node = xmlNewDocFragment(xml_doc->doc);
-  if(node->doc->children)
-    node->ns = node->doc->children->ns;
 
   NOKOGIRI_ROOT_NODE(node);
 
   VALUE rb_node = Nokogiri_wrap_xml_node(klass, node);
-  rb_funcall2(rb_node, rb_intern("initialize"), argc, argv);
+  rb_obj_call_init(rb_node, argc, argv);
 
   if(rb_block_given_p()) rb_yield(rb_node);
 

data/ext/nokogiri/xml_dtd.c

@@ -7,12 +7,14 @@ static void notation_copier(void *payload, void *data, xmlChar *name)
 
   xmlNotationPtr c_notation = (xmlNotationPtr)payload;
 
-  VALUE notation = rb_funcall(klass, rb_intern("new"), 3,
-      c_notation->name ? NOKOGIRI_STR_NEW2(c_notation->name, "UTF-8") : Qnil,
-      c_notation->PublicID ? NOKOGIRI_STR_NEW2(c_notation->PublicID, "UTF-8") : Qnil,
-      c_notation->SystemID ? NOKOGIRI_STR_NEW2(c_notation->SystemID, "UTF-8") : Qnil);
+  VALUE argv[3];
+  argv[0] = (c_notation->name ? NOKOGIRI_STR_NEW2(c_notation->name) : Qnil);
+  argv[1] = (c_notation->PublicID ? NOKOGIRI_STR_NEW2(c_notation->PublicID) : Qnil);
+  argv[2] = (c_notation->SystemID ? NOKOGIRI_STR_NEW2(c_notation->SystemID) : Qnil);
 
-  rb_hash_aset(hash, NOKOGIRI_STR_NEW2(name, "UTF-8"),notation);
+  VALUE notation = rb_class_new_instance(3, argv, klass);
+
+  rb_hash_aset(hash, NOKOGIRI_STR_NEW2(name),notation);
 }
 
 static void element_copier(void *_payload, void *data, xmlChar *name)
@@ -22,7 +24,7 @@ static void element_copier(void *_payload, void *data, xmlChar *name)
 
   VALUE element = Nokogiri_wrap_xml_node(Qnil, payload);
 
-  rb_hash_aset(hash, NOKOGIRI_STR_NEW2(name, payload->doc->encoding), element);
+  rb_hash_aset(hash, NOKOGIRI_STR_NEW2(name), element);
 }
 
 /*
@@ -65,6 +67,26 @@ static VALUE notations(VALUE self)
   return hash;
 }
 
+/*
+ * call-seq:
+ *   attributes
+ *
+ * Get a hash of the attributes for this DTD.
+ */
+static VALUE attributes(VALUE self)
+{
+  xmlDtdPtr dtd;
+  Data_Get_Struct(self, xmlDtd, dtd);
+
+  if(!dtd->attributes) return Qnil;
+
+  VALUE hash = rb_hash_new();
+
+  xmlHashScan((xmlHashTablePtr)dtd->attributes, element_copier, (void *)hash);
+
+  return hash;
+}
+
 /*
  * call-seq:
  *   elements
@@ -113,6 +135,38 @@ static VALUE validate(VALUE self, VALUE document)
   return error_list;
 }
 
+/*
+ * call-seq:
+ *   system_id
+ *
+ * Get the System ID for this DTD
+ */
+static VALUE system_id(VALUE self)
+{
+  xmlDtdPtr dtd;
+  Data_Get_Struct(self, xmlDtd, dtd);
+
+  if(!dtd->SystemID) return Qnil;
+
+  return NOKOGIRI_STR_NEW2(dtd->SystemID);
+}
+
+/*
+ * call-seq:
+ *   external_id
+ *
+ * Get the External ID for this DTD
+ */
+static VALUE external_id(VALUE self)
+{
+  xmlDtdPtr dtd;
+  Data_Get_Struct(self, xmlDtd, dtd);
+
+  if(!dtd->ExternalID) return Qnil;
+
+  return NOKOGIRI_STR_NEW2(dtd->ExternalID);
+}
+
 VALUE cNokogiriXmlDtd;
 
 void init_xml_dtd()
@@ -132,4 +186,7 @@ void init_xml_dtd()
   rb_define_method(klass, "elements", elements, 0);
   rb_define_method(klass, "entities", entities, 0);
   rb_define_method(klass, "validate", validate, 1);
+  rb_define_method(klass, "attributes", attributes, 0);
+  rb_define_method(klass, "system_id", system_id, 0);
+  rb_define_method(klass, "external_id", external_id, 0);
 }