nokogiri 1.11.1 → 1.11.2

data/ext/nokogiri/xml_sax_parser_context.c

@@ -1,8 +1,9 @@
-#include <xml_sax_parser_context.h>
+#include <nokogiri.h>
 
 VALUE cNokogiriXmlSaxParserContext ;
 
-static void deallocate(xmlParserCtxtPtr ctxt)
+static void
+deallocate(xmlParserCtxtPtr ctxt)
 {
   NOKOGIRI_DEBUG_START(ctxt);
 
@@ -22,19 +23,19 @@ static void deallocate(xmlParserCtxtPtr ctxt)
 static VALUE
 parse_io(VALUE klass, VALUE io, VALUE encoding)
 {
-    xmlParserCtxtPtr ctxt;
-    xmlCharEncoding enc = (xmlCharEncoding)NUM2INT(encoding);
-
-    ctxt = xmlCreateIOParserCtxt(NULL, NULL,
-				 (xmlInputReadCallback)io_read_callback,
-				 (xmlInputCloseCallback)io_close_callback,
-				 (void *)io, enc);
-    if (ctxt->sax) {
-	xmlFree(ctxt->sax);
-	ctxt->sax = NULL;
-    }
-
-    return Data_Wrap_Struct(klass, NULL, deallocate, ctxt);
+  xmlParserCtxtPtr ctxt;
+  xmlCharEncoding enc = (xmlCharEncoding)NUM2INT(encoding);
+
+  ctxt = xmlCreateIOParserCtxt(NULL, NULL,
+                               (xmlInputReadCallback)noko_io_read,
+                               (xmlInputCloseCallback)noko_io_close,
+                               (void *)io, enc);
+  if (ctxt->sax) {
+    xmlFree(ctxt->sax);
+    ctxt->sax = NULL;
+  }
+
+  return Data_Wrap_Struct(klass, NULL, deallocate, ctxt);
 }
 
 /*
@@ -43,7 +44,8 @@ parse_io(VALUE klass, VALUE io, VALUE encoding)
  *
  * Parse file given +filename+
  */
-static VALUE parse_file(VALUE klass, VALUE filename)
+static VALUE
+parse_file(VALUE klass, VALUE filename)
 {
   xmlParserCtxtPtr ctxt = xmlCreateFileParserCtxt(StringValueCStr(filename));
   return Data_Wrap_Struct(klass, NULL, deallocate, ctxt);
@@ -58,41 +60,44 @@ static VALUE parse_file(VALUE klass, VALUE filename)
 static VALUE
 parse_memory(VALUE klass, VALUE data)
 {
-    xmlParserCtxtPtr ctxt;
+  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");
+  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");
+  }
 
-    ctxt = xmlCreateMemoryParserCtxt(StringValuePtr(data),
-				     (int)RSTRING_LEN(data));
-    if (ctxt->sax) {
-	xmlFree(ctxt->sax);
-	ctxt->sax = NULL;
-    }
+  ctxt = xmlCreateMemoryParserCtxt(StringValuePtr(data),
+                                   (int)RSTRING_LEN(data));
+  if (ctxt->sax) {
+    xmlFree(ctxt->sax);
+    ctxt->sax = NULL;
+  }
 
-    return Data_Wrap_Struct(klass, NULL, deallocate, ctxt);
+  return Data_Wrap_Struct(klass, NULL, deallocate, ctxt);
 }
 
 static VALUE
 parse_doc(VALUE ctxt_val)
 {
-    xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr)ctxt_val;
-    xmlParseDocument(ctxt);
-    return Qnil;
+  xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr)ctxt_val;
+  xmlParseDocument(ctxt);
+  return Qnil;
 }
 
 static VALUE
 parse_doc_finalize(VALUE ctxt_val)
 {
-    xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr)ctxt_val;
+  xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr)ctxt_val;
 
-    if (NULL != ctxt->myDoc)
-	xmlFreeDoc(ctxt->myDoc);
+  if (NULL != ctxt->myDoc) {
+    xmlFreeDoc(ctxt->myDoc);
+  }
 
