nokogiri 1.4.1 → 1.4.2

data/ext/nokogiri/xml_text.c

@@ -9,18 +9,20 @@
 static VALUE new(int argc, VALUE *argv, VALUE klass)
 {
   xmlDocPtr doc;
+  xmlNodePtr node;
   VALUE string;
   VALUE document;
   VALUE rest;
+  VALUE rb_node;
 
   rb_scan_args(argc, argv, "2*", &string, &document, &rest);
 
   Data_Get_Struct(document, xmlDoc, doc);
 
-  xmlNodePtr node = xmlNewText((xmlChar *)StringValuePtr(string));
+  node = xmlNewText((xmlChar *)StringValuePtr(string));
   node->doc = doc->doc;
 
-  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_xpath_context.c

@@ -1,5 +1,7 @@
 #include <xml_xpath_context.h>
 
+int vasprintf (char **strp, const char *fmt, va_list ap);
+
 static void deallocate(xmlXPathContextPtr ctx)
 {
   NOKOGIRI_DEBUG_START(ctx);
@@ -28,7 +30,13 @@ static VALUE register_ns(VALUE self, VALUE prefix, VALUE uri)
 static void ruby_funcall(xmlXPathParserContextPtr ctx, int nargs)
 {
   VALUE xpath_handler = Qnil;
+  VALUE result;
+  VALUE *argv;
+  VALUE doc;
+  VALUE node_set = Qnil;
+  xmlNodeSetPtr xml_node_set = NULL;
   xmlXPathObjectPtr obj;
+  int i;
 
   assert(ctx);
   assert(ctx->context);
@@ -38,10 +46,10 @@ static void ruby_funcall(xmlXPathParserContextPtr ctx, int nargs)
 
   xpath_handler = (VALUE)(ctx->context->userData);
 
-  VALUE * argv = (VALUE *)calloc((unsigned int)nargs, sizeof(VALUE));
-  VALUE doc = DOC_RUBY_OBJECT(ctx->context->doc);
+  argv = (VALUE *)calloc((unsigned int)nargs, sizeof(VALUE));
+  doc = DOC_RUBY_OBJECT(ctx->context->doc);
 
-  int i = nargs - 1;
+  i = nargs - 1;
   do {
     obj = valuePop(ctx);
     switch(obj->type) {
@@ -55,7 +63,7 @@ static void ruby_funcall(xmlXPathParserContextPtr ctx, int nargs)
         argv[i] = rb_float_new(obj->floatval);
         break;
       case XPATH_NODESET:
-        argv[i] = Nokogiri_wrap_xml_node_set(obj->nodesetval);
+        argv[i] = Nokogiri_wrap_xml_node_set(obj->nodesetval, doc);
         break;
       default:
         argv[i] = NOKOGIRI_STR_NEW2(xmlXPathCastToString(obj));
@@ -63,7 +71,7 @@ static void ruby_funcall(xmlXPathParserContextPtr ctx, int nargs)
     xmlXPathFreeNodeSetList(obj);
   } while(i-- > 0);
 
-  VALUE result = rb_funcall2(
+  result = rb_funcall2(
       xpath_handler,
       rb_intern((const char *)ctx->context->function),
       nargs,
@@ -71,9 +79,6 @@ static void ruby_funcall(xmlXPathParserContextPtr ctx, int nargs)
   );
   free(argv);
 
-  VALUE node_set = Qnil;
-  xmlNodeSetPtr xml_node_set = NULL;
-
   switch(TYPE(result)) {
     case T_FLOAT:
     case T_BIGNUM:
@@ -96,7 +101,9 @@ static void ruby_funcall(xmlXPathParserContextPtr ctx, int nargs)
       break;
     case T_ARRAY:
       {
-        VALUE args[2] = {doc, result};
+        VALUE args[2];
+	args[0] = doc;
+	args[1] = result;
         node_set = rb_class_new_instance(2, args, cNokogiriXmlNodeSet);
         Data_Get_Struct(node_set, xmlNodeSet, xml_node_set);
         xmlXPathReturnNodeSet(ctx, xmlXPathNodeSetMerge(NULL, xml_node_set));
@@ -105,7 +112,7 @@ static void ruby_funcall(xmlXPathParserContextPtr ctx, int nargs)
     case T_DATA:
       if(rb_obj_is_kind_of(result, cNokogiriXmlNodeSet)) {
         Data_Get_Struct(result, xmlNodeSet, xml_node_set);
-        // Copy the node set, otherwise it will get GC'd.
+        /* Copy the node set, otherwise it will get GC'd. */
         xmlXPathReturnNodeSet(ctx, xmlXPathNodeSetMerge(NULL, xml_node_set));
         break;
       }
@@ -125,6 +132,7 @@ static xmlXPathFunction lookup( void *ctx,
   return NULL;
 }
 
+NORETURN(static void xpath_exception_handler(void * ctx, xmlErrorPtr error));
 static void xpath_exception_handler(void * ctx, xmlErrorPtr error)
 {
   VALUE xpath = rb_const_get(mNokogiriXml, rb_intern("XPath"));
@@ -133,6 +141,7 @@ static void xpath_exception_handler(void * ctx, xmlErrorPtr error)
   rb_exc_raise(Nokogiri_wrap_xml_syntax_error(klass, error));
 }
 
+NORETURN(static void xpath_generic_exception_handler(void * ctx, const char *msg, ...));
 static void xpath_generic_exception_handler(void * ctx, const char *msg, ...)
 {
   char * message;
@@ -154,16 +163,20 @@ static void xpath_generic_exception_handler(void * ctx, const char *msg, ...)
 static VALUE evaluate(int argc, VALUE *argv, VALUE self)
 {
   VALUE search_path, xpath_handler;
+  VALUE thing = Qnil;
   xmlXPathContextPtr ctx;
+  xmlXPathObjectPtr xpath;
+  xmlChar *query;
+
   Data_Get_Struct(self, xmlXPathContext, ctx);
 
   if(rb_scan_args(argc, argv, "11", &search_path, &xpath_handler) == 1)
     xpath_handler = Qnil;
 
-  xmlChar* query = (xmlChar *)StringValuePtr(search_path);
+  query = (xmlChar *)StringValuePtr(search_path);
 
   if(Qnil != xpath_handler) {
-    // FIXME: not sure if this is the correct place to shove private data.
+    /* FIXME: not sure if this is the correct place to shove private data. */
     ctx->userData = (void *)xpath_handler;
     xmlXPathRegisterFuncLookup(ctx, lookup, (void *)xpath_handler);
   }
@@ -171,11 +184,11 @@ static VALUE evaluate(int argc, VALUE *argv, VALUE self)
   xmlResetLastError();
   xmlSetStructuredErrorFunc(NULL, xpath_exception_handler);
 
-  // For some reason, xmlXPathEvalExpression will blow up with a generic error
-  // when there is a non existent function.
+  /* For some reason, xmlXPathEvalExpression will blow up with a generic error */
+  /* when there is a non existent function. */
   xmlSetGenericErrorFunc(NULL, xpath_generic_exception_handler);
 
-  xmlXPathObjectPtr xpath = xmlXPathEvalExpression(query, ctx);
+  xpath = xmlXPathEvalExpression(query, ctx);
   xmlSetStructuredErrorFunc(NULL, NULL);
   xmlSetGenericErrorFunc(NULL, NULL);
 
@@ -187,13 +200,34 @@ static VALUE evaluate(int argc, VALUE *argv, VALUE self)
     rb_exc_raise(Nokogiri_wrap_xml_syntax_error(klass, error));
   }
 
-  VALUE xpath_object = Nokogiri_wrap_xml_xpath(xpath);
-
   assert(ctx->doc);
   assert(DOC_RUBY_OBJECT_TEST(ctx->doc));
 
-  rb_iv_set(xpath_object, "@document", DOC_RUBY_OBJECT(ctx->doc));
-  return xpath_object;
+  switch(xpath->type) {
+    case XPATH_STRING:
+      thing = NOKOGIRI_STR_NEW2(xpath->stringval);
+      break;
+    case XPATH_NODESET:
+      if(NULL == xpath->nodesetval) {
+        thing = Nokogiri_wrap_xml_node_set(xmlXPathNodeSetCreate(NULL),
+          DOC_RUBY_OBJECT(ctx->doc));
+      } else {
+        thing = Nokogiri_wrap_xml_node_set(xpath->nodesetval,
+            DOC_RUBY_OBJECT(ctx->doc));
+      }
+      break;
+    case XPATH_NUMBER:
+      thing = rb_float_new(xpath->floatval);
+      break;
+    case XPATH_BOOLEAN:
+      thing = xpath->boolval == 1 ? Qtrue : Qfalse;
+      break;
+    default:
+      thing = Nokogiri_wrap_xml_node_set(xmlXPathNodeSetCreate(NULL),
+        DOC_RUBY_OBJECT(ctx->doc));
+  }
+
+  return thing;
 }
 
 /*
@@ -204,15 +238,18 @@ static VALUE evaluate(int argc, VALUE *argv, VALUE self)
  */
 static VALUE new(VALUE klass, VALUE nodeobj)
 {
+  xmlNodePtr node;
+  xmlXPathContextPtr ctx;
+  VALUE self;
+
   xmlXPathInit();
 
-  xmlNodePtr node ;
   Data_Get_Struct(nodeobj, xmlNode, node);
 
-  xmlXPathContextPtr ctx = xmlXPathNewContext(node->doc);
+  ctx = xmlXPathNewContext(node->doc);
   ctx->node = node;
-  VALUE self = Data_Wrap_Struct(klass, 0, deallocate, ctx);
-  //rb_iv_set(self, "@xpath_handler", Qnil);
+  self = Data_Wrap_Struct(klass, 0, deallocate, ctx);
+  /*rb_iv_set(self, "@xpath_handler", Qnil); */
   return self;
 }
 

data/ext/nokogiri/xslt_stylesheet.c

@@ -5,13 +5,16 @@
 #include <libxslt/transform.h>
 #include <libexslt/exslt.h>
 
+int vasprintf (char **strp, const char *fmt, va_list ap);
+
 static void dealloc(xsltStylesheetPtr doc)
 {
     NOKOGIRI_DEBUG_START(doc);
-    xsltFreeStylesheet(doc); // commented out for now.
+    xsltFreeStylesheet(doc); /* commented out for now. */
     NOKOGIRI_DEBUG_END(doc);
 }
 
+NORETURN(static void xslt_generic_error_handler(void * ctx, const char *msg, ...));
 static void xslt_generic_error_handler(void * ctx, const char *msg, ...)
 {
   char * message;
@@ -91,11 +94,19 @@ static VALUE transform(int argc, VALUE* argv, VALUE self)
     xmlDocPtr result ;
     xsltStylesheetPtr ss ;
     const char** params ;
-    int param_len, j ;
+    long param_len, j ;
 
     rb_scan_args(argc, argv, "11", &xmldoc, &paramobj);
     if (NIL_P(paramobj)) { paramobj = rb_ary_new2(0) ; }
 
+    /* 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, xsltStylesheet, ss);
 
@@ -124,7 +135,7 @@ void init_xslt_stylesheet()
   VALUE klass = rb_define_class_under(xslt, "Stylesheet", rb_cObject);
 
   cNokogiriXsltStylesheet = klass;
-    
+
   rb_define_singleton_method(klass, "parse_stylesheet_doc", parse_stylesheet_doc, 1);
   rb_define_method(klass, "serialize", serialize, 1);
   rb_define_method(klass, "transform", transform, -1);

data/lib/nokogiri.rb

@@ -13,6 +13,23 @@ else
   require 'nokogiri/nokogiri'
 end
 
+warn(<<-eowarn) if '1.8.6' == RUBY_VERSION && $VERBOSE
+!!! DEPRECATION WARNING !!!
+Hey Champ!  I see you're using Ruby 1.8.6!  While I applaud you for sticking to
+your guns and using The One True Ruby, I have to let you know that we're going
+to stop supporting 1.8.6.  I know, it's sad.  But, we just don't have time to
+support every version of Ruby out there.  Whether we like it or not, time moves
+forward and so does our software.
+
+On August 1, 2010, we will no longer support Ruby 1.8.6.  If nokogiri happens to
+work on 1.8.6 after that date, then great!  We will hownever, no longer test,
+use, or endorse 1.8.6 as a supported platform.
+
+Thanks,
+
+  Team Nokogiri
+eowarn
+
 require 'nokogiri/version'
 require 'nokogiri/version_warning'
 require 'nokogiri/syntax_error'

data/lib/nokogiri/css/generated_parser.rb

@@ -13,82 +13,86 @@ module Nokogiri
 ##### State transition tables begin ###
 
 racc_action_table = [
-     3,    55,    26,    21,    12,    24,    56,     3,    57,     1,
-    73,    12,    41,    56,     3,    23,     1,    79,    12,    18,
-    91,    90,     4,     1,     9,    10,    18,    13,    16,     4,
+     3,    55,    26,    21,    12,    24,    56,     3,    81,     1,
+    41,    12,    41,    56,     3,    23,     1,    80,    12,    18,
+    92,    91,     4,     1,     9,    10,    18,    13,    16,     4,
     12,     9,    10,    18,    13,    16,     4,    12,     9,    10,
-     3,    13,    16,    41,    12,    41,    60,    61,     4,     1,
-    63,    10,    12,    44,    16,     4,    12,    12,    10,    18,
-     3,    16,     4,     3,     9,    10,    80,    13,    16,    27,
-     4,    28,    48,    10,     4,     4,    16,    10,    10,    18,
-    16,    16,    18,    12,     9,    58,    61,     9,    26,    51,
-    57,    53,    26,    51,    81,    53,    82,    66,    68,   -22,
-    62,     4,    66,    68,    10,    85,    86,    16,    67,    69,
-    70,    59,    72,    67,    69,    70,    64,    72,    32,    34,
-    36,    64,    26,    51,    54,    53,    26,    51,    31,    53,
-    33,    35,    89,     4,    92,    93,    94 ]
+     3,    13,    16,    73,    12,    12,    60,    61,     4,     1,
+    57,    10,    12,    44,    16,     4,    61,     1,    10,    18,
+    41,    16,     4,     4,     9,    10,    10,    13,    16,    16,
+     4,     3,    58,    10,     3,    13,    16,    57,    12,    12,
+    27,    82,    28,    48,    26,    51,    12,    53,    26,    51,
+    18,    53,    83,    18,     4,     9,     4,     4,     9,    10,
+    10,    63,    16,    16,     4,    66,    68,    10,    26,    51,
+    16,    53,    86,    87,    66,    68,    67,    69,    70,    62,
+    72,    59,    90,    54,    64,    67,    69,    70,    93,    72,
+    32,    34,    36,    64,    26,    51,   -22,    53,    95,    96,
+    31,   nil,    33,    35 ]
 
 racc_action_check = [
-     0,    20,     3,     3,     0,     3,    43,    56,    51,     0,
-    28,    56,    39,    20,     9,     3,    56,    43,     9,     0,
-    71,    71,     0,     9,     0,     0,    56,     0,     0,    56,
-     7,    56,    56,     9,    56,    56,     9,     6,     9,     9,
-    30,     9,     9,    11,    30,     7,    24,    24,     7,    30,
-    26,     7,     8,    10,     7,     6,    41,    17,     6,    30,
-     4,     6,    30,    16,    30,    30,    52,    30,    30,     4,
-     8,     4,    16,     8,    41,    17,     8,    41,    17,     4,
-    41,    17,    16,    15,     4,    21,    53,    16,    61,    61,
-    21,    61,    18,    18,    54,    18,    55,    29,    29,     1,
-    25,    15,    27,    27,    15,    58,    60,    15,    29,    29,
-    29,    22,    29,    27,    27,    27,    29,    27,     5,     5,
-     5,    27,    57,    57,    19,    57,    63,    63,     5,    63,
-     5,     5,    65,    14,    74,    78,    86 ]
+     0,    20,     3,     3,     0,     3,    43,    30,    52,     0,
+    39,    30,    11,    20,    56,     3,    30,    43,    56,     0,
+    71,    71,     0,    56,     0,     0,    30,     0,     0,    30,
+     8,    30,    30,    56,    30,    30,    56,     6,    56,    56,
+     9,    56,    56,    28,     9,     7,    24,    24,     8,     9,
+    51,     8,    41,    10,     8,     6,    53,    41,     6,     9,
+     7,     6,     9,     7,     9,     9,     7,     9,     9,     7,
+    41,     4,    21,    41,    16,    41,    41,    21,    15,    17,
+     4,    54,     4,    16,    63,    63,    77,    63,    61,    61,
+     4,    61,    55,    16,    14,     4,    15,    17,    16,    15,
+    17,    26,    15,    17,    77,    29,    29,    77,    57,    57,
+    77,    57,    58,    60,    27,    27,    29,    29,    29,    25,
+    29,    22,    65,    19,    29,    27,    27,    27,    74,    27,
+     5,     5,     5,    27,    18,    18,     1,    18,    79,    87,
+     5,   nil,     5,     5 ]
 
 racc_action_pointer = [
-    -2,    71,   nil,    -8,    58,   111,    31,    24,    46,    12,
-    42,    22,   nil,   nil,   109,    77,    61,    51,    82,    96,
-     1,    78,    88,   nil,    35,    77,    38,    99,   -15,    94,
-    38,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    -9,
-   nil,    50,   nil,    -6,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    -4,    43,    74,    83,    96,     5,   112,    92,   nil,
-    99,    78,   nil,   116,   nil,   107,   nil,   nil,   nil,   nil,
-   nil,    10,   nil,   nil,   109,   nil,   nil,   nil,   112,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   123,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil ]
+    -2,   108,   nil,    -8,    69,   123,    31,    39,    24,    38,
+    42,    -9,   nil,   nil,    70,    72,    72,    73,   124,    95,
+     1,    65,    98,   nil,    35,    96,    89,   111,    18,   102,
+     5,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   -11,
+   nil,    46,   nil,    -6,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,    38,   -15,    44,    70,    92,    12,    98,    99,   nil,
+   106,    78,   nil,    74,   nil,    97,   nil,   nil,   nil,   nil,
+   nil,    10,   nil,   nil,   103,   nil,   nil,    80,   nil,   115,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   126,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil ]
 
 racc_action_default = [
-   -23,   -20,    -2,   -66,   -66,   -17,   -52,   -44,   -49,   -23,
-   -66,   -15,   -53,   -21,   -12,   -51,   -66,   -50,   -66,   -66,
-   -66,   -37,   -66,   -27,   -35,   -66,   -36,   -56,   -66,   -56,
+   -23,   -20,    -2,   -68,   -68,   -17,   -52,   -44,   -49,   -23,
+   -68,   -15,   -53,   -21,   -12,   -51,   -68,   -50,   -68,   -68,
+   -68,   -37,   -68,   -27,   -35,   -68,   -36,   -56,   -68,   -56,
    -23,    -5,    -3,    -8,    -4,    -7,    -6,   -48,    -9,   -43,
-   -11,   -66,   -45,   -66,   -18,   -14,   -13,   -47,   -42,   -41,
-   -46,   -37,   -66,   -35,   -66,   -66,   -23,   -66,   -66,   -28,
-   -40,   -66,   -29,   -66,   -57,   -66,   -62,   -58,   -63,   -59,
-   -60,   -66,   -61,   -26,   -66,   -16,   -10,   -65,   -66,   -31,
-   -30,   -19,    95,    -1,   -34,   -39,   -66,   -32,   -33,   -24,
-   -54,   -55,   -25,   -64,   -38 ]
+   -11,   -23,   -45,   -68,   -18,   -14,   -13,   -47,   -42,   -41,
+   -46,   -37,   -68,   -35,   -68,   -68,   -23,   -68,   -68,   -28,
+   -40,   -68,   -29,   -68,   -57,   -68,   -62,   -58,   -63,   -59,
+   -60,   -68,   -61,   -26,   -68,   -16,   -10,   -65,   -67,   -68,
+   -31,   -30,   -19,    97,    -1,   -34,   -39,   -68,   -32,   -33,
+   -24,   -54,   -55,   -25,   -66,   -64,   -38 ]
 
 racc_goto_table = [
-    22,    37,    39,    42,    75,    40,    29,    20,    30,    45,
-    47,    65,    50,    74,    38,    52,    43,    46,    49,    25,
-    78,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-    83,   nil,   nil,   nil,   nil,   nil,    77,    76,   nil,   nil,
+    37,    39,    42,    22,    40,    75,    20,    29,    45,    47,
+    65,    50,    74,    38,    46,    43,    77,    30,    52,    49,
+    25,    79,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,    84,   nil,   nil,   nil,    78,    76,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    84,   nil,   nil,   nil,    87,   nil,
-    88 ]
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    85,   nil,   nil,
+   nil,    88,   nil,    89,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,    94 ]
 
 racc_goto_check = [
-    14,     7,     7,     7,     2,     8,     9,     1,     3,     8,
-     7,    13,     7,    13,     6,    14,     1,    10,     9,    15,
-    19,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-     2,   nil,   nil,   nil,   nil,   nil,     7,     8,   nil,   nil,
+     7,     7,     7,    14,     8,     2,     1,     9,     8,     7,
+    13,     7,    13,     6,    10,     1,     5,     3,    14,     9,
+    15,    19,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,     2,   nil,   nil,   nil,     7,     8,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    14,   nil,   nil,   nil,    14,   nil,
-    14 ]
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    14,   nil,   nil,
+   nil,    14,   nil,    14,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,     7 ]
 
 racc_goto_pointer = [
-   nil,     7,   -26,     3,   nil,   nil,     7,    -5,    -2,     2,
-     3,   nil,   nil,   -16,    -3,    16,   nil,   nil,   nil,   -21 ]
+   nil,     6,   -25,    12,   nil,   -25,     6,    -6,    -3,     3,
+     0,   nil,   nil,   -17,     0,    17,   nil,   nil,   nil,   -20 ]
 
 racc_goto_default = [
    nil,   nil,     2,   nil,     5,     7,   nil,    11,   nil,    14,
@@ -160,11 +164,13 @@ racc_reduce_table = [
   1, 49, :_reduce_62,
   1, 49, :_reduce_63,
   3, 39, :_reduce_64,
+  1, 50, :_reduce_none,
+  2, 50, :_reduce_none,
   1, 50, :_reduce_none ]
 
-racc_reduce_n = 66
+racc_reduce_n = 68
 
-racc_shift_n = 95
+racc_shift_n = 97
 
 racc_token_table = {
   false => 0,
@@ -650,6 +656,10 @@ end
 
 # reduce 65 omitted
 
+# reduce 66 omitted
+
+# reduce 67 omitted
+
 def _reduce_none(val, _values, result)
   val[0]
 end