nokogiri 1.4.1 → 1.4.2

data/ext/nokogiri/xml_relax_ng.c

@@ -17,16 +17,18 @@ static VALUE validate_document(VALUE self, VALUE document)
 {
   xmlDocPtr doc;
   xmlRelaxNGPtr schema;
+  VALUE errors;
+  xmlRelaxNGValidCtxtPtr valid_ctxt;
 
   Data_Get_Struct(self, xmlRelaxNG, schema);
   Data_Get_Struct(document, xmlDoc, doc);
 
-  VALUE errors = rb_ary_new();
+  errors = rb_ary_new();
 
-  xmlRelaxNGValidCtxtPtr valid_ctxt = xmlRelaxNGNewValidCtxt(schema);
+  valid_ctxt = xmlRelaxNGNewValidCtxt(schema);
 
   if(NULL == valid_ctxt) {
-    // we have a problem
+    /* we have a problem */
     rb_raise(rb_eRuntimeError, "Could not create a validation context");
   }
 
@@ -55,10 +57,12 @@ static VALUE read_memory(VALUE klass, VALUE content)
 {
   xmlRelaxNGParserCtxtPtr ctx = xmlRelaxNGNewMemParserCtxt(
       (const char *)StringValuePtr(content),
-      RSTRING_LEN(content)
+      (int)RSTRING_LEN(content)
   );
-
+  xmlRelaxNGPtr schema;
   VALUE errors = rb_ary_new();
+  VALUE rb_schema;
+
   xmlSetStructuredErrorFunc((void *)errors, Nokogiri_error_array_pusher);
 
 #ifdef HAVE_XMLRELAXNGSETPARSERSTRUCTUREDERRORS
@@ -69,7 +73,7 @@ static VALUE read_memory(VALUE klass, VALUE content)
   );
 #endif
 
-  xmlRelaxNGPtr schema = xmlRelaxNGParse(ctx);
+  schema = xmlRelaxNGParse(ctx);
 
   xmlSetStructuredErrorFunc(NULL, NULL);
   xmlRelaxNGFreeParserCtxt(ctx);
@@ -84,7 +88,7 @@ static VALUE read_memory(VALUE klass, VALUE content)
     return Qnil;
   }
 
-  VALUE rb_schema = Data_Wrap_Struct(klass, 0, dealloc, schema);
+  rb_schema = Data_Wrap_Struct(klass, 0, dealloc, schema);
   rb_iv_set(rb_schema, "@errors", errors);
 
   return rb_schema;
@@ -99,14 +103,19 @@ static VALUE read_memory(VALUE klass, VALUE content)
 static VALUE from_document(VALUE klass, VALUE document)
 {
   xmlDocPtr doc;
+  xmlRelaxNGParserCtxtPtr ctx;
+  xmlRelaxNGPtr schema;
+  VALUE errors;
+  VALUE rb_schema;
+
   Data_Get_Struct(document, xmlDoc, doc);
 
-  // In case someone passes us a node. ugh.
+  /* In case someone passes us a node. ugh. */
   doc = doc->doc;
 
-  xmlRelaxNGParserCtxtPtr ctx = xmlRelaxNGNewDocParserCtxt(doc);
+  ctx = xmlRelaxNGNewDocParserCtxt(doc);
 
-  VALUE errors = rb_ary_new();
+  errors = rb_ary_new();
   xmlSetStructuredErrorFunc((void *)errors, Nokogiri_error_array_pusher);
 
 #ifdef HAVE_XMLRELAXNGSETPARSERSTRUCTUREDERRORS
@@ -117,7 +126,7 @@ static VALUE from_document(VALUE klass, VALUE document)
   );
 #endif
 
-  xmlRelaxNGPtr schema = xmlRelaxNGParse(ctx);
+  schema = xmlRelaxNGParse(ctx);
 
   xmlSetStructuredErrorFunc(NULL, NULL);
   if (! is_2_6_16()) {
@@ -138,7 +147,7 @@ static VALUE from_document(VALUE klass, VALUE document)
     xmlRelaxNGFreeParserCtxt(ctx);
   }
 
