nokogiri 1.5.3.rc2-java → 1.5.3.rc3-java

data/CHANGELOG.ja.rdoc

@@ -6,6 +6,8 @@
   * Nokogiri::XML::Node#css now works for XML documents with default
     namespaces when the rule contains attribute selector without
     namespace.
+  * Fixed marshalling bugs around how arguments are passed to (and
+    returned from) XSLT custom xpath functions. #640.
 
 
 == 1.5.2 / 2012-03-09

data/CHANGELOG.rdoc

@@ -6,6 +6,8 @@
   * Nokogiri::XML::Node#css now works for XML documents with default
     namespaces when the rule contains attribute selector without
     namespace.
+  * Fixed marshalling bugs around how arguments are passed to (and
+    returned from) XSLT custom xpath functions. #640.
 
 
 == 1.5.2 / 2012-03-09

data/ext/nokogiri/xml_xpath_context.c

@@ -49,26 +49,19 @@ static VALUE register_variable(VALUE self, VALUE name, VALUE value)
    return self;
 }
 
-static void ruby_funcall(xmlXPathParserContextPtr ctx, int nargs)
+void Nokogiri_marshal_xpath_funcall_and_return_values(xmlXPathParserContextPtr ctx, int nargs, VALUE handler, const char* function_name)
 {
-  VALUE xpath_handler = Qnil;
-  VALUE result;
+  int i;
+  VALUE result, doc;
   VALUE *argv;
-  VALUE doc;
   VALUE node_set = Qnil;
   xmlNodeSetPtr xml_node_set = NULL;
   xmlXPathObjectPtr obj;
-  int i;
   nokogiriNodeSetTuple *node_set_tuple;
 
-  assert(ctx);
-  assert(ctx->context);
-  assert(ctx->context->userData);
   assert(ctx->context->doc);
   assert(DOC_RUBY_OBJECT_TEST(ctx->context->doc));
 
-  xpath_handler = (VALUE)(ctx->context->userData);
-
   argv = (VALUE *)calloc((size_t)nargs, sizeof(VALUE));
   for (i = 0 ; i < nargs ; ++i) {
     rb_gc_register_address(&argv[i]);
@@ -100,12 +93,7 @@ static void ruby_funcall(xmlXPathParserContextPtr ctx, int nargs)
     } while(i-- > 0);
   }
 
-  result = rb_funcall2(
-      xpath_handler,
-      rb_intern((const char *)ctx->context->function),
-      nargs,
-      argv
-  );
+  result = rb_funcall2(handler, rb_intern((const char*)function_name), nargs, argv);
 
   for (i = 0 ; i < nargs ; ++i) {
     rb_gc_unregister_address(&argv[i]);
@@ -156,6 +144,22 @@ static void ruby_funcall(xmlXPathParserContextPtr ctx, int nargs)
   }
 }
 
+static void ruby_funcall(xmlXPathParserContextPtr ctx, int nargs)
+{
+  VALUE handler = Qnil;
+  const char *function = NULL ;
+
+  assert(ctx);
+  assert(ctx->context);
+  assert(ctx->context->userData);
+  assert(ctx->context->function);
+
+  handler = (VALUE)(ctx->context->userData);
+  function = (const char*)(ctx->context->function);
+
+  Nokogiri_marshal_xpath_funcall_and_return_values(ctx, nargs, handler, function);
+}
+
 static xmlXPathFunction lookup( void *ctx,
                                 const xmlChar * name,
                                 const xmlChar* ns_uri )

data/ext/nokogiri/xml_xpath_context.h

@@ -4,6 +4,7 @@
 #include <nokogiri.h>
 
 void init_xml_xpath_context();
+void Nokogiri_marshal_xpath_funcall_and_return_values(xmlXPathParserContextPtr ctx, int nargs, VALUE handler, const char* function_name) ;
 
 extern VALUE cNokogiriXmlXpathContext;
 #endif

