nokogiri 1.11.0.rc3-x64-mingw32 → 1.11.3-x64-mingw32

data/ext/nokogiri/xslt_stylesheet.c

@@ -1,34 +1,29 @@
-#include <xslt_stylesheet.h>
+#include <nokogiri.h>
 
-#include <libxslt/xsltInternals.h>
-#include <libxslt/xsltutils.h>
-#include <libxslt/transform.h>
-#include <libexslt/exslt.h>
-
-VALUE xslt;
-
-int vasprintf (char **strp, const char *fmt, va_list ap);
-void vasprintf_free (void *p);
+VALUE cNokogiriXsltStylesheet ;
 
-static void mark(nokogiriXsltStylesheetTuple *wrapper)
+static void
+mark(nokogiriXsltStylesheetTuple *wrapper)
 {
   rb_gc_mark(wrapper->func_instances);
 }
 
-static void dealloc(nokogiriXsltStylesheetTuple *wrapper)
+static void
+dealloc(nokogiriXsltStylesheetTuple *wrapper)
 {
-    xsltStylesheetPtr doc = wrapper->ss;
+  xsltStylesheetPtr doc = wrapper->ss;
 
-    NOKOGIRI_DEBUG_START(doc);
-    xsltFreeStylesheet(doc); /* commented out for now. */
-    NOKOGIRI_DEBUG_END(doc);
+  NOKOGIRI_DEBUG_START(doc);
+  xsltFreeStylesheet(doc); /* commented out for now. */
+  NOKOGIRI_DEBUG_END(doc);
 
-    free(wrapper);
+  free(wrapper);
 }
 
-static void xslt_generic_error_handler(void * ctx, const char *msg, ...)
+static void
+xslt_generic_error_handler(void *ctx, const char *msg, ...)
 {
-  char * message;
+  char *message;
 
   va_list args;
   va_start(args, msg);
@@ -37,10 +32,11 @@ static void xslt_generic_error_handler(void * ctx, const char *msg, ...)
 
   rb_str_cat2((VALUE)ctx, message);
 
-  vasprintf_free(message);
+  free(message);
 }
 