-  VALUE rb_schema = Data_Wrap_Struct(klass, 0, dealloc, schema);
+  rb_schema = Data_Wrap_Struct(klass, 0, dealloc, schema);
   rb_iv_set(rb_schema, "@errors", errors);
 
   return rb_schema;

data/ext/nokogiri/xml_sax_parser.c

@@ -1,5 +1,7 @@
 #include <xml_sax_parser.h>
 
+int vasprintf (char **strp, const char *fmt, va_list ap);
+
 static ID id_start_document, id_end_document, id_start_element, id_end_element;
 static ID id_start_element_namespace, id_end_element_namespace;
 static ID id_comment, id_characters, id_xmldecl, id_error, id_warning;
@@ -16,7 +18,7 @@ static void start_document(void * ctx)
   xmlParserCtxtPtr ctxt = NOKOGIRI_SAX_CTXT(ctx);
 
   if(NULL != ctxt && ctxt->html != 1) {
-    if(ctxt->standalone != -1) {  // -1 means there was no declaration
+    if(ctxt->standalone != -1) {  /* -1 means there was no declaration */
       VALUE encoding = ctxt->encoding ?
         NOKOGIRI_STR_NEW2(ctxt->encoding) :
         Qnil;
@@ -92,7 +94,8 @@ static VALUE attributes_as_list(
     /* Each attribute is an array of [localname, prefix, URI, value, end] */
     int i;
     for (i = 0; i < nb_attributes * 5; i += 5) {
-      VALUE argv[4];
+      VALUE argv[4], attribute;
+
       argv[0] = RBSTR_OR_QNIL(attributes[i + 0]); /* localname */
       argv[1] = RBSTR_OR_QNIL(attributes[i + 1]); /* prefix */
       argv[2] = RBSTR_OR_QNIL(attributes[i + 2]); /* URI */
@@ -101,7 +104,7 @@ static VALUE attributes_as_list(
       argv[3] = NOKOGIRI_STR_NEW((const char*)attributes[i+3],
           (attributes[i+4] - attributes[i+3]));
 
-      VALUE attribute = rb_class_new_instance(4, argv, attr_klass);
+      attribute = rb_class_new_instance(4, argv, attr_klass);
       rb_ary_push(list, attribute);
     }
   }

data/ext/nokogiri/xml_sax_parser.h

@@ -15,29 +15,25 @@ typedef struct _nokogiriSAXTuple {
 typedef nokogiriSAXTuple * nokogiriSAXTuplePtr;
 
 #define NOKOGIRI_SAX_SELF(_ctxt) \
-  ({ \
-    nokogiriSAXTuplePtr _tuple = (nokogiriSAXTuplePtr)(_ctxt); \
-    _tuple->self; \
-  })
+  ((nokogiriSAXTuplePtr)(_ctxt))->self
 
 #define NOKOGIRI_SAX_CTXT(_ctxt) \
-  ({ \
-    nokogiriSAXTuplePtr _tuple = (nokogiriSAXTuplePtr)(_ctxt); \
-    _tuple->ctxt; \
-  })
+  ((nokogiriSAXTuplePtr)(_ctxt))->ctxt
 
 #define NOKOGIRI_SAX_TUPLE_NEW(_ctxt, _self) \
-  ({ \
-    nokogiriSAXTuplePtr _tuple = malloc(sizeof(nokogiriSAXTuple)); \
-    _tuple->self = _self; \
-    _tuple->ctxt = _ctxt; \
-    _tuple; \
-  })
+  nokogiri_sax_tuple_new(_ctxt, _self)
+
+static inline nokogiriSAXTuplePtr
+nokogiri_sax_tuple_new(xmlParserCtxtPtr ctxt, VALUE self)
+{
+  nokogiriSAXTuplePtr tuple = malloc(sizeof(nokogiriSAXTuple));
+  tuple->self = self;
+  tuple->ctxt = ctxt;
+  return tuple;
+}
 
 #define NOKOGIRI_SAX_TUPLE_DESTROY(_tuple) \
-  ({ \
-    free(_tuple); \
-  })
+  free(_tuple) \
 
 #endif
 

data/ext/nokogiri/xml_sax_parser_context.c

@@ -21,7 +21,7 @@ static void deallocate(xmlParserCtxtPtr ctxt)
  */
 static VALUE parse_io(VALUE klass, VALUE io, VALUE encoding)
 {
-  xmlCharEncoding enc = (xmlCharEncoding)NUM2INT(encoding); 
+  xmlCharEncoding enc = (xmlCharEncoding)NUM2INT(encoding);
 
   xmlParserCtxtPtr ctxt = xmlCreateIOParserCtxt(
       NULL,
@@ -55,11 +55,13 @@ static VALUE parse_file(VALUE klass, VALUE filename)
  */
 static VALUE parse_memory(VALUE klass, VALUE data)
 {
+  xmlParserCtxtPtr ctxt;
+
   if(NIL_P(data)) rb_raise(rb_eArgError, "data cannot be nil");
   if(!(int)RSTRING_LEN(data))
     rb_raise(rb_eRuntimeError, "data cannot be empty");
 
-  xmlParserCtxtPtr ctxt = xmlCreateMemoryParserCtxt(
+  ctxt = xmlCreateMemoryParserCtxt(
       StringValuePtr(data),
       (int)RSTRING_LEN(data)
   );
@@ -75,16 +77,16 @@ static VALUE parse_memory(VALUE klass, VALUE data)
  */
 static VALUE parse_with(VALUE self, VALUE sax_handler)
 {
+  xmlParserCtxtPtr ctxt;
+  xmlSAXHandlerPtr sax;
+
   if(!rb_obj_is_kind_of(sax_handler, cNokogiriXmlSaxParser))
     rb_raise(rb_eArgError, "argument must be a Nokogiri::XML::SAX::Parser");
 
-  xmlParserCtxtPtr ctxt;
   Data_Get_Struct(self, xmlParserCtxt, ctxt);
-
-  xmlSAXHandlerPtr sax;
   Data_Get_Struct(sax_handler, xmlSAXHandler, sax);
 
-  // Free the sax handler since we'll assign our own
+  /* Free the sax handler since we'll assign our own */
   if(ctxt->sax && ctxt->sax != (xmlSAXHandlerPtr)&xmlDefaultSAXHandler)
     xmlFree(ctxt->sax);
 

data/ext/nokogiri/xml_sax_push_parser.c

@@ -24,14 +24,15 @@ static VALUE allocate(VALUE klass)
 static VALUE native_write(VALUE self, VALUE _chunk, VALUE _last_chunk)
 {
   xmlParserCtxtPtr ctx;
-  Data_Get_Struct(self, xmlParserCtxt, ctx);
-
   const char * chunk  = NULL;
   int size            = 0;
 
+
+  Data_Get_Struct(self, xmlParserCtxt, ctx);
+
   if(Qnil != _chunk) {
     chunk = StringValuePtr(_chunk);
-    size = RSTRING_LEN(_chunk);
+    size = (int)RSTRING_LEN(_chunk);
   }
 
   if(xmlParseChunk(ctx, chunk, size, Qtrue == _last_chunk ? 1 : 0)) {
@@ -53,14 +54,14 @@ static VALUE native_write(VALUE self, VALUE _chunk, VALUE _last_chunk)
 static VALUE initialize_native(VALUE self, VALUE _xml_sax, VALUE _filename)
 {
   xmlSAXHandlerPtr sax;
+  const char * filename = NULL;
+  xmlParserCtxtPtr ctx;
 
   Data_Get_Struct(_xml_sax, xmlSAXHandler, sax);
 
-  const char * filename = NULL;
-
   if(_filename != Qnil) filename = StringValuePtr(_filename);
 
-  xmlParserCtxtPtr ctx = xmlCreatePushParserCtxt(
+  ctx = xmlCreatePushParserCtxt(
       sax,
       NULL,
       NULL,

data/ext/nokogiri/xml_schema.c

@@ -17,16 +17,18 @@ static VALUE validate_document(VALUE self, VALUE document)
 {
   xmlDocPtr doc;
   xmlSchemaPtr schema;
+  xmlSchemaValidCtxtPtr valid_ctxt;
+  VALUE errors;
 
   Data_Get_Struct(self, xmlSchema, schema);
   Data_Get_Struct(document, xmlDoc, doc);
 
-  VALUE errors = rb_ary_new();
+  errors = rb_ary_new();
 
-  xmlSchemaValidCtxtPtr valid_ctxt = xmlSchemaNewValidCtxt(schema);
+  valid_ctxt = xmlSchemaNewValidCtxt(schema);
 
   if(NULL == valid_ctxt) {
-    // we have a problem
+    /* we have a problem */
     rb_raise(rb_eRuntimeError, "Could not create a validation context");
   }
 
@@ -45,6 +47,46 @@ static VALUE validate_document(VALUE self, VALUE document)
   return errors;
 }
 
+/*
+ * call-seq:
+ *  validate_file(filename)
+ *
+ * Validate a file against this Schema.
+ */
+static VALUE validate_file(VALUE self, VALUE rb_filename)
+{
+  xmlSchemaPtr schema;
+  xmlSchemaValidCtxtPtr valid_ctxt;
+  const char *filename ;
+  VALUE errors;
+
+  Data_Get_Struct(self, xmlSchema, schema);
+  filename = (const char*)StringValuePtr(rb_filename) ;
+
+  errors = rb_ary_new();
+
+  valid_ctxt = xmlSchemaNewValidCtxt(schema);
+
+  if(NULL == valid_ctxt) {
+    /* we have a problem */
+    rb_raise(rb_eRuntimeError, "Could not create a validation context");
+  }
+
+#ifdef HAVE_XMLSCHEMASETVALIDSTRUCTUREDERRORS
+  xmlSchemaSetValidStructuredErrors(
+    valid_ctxt,
+    Nokogiri_error_array_pusher,
+    (void *)errors
+  );
+#endif
+
+  xmlSchemaValidateFile(valid_ctxt, filename, 0);
+
+  xmlSchemaFreeValidCtxt(valid_ctxt);
+
+  return errors;
+}
+
 /*
  * call-seq:
  *  read_memory(string)
@@ -53,12 +95,12 @@ static VALUE validate_document(VALUE self, VALUE document)
  */
 static VALUE read_memory(VALUE klass, VALUE content)
 {
-
+  xmlSchemaPtr schema;
   xmlSchemaParserCtxtPtr ctx = xmlSchemaNewMemParserCtxt(
       (const char *)StringValuePtr(content),
-      RSTRING_LEN(content)
+      (int)RSTRING_LEN(content)
   );
-
+  VALUE rb_schema;
   VALUE errors = rb_ary_new();
   xmlSetStructuredErrorFunc((void *)errors, Nokogiri_error_array_pusher);
 
@@ -70,7 +112,7 @@ static VALUE read_memory(VALUE klass, VALUE content)
   );
 #endif
 
-  xmlSchemaPtr schema = xmlSchemaParse(ctx);
+   schema = xmlSchemaParse(ctx);
 
   xmlSetStructuredErrorFunc(NULL, NULL);
   xmlSchemaFreeParserCtxt(ctx);
@@ -85,7 +127,7 @@ static VALUE read_memory(VALUE klass, VALUE content)
     return Qnil;
   }
 
-  VALUE rb_schema = Data_Wrap_Struct(klass, 0, dealloc, schema);
+  rb_schema = Data_Wrap_Struct(klass, 0, dealloc, schema);
   rb_iv_set(rb_schema, "@errors", errors);
 
   return rb_schema;
@@ -100,14 +142,19 @@ static VALUE read_memory(VALUE klass, VALUE content)
 static VALUE from_document(VALUE klass, VALUE document)
 {
   xmlDocPtr doc;
+  xmlSchemaParserCtxtPtr ctx;
+  xmlSchemaPtr schema;
+  VALUE errors;
+  VALUE rb_schema;
+
   Data_Get_Struct(document, xmlDoc, doc);
 
-  // In case someone passes us a node. ugh.
+  /* In case someone passes us a node. ugh. */
   doc = doc->doc;
 
-  xmlSchemaParserCtxtPtr ctx = xmlSchemaNewDocParserCtxt(doc);
+  ctx = xmlSchemaNewDocParserCtxt(doc);
 
-  VALUE errors = rb_ary_new();
+  errors = rb_ary_new();
   xmlSetStructuredErrorFunc((void *)errors, Nokogiri_error_array_pusher);
 
 #ifdef HAVE_XMLSCHEMASETPARSERSTRUCTUREDERRORS
@@ -118,7 +165,7 @@ static VALUE from_document(VALUE klass, VALUE document)
   );
 #endif
 
-  xmlSchemaPtr schema = xmlSchemaParse(ctx);
+  schema = xmlSchemaParse(ctx);
 
   xmlSetStructuredErrorFunc(NULL, NULL);
   xmlSchemaFreeParserCtxt(ctx);
@@ -133,7 +180,7 @@ static VALUE from_document(VALUE klass, VALUE document)
     return Qnil;
   }
 
-  VALUE rb_schema = Data_Wrap_Struct(klass, 0, dealloc, schema);
+  rb_schema = Data_Wrap_Struct(klass, 0, dealloc, schema);
   rb_iv_set(rb_schema, "@errors", errors);
 
   return rb_schema;
@@ -152,5 +199,7 @@ void init_xml_schema()
 
   rb_define_singleton_method(klass, "read_memory", read_memory, 1);
   rb_define_singleton_method(klass, "from_document", from_document, 1);
+
   rb_define_private_method(klass, "validate_document", validate_document, 1);
+  rb_define_private_method(klass, "validate_file",     validate_file, 1);
 }

data/ext/nokogiri/xml_syntax_error.c

@@ -13,25 +13,31 @@ void Nokogiri_error_raise(void * ctx, xmlErrorPtr error)
 
 VALUE Nokogiri_wrap_xml_syntax_error(VALUE klass, xmlErrorPtr error)
 {
+  VALUE msg, e;
+
   if(!klass) klass = cNokogiriXmlSyntaxError;
 
-  VALUE msg = error->message ? NOKOGIRI_STR_NEW2(error->message) : Qnil;
+  msg = (error && error->message) ? NOKOGIRI_STR_NEW2(error->message) : Qnil;
 
-  VALUE e = rb_class_new_instance(
+  e = rb_class_new_instance(
       1,
       &msg,
       klass
   );
-  rb_iv_set(e, "@domain", INT2NUM(error->domain));
-  rb_iv_set(e, "@code", INT2NUM(error->code));
-  rb_iv_set(e, "@level", INT2NUM((short)error->level));
-  rb_iv_set(e, "@file", RBSTR_OR_QNIL(error->file));
-  rb_iv_set(e, "@line", INT2NUM(error->line));
-  rb_iv_set(e, "@str1", RBSTR_OR_QNIL(error->str1));
-  rb_iv_set(e, "@str2", RBSTR_OR_QNIL(error->str2));
-  rb_iv_set(e, "@str3", RBSTR_OR_QNIL(error->str3));
-  rb_iv_set(e, "@int1", INT2NUM(error->int1));
-  rb_iv_set(e, "@column", INT2NUM(error->int2));
+
+  if (error)
+  {
+    rb_iv_set(e, "@domain", INT2NUM(error->domain));
+    rb_iv_set(e, "@code", INT2NUM(error->code));
+    rb_iv_set(e, "@level", INT2NUM((short)error->level));
+    rb_iv_set(e, "@file", RBSTR_OR_QNIL(error->file));
+    rb_iv_set(e, "@line", INT2NUM(error->line));
+    rb_iv_set(e, "@str1", RBSTR_OR_QNIL(error->str1));
+    rb_iv_set(e, "@str2", RBSTR_OR_QNIL(error->str2));
+    rb_iv_set(e, "@str3", RBSTR_OR_QNIL(error->str3));
+    rb_iv_set(e, "@int1", INT2NUM(error->int1));
+    rb_iv_set(e, "@column", INT2NUM(error->int2));
+  }
 
   return e;
 }

data/ext/nokogiri/xml_syntax_error.h

@@ -6,7 +6,7 @@
 void init_xml_syntax_error();
 VALUE Nokogiri_wrap_xml_syntax_error(VALUE klass, xmlErrorPtr error);
 void Nokogiri_error_array_pusher(void * ctx, xmlErrorPtr error);
-void Nokogiri_error_raise(void * ctx, xmlErrorPtr error);
+NORETURN(void Nokogiri_error_raise(void * ctx, xmlErrorPtr error));
 
 extern VALUE cNokogiriXmlSyntaxError;
 #endif