data/ext/nokogiri/xslt_stylesheet.c

@@ -168,74 +168,17 @@ static VALUE transform(int argc, VALUE* argv, VALUE self)
 
 static void method_caller(xmlXPathParserContextPtr ctxt, int nargs)
 {
-    const xmlChar * function;
-    const xmlChar * functionURI;
-    size_t i, count;
-
+    VALUE handler;
+    const char *function_name;
     xsltTransformContextPtr transform;
-    xmlXPathObjectPtr xpath;
-    VALUE obj;
-    VALUE *args;
-    VALUE result;
+    const xmlChar *functionURI;
 
     transform = xsltXPathGetTransformContext(ctxt);
-
-    function = ctxt->context->function;
     functionURI = ctxt->context->functionURI;
-    obj = (VALUE)xsltGetExtData(transform, functionURI);
-
-    count = (size_t)ctxt->valueNr;
-    args = calloc(count, sizeof(VALUE *));
-
-    for(i = 0; i < count; i++) {
-	VALUE thing;
-
-	xpath = valuePop(ctxt);
-	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(ctxt->context->doc));
-		} else {
-		    thing = Nokogiri_wrap_xml_node_set(xpath->nodesetval,
-			    DOC_RUBY_OBJECT(ctxt->context->doc));
-		}
-		break;
-	    default:
-		rb_raise(rb_eRuntimeError, "do not handle type: %d", xpath->type);
-	}
-	args[i] = thing;
-	xmlFree(xpath);
-    }
-    result = rb_funcall3(obj, rb_intern((const char *)function), (int)count, args);
-    free(args);
-    switch(TYPE(result)) {
-	case T_FLOAT:
-	case T_BIGNUM:
-	case T_FIXNUM:
-	    xmlXPathReturnNumber(ctxt, NUM2DBL(result));
-	    break;
-	case T_STRING:
-	    xmlXPathReturnString(
-		    ctxt,
-		    xmlStrdup((xmlChar *)StringValuePtr(result))
-		    );
-	    break;
-	case T_TRUE:
-	    xmlXPathReturnTrue(ctxt);
-	    break;
-	case T_FALSE:
-	    xmlXPathReturnFalse(ctxt);
-	    break;
-	case T_NIL:
-	    break;
-	default:
-	    rb_raise(rb_eRuntimeError, "Invalid return type");
-    }
+    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);
 }
 
 static void * initFunc(xsltTransformContextPtr ctxt, const xmlChar *uri)

data/lib/nokogiri/version.rb

@@ -1,6 +1,6 @@
 module Nokogiri
   # The version of Nokogiri you are using
-  VERSION = '1.5.3.rc2'
+  VERSION = '1.5.3.rc3'
 
   class VersionInfo # :nodoc:
     def jruby?

data/lib/nokogiri/xslt.rb

@@ -15,7 +15,7 @@ module Nokogiri
   end
 
   ###
-  # See Nokogiri::XSLT::Stylesheet for creating and maniuplating
+  # See Nokogiri::XSLT::Stylesheet for creating and manipulating
   # Stylesheet object.
   module XSLT
     class << self

data/test/helper.rb

@@ -11,25 +11,25 @@ warn "#{__FILE__}:#{__LINE__}: version info: #{Nokogiri::VERSION_INFO.inspect}"
 
 module Nokogiri
   class TestCase < MiniTest::Spec
