nokogiri 1.0.0 → 1.6.8.1

data/ext/nokogiri/xml_reader.c

@@ -25,6 +25,43 @@ static int has_attributes(xmlTextReaderPtr reader)
   return(0);
 }
 
+static void Nokogiri_xml_node_namespaces(xmlNodePtr node, VALUE attr_hash)
+{
+  xmlNsPtr ns;
+  static char buffer[XMLNS_BUFFER_LEN] ;
+  char *key ;
+  size_t keylen ;
+
+  if (node->type != XML_ELEMENT_NODE) return ;
+
+  ns = node->nsDef;
+  while (ns != NULL) {
+
+    keylen = XMLNS_PREFIX_LEN + (ns->prefix ? (strlen((const char*)ns->prefix) + 1) : 0) ;
+    if (keylen > XMLNS_BUFFER_LEN) {
+      key = (char*)malloc(keylen) ;
+    } else {
+      key = buffer ;
+    }
+
+    if (ns->prefix) {
+      sprintf(key, "%s:%s", XMLNS_PREFIX, ns->prefix);
+    } else {
+      sprintf(key, "%s", XMLNS_PREFIX);
+    }
+
+    rb_hash_aset(attr_hash,
+        NOKOGIRI_STR_NEW2(key),
+        (ns->href ? NOKOGIRI_STR_NEW2(ns->href) : Qnil)
+    );
+    if (key != buffer) {
+      free(key);
+    }
+    ns = ns->next ;
+  }
+}
+
+
 /*
  * call-seq:
  *   default?
@@ -34,8 +71,10 @@ static int has_attributes(xmlTextReaderPtr reader)
 static VALUE default_eh(VALUE self)
 {
   xmlTextReaderPtr reader;
+  int eh;
+
   Data_Get_Struct(self, xmlTextReader, reader);
-  int eh = xmlTextReaderIsDefault(reader);
+  eh = xmlTextReaderIsDefault(reader);
   if(eh == 0) return Qfalse;
   if(eh == 1) return Qtrue;
 
@@ -51,8 +90,10 @@ static VALUE default_eh(VALUE self)
 static VALUE value_eh(VALUE self)
 {
   xmlTextReaderPtr reader;
+  int eh;
+
   Data_Get_Struct(self, xmlTextReader, reader);
-  int eh = xmlTextReaderHasValue(reader);
+  eh = xmlTextReaderHasValue(reader);
   if(eh == 0) return Qfalse;
   if(eh == 1) return Qtrue;
 
@@ -68,8 +109,10 @@ static VALUE value_eh(VALUE self)
 static VALUE attributes_eh(VALUE self)
 {
   xmlTextReaderPtr reader;
+  int eh;
+
   Data_Get_Struct(self, xmlTextReader, reader);
-  int eh = has_attributes(reader);
+  eh = has_attributes(reader);
   if(eh == 0) return Qfalse;
   if(eh == 1) return Qtrue;
 
@@ -78,13 +121,14 @@ static VALUE attributes_eh(VALUE self)
 
 /*
  * call-seq:
- *   attributes
+ *   namespaces
  *
- * Get a Hash of attributes for this node
+ * Get a hash of namespaces for this Node
  */