-VALUE Nokogiri_wrap_xslt_stylesheet(xsltStylesheetPtr ss)
+VALUE
+Nokogiri_wrap_xslt_stylesheet(xsltStylesheetPtr ss)
 {
   VALUE self;
   nokogiriXsltStylesheetTuple *wrapper;
@@ -61,29 +57,30 @@ VALUE Nokogiri_wrap_xslt_stylesheet(xsltStylesheetPtr ss)
  *
  * Parse a stylesheet from +document+.
  */
-static VALUE parse_stylesheet_doc(VALUE klass, VALUE xmldocobj)
+static VALUE
+parse_stylesheet_doc(VALUE klass, VALUE xmldocobj)
 {
-    xmlDocPtr xml, xml_cpy;
-    VALUE errstr, exception;
-    xsltStylesheetPtr ss ;
-    Data_Get_Struct(xmldocobj, xmlDoc, xml);
-    exsltRegisterAll();
+  xmlDocPtr xml, xml_cpy;
+  VALUE errstr, exception;
+  xsltStylesheetPtr ss ;
+  Data_Get_Struct(xmldocobj, xmlDoc, xml);
+  exsltRegisterAll();
 
-    errstr = rb_str_new(0, 0);
-    xsltSetGenericErrorFunc((void *)errstr, xslt_generic_error_handler);
+  errstr = rb_str_new(0, 0);
+  xsltSetGenericErrorFunc((void *)errstr, xslt_generic_error_handler);
 
-    xml_cpy = xmlCopyDoc(xml, 1); /* 1 => recursive */
-    ss = xsltParseStylesheetDoc(xml_cpy);
+  xml_cpy = xmlCopyDoc(xml, 1); /* 1 => recursive */
+  ss = xsltParseStylesheetDoc(xml_cpy);
 
-    xsltSetGenericErrorFunc(NULL, NULL);
+  xsltSetGenericErrorFunc(NULL, NULL);
 
-    if (!ss) {
-	xmlFreeDoc(xml_cpy);
-	exception = rb_exc_new3(rb_eRuntimeError, errstr);
-	rb_exc_raise(exception);
-    }
+  if (!ss) {
+    xmlFreeDoc(xml_cpy);
+    exception = rb_exc_new3(rb_eRuntimeError, errstr);
+    rb_exc_raise(exception);
+  }
 
-    return Nokogiri_wrap_xslt_stylesheet(ss);
+  return Nokogiri_wrap_xslt_stylesheet(ss);
 }
 
 
@@ -93,20 +90,21 @@ static VALUE parse_stylesheet_doc(VALUE klass, VALUE xmldocobj)
  *
  * Serialize +document+ to an xml string.
  */
-static VALUE serialize(VALUE self, VALUE xmlobj)
+static VALUE
+serialize(VALUE self, VALUE xmlobj)
 {
-    xmlDocPtr xml ;
-    nokogiriXsltStylesheetTuple *wrapper;
-    xmlChar* doc_ptr ;
-    int doc_len ;
-    VALUE rval ;
-
-    Data_Get_Struct(xmlobj, xmlDoc, xml);
-    Data_Get_Struct(self, nokogiriXsltStylesheetTuple, wrapper);
-    xsltSaveResultToString(&doc_ptr, &doc_len, xml, wrapper->ss);
-    rval = NOKOGIRI_STR_NEW(doc_ptr, doc_len);
-    xmlFree(doc_ptr);
-    return rval ;
+  xmlDocPtr xml ;
+  nokogiriXsltStylesheetTuple *wrapper;
+  xmlChar *doc_ptr ;
+  int doc_len ;
+  VALUE rval ;
+
+  Data_Get_Struct(xmlobj, xmlDoc, xml);
+  Data_Get_Struct(self, nokogiriXsltStylesheetTuple, wrapper);
+  xsltSaveResultToString(&doc_ptr, &doc_len, xml, wrapper->ss);
+  rval = NOKOGIRI_STR_NEW(doc_ptr, doc_len);
+  xmlFree(doc_ptr);
+  return rval ;
 }
 
 /*
@@ -124,109 +122,114 @@ static VALUE serialize(VALUE self, VALUE xmlobj)
  *    puts xslt.transform(doc, ['key', 'value'])
  *
  */
-static VALUE transform(int argc, VALUE* argv, VALUE self)
+static VALUE
+transform(int argc, VALUE *argv, VALUE self)
 {
-    VALUE xmldoc, paramobj, errstr, exception ;
-    xmlDocPtr xml ;
-    xmlDocPtr result ;
-    nokogiriXsltStylesheetTuple *wrapper;
-    const char** params ;
-    long param_len, j ;
-    int parse_error_occurred ;
-
-    rb_scan_args(argc, argv, "11", &xmldoc, &paramobj);
-    if (NIL_P(paramobj)) { paramobj = rb_ary_new2(0L) ; }
-    if (!rb_obj_is_kind_of(xmldoc, cNokogiriXmlDocument))
-      rb_raise(rb_eArgError, "argument must be a Nokogiri::XML::Document");
-
-    /* handle hashes as arguments. */
-    if(T_HASH == TYPE(paramobj)) {
-      paramobj = rb_funcall(paramobj, rb_intern("to_a"), 0);
-      paramobj = rb_funcall(paramobj, rb_intern("flatten"), 0);
-    }
-
-    Check_Type(paramobj, T_ARRAY);
-
-    Data_Get_Struct(xmldoc, xmlDoc, xml);
-    Data_Get_Struct(self, nokogiriXsltStylesheetTuple, wrapper);
-
-    param_len = RARRAY_LEN(paramobj);
-    params = calloc((size_t)param_len+1, sizeof(char*));
-    for (j = 0 ; j < param_len ; j++) {
-      VALUE entry = rb_ary_entry(paramobj, j);
-      const char * ptr = StringValueCStr(entry);
-      params[j] = ptr;
-    }
-    params[param_len] = 0 ;
-
-    errstr = rb_str_new(0, 0);
-    xsltSetGenericErrorFunc((void *)errstr, xslt_generic_error_handler);
-    xmlSetGenericErrorFunc((void *)errstr, xslt_generic_error_handler);
-
-    result = xsltApplyStylesheet(wrapper->ss, xml, params);
-    free(params);
-
-    xsltSetGenericErrorFunc(NULL, NULL);
-    xmlSetGenericErrorFunc(NULL, NULL);
-
-    parse_error_occurred = (Qfalse == rb_funcall(errstr, rb_intern("empty?"), 0));
-
-    if (parse_error_occurred) {
-      exception = rb_exc_new3(rb_eRuntimeError, errstr);
-      rb_exc_raise(exception);
-    }
-
-    return Nokogiri_wrap_xml_document((VALUE)0, result) ;
+  VALUE xmldoc, paramobj, errstr, exception ;
+  xmlDocPtr xml ;
+  xmlDocPtr result ;
+  nokogiriXsltStylesheetTuple *wrapper;
+  const char **params ;
+  long param_len, j ;
+  int parse_error_occurred ;
+
+  rb_scan_args(argc, argv, "11", &xmldoc, &paramobj);
+  if (NIL_P(paramobj)) { paramobj = rb_ary_new2(0L) ; }
+  if (!rb_obj_is_kind_of(xmldoc, cNokogiriXmlDocument)) {
+    rb_raise(rb_eArgError, "argument must be a Nokogiri::XML::Document");
+  }
+
+  /* handle hashes as arguments. */
+  if (T_HASH == TYPE(paramobj)) {
+    paramobj = rb_funcall(paramobj, rb_intern("to_a"), 0);
+    paramobj = rb_funcall(paramobj, rb_intern("flatten"), 0);
+  }
+
+  Check_Type(paramobj, T_ARRAY);
+
+  Data_Get_Struct(xmldoc, xmlDoc, xml);
+  Data_Get_Struct(self, nokogiriXsltStylesheetTuple, wrapper);
+
+  param_len = RARRAY_LEN(paramobj);
+  params = calloc((size_t)param_len + 1, sizeof(char *));
+  for (j = 0 ; j < param_len ; j++) {
+    VALUE entry = rb_ary_entry(paramobj, j);
+    const char *ptr = StringValueCStr(entry);
+    params[j] = ptr;
+  }
+  params[param_len] = 0 ;
+
+  errstr = rb_str_new(0, 0);
+  xsltSetGenericErrorFunc((void *)errstr, xslt_generic_error_handler);
+  xmlSetGenericErrorFunc((void *)errstr, xslt_generic_error_handler);
+
+  result = xsltApplyStylesheet(wrapper->ss, xml, params);
+  free(params);
+
+  xsltSetGenericErrorFunc(NULL, NULL);
+  xmlSetGenericErrorFunc(NULL, NULL);
+
+  parse_error_occurred = (Qfalse == rb_funcall(errstr, rb_intern("empty?"), 0));
+
+  if (parse_error_occurred) {
+    exception = rb_exc_new3(rb_eRuntimeError, errstr);
+    rb_exc_raise(exception);
+  }
+
+  return noko_xml_document_wrap((VALUE)0, result) ;
 }
 
-static void method_caller(xmlXPathParserContextPtr ctxt, int nargs)
+static void
+method_caller(xmlXPathParserContextPtr ctxt, int nargs)
 {
-    VALUE handler;
-    const char *function_name;
-    xsltTransformContextPtr transform;
-    const xmlChar *functionURI;
+  VALUE handler;
+  const char *function_name;
+  xsltTransformContextPtr transform;
+  const xmlChar *functionURI;
 
-    transform = xsltXPathGetTransformContext(ctxt);
-    functionURI = ctxt->context->functionURI;
-    handler = (VALUE)xsltGetExtData(transform, functionURI);
-    function_name = (const char*)(ctxt->context->function);
+  transform = xsltXPathGetTransformContext(ctxt);
+  functionURI = ctxt->context->functionURI;
+  handler = (VALUE)xsltGetExtData(transform, functionURI);
+  function_name = (const char *)(ctxt->context->function);
 
-    Nokogiri_marshal_xpath_funcall_and_return_values(ctxt, nargs, handler, (const char*)function_name);
+  Nokogiri_marshal_xpath_funcall_and_return_values(ctxt, nargs, handler, (const char *)function_name);
 }
 
-static void * initFunc(xsltTransformContextPtr ctxt, const xmlChar *uri)
+static void *
+initFunc(xsltTransformContextPtr ctxt, const xmlChar *uri)
 {
-    VALUE modules = rb_iv_get(xslt, "@modules");
-    VALUE obj = rb_hash_aref(modules, rb_str_new2((const char *)uri));
-    VALUE args = { Qfalse };
-    VALUE methods = rb_funcall(obj, rb_intern("instance_methods"), 1, args);
-    VALUE inst;
-    nokogiriXsltStylesheetTuple *wrapper;
-    int i;
-
-    for(i = 0; i < RARRAY_LEN(methods); i++) {
-	VALUE method_name = rb_obj_as_string(rb_ary_entry(methods, i));
-	xsltRegisterExtFunction(ctxt,
-          (unsigned char *)StringValueCStr(method_name), uri, method_caller);
-    }
-
-    Data_Get_Struct((VALUE)ctxt->style->_private, nokogiriXsltStylesheetTuple,
-                    wrapper);
-    inst = rb_class_new_instance(0, NULL, obj);
-    rb_ary_push(wrapper->func_instances, inst);
-
-    return (void *)inst;
+  VALUE modules = rb_iv_get(mNokogiriXslt, "@modules");
+  VALUE obj = rb_hash_aref(modules, rb_str_new2((const char *)uri));
+  VALUE args = { Qfalse };
+  VALUE methods = rb_funcall(obj, rb_intern("instance_methods"), 1, args);
+  VALUE inst;
+  nokogiriXsltStylesheetTuple *wrapper;
+  int i;
+
+  for (i = 0; i < RARRAY_LEN(methods); i++) {
+    VALUE method_name = rb_obj_as_string(rb_ary_entry(methods, i));
+    xsltRegisterExtFunction(ctxt,
+                            (unsigned char *)StringValueCStr(method_name), uri, method_caller);
+  }
+
+  Data_Get_Struct((VALUE)ctxt->style->_private, nokogiriXsltStylesheetTuple,
+                  wrapper);
+  inst = rb_class_new_instance(0, NULL, obj);
+  rb_ary_push(wrapper->func_instances, inst);
+
+  return (void *)inst;
 }
 
-static void shutdownFunc(xsltTransformContextPtr ctxt,
-	const xmlChar *uri, void *data)
+static void
+shutdownFunc(xsltTransformContextPtr ctxt,
+             const xmlChar *uri, void *data)
 {
-    nokogiriXsltStylesheetTuple *wrapper;
+  nokogiriXsltStylesheetTuple *wrapper;
 
-    Data_Get_Struct((VALUE)ctxt->style->_private, nokogiriXsltStylesheetTuple,
-                    wrapper);
+  Data_Get_Struct((VALUE)ctxt->style->_private, nokogiriXsltStylesheetTuple,
+                  wrapper);
 
-    rb_ary_clear(wrapper->func_instances);
+  rb_ary_clear(wrapper->func_instances);
 }
 
 /*
@@ -235,32 +238,26 @@ static void shutdownFunc(xsltTransformContextPtr ctxt,
  *
  *  Register a class that implements custom XSLT transformation functions.
  */
-static VALUE registr(VALUE self, VALUE uri, VALUE obj)
+static VALUE
+registr(VALUE self, VALUE uri, VALUE obj)
 {
-    VALUE modules = rb_iv_get(self, "@modules");
-    if(NIL_P(modules)) rb_raise(rb_eRuntimeError, "wtf! @modules isn't set");
+  VALUE modules = rb_iv_get(self, "@modules");
+  if (NIL_P(modules)) { rb_raise(rb_eRuntimeError, "wtf! @modules isn't set"); }
 
-    rb_hash_aset(modules, uri, obj);
-    xsltRegisterExtModule((unsigned char *)StringValueCStr(uri), initFunc, shutdownFunc);
-    return self;
+  rb_hash_aset(modules, uri, obj);
+  xsltRegisterExtModule((unsigned char *)StringValueCStr(uri), initFunc, shutdownFunc);
+  return self;
 }
 
-VALUE cNokogiriXsltStylesheet ;
-void init_xslt_stylesheet()
+void
+noko_init_xslt_stylesheet()
 {
-  VALUE nokogiri;
-  VALUE klass;
-
-  nokogiri = rb_define_module("Nokogiri");
-  xslt = rb_define_module_under(nokogiri, "XSLT");
-  klass = rb_define_class_under(xslt, "Stylesheet", rb_cObject);
-
-  rb_iv_set(xslt, "@modules", rb_hash_new());
+  rb_define_singleton_method(mNokogiriXslt, "register", registr, 2);
+  rb_iv_set(mNokogiriXslt, "@modules", rb_hash_new());
 
-  cNokogiriXsltStylesheet = klass;
+  cNokogiriXsltStylesheet = rb_define_class_under(mNokogiriXslt, "Stylesheet", rb_cObject);
 
-  rb_define_singleton_method(klass, "parse_stylesheet_doc", parse_stylesheet_doc, 1);
-  rb_define_singleton_method(xslt, "register", registr, 2);
-  rb_define_method(klass, "serialize", serialize, 1);
-  rb_define_method(klass, "transform", transform, -1);
+  rb_define_singleton_method(cNokogiriXsltStylesheet, "parse_stylesheet_doc", parse_stylesheet_doc, 1);
+  rb_define_method(cNokogiriXsltStylesheet, "serialize", serialize, 1);
+  rb_define_method(cNokogiriXsltStylesheet, "transform", transform, -1);
 }

data/lib/nokogiri.rb

@@ -8,12 +8,8 @@ if defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
   require 'nokogiri/jruby/dependencies'
 end
 
-begin
-  RUBY_VERSION =~ /(\d+\.\d+)/
-  require "nokogiri/#{$1}/nokogiri"
-rescue LoadError
-  require 'nokogiri/nokogiri'
-end
+require 'nokogiri/extension'
+
 require 'nokogiri/version'
 require 'nokogiri/syntax_error'
 require 'nokogiri/xml'
@@ -113,7 +109,7 @@ module Nokogiri
 end
 
 ###
-# Parser a document contained in +args+.  Nokogiri will try to guess what
+# Parse a document contained in +args+.  Nokogiri will try to guess what
 # type of document you are attempting to parse.  For more information, see
 # Nokogiri.parse
 #

data/lib/nokogiri/css/parser.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.16
+# This file is automatically generated by Racc 1.5.2
 # from Racc grammar file "".
 #
 
@@ -476,7 +476,7 @@ def _reduce_26(val, _values, result)
 end
 
 def _reduce_27(val, _values, result)
-        # Non standard, but hpricot supports it.
+        # non-standard, from hpricot
         result = Node.new(:PSEUDO_CLASS,
           [Node.new(:FUNCTION, ['nth-child(', val[1]])]
         )
@@ -558,7 +558,7 @@ def _reduce_40(val, _values, result)
         when 'n'
           result = Node.new(:NTH, ['1','n','+','0'])
         else
-          # This is not CSS standard.  It allows us to support this:
+          # non-standard to support custom functions:
           # assert_xpath("//a[foo(., @href)]", @parser.parse('a:foo(@href)'))
           # assert_xpath("//a[foo(., @a, b)]", @parser.parse('a:foo(@a, b)'))
           # assert_xpath("//a[foo(., a, 10)]", @parser.parse('a:foo(a, 10)'))