-    ASSETS_DIR      = File.expand_path File.join(File.dirname(__FILE__), 'files')
-    XML_FILE        = File.join(ASSETS_DIR, 'staff.xml')
-    XSLT_FILE       = File.join(ASSETS_DIR, 'staff.xslt')
-    EXSLT_FILE      = File.join(ASSETS_DIR, 'exslt.xslt')
-    EXML_FILE       = File.join(ASSETS_DIR, 'exslt.xml')
-    HTML_FILE       = File.join(ASSETS_DIR, 'tlm.html')
-    NICH_FILE       = File.join(ASSETS_DIR, '2ch.html')
-    SHIFT_JIS_XML   = File.join(ASSETS_DIR, 'shift_jis.xml')
-    SHIFT_JIS_HTML  = File.join(ASSETS_DIR, 'shift_jis.html')
-    ENCODING_XHTML_FILE = File.join(ASSETS_DIR, 'encoding.xhtml')
-    ENCODING_HTML_FILE  = File.join(ASSETS_DIR, 'encoding.html')
-    NOENCODING_FILE  = File.join(ASSETS_DIR, 'noencoding.html')
-    METACHARSET_FILE  = File.join(ASSETS_DIR, 'metacharset.html')
-    PO_XML_FILE     = File.join(ASSETS_DIR, 'po.xml')
-    PO_SCHEMA_FILE  = File.join(ASSETS_DIR, 'po.xsd')
+    ASSETS_DIR          = File.expand_path File.join(File.dirname(__FILE__), 'files')
     ADDRESS_SCHEMA_FILE = File.join(ASSETS_DIR, 'address_book.rlx')
-    ADDRESS_XML_FILE = File.join(ASSETS_DIR, 'address_book.xml')
-    SNUGGLES_FILE   = File.join(ASSETS_DIR, 'snuggles.xml')
-    XML_XINCLUDE_FILE = File.join(ASSETS_DIR, 'xinclude.xml')
+    ADDRESS_XML_FILE    = File.join(ASSETS_DIR, 'address_book.xml')
+    ENCODING_HTML_FILE  = File.join(ASSETS_DIR, 'encoding.html')
+    ENCODING_XHTML_FILE = File.join(ASSETS_DIR, 'encoding.xhtml')
+    EXML_FILE           = File.join(ASSETS_DIR, 'exslt.xml')
+    EXSLT_FILE          = File.join(ASSETS_DIR, 'exslt.xslt')
+    HTML_FILE           = File.join(ASSETS_DIR, 'tlm.html')
+    METACHARSET_FILE    = File.join(ASSETS_DIR, 'metacharset.html')
+    NICH_FILE           = File.join(ASSETS_DIR, '2ch.html')
+    NOENCODING_FILE     = File.join(ASSETS_DIR, 'noencoding.html')
+    PO_SCHEMA_FILE      = File.join(ASSETS_DIR, 'po.xsd')
+    PO_XML_FILE         = File.join(ASSETS_DIR, 'po.xml')
+    SHIFT_JIS_HTML      = File.join(ASSETS_DIR, 'shift_jis.html')
+    SHIFT_JIS_XML       = File.join(ASSETS_DIR, 'shift_jis.xml')
+    SNUGGLES_FILE       = File.join(ASSETS_DIR, 'snuggles.xml')
+    XML_FILE            = File.join(ASSETS_DIR, 'staff.xml')
+    XML_XINCLUDE_FILE   = File.join(ASSETS_DIR, 'xinclude.xml')
+    XSLT_FILE           = File.join(ASSETS_DIR, 'staff.xslt')
 
     def teardown
       if ENV['NOKOGIRI_GC']
@@ -68,33 +68,6 @@ module Nokogiri
     alias :assert_not_nil       :refute_nil
     alias :assert_raise         :assert_raises
     alias :assert_not_equal     :refute_equal
-
-    def assert_nothing_raised(*args)
-      self._assertions += 1
-      if Module === args.last
-        msg = nil
-      else
-        msg = args.pop
-      end
-      begin
-        line = __LINE__; yield
-      rescue Exception => e
-        bt = e.backtrace
-        as = e.instance_of?(MiniTest::Assertion)
-        if as
-          ans = /\A#{Regexp.quote(__FILE__)}:#{line}:in /o
-          bt.reject! {|ln| ans =~ ln}
-        end
-        if ((args.empty? && !as) ||
-            args.any? {|a| a.instance_of?(Module) ? e.is_a?(a) : e.class == a })
-          msg = message(msg) { "Exception raised:\n<#{mu_pp(e)}>" }
-          raise MiniTest::Assertion, msg.call, bt
-        else
-          raise
-        end
-      end
-      nil
-    end
   end
 
   module SAX