-    NOKOGIRI_SAX_TUPLE_DESTROY(ctxt->userData);
-    return Qnil;
+  NOKOGIRI_SAX_TUPLE_DESTROY(ctxt->userData);
+  return Qnil;
 }
 
 /*
@@ -104,27 +109,29 @@ parse_doc_finalize(VALUE ctxt_val)
 static VALUE
 parse_with(VALUE self, VALUE sax_handler)
 {
-    xmlParserCtxtPtr ctxt;
-    xmlSAXHandlerPtr sax;
+  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");
+  if (!rb_obj_is_kind_of(sax_handler, cNokogiriXmlSaxParser)) {
+    rb_raise(rb_eArgError, "argument must be a Nokogiri::XML::SAX::Parser");
+  }
 
-    Data_Get_Struct(self, xmlParserCtxt, ctxt);
-    Data_Get_Struct(sax_handler, xmlSAXHandler, sax);
+  Data_Get_Struct(self, xmlParserCtxt, ctxt);
+  Data_Get_Struct(sax_handler, xmlSAXHandler, sax);
 
-    /* Free the sax handler since we'll assign our own */
-    if (ctxt->sax && ctxt->sax != (xmlSAXHandlerPtr)&xmlDefaultSAXHandler)
-	xmlFree(ctxt->sax);
+  /* Free the sax handler since we'll assign our own */
+  if (ctxt->sax && ctxt->sax != (xmlSAXHandlerPtr)&xmlDefaultSAXHandler) {
+    xmlFree(ctxt->sax);
+  }
 
-    ctxt->sax = sax;
-    ctxt->userData = (void *)NOKOGIRI_SAX_TUPLE_NEW(ctxt, sax_handler);
+  ctxt->sax = sax;
+  ctxt->userData = (void *)NOKOGIRI_SAX_TUPLE_NEW(ctxt, sax_handler);
 
-    xmlSetStructuredErrorFunc(NULL, NULL);
+  xmlSetStructuredErrorFunc(NULL, NULL);
 
-    rb_ensure(parse_doc, (VALUE)ctxt, parse_doc_finalize, (VALUE)ctxt);
+  rb_ensure(parse_doc, (VALUE)ctxt, parse_doc_finalize, (VALUE)ctxt);
 
-    return Qnil;
+  return Qnil;
 }
 
 /*
@@ -134,15 +141,17 @@ parse_with(VALUE self, VALUE sax_handler)
  * Should this parser replace entities?  &amp; will get converted to '&' if
  * set to true
  */
-static VALUE set_replace_entities(VALUE self, VALUE value)
+static VALUE
+set_replace_entities(VALUE self, VALUE value)
 {
   xmlParserCtxtPtr ctxt;
   Data_Get_Struct(self, xmlParserCtxt, ctxt);
 
-  if(Qfalse == value)
+  if (Qfalse == value) {
     ctxt->replaceEntities = 0;
-  else
+  } else {
     ctxt->replaceEntities = 1;
+  }
 
   return value;
 }
@@ -154,15 +163,17 @@ static VALUE set_replace_entities(VALUE self, VALUE value)
  * Should this parser replace entities?  &amp; will get converted to '&' if
  * set to true
  */
-static VALUE get_replace_entities(VALUE self)
+static VALUE
+get_replace_entities(VALUE self)
 {
   xmlParserCtxtPtr ctxt;
   Data_Get_Struct(self, xmlParserCtxt, ctxt);
 
-  if(0 == ctxt->replaceEntities)
+  if (0 == ctxt->replaceEntities) {
     return Qfalse;
-  else
+  } else {
     return Qtrue;
+  }
 }
 
 /*
@@ -170,7 +181,8 @@ static VALUE get_replace_entities(VALUE self)
  *
  * Get the current line the parser context is processing.
  */
-static VALUE line(VALUE self)
+static VALUE
+line(VALUE self)
 {
   xmlParserCtxtPtr ctxt;
   xmlParserInputPtr io;
@@ -178,8 +190,9 @@ static VALUE line(VALUE self)
   Data_Get_Struct(self, xmlParserCtxt, ctxt);
 
   io = ctxt->input;
-  if(io)
+  if (io) {
     return INT2NUM(io->line);
+  }
 
   return Qnil;
 }
@@ -189,7 +202,8 @@ static VALUE line(VALUE self)
  *
  * Get the current column the parser context is processing.
  */
-static VALUE column(VALUE self)
+static VALUE
+column(VALUE self)
 {
   xmlParserCtxtPtr ctxt;
   xmlParserInputPtr io;
@@ -197,8 +211,9 @@ static VALUE column(VALUE self)
   Data_Get_Struct(self, xmlParserCtxt, ctxt);
 
   io = ctxt->input;
-  if(io)
+  if (io) {
     return INT2NUM(io->col);
+  }
 
   return Qnil;
 }
