nokogiri 1.0.7 → 1.1.0

data/ext/nokogiri/xslt_stylesheet.c

@@ -3,6 +3,7 @@
 #include <libxslt/xsltInternals.h>
 #include <libxslt/xsltutils.h>
 #include <libxslt/transform.h>
+#include <libexslt/exslt.h>
 
 static void dealloc(xsltStylesheetPtr doc)
 {
@@ -22,6 +23,7 @@ static VALUE parse_stylesheet_doc(VALUE klass, VALUE xmldocobj)
     xmlDocPtr xml ;
     xsltStylesheetPtr ss ;
     Data_Get_Struct(xmldocobj, xmlDoc, xml);
+    exsltRegisterAll();
     ss = xsltParseStylesheetDoc(xmlCopyDoc(xml, 1)); /* 1 => recursive */
     return Data_Wrap_Struct(klass, NULL, dealloc, ss);
 }
@@ -48,16 +50,15 @@ static VALUE serialize(VALUE self, VALUE xmlobj)
     xmlFree(doc_ptr);
     return rval ;
 }
-
-
 /*
  *  call-seq:
- *    apply_to(document, params)
+ *    transform(document, params)
  *
  *  Apply an XSLT stylesheet to an XML::Document.
  *  +params+ is an array of strings used as XSLT parameters.
+ *  returns Nokogiri::XML::Document
  */
-static VALUE apply_to(int argc, VALUE* argv, VALUE self)
+static VALUE transform(int argc, VALUE* argv, VALUE self)
 {
     VALUE xmldoc, paramobj ;
     xmlDocPtr xml ;
@@ -65,7 +66,6 @@ static VALUE apply_to(int argc, VALUE* argv, VALUE self)
     xsltStylesheetPtr ss ;
     const char** params ;
     int param_len, j ;
-    VALUE resultobj ;
 
     rb_scan_args(argc, argv, "11", &xmldoc, &paramobj);
     if (paramobj == Qnil) { paramobj = rb_ary_new2(0) ; }
@@ -84,8 +84,22 @@ static VALUE apply_to(int argc, VALUE* argv, VALUE self)
 
     result = xsltApplyStylesheet(ss, xml, params);
     free(params);
-    resultobj = Nokogiri_wrap_xml_document(0, result) ;
-    return rb_funcall(self, rb_intern("serialize"), 1, resultobj);
+
+    return Nokogiri_wrap_xml_document(0, result) ;
+}
+
+/*
+ *  call-seq:
+ *    apply_to(document, params)
+ *
+ *  Apply an XSLT stylesheet to an XML::Document.
+ *  +params+ is an array of strings used as XSLT parameters.
+ *  returns serialized document
+ */
+static VALUE apply_to(int argc, VALUE* argv, VALUE self)
+{
+  return rb_funcall(self, rb_intern("serialize"), 1, 
+                    transform(argc, argv, self));
 }
 
 VALUE cNokogiriXsltStylesheet ;
@@ -105,4 +119,5 @@ void init_xslt_stylesheet()
   rb_define_singleton_method(klass, "parse_stylesheet_doc", parse_stylesheet_doc, 1);
   rb_define_method(klass, "serialize", serialize, 1);
   rb_define_method(klass, "apply_to", apply_to, -1);
+  rb_define_method(klass, "transform", transform, -1);
 }

data/lib/nokogiri/css.rb

@@ -5,6 +5,7 @@ require 'nokogiri/css/generated_tokenizer'
 require 'nokogiri/css/tokenizer'
 require 'nokogiri/css/parser'
 require 'nokogiri/css/syntax_error'
+require 'nokogiri/css/selector_handler'
 
 module Nokogiri
   module CSS

data/lib/nokogiri/css/generated_parser.rb