data/test/html/sax/test_parser.rb

@@ -12,19 +12,21 @@ module Nokogiri
 
         def test_parse_empty_document
           # This caused a segfault in libxml 2.6.x
-          assert_nothing_raised { @parser.parse '' }
+          assert_nil @parser.parse ''
         end
 
         def test_parse_empty_file
           # Make sure empty files don't break stuff
           empty_file_name =  File.join(Dir.tmpdir, 'bogus.xml')
           FileUtils.touch empty_file_name
-          assert_nothing_raised { @parser.parse_file empty_file_name }
+          # assert_nothing_raised do
+            @parser.parse_file empty_file_name
+          # end
         end
 
         def test_parse_file
           @parser.parse_file(HTML_FILE)
-          
+
           # Take a look at the comment in test_parse_document to know
           # a possible reason to this difference.
           if Nokogiri.uses_libxml?

data/test/html/sax/test_parser_context.rb

@@ -7,15 +7,13 @@ module Nokogiri
     module SAX
       class TestParserContext < Nokogiri::SAX::TestCase
         def test_from_io
-          assert_nothing_raised do
-            ParserContext.new StringIO.new('fo'), 'UTF-8'
-          end
+          ctx = ParserContext.new StringIO.new('fo'), 'UTF-8'
+          assert ctx
         end
 
         def test_from_string
-          assert_nothing_raised do
-            ParserContext.new 'blah blah'
-          end
+          ctx = ParserContext.new 'blah blah'
+          assert ctx
         end
 
         def test_parse_with
@@ -26,20 +24,20 @@ module Nokogiri
         end
 
         def test_parse_with_sax_parser
-          assert_nothing_raised do
+          # assert_nothing_raised do
             xml = "<root />"
             ctx = ParserContext.new xml
             parser = Parser.new Doc.new
             ctx.parse_with parser
-          end
+          # end
         end
 
         def test_from_file
-          assert_nothing_raised do
+          # assert_nothing_raised do
             ctx = ParserContext.file HTML_FILE, 'UTF-8'
             parser = Parser.new Doc.new
             ctx.parse_with parser
-          end
+          # end
         end
       end
     end

data/test/html/test_document.rb

@@ -232,9 +232,7 @@ eohtml
       end
 
       def test_parse_handles_nil_gracefully
-        assert_nothing_raised do
-          @doc = Nokogiri::HTML::Document.parse(nil)
-        end
+        @doc = Nokogiri::HTML::Document.parse(nil)
         assert_instance_of Nokogiri::HTML::Document, @doc
       end
 

data/test/html/test_node.rb

@@ -101,9 +101,7 @@ module Nokogiri
         assert another_node, 'should have a node'
 
         # This used to segv
-        assert_nothing_raised do
-          node.add_previous_sibling another_node
-        end
+        assert node.add_previous_sibling another_node
       end
 
       def test_swap
@@ -138,7 +136,7 @@ module Nokogiri
 
       def test_fragment_handler_does_not_regurge_on_invalid_attributes
         iframe = %Q{<iframe style="width: 0%; height: 0px" src="http://someurl" allowtransparency></iframe>}
-        assert_nothing_raised { @html.at('div').fragment(iframe) }
+        assert @html.at('div').fragment(iframe)
       end
 
       def test_fragment

data/test/test_xslt_transforms.rb

@@ -158,7 +158,9 @@ encoding="iso-8859-1" indent="yes"/>
     assert_equal  result_array, result_hash
   end
 