@@ -210,15 +225,17 @@ static VALUE column(VALUE self)
  * Should this parser recover from structural errors? It will not stop processing
  * file on structural errors if set to true
  */
-static VALUE set_recovery(VALUE self, VALUE value)
+static VALUE
+set_recovery(VALUE self, VALUE value)
 {
   xmlParserCtxtPtr ctxt;
   Data_Get_Struct(self, xmlParserCtxt, ctxt);
 
-  if(value == Qfalse)
+  if (value == Qfalse) {
     ctxt->recovery = 0;
-  else
+  } else {
     ctxt->recovery = 1;
+  }
 
   return value;
 }
@@ -230,35 +247,33 @@ static VALUE set_recovery(VALUE self, VALUE value)
  * Should this parser recover from structural errors? It will not stop processing
  * file on structural errors if set to true
  */
-static VALUE get_recovery(VALUE self)
+static VALUE
+get_recovery(VALUE self)
 {
   xmlParserCtxtPtr ctxt;
   Data_Get_Struct(self, xmlParserCtxt, ctxt);
 
-  if(ctxt->recovery == 0)
+  if (ctxt->recovery == 0) {
     return Qfalse;
-  else
+  } else {
     return Qtrue;
+  }
 }
 
-void init_xml_sax_parser_context()
+void
+noko_init_xml_sax_parser_context()
 {
-  VALUE nokogiri  = rb_define_module("Nokogiri");
-  VALUE xml       = rb_define_module_under(nokogiri, "XML");
-  VALUE sax       = rb_define_module_under(xml, "SAX");
-  VALUE klass     = rb_define_class_under(sax, "ParserContext", rb_cObject);
-
-  cNokogiriXmlSaxParserContext = klass;
-
-  rb_define_singleton_method(klass, "io", parse_io, 2);
-  rb_define_singleton_method(klass, "memory", parse_memory, 1);
-  rb_define_singleton_method(klass, "file", parse_file, 1);
-
-  rb_define_method(klass, "parse_with", parse_with, 1);
-  rb_define_method(klass, "replace_entities=", set_replace_entities, 1);
-  rb_define_method(klass, "replace_entities", get_replace_entities, 0);
-  rb_define_method(klass, "recovery=", set_recovery, 1);
-  rb_define_method(klass, "recovery", get_recovery, 0);
-  rb_define_method(klass, "line", line, 0);
-  rb_define_method(klass, "column", column, 0);
+  cNokogiriXmlSaxParserContext = rb_define_class_under(mNokogiriXmlSax, "ParserContext", rb_cObject);
+
+  rb_define_singleton_method(cNokogiriXmlSaxParserContext, "io", parse_io, 2);
+  rb_define_singleton_method(cNokogiriXmlSaxParserContext, "memory", parse_memory, 1);
+  rb_define_singleton_method(cNokogiriXmlSaxParserContext, "file", parse_file, 1);
+
+  rb_define_method(cNokogiriXmlSaxParserContext, "parse_with", parse_with, 1);
+  rb_define_method(cNokogiriXmlSaxParserContext, "replace_entities=", set_replace_entities, 1);
+  rb_define_method(cNokogiriXmlSaxParserContext, "replace_entities", get_replace_entities, 0);
+  rb_define_method(cNokogiriXmlSaxParserContext, "recovery=", set_recovery, 1);
+  rb_define_method(cNokogiriXmlSaxParserContext, "recovery", get_recovery, 0);
+  rb_define_method(cNokogiriXmlSaxParserContext, "line", line, 0);
+  rb_define_method(cNokogiriXmlSaxParserContext, "column", column, 0);
 }

data/ext/nokogiri/xml_sax_push_parser.c

@@ -1,6 +1,9 @@
-#include <xml_sax_push_parser.h>
+#include <nokogiri.h>
 