@@ -44,27 +44,29 @@ racc_reduce_table = [
  3, 55, :_reduce_25,
  3, 55, :_reduce_26,
  3, 55, :_reduce_27,
+ 4, 59, :_reduce_28,
+ 4, 59, :_reduce_29,
  1, 59, :_reduce_none,
  1, 59, :_reduce_none,
- 4, 60, :_reduce_30,
- 3, 60, :_reduce_31,
- 2, 60, :_reduce_32,
- 1, 60, :_reduce_33,
- 2, 61, :_reduce_34,
- 2, 61, :_reduce_35,
+ 4, 60, :_reduce_32,
+ 3, 60, :_reduce_33,
+ 2, 60, :_reduce_34,
+ 1, 60, :_reduce_35,
+ 2, 61, :_reduce_36,
+ 2, 61, :_reduce_37,
  1, 52, :_reduce_none,
  0, 52, :_reduce_none,
- 2, 53, :_reduce_38,
- 2, 53, :_reduce_39,
  2, 53, :_reduce_40,
  2, 53, :_reduce_41,
+ 2, 53, :_reduce_42,
+ 2, 53, :_reduce_43,
  1, 53, :_reduce_none,
  1, 53, :_reduce_none,
  1, 53, :_reduce_none,
  1, 53, :_reduce_none,
- 1, 62, :_reduce_46,
- 4, 58, :_reduce_47,
- 4, 58, :_reduce_48,
+ 1, 62, :_reduce_48,
+ 4, 58, :_reduce_49,
+ 4, 58, :_reduce_50,
  0, 58, :_reduce_none,
  1, 63, :_reduce_none,
  1, 63, :_reduce_none,
@@ -73,96 +75,100 @@ racc_reduce_table = [
  1, 63, :_reduce_none,
  1, 63, :_reduce_none,
  1, 63, :_reduce_none,
- 5, 54, :_reduce_57,
+ 5, 54, :_reduce_59,
  1, 64, :_reduce_none,
  2, 47, :_reduce_none,
  0, 47, :_reduce_none ]
 
-racc_reduce_n = 61
+racc_reduce_n = 63
 
-racc_shift_n = 99
+racc_shift_n = 105
 
 racc_action_table = [
-     5,    81,    83,    28,    10,    71,    27,    27,    22,     1,
-    55,     5,    31,    24,     5,    29,    81,    83,    10,    43,
-    65,    96,    95,     1,    57,    66,    43,    10,    84,    86,
-    87,    43,    80,    10,    10,     7,     9,    12,    15,    26,
-    10,    18,    79,    84,    86,    87,     7,    80,    10,     7,
-     9,    12,    15,    43,     5,    18,    44,    79,    10,     9,
-    43,    15,    10,     1,    18,     9,     9,    15,    15,     5,
-    18,    18,     9,    43,    15,    51,    43,    18,    49,    44,
-     9,    43,    15,    44,    70,    18,    38,    39,    40,     7,
-     9,    12,    15,    54,     9,    18,    15,    43,    43,    18,
-    43,    43,    32,    78,     7,    52,    15,    89,    43,    91,
-    43,    93,    34,    94,    35,    36,    53,    43,    43 ]
+     5,    28,    27,    22,    10,     5,    27,     5,    24,     1,
+    43,    10,    31,    29,    49,    27,     1,     5,    27,    53,
+    54,    31,    87,    89,    31,    59,    67,    87,    89,    54,
+    10,    68,   102,   101,    26,     7,     9,    12,    15,    10,
+     7,    18,     7,     9,    12,    15,    10,    10,    18,    90,
+    92,    93,     7,    86,    90,    92,    93,     5,    86,    43,
+    43,    10,     9,    85,    15,    10,     1,    18,    85,    10,
+    43,     9,    57,    15,    43,    43,    18,    44,     9,     9,
+    15,    15,    56,    18,    18,    38,    39,    40,    43,    43,
+    44,    72,     7,     9,    12,    15,    73,     9,    18,    15,
+    43,     9,    18,    15,    43,    55,    18,    43,    43,    43,
+    52,    34,    82,    35,    36,    51,    44,    43,    32,    95,
+    43,    97,    43,    99,   100,    15,    43,    43 ]
 
 racc_action_check = [
-     0,    74,    74,     6,     0,    53,     7,     5,     5,     0,
-    28,    42,     7,     5,    56,     6,    73,    73,    56,    29,
-    42,    92,    92,    56,    30,    42,    34,    14,    74,    74,
-    74,    35,    74,     3,    68,     0,     0,     0,     0,     5,
-    11,     0,    74,    73,    73,    73,    42,    73,    16,    56,
-    56,    56,    56,    36,    37,    56,    17,    73,    37,    14,
-    38,    14,     4,    37,    14,     3,    68,     3,    68,    18,
-     3,    68,    11,    39,    11,    22,    43,    11,    18,    16,
-    16,    44,    16,    46,    51,    16,    13,    13,    13,    37,
-    37,    37,    37,    25,     4,    37,     4,    15,    64,     4,
-    65,    66,     9,    71,    18,    23,     2,    75,    77,    82,
-    85,    88,    13,    90,    13,    13,    24,    95,    96 ]
+     0,     6,     5,     5,     0,    18,    74,    58,     5,     0,
+    38,    58,    74,     6,    18,     7,    58,    42,    75,    24,
+    24,     7,    77,    77,    75,    30,    42,    78,    78,    31,
+    14,    42,    98,    98,     5,     0,     0,     0,     0,    70,
+    18,     0,    58,    58,    58,    58,    16,    11,    58,    77,
+    77,    77,    42,    77,    78,    78,    78,    37,    78,    34,
+    35,    37,    14,    77,    14,     3,    37,    14,    78,     4,
+    36,    70,    28,    70,    29,    39,    70,    16,    16,    11,
+    16,    11,    27,    16,    11,    13,    13,    13,    43,    44,
+    46,    51,    37,    37,    37,    37,    53,     3,    37,     3,
+    54,     4,     3,     4,    56,    25,     4,    66,    67,    68,
+    23,    13,    73,    13,    13,    22,    17,    15,     9,    79,
+    81,    88,    91,    94,    96,     2,   101,   102 ]
 
 racc_action_pointer = [
-    -2,   nil,    66,    27,    56,    -3,     3,    -4,   nil,    91,
-   nil,    34,   nil,    79,    21,    88,    42,    19,    67,   nil,
-   nil,   nil,    68,    63,   105,    51,   nil,   nil,    10,    10,
-   -18,   nil,   nil,   nil,    17,    22,    44,    52,    51,    64,
-   nil,   nil,     9,    67,    72,   nil,    46,   nil,   nil,   nil,
-   nil,    68,   nil,    -2,   nil,   nil,    12,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    89,    91,    92,   nil,    28,   nil,
-   nil,    87,   nil,    13,    -2,    66,   nil,    99,   nil,   nil,
-   nil,   nil,    68,   nil,   nil,   101,   nil,   nil,    70,   nil,
-    71,   nil,    11,   nil,   nil,   108,   109,   nil,   nil ]
+    -2,   nil,    85,    59,    63,    -8,     1,     5,   nil,   107,
+   nil,    41,   nil,    78,    24,   108,    40,    79,     3,   nil,
+   nil,   nil,   108,    68,     8,    63,   nil,    70,    72,    65,
+   -17,    17,   nil,   nil,    50,    51,    61,    55,     1,    66,
+   nil,   nil,    15,    79,    80,   nil,    53,   nil,   nil,   nil,
+   nil,    75,   nil,    89,    91,   nil,    95,   nil,     5,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    98,    99,   100,   nil,
+    33,   nil,   nil,    96,    -4,     8,   nil,    19,    24,    78,
+   nil,   111,   nil,   nil,   nil,   nil,   nil,   nil,    80,   nil,
+   nil,   113,   nil,   nil,    82,   nil,    82,   nil,    22,   nil,
+   nil,   117,   118,   nil,   nil ]
 
 racc_action_default = [
-   -61,   -19,   -12,   -44,   -43,   -61,   -61,   -61,    -2,   -61,
-   -46,   -45,   -20,   -17,   -42,   -60,   -37,   -15,   -61,   -13,
-   -40,   -39,   -33,   -61,   -28,   -61,   -24,   -29,   -61,   -60,
-   -61,   -28,   -18,   -41,   -60,   -60,   -60,   -61,   -60,   -60,
-    -6,   -38,   -61,   -60,   -60,    -9,   -36,   -11,   -14,   -35,
-   -34,   -61,   -25,   -32,   -26,    99,   -61,   -27,    -5,    -8,
-    -7,   -16,    -3,    -4,   -60,   -60,   -60,   -59,   -61,   -10,
-   -31,   -61,    -1,   -49,   -49,   -61,   -58,   -60,   -30,   -50,
-   -54,   -55,   -61,   -56,   -51,   -60,   -52,   -53,   -61,   -23,
-   -61,   -22,   -61,   -21,   -57,   -60,   -60,   -47,   -48 ]
+   -63,   -19,   -12,   -46,   -45,   -63,   -63,   -63,    -2,   -63,
+   -48,   -47,   -20,   -17,   -44,   -62,   -39,   -15,   -63,   -13,
+   -42,   -41,   -35,   -63,   -30,   -63,   -24,   -31,   -63,   -62,
+   -63,   -30,   -18,   -43,   -62,   -62,   -62,   -63,   -62,   -62,
+    -6,   -40,   -63,   -62,   -62,    -9,   -38,   -11,   -14,   -37,
+   -36,   -63,   -25,   -34,   -62,   -26,   -62,   105,   -63,   -27,
+    -5,    -8,    -7,   -16,    -3,    -4,   -62,   -62,   -62,   -61,
+   -63,   -10,   -33,   -63,   -63,   -63,    -1,   -51,   -51,   -63,
+   -60,   -62,   -32,   -28,   -29,   -52,   -56,   -57,   -63,   -58,
+   -53,   -62,   -54,   -55,   -63,   -23,   -63,   -22,   -63,   -21,
+   -59,   -62,   -62,   -49,   -50 ]
 
 racc_goto_table = [
-    42,     8,    20,    21,    47,    48,    50,    23,     6,    30,
-    33,    82,    88,    41,    56,    46,    19,    45,    37,    58,
-    59,    60,    25,    62,    63,    77,   nil,   nil,    67,    68,
-    64,   nil,   nil,   nil,    69,   nil,   nil,   nil,    61,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    73,
-    74,    75,   nil,   nil,   nil,   nil,   nil,    72,   nil,   nil,
-   nil,   nil,    90,   nil,   nil,   nil,   nil,    76,   nil,   nil,
-    92,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-    97,    98 ]
+    42,    23,    50,    30,     6,    20,    21,     8,    47,    48,
+    88,    94,    19,    33,    58,    45,    41,    37,    46,    60,
+    61,    62,    25,    64,    65,    81,    66,   nil,    69,    70,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    71,    74,
+   nil,    75,   nil,   nil,    63,   nil,   nil,   nil,   nil,   nil,
+   nil,    77,    78,    79,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,    76,    96,   nil,   nil,   nil,
+    83,    84,    80,   nil,   nil,   nil,    98,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   103,   104 ]
 
 racc_goto_check = [
-     2,     3,     8,     8,     9,     9,    10,    14,     1,    14,
-     8,    13,    13,     8,     2,     8,    11,     7,     4,     2,
-     2,     2,    15,     2,     2,    19,   nil,   nil,     2,     2,
-    10,   nil,   nil,   nil,     9,   nil,   nil,   nil,     3,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,     2,
-     2,     2,   nil,   nil,   nil,   nil,   nil,     3,   nil,   nil,
-   nil,   nil,     2,   nil,   nil,   nil,   nil,     8,   nil,   nil,
-     2,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-     2,     2 ]
+     2,    14,    10,    14,     1,     8,     8,     3,     9,     9,
+    13,    13,    11,     8,     2,     7,     8,     4,     8,     2,
+     2,     2,    15,     2,     2,    19,    10,   nil,     2,     2,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,     9,     2,
+   nil,     2,   nil,   nil,     3,   nil,   nil,   nil,   nil,   nil,
+   nil,     2,     2,     2,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,     3,     2,   nil,   nil,   nil,
+    14,    14,     8,   nil,   nil,   nil,     2,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,     2,     2 ]
 
 racc_goto_pointer = [
-   nil,     8,   -15,     1,     5,   nil,   nil,     1,    -1,   -12,
-   -12,    14,   nil,   -62,     2,    17,   nil,   nil,   nil,   -43 ]
+   nil,     4,   -15,     7,     4,   nil,   nil,    -1,     2,    -8,
+   -16,    10,   nil,   -67,    -4,    17,   nil,   nil,   nil,   -45 ]
 
 racc_goto_default = [
    nil,   nil,   nil,   nil,   nil,    13,    16,   nil,    17,   nil,
-     2,     3,     4,   nil,   nil,   nil,    11,    14,    85,   nil ]
+     2,     3,     4,   nil,   nil,   nil,    11,    14,    91,   nil ]
 
 racc_token_table = {
  false => 0,
@@ -506,12 +512,26 @@ module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 104
   end
 .,.,
 
- # reduce 28 omitted
+module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 106
+  def _reduce_28( val, _values, result )
+ result = [val.first, val.last]
+   result
+  end
+.,.,
 
- # reduce 29 omitted
+module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 107
+  def _reduce_29( val, _values, result )
+ result = [val.first, val.last]
+   result
+  end
+.,.,
+
+ # reduce 30 omitted
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 118
-  def _reduce_30( val, _values, result )
+ # reduce 31 omitted
+
+module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 120
+  def _reduce_32( val, _values, result )
         if val[1] == 'n'
           result = Node.new(:AN_PLUS_B, val)
         else
@@ -521,8 +541,8 @@ module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 118
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 129
-  def _reduce_31( val, _values, result )
+module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 131
+  def _reduce_33( val, _values, result )
                # n+3, -n+3
         if val[0] == 'n'
           val.unshift("1")
@@ -538,8 +558,8 @@ module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 129
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 140
-  def _reduce_32( val, _values, result )
+module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 142
+  def _reduce_34( val, _values, result )
         if val[1] == 'n'
           val << "+"
           val << "0"
@@ -551,8 +571,8 @@ module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 140
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 152
-  def _reduce_33( val, _values, result )
+module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 154
+  def _reduce_35( val, _values, result )
         if val[0] == 'even'
           val = ["2","n","+","0"]
           result = Node.new(:AN_PLUS_B, val)
@@ -566,85 +586,81 @@ module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 152
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 157
-  def _reduce_34( val, _values, result )
+module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 159
+  def _reduce_36( val, _values, result )
         result = Node.new(:PSEUDO_CLASS, [val[1]])
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 157
-  def _reduce_35( val, _values, result )
+module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 159
+  def _reduce_37( val, _values, result )
  result = Node.new(:PSEUDO_CLASS, [val[1]])
    result
   end
 .,.,
 
- # reduce 36 omitted
+ # reduce 38 omitted
 
- # reduce 37 omitted
+ # reduce 39 omitted
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 167
-  def _reduce_38( val, _values, result )
+module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 169
+  def _reduce_40( val, _values, result )
         result = Node.new(:COMBINATOR, val)
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 170
-  def _reduce_39( val, _values, result )
+module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 172
+  def _reduce_41( val, _values, result )
         result = Node.new(:COMBINATOR, val)
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 173
-  def _reduce_40( val, _values, result )
+module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 175
+  def _reduce_42( val, _values, result )
         result = Node.new(:COMBINATOR, val)
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 176
-  def _reduce_41( val, _values, result )
+module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 178
+  def _reduce_43( val, _values, result )
         result = Node.new(:COMBINATOR, val)
    result
   end
 .,.,
 
- # reduce 42 omitted
-
- # reduce 43 omitted
-
  # reduce 44 omitted
 
  # reduce 45 omitted
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 182
-  def _reduce_46( val, _values, result )
+ # reduce 46 omitted
+
+ # reduce 47 omitted
+
+module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 184
+  def _reduce_48( val, _values, result )
  result = Node.new(:ID, val)
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 185
-  def _reduce_47( val, _values, result )
+module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 187
+  def _reduce_49( val, _values, result )
  result = [val.first, val[2]]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 186
-  def _reduce_48( val, _values, result )
+module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 188
+  def _reduce_50( val, _values, result )
  result = [val.first, val[2]]
    result
   end
 .,.,
 
- # reduce 49 omitted
-
- # reduce 50 omitted
-
  # reduce 51 omitted
 
  # reduce 52 omitted
@@ -657,18 +673,22 @@ module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 186
 
  # reduce 56 omitted
 
-module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 202
-  def _reduce_57( val, _values, result )
+ # reduce 57 omitted
+
+ # reduce 58 omitted
+
+module_eval <<'.,.,', 'lib/nokogiri/css/parser.y', 204
+  def _reduce_59( val, _values, result )
         result = Node.new(:NOT, [val[2]])
    result
   end
 .,.,
 
- # reduce 58 omitted
+ # reduce 60 omitted
 
- # reduce 59 omitted
+ # reduce 61 omitted
 
- # reduce 60 omitted
+ # reduce 62 omitted
 
  def _reduce_none( val, _values, result )
   result