-  if Nokogiri.uses_libxml? # By now, cannot get it working on JRuby.
+  if Nokogiri.uses_libxml?
+    # By now, cannot get it working on JRuby, see:
+    #   http://yokolet.blogspot.com/2010/10/pure-java-nokogiri-xslt-extension.html
     def test_exslt
       assert doc = Nokogiri::XML.parse(File.read(EXML_FILE))
       assert doc.xml?

data/test/xml/sax/test_parser_context.rb

@@ -66,15 +66,12 @@ world
         end
 
         def test_from_io
-          assert_nothing_raised do
-            ParserContext.new StringIO.new('fo'), 'UTF-8'
-          end
+          ctx = ParserContext.new StringIO.new('fo'), 'UTF-8'
+          assert ctx
         end
 
         def test_from_string
-          assert_nothing_raised do
-            ParserContext.new 'blah blah'
-          end
+          assert ParserContext.new 'blah blah'
         end
 
         def test_parse_with
@@ -85,20 +82,16 @@ world
         end
 
         def test_parse_with_sax_parser
-          assert_nothing_raised do
-            xml = "<root />"
-            ctx = ParserContext.new xml
-            parser = Parser.new Doc.new
-            ctx.parse_with parser
-          end
+          xml = "<root />"
+          ctx = ParserContext.new xml
+          parser = Parser.new Doc.new
+          assert_nil ctx.parse_with parser
         end
 
         def test_from_file
-          assert_nothing_raised do
-            ctx = ParserContext.file XML_FILE
-            parser = Parser.new Doc.new
-            ctx.parse_with parser
-          end
+          ctx = ParserContext.file XML_FILE
+          parser = Parser.new Doc.new
+          assert_nil ctx.parse_with parser
         end
 
         def test_parse_with_returns_nil

data/test/xml/test_attr.rb

@@ -4,12 +4,11 @@ module Nokogiri
   module XML
     class TestAttr < Nokogiri::TestCase
       def test_new
-        assert_nothing_raised do
-          100.times {
-            doc = Nokogiri::XML::Document.new
-            Nokogiri::XML::Attr.new(doc, 'foo')
-          }
-        end
+        100.times {
+          doc = Nokogiri::XML::Document.new
+          assert doc
+          assert Nokogiri::XML::Attr.new(doc, 'foo')
+        }
       end
 
       def test_content=

data/test/xml/test_builder.rb

@@ -47,14 +47,13 @@ module Nokogiri
       end
 
       def test_builder_with_unlink
-        assert_nothing_raised do
-          Nokogiri::XML::Builder.new do |xml|
-            xml.foo do
-              xml.bar { xml.parent.unlink }
-              xml.bar2
-            end
+        b = Nokogiri::XML::Builder.new do |xml|
+          xml.foo do
+            xml.bar { xml.parent.unlink }
+            xml.bar2
           end
         end
+        assert b
       end
 
       def test_with_root

data/test/xml/test_cdata.rb

@@ -29,9 +29,7 @@ module Nokogiri
       end
 
       def test_lots_of_new_cdata
-        assert_nothing_raised do
-          100.times { CDATA.new(@xml, "asdfasdf") }
-        end
+        assert 100.times { CDATA.new(@xml, "asdfasdf") }
       end
 
       def test_content=

data/test/xml/test_document.rb

@@ -124,9 +124,8 @@ module Nokogiri
 
       def test_pp
         out = StringIO.new('')
-        assert_nothing_raised do
-          ::PP.pp @xml, out
-        end
+        ::PP.pp @xml, out
+        assert_operator out.string.length, :>, 0
       end
 
       def test_create_internal_subset_on_existing_subset
@@ -295,9 +294,7 @@ module Nokogiri
       end
 
       def test_parse_handles_nil_gracefully
-        assert_nothing_raised do
-          @doc = Nokogiri::XML::Document.parse(nil)
-        end
+        @doc = Nokogiri::XML::Document.parse(nil)
         assert_instance_of Nokogiri::XML::Document, @doc
       end
 
@@ -633,9 +630,7 @@ module Nokogiri
 
       def test_new
         doc = nil