-static VALUE attributes(VALUE self)
+static VALUE namespaces(VALUE self)
 {
   xmlTextReaderPtr reader;
+  xmlNodePtr ptr;
   VALUE attr ;
 
   Data_Get_Struct(self, xmlTextReader, reader);
@@ -94,10 +138,36 @@ static VALUE attributes(VALUE self)
   if (! has_attributes(reader))
     return attr ;
 
-  xmlNodePtr ptr = xmlTextReaderExpand(reader);
+  ptr = xmlTextReaderExpand(reader);
   if(ptr == NULL) return Qnil;
 
   Nokogiri_xml_node_namespaces(ptr, attr);
+
+  return attr ;
+}
+
+/*
+ * call-seq:
+ *   attribute_nodes
+ *
+ * Get a list of attributes for this Node
+ */
+static VALUE attribute_nodes(VALUE self)
+{
+  xmlTextReaderPtr reader;
+  xmlNodePtr ptr;
+  VALUE attr ;
+
+  Data_Get_Struct(self, xmlTextReader, reader);
+
+  attr = rb_ary_new() ;
+
+  if (! has_attributes(reader))
+    return attr ;
+
+  ptr = xmlTextReaderExpand(reader);
+  if(ptr == NULL) return Qnil;
+
   Nokogiri_xml_node_properties(ptr, attr);
 
   return attr ;
@@ -112,18 +182,21 @@ static VALUE attributes(VALUE self)
 static VALUE attribute_at(VALUE self, VALUE index)
 {
   xmlTextReaderPtr reader;
+  xmlChar *value;
+  VALUE rb_value;
+
   Data_Get_Struct(self, xmlTextReader, reader);
 
-  if(index == Qnil) return Qnil;
-  index = rb_funcall(index, rb_intern("to_i"), 0);
+  if(NIL_P(index)) return Qnil;
+  index = rb_Integer(index);
 
-  xmlChar * value = xmlTextReaderGetAttributeNo(
+  value = xmlTextReaderGetAttributeNo(
       reader,
-      NUM2INT(index)
+      (int)NUM2INT(index)
   );
   if(value == NULL) return Qnil;
 
-  VALUE rb_value = rb_str_new2((const char *)value);
+  rb_value = NOKOGIRI_STR_NEW2(value);
   xmlFree(value);
   return rb_value;
 }
@@ -138,27 +211,17 @@ static VALUE reader_attribute(VALUE self, VALUE name)
 {
   xmlTextReaderPtr reader;
   xmlChar *value ;
+  VALUE rb_value;
+
   Data_Get_Struct(self, xmlTextReader, reader);
 
-  if(name == Qnil) return Qnil;
+  if(NIL_P(name)) return Qnil;
   name = StringValue(name) ;
 
-  value = xmlTextReaderGetAttribute(reader, (xmlChar*)StringValuePtr(name));
-  if(value == NULL) {
-    /* this section is an attempt to workaround older versions of libxml that
-       don't handle namespaces properly in all attribute-and-friends functions */
-    xmlChar *prefix = NULL ;
-    xmlChar *localname = xmlSplitQName2((xmlChar*)StringValuePtr(name), &prefix);
-    if (localname != NULL) {
-      value = xmlTextReaderLookupNamespace(reader, localname);
-      free(localname) ;
-    } else {
-      value = xmlTextReaderLookupNamespace(reader, prefix);
-    }
-  }
+  value = xmlTextReaderGetAttribute(reader, (xmlChar*)StringValueCStr(name));
   if(value == NULL) return Qnil;
 
-  VALUE rb_value = rb_str_new2((const char *)value);
+  rb_value = NOKOGIRI_STR_NEW2(value);
   xmlFree(value);
   return rb_value;
 }
@@ -172,11 +235,13 @@ static VALUE reader_attribute(VALUE self, VALUE name)
 static VALUE attribute_count(VALUE self)
 {
   xmlTextReaderPtr reader;
+  int count;
+
   Data_Get_Struct(self, xmlTextReader, reader);
-  int count = xmlTextReaderAttributeCount(reader);
+  count = xmlTextReaderAttributeCount(reader);
   if(count == -1) return Qnil;
 
-  return INT2NUM(count);
+  return INT2NUM((long)count);
 }
 
 /*
@@ -188,27 +253,13 @@ static VALUE attribute_count(VALUE self)
 static VALUE depth(VALUE self)
 {
   xmlTextReaderPtr reader;
-  Data_Get_Struct(self, xmlTextReader, reader);
-  int depth = xmlTextReaderDepth(reader);
-  if(depth == -1) return Qnil;
+  int depth;
 
-  return INT2NUM(depth);
-}
-
-/*
- * call-seq:
- *   encoding
- *
- * Get the encoding for the document
- */
-static VALUE encoding(VALUE self)
-{
-  xmlTextReaderPtr reader;
   Data_Get_Struct(self, xmlTextReader, reader);
-  const char * encoding = (const char *)xmlTextReaderConstEncoding(reader);
-  if(encoding == NULL) return Qnil;
+  depth = xmlTextReaderDepth(reader);
+  if(depth == -1) return Qnil;
 
-  return rb_str_new2(encoding);
+  return INT2NUM((long)depth);
 }
 
 /*
@@ -220,11 +271,13 @@ static VALUE encoding(VALUE self)
 static VALUE xml_version(VALUE self)
 {
   xmlTextReaderPtr reader;
+  const char *version;
+
   Data_Get_Struct(self, xmlTextReader, reader);
-  const char * version = (const char *)xmlTextReaderConstXmlVersion(reader);
+  version = (const char *)xmlTextReaderConstXmlVersion(reader);
   if(version == NULL) return Qnil;
 
-  return rb_str_new2(version);
+  return NOKOGIRI_STR_NEW2(version);
 }
 
 /*
@@ -236,27 +289,31 @@ static VALUE xml_version(VALUE self)
 static VALUE lang(VALUE self)
 {
   xmlTextReaderPtr reader;
+  const char *lang;
+
   Data_Get_Struct(self, xmlTextReader, reader);
-  const char * lang = (const char *)xmlTextReaderConstXmlLang(reader);
+  lang = (const char *)xmlTextReaderConstXmlLang(reader);
   if(lang == NULL) return Qnil;
 
-  return rb_str_new2(lang);
+  return NOKOGIRI_STR_NEW2(lang);
 }
 
 /*
  * call-seq:
  *   value
  *
- * Get the text value of the node if present
+ * Get the text value of the node if present. Returns a utf-8 encoded string.
  */
 static VALUE value(VALUE self)
 {
   xmlTextReaderPtr reader;
+  const char *value;
+
   Data_Get_Struct(self, xmlTextReader, reader);
-  const char * value = (const char *)xmlTextReaderConstValue(reader);
+  value = (const char *)xmlTextReaderConstValue(reader);
   if(value == NULL) return Qnil;
 
-  return rb_str_new2(value);
+  return NOKOGIRI_STR_NEW2(value);
 }
 
 /*
@@ -268,11 +325,13 @@ static VALUE value(VALUE self)
 static VALUE prefix(VALUE self)
 {
   xmlTextReaderPtr reader;
+  const char *prefix;
+
   Data_Get_Struct(self, xmlTextReader, reader);
-  const char * prefix = (const char *)xmlTextReaderConstPrefix(reader);
+  prefix = (const char *)xmlTextReaderConstPrefix(reader);
   if(prefix == NULL) return Qnil;
 
-  return rb_str_new2(prefix);
+  return NOKOGIRI_STR_NEW2(prefix);
 }
 
 /*
@@ -284,11 +343,13 @@ static VALUE prefix(VALUE self)
 static VALUE namespace_uri(VALUE self)
 {
   xmlTextReaderPtr reader;
+  const char *uri;
+
   Data_Get_Struct(self, xmlTextReader, reader);
-  const char * uri = (const char *)xmlTextReaderConstNamespaceUri(reader);
+  uri = (const char *)xmlTextReaderConstNamespaceUri(reader);
   if(uri == NULL) return Qnil;
 
-  return rb_str_new2(uri);
+  return NOKOGIRI_STR_NEW2(uri);
 }
 
 /*
@@ -300,27 +361,49 @@ static VALUE namespace_uri(VALUE self)
 static VALUE local_name(VALUE self)
 {
   xmlTextReaderPtr reader;
+  const char *name;
+
   Data_Get_Struct(self, xmlTextReader, reader);
-  const char * name = (const char *)xmlTextReaderConstLocalName(reader);
+  name = (const char *)xmlTextReaderConstLocalName(reader);
   if(name == NULL) return Qnil;
 
-  return rb_str_new2(name);
+  return NOKOGIRI_STR_NEW2(name);
 }
 
 /*
  * call-seq:
  *   name
  *
- * Get the name of the node
+ * Get the name of the node. Returns a utf-8 encoded string.
  */
 static VALUE name(VALUE self)
 {
   xmlTextReaderPtr reader;
+  const char *name;
+
   Data_Get_Struct(self, xmlTextReader, reader);
-  const char * name = (const char *)xmlTextReaderConstName(reader);
+  name = (const char *)xmlTextReaderConstName(reader);
   if(name == NULL) return Qnil;
 
-  return rb_str_new2(name);
+  return NOKOGIRI_STR_NEW2(name);
+}
+
+/*
+ * call-seq:
+ * base_uri
+ *
+ * Get the xml:base of the node
+ */
+static VALUE base_uri(VALUE self)
+{
+  xmlTextReaderPtr reader;
+  const char * base_uri;
+
+  Data_Get_Struct(self, xmlTextReader, reader);
+  base_uri = (const char *)xmlTextReaderBaseUri(reader);
+  if (base_uri == NULL) return Qnil;
+
+  return NOKOGIRI_STR_NEW2(base_uri);
 }
 
 /*
@@ -333,7 +416,20 @@ static VALUE state(VALUE self)
 {
   xmlTextReaderPtr reader;
   Data_Get_Struct(self, xmlTextReader, reader);
-  return INT2NUM(xmlTextReaderReadState(reader));
+  return INT2NUM((long)xmlTextReaderReadState(reader));
+}
+
+/*
+ * call-seq:
+ *   node_type
+ *
+ * Get the type of readers current node
+ */
+static VALUE node_type(VALUE self)
+{
+  xmlTextReaderPtr reader;
+  Data_Get_Struct(self, xmlTextReader, reader);
+  return INT2NUM((long)xmlTextReaderNodeType(reader));
 }
 
 /*
@@ -345,13 +441,78 @@ static VALUE state(VALUE self)
 static VALUE read_more(VALUE self)
 {
   xmlTextReaderPtr reader;
+  xmlErrorPtr error;
+  VALUE error_list;
+  int ret;
+
   Data_Get_Struct(self, xmlTextReader, reader);
 
-  int ret = xmlTextReaderRead(reader);
+  error_list = rb_funcall(self, rb_intern("errors"), 0);
+
+  xmlSetStructuredErrorFunc((void *)error_list, Nokogiri_error_array_pusher);
+  ret = xmlTextReaderRead(reader);
+  xmlSetStructuredErrorFunc(NULL, NULL);
+
   if(ret == 1) return self;
   if(ret == 0) return Qnil;
 
-  rb_raise(rb_eRuntimeError, "Error pulling: %d", ret);
+  error = xmlGetLastError();
+  if(error)
+    rb_exc_raise(Nokogiri_wrap_xml_syntax_error(error));
+  else
+    rb_raise(rb_eRuntimeError, "Error pulling: %d", ret);
+
+  return Qnil;
+}
+
+/*
+ * call-seq:
+ *   inner_xml
+ *
+ * Read the contents of the current node, including child nodes and markup.
+ * Returns a utf-8 encoded string.
+ */
+static VALUE inner_xml(VALUE self)
+{
+  xmlTextReaderPtr reader;
+  xmlChar* value;
+  VALUE str;
+
+  Data_Get_Struct(self, xmlTextReader, reader);
+
+  value = xmlTextReaderReadInnerXml(reader);
+
+  str = Qnil;
+  if(value) {
+    str = NOKOGIRI_STR_NEW2((char*)value);
+    xmlFree(value);
+  }
+
+  return str;
+}
+
+/*
+ * call-seq:
+ *   outer_xml
+ *
+ * Read the current node and its contents, including child nodes and markup.
+ * Returns a utf-8 encoded string.
+ */
+static VALUE outer_xml(VALUE self)
+{
+  xmlTextReaderPtr reader;
+  xmlChar *value;
+  VALUE str = Qnil;
+
+  Data_Get_Struct(self, xmlTextReader, reader);
+
+  value = xmlTextReaderReadOuterXml(reader);
+
+  if(value) {
+    str = NOKOGIRI_STR_NEW2((char*)value);
+    xmlFree(value);
+  }
+  return str;
 }
 
 /*
@@ -363,21 +524,22 @@ static VALUE read_more(VALUE self)
 static VALUE from_memory(int argc, VALUE *argv, VALUE klass)
 {
   VALUE rb_buffer, rb_url, encoding, rb_options;
-
+  xmlTextReaderPtr reader;
   const char * c_url      = NULL;
   const char * c_encoding = NULL;
-  int c_options           = 0; 
+  int c_options           = 0;
+  VALUE rb_reader, args[3];
 
   rb_scan_args(argc, argv, "13", &rb_buffer, &rb_url, &encoding, &rb_options);
 
-  rb_buffer = StringValue(rb_buffer) ;
-  if (RTEST(rb_url)) c_url = StringValuePtr(rb_url);
-  if (RTEST(encoding)) c_encoding = StringValuePtr(rb_url);
-  if (RTEST(rb_options)) c_options = NUM2INT(rb_options);
+  if (!RTEST(rb_buffer)) rb_raise(rb_eArgError, "string cannot be nil");
+  if (RTEST(rb_url)) c_url = StringValueCStr(rb_url);
+  if (RTEST(encoding)) c_encoding = StringValueCStr(encoding);
+  if (RTEST(rb_options)) c_options = (int)NUM2INT(rb_options);
 
-  xmlTextReaderPtr reader = xmlReaderForMemory(
+  reader = xmlReaderForMemory(
       StringValuePtr(rb_buffer),
-      NUM2INT(rb_funcall(rb_buffer, rb_intern("length"), 0)),
+      (int)RSTRING_LEN(rb_buffer),
       c_url,
       c_encoding,
       c_options
@@ -388,7 +550,76 @@ static VALUE from_memory(int argc, VALUE *argv, VALUE klass)
     rb_raise(rb_eRuntimeError, "couldn't create a parser");
   }
 
-  return Data_Wrap_Struct(klass, NULL, dealloc, reader);
+  rb_reader = Data_Wrap_Struct(klass, NULL, dealloc, reader);
+  args[0] = rb_buffer;
+  args[1] = rb_url;
+  args[2] = encoding;
+  rb_obj_call_init(rb_reader, 3, args);
+
+  return rb_reader;
+}
+
+/*
+ * call-seq:
+ *   from_io(io, url = nil, encoding = nil, options = 0)
+ *
+ * Create a new reader that parses +io+
+ */
+static VALUE from_io(int argc, VALUE *argv, VALUE klass)
+{
+  VALUE rb_io, rb_url, encoding, rb_options;
+  xmlTextReaderPtr reader;
+  const char * c_url      = NULL;
+  const char * c_encoding = NULL;
+  int c_options           = 0;
+  VALUE rb_reader, args[3];
+
+  rb_scan_args(argc, argv, "13", &rb_io, &rb_url, &encoding, &rb_options);
+
+  if (!RTEST(rb_io)) rb_raise(rb_eArgError, "io cannot be nil");
+  if (RTEST(rb_url)) c_url = StringValueCStr(rb_url);
+  if (RTEST(encoding)) c_encoding = StringValueCStr(encoding);
+  if (RTEST(rb_options)) c_options = (int)NUM2INT(rb_options);
+
+  reader = xmlReaderForIO(
+      (xmlInputReadCallback)io_read_callback,
+      (xmlInputCloseCallback)io_close_callback,
+      (void *)rb_io,
+      c_url,
+      c_encoding,
+      c_options
+  );
+
+  if(reader == NULL) {
+    xmlFreeTextReader(reader);
+    rb_raise(rb_eRuntimeError, "couldn't create a parser");
+  }
+
+  rb_reader = Data_Wrap_Struct(klass, NULL, dealloc, reader);
+  args[0] = rb_io;
+  args[1] = rb_url;
+  args[2] = encoding;
+  rb_obj_call_init(rb_reader, 3, args);
+
+  return rb_reader;
+}
+
+/*
+ * call-seq:
+ *   reader.empty_element? # => true or false
+ *
+ * Returns true if the current node is empty, otherwise false.
+ */
+static VALUE empty_element_p(VALUE self)
+{
+  xmlTextReaderPtr reader;
+
+  Data_Get_Struct(self, xmlTextReader, reader);
+
+  if(xmlTextReaderIsEmptyElement(reader))
+    return Qtrue;
+
+  return Qfalse;
 }
 
 VALUE cNokogiriXmlReader;
@@ -408,8 +639,13 @@ void init_xml_reader()
   cNokogiriXmlReader = klass;
 
   rb_define_singleton_method(klass, "from_memory", from_memory, -1);
+  rb_define_singleton_method(klass, "from_io", from_io, -1);
+
   rb_define_method(klass, "read", read_more, 0);
+  rb_define_method(klass, "inner_xml", inner_xml, 0);
+  rb_define_method(klass, "outer_xml", outer_xml, 0);
   rb_define_method(klass, "state", state, 0);
+  rb_define_method(klass, "node_type", node_type, 0);
   rb_define_method(klass, "name", name, 0);
   rb_define_method(klass, "local_name", local_name, 0);
   rb_define_method(klass, "namespace_uri", namespace_uri, 0);
@@ -417,13 +653,16 @@ void init_xml_reader()
   rb_define_method(klass, "value", value, 0);
   rb_define_method(klass, "lang", lang, 0);
   rb_define_method(klass, "xml_version", xml_version, 0);
-  rb_define_method(klass, "encoding", encoding, 0);
   rb_define_method(klass, "depth", depth, 0);
   rb_define_method(klass, "attribute_count", attribute_count, 0);
   rb_define_method(klass, "attribute", reader_attribute, 1);
+  rb_define_method(klass, "namespaces", namespaces, 0);
   rb_define_method(klass, "attribute_at", attribute_at, 1);
-  rb_define_method(klass, "attributes", attributes, 0);
+  rb_define_method(klass, "empty_element?", empty_element_p, 0);
   rb_define_method(klass, "attributes?", attributes_eh, 0);
   rb_define_method(klass, "value?", value_eh, 0);
   rb_define_method(klass, "default?", default_eh, 0);
+  rb_define_method(klass, "base_uri", base_uri, 0);
+
+  rb_define_private_method(klass, "attr_nodes", attribute_nodes, 0);
 }

data/ext/nokogiri/xml_reader.h

@@ -1,7 +1,7 @@
 #ifndef NOKOGIRI_XML_READER
 #define NOKOGIRI_XML_READER
 
-#include <native.h>
+#include <nokogiri.h>
 
 void init_xml_reader();