-static void deallocate(xmlParserCtxtPtr ctx)
+VALUE cNokogiriXmlSaxPushParser ;
+
+static void
+deallocate(xmlParserCtxtPtr ctx)
 {
   NOKOGIRI_DEBUG_START(ctx);
   if (ctx != NULL) {
@@ -10,7 +13,8 @@ static void deallocate(xmlParserCtxtPtr ctx)
   NOKOGIRI_DEBUG_END(ctx);
 }
 
-static VALUE allocate(VALUE klass)
+static VALUE
+allocate(VALUE klass)
 {
   return Data_Wrap_Struct(klass, NULL, deallocate, NULL);
 }
@@ -21,10 +25,11 @@ static VALUE allocate(VALUE klass)
  *
  * Write +chunk+ to PushParser. +last_chunk+ triggers the end_document handle
  */
-static VALUE native_write(VALUE self, VALUE _chunk, VALUE _last_chunk)
+static VALUE
+native_write(VALUE self, VALUE _chunk, VALUE _last_chunk)
 {
   xmlParserCtxtPtr ctx;
-  const char * chunk  = NULL;
+  const char *chunk  = NULL;
   int size            = 0;
 
 
@@ -53,10 +58,11 @@ static VALUE native_write(VALUE self, VALUE _chunk, VALUE _last_chunk)
  *
  * Initialize the push parser with +xml_sax+ using +filename+
  */
-static VALUE initialize_native(VALUE self, VALUE _xml_sax, VALUE _filename)
+static VALUE
+initialize_native(VALUE self, VALUE _xml_sax, VALUE _filename)
 {
   xmlSAXHandlerPtr sax;
-  const char * filename = NULL;
+  const char *filename = NULL;
   xmlParserCtxtPtr ctx;
 
   Data_Get_Struct(_xml_sax, xmlSAXHandler, sax);
@@ -81,7 +87,8 @@ static VALUE initialize_native(VALUE self, VALUE _xml_sax, VALUE _filename)
   return self;
 }
 
-static VALUE get_options(VALUE self)
+static VALUE
+get_options(VALUE self)
 {
   xmlParserCtxtPtr ctx;
   Data_Get_Struct(self, xmlParserCtxt, ctx);
@@ -89,7 +96,8 @@ static VALUE get_options(VALUE self)
   return INT2NUM(ctx->options);
 }
 
-static VALUE set_options(VALUE self, VALUE options)
+static VALUE
+set_options(VALUE self, VALUE options)
 {
   xmlParserCtxtPtr ctx;
   Data_Get_Struct(self, xmlParserCtxt, ctx);
@@ -108,7 +116,8 @@ static VALUE set_options(VALUE self, VALUE options)
  * Should this parser replace entities?  &amp; will get converted to '&' if
  * set to true
  */
-static VALUE get_replace_entities(VALUE self)
+static VALUE
+get_replace_entities(VALUE self)
 {
   xmlParserCtxtPtr ctx;
   Data_Get_Struct(self, xmlParserCtxt, ctx);
@@ -127,7 +136,8 @@ static VALUE get_replace_entities(VALUE self)
  * Should this parser replace entities?  &amp; will get converted to '&' if
  * set to true
  */
-static VALUE set_replace_entities(VALUE self, VALUE value)
+static VALUE
+set_replace_entities(VALUE self, VALUE value)
 {
   xmlParserCtxtPtr ctx;
   Data_Get_Struct(self, xmlParserCtxt, ctx);
@@ -141,21 +151,18 @@ static VALUE set_replace_entities(VALUE self, VALUE value)
   return value;
 }
 
-VALUE cNokogiriXmlSaxPushParser ;
-void init_xml_sax_push_parser()
+void
+noko_init_xml_sax_push_parser()
 {
-  VALUE nokogiri = rb_define_module("Nokogiri");
-  VALUE xml = rb_define_module_under(nokogiri, "XML");
-  VALUE sax = rb_define_module_under(xml, "SAX");
-  VALUE klass = rb_define_class_under(sax, "PushParser", rb_cObject);
-
-  cNokogiriXmlSaxPushParser = klass;
-
-  rb_define_alloc_func(klass, allocate);
-  rb_define_private_method(klass, "initialize_native", initialize_native, 2);
-  rb_define_private_method(klass, "native_write", native_write, 2);
-  rb_define_method(klass, "options", get_options, 0);
-  rb_define_method(klass, "options=", set_options, 1);
-  rb_define_method(klass, "replace_entities", get_replace_entities, 0);
-  rb_define_method(klass, "replace_entities=", set_replace_entities, 1);
+  cNokogiriXmlSaxPushParser = rb_define_class_under(mNokogiriXmlSax, "PushParser", rb_cObject);
+
+  rb_define_alloc_func(cNokogiriXmlSaxPushParser, allocate);
+
+  rb_define_method(cNokogiriXmlSaxPushParser, "options", get_options, 0);
+  rb_define_method(cNokogiriXmlSaxPushParser, "options=", set_options, 1);
+  rb_define_method(cNokogiriXmlSaxPushParser, "replace_entities", get_replace_entities, 0);
+  rb_define_method(cNokogiriXmlSaxPushParser, "replace_entities=", set_replace_entities, 1);
+
+  rb_define_private_method(cNokogiriXmlSaxPushParser, "initialize_native", initialize_native, 2);
+  rb_define_private_method(cNokogiriXmlSaxPushParser, "native_write", native_write, 2);
 }

data/ext/nokogiri/xml_schema.c

@@ -1,6 +1,9 @@
-#include <xml_schema.h>
+#include <nokogiri.h>
 
-static void dealloc(xmlSchemaPtr schema)
+VALUE cNokogiriXmlSchema;
+
+static void
+dealloc(xmlSchemaPtr schema)
 {
   NOKOGIRI_DEBUG_START(schema);
   xmlSchemaFree(schema);
@@ -13,7 +16,8 @@ static void dealloc(xmlSchemaPtr schema)
  *
  * Validate a Nokogiri::XML::Document against this Schema.
  */
-static VALUE validate_document(VALUE self, VALUE document)
+static VALUE
+validate_document(VALUE self, VALUE document)
 {
   xmlDocPtr doc;
   xmlSchemaPtr schema;
@@ -27,7 +31,7 @@ static VALUE validate_document(VALUE self, VALUE document)
 
   valid_ctxt = xmlSchemaNewValidCtxt(schema);
 
-  if(NULL == valid_ctxt) {
+  if (NULL == valid_ctxt) {
     /* we have a problem */
     rb_raise(rb_eRuntimeError, "Could not create a validation context");
   }
@@ -53,7 +57,8 @@ static VALUE validate_document(VALUE self, VALUE document)
  *
  * Validate a file against this Schema.
  */
-static VALUE validate_file(VALUE self, VALUE rb_filename)
+static VALUE
+validate_file(VALUE self, VALUE rb_filename)
 {
   xmlSchemaPtr schema;
   xmlSchemaValidCtxtPtr valid_ctxt;
@@ -61,13 +66,13 @@ static VALUE validate_file(VALUE self, VALUE rb_filename)
   VALUE errors;
 
   Data_Get_Struct(self, xmlSchema, schema);
-  filename = (const char*)StringValueCStr(rb_filename) ;
+  filename = (const char *)StringValueCStr(rb_filename) ;
 
   errors = rb_ary_new();
 
   valid_ctxt = xmlSchemaNewValidCtxt(schema);
 
-  if(NULL == valid_ctxt) {
+  if (NULL == valid_ctxt) {
     /* we have a problem */
     rb_raise(rb_eRuntimeError, "Could not create a validation context");
   }
@@ -93,7 +98,8 @@ static VALUE validate_file(VALUE self, VALUE rb_filename)
  *
  * Create a new Schema from the contents of +string+
  */
-static VALUE read_memory(int argc, VALUE *argv, VALUE klass)
+static VALUE
+read_memory(int argc, VALUE *argv, VALUE klass)
 {
   VALUE content;
   VALUE parse_options;
@@ -107,7 +113,7 @@ static VALUE read_memory(int argc, VALUE *argv, VALUE klass)
 
   scanned_args = rb_scan_args(argc, argv, "11", &content, &parse_options);
   if (scanned_args == 1) {
-    parse_options = rb_const_get(rb_const_get(mNokogiriXml, rb_intern("ParseOptions")), rb_intern("DEFAULT_SCHEMA"));
+    parse_options = rb_const_get_at(rb_const_get_at(mNokogiriXml, rb_intern("ParseOptions")), rb_intern("DEFAULT_SCHEMA"));
   }
   parse_options_int = (int)NUM2INT(rb_funcall(parse_options, rb_intern("to_i"), 0));
 
@@ -121,7 +127,7 @@ static VALUE read_memory(int argc, VALUE *argv, VALUE klass)
     ctx,
     Nokogiri_error_array_pusher,
     (void *)errors
-    );
+  );
 #endif
 
   if (parse_options_int & XML_PARSE_NONET) {
@@ -138,12 +144,13 @@ static VALUE read_memory(int argc, VALUE *argv, VALUE klass)
   xmlSetStructuredErrorFunc(NULL, NULL);
   xmlSchemaFreeParserCtxt(ctx);
 
-  if(NULL == schema) {
+  if (NULL == schema) {
     xmlErrorPtr error = xmlGetLastError();
-    if(error)
+    if (error) {
       Nokogiri_error_raise(NULL, error);
-    else
+    } else {
       rb_raise(rb_eRuntimeError, "Could not parse document");
+    }
 
     return Qnil;
   }
@@ -160,24 +167,25 @@ static VALUE read_memory(int argc, VALUE *argv, VALUE klass)
  * out from under the VALUE pointer.  This function checks to see if any of
  * those nodes have been exposed to Ruby, and if so we should raise an exception.
  */
-static int has_blank_nodes_p(VALUE cache)
+static int
+has_blank_nodes_p(VALUE cache)
 {
-    long i;
+  long i;
 
-    if (NIL_P(cache)) {
-        return 0;
-    }
+  if (NIL_P(cache)) {
+    return 0;
+  }
 
-    for (i = 0; i < RARRAY_LEN(cache); i++) {
-        xmlNodePtr node;
-        VALUE element = rb_ary_entry(cache, i);
-        Data_Get_Struct(element, xmlNode, node);
-        if (xmlIsBlankNode(node)) {
-            return 1;
-        }
+  for (i = 0; i < RARRAY_LEN(cache); i++) {
+    xmlNodePtr node;
+    VALUE element = rb_ary_entry(cache, i);
+    Data_Get_Struct(element, xmlNode, node);
+    if (xmlIsBlankNode(node)) {
+      return 1;
     }
+  }
 
-    return 0;
+  return 0;
 }
 
 /*
@@ -186,7 +194,8 @@ static int has_blank_nodes_p(VALUE cache)
  *
  * Create a new Schema from the Nokogiri::XML::Document +doc+
  */
-static VALUE from_document(int argc, VALUE *argv, VALUE klass)
+static VALUE
+from_document(int argc, VALUE *argv, VALUE klass)
 {
   VALUE document;
   VALUE parse_options;
@@ -205,7 +214,7 @@ static VALUE from_document(int argc, VALUE *argv, VALUE klass)
   doc = doc->doc; /* In case someone passes us a node. ugh. */
 
   if (scanned_args == 1) {
-    parse_options = rb_const_get(rb_const_get(mNokogiriXml, rb_intern("ParseOptions")), rb_intern("DEFAULT_SCHEMA"));
+    parse_options = rb_const_get_at(rb_const_get_at(mNokogiriXml, rb_intern("ParseOptions")), rb_intern("DEFAULT_SCHEMA"));
   }
   parse_options_int = (int)NUM2INT(rb_funcall(parse_options, rb_intern("to_i"), 0));
 
@@ -240,12 +249,13 @@ static VALUE from_document(int argc, VALUE *argv, VALUE klass)
   xmlSetStructuredErrorFunc(NULL, NULL);
   xmlSchemaFreeParserCtxt(ctx);
 
-  if(NULL == schema) {
+  if (NULL == schema) {
     xmlErrorPtr error = xmlGetLastError();
-    if(error)
+    if (error) {
       Nokogiri_error_raise(NULL, error);
-    else
+    } else {
       rb_raise(rb_eRuntimeError, "Could not parse document");
+    }
 
     return Qnil;
   }
@@ -259,18 +269,14 @@ static VALUE from_document(int argc, VALUE *argv, VALUE klass)
   return Qnil;
 }
 
-VALUE cNokogiriXmlSchema;
-void init_xml_schema()
+void
+noko_init_xml_schema()
 {
-  VALUE nokogiri = rb_define_module("Nokogiri");
-  VALUE xml = rb_define_module_under(nokogiri, "XML");
-  VALUE klass = rb_define_class_under(xml, "Schema", rb_cObject);
-
-  cNokogiriXmlSchema = klass;
+  cNokogiriXmlSchema = rb_define_class_under(mNokogiriXml, "Schema", rb_cObject);
 
-  rb_define_singleton_method(klass, "read_memory", read_memory, -1);
-  rb_define_singleton_method(klass, "from_document", from_document, -1);
+  rb_define_singleton_method(cNokogiriXmlSchema, "read_memory", read_memory, -1);
+  rb_define_singleton_method(cNokogiriXmlSchema, "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);
+  rb_define_private_method(cNokogiriXmlSchema, "validate_document", validate_document, 1);
+  rb_define_private_method(cNokogiriXmlSchema, "validate_file",     validate_file, 1);
 }