nokogiri 1.4.1 → 1.4.2

data/ext/nokogiri/xml_document.c

@@ -6,6 +6,9 @@ static int dealloc_node_i(xmlNodePtr key, xmlNodePtr node, xmlDocPtr doc)
   case XML_ATTRIBUTE_NODE:
     xmlFreePropList((xmlAttrPtr)node);
     break;
+  case XML_NAMESPACE_DECL:
+    xmlFree(node);
+    break;
   default:
     if(node->parent == NULL) {
       xmlAddChild((xmlNodePtr)doc, node);
@@ -16,11 +19,13 @@ static int dealloc_node_i(xmlNodePtr key, xmlNodePtr node, xmlDocPtr doc)
 
 static void dealloc(xmlDocPtr doc)
 {
-  NOKOGIRI_DEBUG_START(doc);
+  xmlDeregisterNodeFunc func;
+  st_table *node_hash;
 
-  st_table *node_hash = DOC_UNLINKED_NODE_HASH(doc);
+  NOKOGIRI_DEBUG_START(doc);
+  func = xmlDeregisterNodeDefault(NULL);
 
-  xmlDeregisterNodeFunc func = xmlDeregisterNodeDefault(NULL);
+  node_hash  = DOC_UNLINKED_NODE_HASH(doc);
 
   st_foreach(node_hash, dealloc_node_i, (st_data_t)doc);
   st_free_table(node_hash);
@@ -30,7 +35,6 @@ static void dealloc(xmlDocPtr doc)
   xmlFreeDoc(doc);
 
   xmlDeregisterNodeDefault(func);
-
   NOKOGIRI_DEBUG_END(doc);
 }
 
@@ -70,11 +74,25 @@ static VALUE set_root(VALUE self, VALUE root)
 {
   xmlDocPtr doc;
   xmlNodePtr new_root;
+  xmlNodePtr old_root;
 
   Data_Get_Struct(self, xmlDoc, doc);
+
+  old_root = NULL;
+
+  if(NIL_P(root)) {
+    old_root = xmlDocGetRootElement(doc);
+
+    if(old_root) {
+      xmlUnlinkNode(old_root);
+      NOKOGIRI_ROOT_NODE(old_root);
+    }
+
+    return root;
+  }
+
   Data_Get_Struct(root, xmlNode, new_root);
 
-  xmlNodePtr old_root = NULL;
 
   /* If the new root's document is not the same as the current document,
    * then we need to dup the node in to this document. */
@@ -99,9 +117,11 @@ static VALUE set_root(VALUE self, VALUE root)
 static VALUE root(VALUE self)
 {
   xmlDocPtr doc;
+  xmlNodePtr root;
+
   Data_Get_Struct(self, xmlDoc, doc);
 
-  xmlNodePtr root = xmlDocGetRootElement(doc);
+  root = xmlDocGetRootElement(doc);
 
   if(!root) return Qnil;
   return Nokogiri_wrap_xml_node(Qnil, root) ;
@@ -168,11 +188,13 @@ static VALUE read_io( VALUE klass,
   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();
+  VALUE document;
+  xmlDocPtr doc;
 
   xmlResetLastError();
   xmlSetStructuredErrorFunc((void *)error_list, Nokogiri_error_array_pusher);
 
-  xmlDocPtr doc = xmlReadIO(
+  doc = xmlReadIO(
       (xmlInputReadCallback)io_read_callback,
       (xmlInputCloseCallback)io_close_callback,
       (void *)io,
@@ -183,9 +205,11 @@ static VALUE read_io( VALUE klass,
   xmlSetStructuredErrorFunc(NULL, NULL);
 
   if(doc == NULL) {
+    xmlErrorPtr error;
+
     xmlFreeDoc(doc);
 
-    xmlErrorPtr error = xmlGetLastError();
+    error = xmlGetLastError();
     if(error)
       rb_exc_raise(Nokogiri_wrap_xml_syntax_error((VALUE)NULL, error));
     else
@@ -194,7 +218,7 @@ static VALUE read_io( VALUE klass,
     return Qnil;
   }
 
-  VALUE document = Nokogiri_wrap_xml_document(klass, doc);
+  document = Nokogiri_wrap_xml_document(klass, doc);
   rb_iv_set(document, "@errors", error_list);
   return document;
 }
@@ -214,18 +238,22 @@ static VALUE read_memory( VALUE klass,
   const char * c_buffer = StringValuePtr(string);
   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);
+  int len               = (int)RSTRING_LEN(string);
   VALUE error_list      = rb_ary_new();
+  VALUE document;
+  xmlDocPtr doc;
 
   xmlResetLastError();
   xmlSetStructuredErrorFunc((void *)error_list, Nokogiri_error_array_pusher);
-  xmlDocPtr doc = xmlReadMemory(c_buffer, len, c_url, c_enc, (int)NUM2INT(options));
+  doc = xmlReadMemory(c_buffer, len, c_url, c_enc, (int)NUM2INT(options));
   xmlSetStructuredErrorFunc(NULL, NULL);
 
   if(doc == NULL) {
+    xmlErrorPtr error;
+
     xmlFreeDoc(doc);
 
-    xmlErrorPtr error = xmlGetLastError();
+    error = xmlGetLastError();
     if(error)
       rb_exc_raise(Nokogiri_wrap_xml_syntax_error((VALUE)NULL, error));
     else
@@ -234,7 +262,7 @@ static VALUE read_memory( VALUE klass,
     return Qnil;
   }
 
-  VALUE document = Nokogiri_wrap_xml_document(klass, doc);
+  document = Nokogiri_wrap_xml_document(klass, doc);
   rb_iv_set(document, "@errors", error_list);
   return document;
 }
@@ -248,12 +276,12 @@ static VALUE read_memory( VALUE klass,
  */
 static VALUE duplicate_node(int argc, VALUE *argv, VALUE self)
 {
+  xmlDocPtr doc, dup;
   VALUE level;
 
   if(rb_scan_args(argc, argv, "01", &level) == 0)
     level = INT2NUM((long)1);
 
-  xmlDocPtr doc, dup;
   Data_Get_Struct(self, xmlDoc, doc);
 
   dup = xmlCopyDoc(doc, (int)NUM2INT(level));
@@ -271,13 +299,14 @@ static VALUE duplicate_node(int argc, VALUE *argv, VALUE self)
  */
 static VALUE new(int argc, VALUE *argv, VALUE klass)
 {
+  xmlDocPtr doc;
   VALUE version, rest, rb_doc ;
 
   rb_scan_args(argc, argv, "0*", &rest);
   version = rb_ary_entry(rest, (long)0);
   if (NIL_P(version)) version = rb_str_new2("1.0");
 
-  xmlDocPtr doc = xmlNewDoc((xmlChar *)StringValuePtr(version));
+  doc = xmlNewDoc((xmlChar *)StringValuePtr(version));
   rb_doc = Nokogiri_wrap_xml_document(klass, doc);
   rb_obj_call_init(rb_doc, argc, argv);
   return rb_doc ;
@@ -329,6 +358,54 @@ VALUE remove_namespaces_bang(VALUE self)
   return self;
 }
 
+/* call-seq: doc.create_entity(name, type, external_id, system_id, content)
+ *
+ * Create a new entity named +name+.
+ *
+ * +type+ is an integer representing the type of entity to be created, and it
+ * defaults to Nokogiri::XML::EntityDecl::INTERNAL_GENERAL.  See
+ * the constants on Nokogiri::XML::EntityDecl for more information.
+ *
+ * +external_id+, +system_id+, and +content+ set the External ID, System ID,
+ * and content respectively.  All of these parameters are optional.
+ */
+static VALUE create_entity(int argc, VALUE *argv, VALUE self)
+{
+  VALUE name;
+  VALUE type;
+  VALUE external_id;
+  VALUE system_id;
+  VALUE content;
+  xmlEntityPtr ptr;
+  xmlDocPtr doc ;
+
+  Data_Get_Struct(self, xmlDoc, doc);
+
+  rb_scan_args(argc, argv, "14", &name, &type, &external_id, &system_id,
+      &content);
+
+  xmlResetLastError();
+  ptr = xmlAddDocEntity(
+      doc,
+      (xmlChar *)(NIL_P(name)        ? NULL                        : StringValuePtr(name)),
+      (int)      (NIL_P(type)        ? XML_INTERNAL_GENERAL_ENTITY : NUM2INT(type)),
+      (xmlChar *)(NIL_P(external_id) ? NULL                        : StringValuePtr(external_id)),
+      (xmlChar *)(NIL_P(system_id)   ? NULL                        : StringValuePtr(system_id)),
+      (xmlChar *)(NIL_P(content)     ? NULL                        : StringValuePtr(content))
+    );
+
+  if(NULL == ptr) {
+    xmlErrorPtr error = xmlGetLastError();
+    if(error)
+      rb_exc_raise(Nokogiri_wrap_xml_syntax_error((VALUE)NULL, error));
+    else
+      rb_raise(rb_eRuntimeError, "Could not create entity");
+
+    return Qnil;
+  }
+
+  return Nokogiri_wrap_xml_node(cNokogiriXmlEntityDecl, (xmlNodePtr)ptr);
+}
 
 VALUE cNokogiriXmlDocument ;
 void init_xml_document()
@@ -355,6 +432,7 @@ void init_xml_document()
   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, "create_entity", create_entity, -1);
   rb_define_method(klass, "remove_namespaces!", remove_namespaces_bang, 0);
 }
 

data/ext/nokogiri/xml_document.h

@@ -2,7 +2,6 @@
 #define NOKOGIRI_XML_DOCUMENT
 
 #include <nokogiri.h>
-#include "st.h"
 
 struct _nokogiriTuple {
   xmlDocPtr     doc;

data/ext/nokogiri/xml_document_fragment.c

@@ -9,18 +9,20 @@
 static VALUE new(int argc, VALUE *argv, VALUE klass)
 {
   xmlDocPtr xml_doc;
+  xmlNodePtr node;
   VALUE document;
   VALUE rest;
+  VALUE rb_node;
 
   rb_scan_args(argc, argv, "1*", &document, &rest);
 
   Data_Get_Struct(document, xmlDoc, xml_doc);
 
-  xmlNodePtr node = xmlNewDocFragment(xml_doc->doc);
+  node = xmlNewDocFragment(xml_doc->doc);
 
   NOKOGIRI_ROOT_NODE(node);
 
-  VALUE rb_node = Nokogiri_wrap_xml_node(klass, node);
+  rb_node = Nokogiri_wrap_xml_node(klass, node);
   rb_obj_call_init(rb_node, argc, argv);
 
   if(rb_block_given_p()) rb_yield(rb_node);

data/ext/nokogiri/xml_dtd.c

@@ -6,13 +6,13 @@ static void notation_copier(void *payload, void *data, xmlChar *name)
   VALUE klass = rb_const_get(mNokogiriXml, rb_intern("Notation"));
 
   xmlNotationPtr c_notation = (xmlNotationPtr)payload;
-
+  VALUE notation;
   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);
 
-  VALUE notation = rb_class_new_instance(3, argv, klass);
+  notation = rb_class_new_instance(3, argv, klass);
 
   rb_hash_aset(hash, NOKOGIRI_STR_NEW2(name),notation);
 }
@@ -36,11 +36,13 @@ static void element_copier(void *_payload, void *data, xmlChar *name)
 static VALUE entities(VALUE self)
 {
   xmlDtdPtr dtd;
+  VALUE hash;
+
   Data_Get_Struct(self, xmlDtd, dtd);
 
   if(!dtd->entities) return Qnil;
 
-  VALUE hash = rb_hash_new();
+  hash = rb_hash_new();
 
   xmlHashScan((xmlHashTablePtr)dtd->entities, element_copier, (void *)hash);
 
@@ -56,11 +58,13 @@ static VALUE entities(VALUE self)
 static VALUE notations(VALUE self)
 {
   xmlDtdPtr dtd;
+  VALUE hash;
+
   Data_Get_Struct(self, xmlDtd, dtd);
 
   if(!dtd->notations) return Qnil;
 
-  VALUE hash = rb_hash_new();
+  hash = rb_hash_new();
 
   xmlHashScan((xmlHashTablePtr)dtd->notations, notation_copier, (void *)hash);
 
@@ -76,11 +80,13 @@ static VALUE notations(VALUE self)
 static VALUE attributes(VALUE self)
 {
   xmlDtdPtr dtd;
+  VALUE hash;
+
   Data_Get_Struct(self, xmlDtd, dtd);
 
   if(!dtd->attributes) return Qnil;
 
-  VALUE hash = rb_hash_new();
+  hash = rb_hash_new();
 
   xmlHashScan((xmlHashTablePtr)dtd->attributes, element_copier, (void *)hash);
 
@@ -96,11 +102,13 @@ static VALUE attributes(VALUE self)
 static VALUE elements(VALUE self)
 {
   xmlDtdPtr dtd;
+  VALUE hash;
+
   Data_Get_Struct(self, xmlDtd, dtd);
 
   if(!dtd->elements) return Qnil;
 
-  VALUE hash = rb_hash_new();
+  hash = rb_hash_new();
 
   xmlHashScan((xmlHashTablePtr)dtd->elements, element_copier, (void *)hash);
 
@@ -117,12 +125,14 @@ static VALUE validate(VALUE self, VALUE document)
 {
   xmlDocPtr doc;
   xmlDtdPtr dtd;
+  xmlValidCtxtPtr ctxt;
+  VALUE error_list;
 
   Data_Get_Struct(self, xmlDtd, dtd);
   Data_Get_Struct(document, xmlDoc, doc);
-  VALUE error_list      = rb_ary_new();
+  error_list = rb_ary_new();
 
-  xmlValidCtxtPtr ctxt = xmlNewValidCtxt();
+  ctxt = xmlNewValidCtxt();
 
   xmlSetStructuredErrorFunc((void *)error_list, Nokogiri_error_array_pusher);
 

data/ext/nokogiri/xml_element_content.c

@@ -97,8 +97,8 @@ VALUE Nokogiri_wrap_element_content(VALUE doc, xmlElementContentPtr element)
 {
   VALUE elem = Data_Wrap_Struct(cNokogiriXmlElementContent, 0, 0, element);
 
-  // Setting the document is necessary so that this does not get GC'd until
-  // the document is GC'd
+  /* Setting the document is necessary so that this does not get GC'd until */
+  /* the document is GC'd */
   rb_iv_set(elem, "@document", doc);
 
   return elem;

data/ext/nokogiri/xml_entity_decl.c

@@ -1,4 +1,4 @@
-#include <xml_entity_decl.h> 
+#include <xml_entity_decl.h>
 
 /*
  * call-seq:
@@ -34,7 +34,7 @@ static VALUE get_content(VALUE self)
 
 /*
  * call-seq:
- *  content
+ *  entity_type
  *
  * Get the entity type
  */
@@ -94,4 +94,17 @@ void init_xml_entity_decl()
   rb_define_method(klass, "entity_type", entity_type, 0);
   rb_define_method(klass, "external_id", external_id, 0);
   rb_define_method(klass, "system_id", system_id, 0);
+
+  rb_const_set(cNokogiriXmlEntityDecl, rb_intern("INTERNAL_GENERAL"),
+      INT2NUM(XML_INTERNAL_GENERAL_ENTITY));
+  rb_const_set(cNokogiriXmlEntityDecl, rb_intern("EXTERNAL_GENERAL_PARSED"),
+      INT2NUM(XML_EXTERNAL_GENERAL_PARSED_ENTITY));
+  rb_const_set(cNokogiriXmlEntityDecl, rb_intern("EXTERNAL_GENERAL_UNPARSED"),
+      INT2NUM(XML_EXTERNAL_GENERAL_UNPARSED_ENTITY));
+  rb_const_set(cNokogiriXmlEntityDecl, rb_intern("INTERNAL_PARAMETER"),
+      INT2NUM(XML_INTERNAL_PARAMETER_ENTITY));
+  rb_const_set(cNokogiriXmlEntityDecl, rb_intern("EXTERNAL_PARAMETER"),
+      INT2NUM(XML_EXTERNAL_PARAMETER_ENTITY));
+  rb_const_set(cNokogiriXmlEntityDecl, rb_intern("INTERNAL_PREDEFINED"),
+      INT2NUM(XML_INTERNAL_PREDEFINED_ENTITY));
 }

data/ext/nokogiri/xml_entity_reference.c

@@ -9,22 +9,24 @@
 static VALUE new(int argc, VALUE *argv, VALUE klass)
 {
   xmlDocPtr xml_doc;
+  xmlNodePtr node;
   VALUE document;
   VALUE name;
   VALUE rest;
+  VALUE rb_node;
 
   rb_scan_args(argc, argv, "2*", &document, &name, &rest);
 
   Data_Get_Struct(document, xmlDoc, xml_doc);
 
-  xmlNodePtr node = xmlNewReference(
+  node = xmlNewReference(
       xml_doc,
       (const xmlChar *)StringValuePtr(name)
   );
 
   NOKOGIRI_ROOT_NODE(node);
 
-  VALUE rb_node = Nokogiri_wrap_xml_node(klass, node);
+  rb_node = Nokogiri_wrap_xml_node(klass, node);
   rb_obj_call_init(rb_node, argc, argv);
 
   if(rb_block_given_p()) rb_yield(rb_node);

data/ext/nokogiri/xml_io.c

@@ -10,7 +10,7 @@ int io_read_callback(void * ctx, char * buffer, int len) {
 
   memcpy(buffer, StringValuePtr(string), (unsigned int)RSTRING_LEN(string));
 
-  return RSTRING_LEN(string);
+  return (int)RSTRING_LEN(string);
 }
 
 int io_write_callback(void * ctx, char * buffer, int len) {

data/ext/nokogiri/xml_namespace.c

@@ -42,16 +42,18 @@ static VALUE href(VALUE self)
 
 VALUE Nokogiri_wrap_xml_namespace(xmlDocPtr doc, xmlNsPtr node)
 {
+  VALUE ns, document, node_cache;
+
   assert(doc->_private);
 
   if(node->_private)
     return (VALUE)node->_private;
 
-  VALUE ns = Data_Wrap_Struct(cNokogiriXmlNamespace, 0, 0, node);
+  ns = Data_Wrap_Struct(cNokogiriXmlNamespace, 0, 0, node);
 
-  VALUE document = DOC_RUBY_OBJECT(doc);
+  document = DOC_RUBY_OBJECT(doc);
 
-  VALUE node_cache = rb_iv_get(document, "@node_cache");
+  node_cache = rb_iv_get(document, "@node_cache");
   rb_ary_push(node_cache, ns);
 
   rb_iv_set(ns, "@document", DOC_RUBY_OBJECT(doc));