-        assert_nothing_raised {
-          doc = Nokogiri::XML::Document.new
-        }
+        doc = Nokogiri::XML::Document.new
         assert doc
         assert doc.xml?
         assert_nil doc.root
@@ -643,9 +638,7 @@ module Nokogiri
 
       def test_set_root
         doc = nil
-        assert_nothing_raised {
-          doc = Nokogiri::XML::Document.new
-        }
+        doc = Nokogiri::XML::Document.new
         assert doc
         assert doc.xml?
         assert_nil doc.root

data/test/xml/test_node_set.rb

@@ -168,7 +168,7 @@ module Nokogiri
         set = html.xpath("/html/body/div")
         assert_equal set.first, set.search(".a").first
       end
-      
+
       def test_css_search_with_namespace
         fragment = Nokogiri::XML.fragment(<<-eoxml)
           <html xmlns="http://www.w3.org/1999/xhtml">
@@ -176,7 +176,7 @@ module Nokogiri
           <body></body>
           </html>
         eoxml
-        assert_nothing_raised{ fragment.children.search( 'body', { 'xmlns' => 'http://www.w3.org/1999/xhtml' }) }
+        assert fragment.children.search( 'body', { 'xmlns' => 'http://www.w3.org/1999/xhtml' })
       end
 
       def test_double_equal

data/test/xml/test_text.rb

@@ -30,9 +30,7 @@ module Nokogiri
         doc = Document.new
         node = Nokogiri::XML::Element.new('foo', doc)
 
-        assert_nothing_raised do
-          Text.new('hello world', node)
-        end
+        assert Text.new('hello world', node)
       end
 
       def test_content=

data/test/xml/test_xpath.rb

@@ -100,12 +100,10 @@ module Nokogiri
 
       def test_css_search_uses_custom_selectors
         set = @xml.xpath('//employee')
-        assert_nothing_raised do
-          if Nokogiri.uses_libxml?
-            @xml.css('employee:thing()', @handler)
-          else
-            @xml.xpath("//employee[nokogiri:thing(.)]", @ns, @handler)
-          end
+        if Nokogiri.uses_libxml?
+          @xml.css('employee:thing()', @handler)
+        else
+          @xml.xpath("//employee[nokogiri:thing(.)]", @ns, @handler)
         end
         assert_equal(set.length, @handler.things.length)
         assert_equal(set.to_a, @handler.things.flatten)

data/test/xslt/test_custom_functions.rb

@@ -58,6 +58,41 @@ EOXSL
         assert_equal 'FOO', result.css('title').first.text
       end
 
+
+      def test_function_arguments
+        skip("Pure Java version doesn't support this feature.") if !Nokogiri.uses_libxml?
+        foo = Class.new do
+          include MiniTest::Assertions
+
+          def multiarg *args
+            assert_equal ["abc", "xyz"], args
+            args.first
+          end
+
+          def numericarg arg
+            assert_equal 42, arg
+            arg
+          end
+        end
+
+        xsl = Nokogiri.XSLT(<<-EOXSL, "http://e.org/functions" => foo)
+<?xml version="1.0"?>
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:f="http://e.org/functions"
+  extension-element-prefixes="f">
+
+  <xsl:template match="text()">
+    <xsl:copy-of select="f:multiarg('abc', 'xyz')"/>
+    <xsl:copy-of select="f:numericarg(42)"/>
+  </xsl:template>
+</xsl:stylesheet>
+EOXSL
+
+        xsl.transform @xml
+      end
+
+
       def test_function_XSLT
         skip("Pure Java version doesn't support this feature.") if !Nokogiri.uses_libxml?
         foo = Class.new do

metadata

@@ -2,7 +2,7 @@
 name: nokogiri
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 1.5.3.rc2
+  version: 1.5.3.rc3
 platform: java
 authors: 
   - Aaron Patterson
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-22 00:00:00 Z
+date: 2012-03-26 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: hoe-bundler