nokogiri 1.5.5.rc1-java → 1.5.5.rc2-java

data/CHANGELOG.ja.rdoc

@@ -6,6 +6,14 @@
 
   * JRuby Nokogiri の add_previous_sibling が以前は動いていたのに今は動かない(1.5.0 -> 1.5.1)。 #691 (ありがとう, John Shahid!)
   * JRuby バーションは URL が引数にあたえられると HTML ドキュメントを作れない。 #674 (ありがとう, John Shahid!)
+  * JRuby バージョンは HTMLとして nil か "" が与えられると NullPointerException を投げる。 #699
+  * JRuby 1.9 モードでエラー, uncaught throw 'encoding_found', が発生する。 #673
+  * JRuby で US-ASCII にエンコードされた文字列が正しくないエンコードを返してくる。 #583
+  * 512 文字以上が与えられたときに XmlSaxPushParser が IndexOutOfBoundsException を投げる。#567, #615
+  * Xpath を評価した結果、空の NodeSet が帰ってくる場合に、NodeSet が持っている Document の decorate に失敗して例外が投げられる。#514
+  * JRuby で xpath を namespace 付きで指定した場合に、エラーが発生する。pull request #681 (ありがとう, Piotr Szmielew) 
+  * JRuby で Nokogiri::XML::Node を継承したクラスを定義すると、namespace が表示されない。 #695
+  * JRuby で RDF::RDFXML::Writer をインスタンス化しようとすると NAMESPACE_ERR (org.w3c.dom.DOMException) が発生する. #683
 
 
 == 1.5.4 / ２０１２年６月１２日

data/CHANGELOG.rdoc

@@ -4,8 +4,16 @@
 
 * Bugfixes
 
-  * Regression in JRuby Nokogiri add_previous_sibling (1.5.0 -> 1.5.1) #691 (Thanks, Shahid!)
-  * JRuby unable to create HTML doc if URL arg provided #674 (Thanks, Shahid!)
+  * Regression in JRuby Nokogiri add_previous_sibling (1.5.0 -> 1.5.1) #691 (Thanks, John Shahid!)
+  * JRuby unable to create HTML doc if URL arg provided #674 (Thanks, John Shahid!)
+  * JRuby raises NullPointerException when given HTML document is nil or empty string. #699
+  * JRuby 1.9 error, uncaught throw 'encoding_found', has been fixed. #673
+  * Invalid encoding returned in JRuby with US-ASCII. #583
+  * XmlSaxPushParser raises IndexOutOfBoundsException when over 512 characters are given. #567, #615
+  * When xpath evaluation returns empty NodeSet, decorating NodeSet's base document raises exception. #514
+  * JRuby raises exception when xpath with namespace is specified. pull request #681 (Thanks, Piotr Szmielew)
+  * JRuby renders nodes without their namespace when subclassing Node. #695
+  * JRuby raises NAMESPACE_ERR (org.w3c.dom.DOMException) while instantiating RDF::RDFXML::Writer. #683
 
 
 == 1.5.4 / 2012-06-12

data/Rakefile

@@ -34,8 +34,8 @@ HOE = Hoe.spec 'nokogiri' do
     'nokogiri.gemspec',
     'lib/nokogiri/nokogiri.{bundle,jar,rb,so}',
     'lib/nokogiri/1.{8,9}',
-    GENERATED_PARSER,
-    GENERATED_TOKENIZER
+    # GENERATED_PARSER,
+    # GENERATED_TOKENIZER
   ]
 
   self.extra_dev_deps += [
@@ -45,11 +45,15 @@ HOE = Hoe.spec 'nokogiri' do
     ["hoe-git",         ">= 1.4"],
     ["mini_portile",    ">= 0.2.2"],
     ["minitest",        "~> 2.2.2"],
-    ["racc",            ">= 1.4.6"],
     ["rake",            ">= 0.9"],
-    ["rake-compiler",   "=  0.8.0"],
-    ["rexical",         ">= 1.0.5"],
+    ["rake-compiler",   "=  0.8.0"]
   ]
+  if ! java?
+    self.extra_dev_deps += [
+      ["racc",            ">= 1.4.6"],
+      ["rexical",         ">= 1.0.5"]
+    ]
+  end
 
   if java?
     self.spec_extras = { :platform => 'java' }

data/ext/java/nokogiri/XmlElement.java

@@ -1,7 +1,7 @@
 /**
  * (The MIT License)
  *
- * Copyright (c) 2008 - 2011:
+ * Copyright (c) 2008 - 2012:
  *
  * * {Aaron Patterson}[http://tenderlovemaking.com]
  * * {Mike Dalessio}[http://mike.daless.io]
@@ -80,24 +80,6 @@ public class XmlElement extends XmlNode {
         }
     }
 
-    @Override
-    @JRubyMethod(name = {"add_namespace_definition", "add_namespace"})
-    public IRubyObject add_namespace_definition(ThreadContext context,
-                                                IRubyObject prefix,
-                                                IRubyObject href) {
-        Element element = (Element) node;
-
-        final String uri = "http://www.w3.org/2000/xmlns/";
-        String qName =
-            prefix.isNil() ? "xmlns" : "xmlns:" + rubyStringToString(prefix);
-        element.setAttributeNS(uri, qName, rubyStringToString(href));
-
-        XmlNamespace ns = (XmlNamespace) super.add_namespace_definition(context, prefix, href);
-        updateNodeNamespaceIfNecessary(context, ns);
-
-        return ns;
-    }
-
     @Override
     public boolean isElement() { return true; }
 

data/ext/java/nokogiri/XmlNode.java

@@ -323,7 +323,15 @@ public class XmlNode extends RubyObject {
             throw getRuntime().newArgumentError("node must have owner document");
         }
 
-        Element element = document.createElementNS(null, rubyStringToString(name));
+        Element element = null;
+        String node_name = rubyStringToString(name);
+        try {
+          element = document.createElementNS(null, node_name);
+        } catch (org.w3c.dom.DOMException e) {
+            // issue#683 NAMESPACE_ERR is thrown from RDF::RDFXML::Writer.new
+            // retry without namespace
+            element = document.createElement(node_name);
+        }
         setNode(context, element);
     }
 
@@ -524,7 +532,15 @@ public class XmlNode extends RubyObject {
                                                 IRubyObject prefix,
                                                 IRubyObject href) {
         Node namespaceOwner;
-        if (node.getNodeType() == Node.ELEMENT_NODE) namespaceOwner = node;
+        if (node.getNodeType() == Node.ELEMENT_NODE) {
+            namespaceOwner = node;
+            Element element = (Element) node;
+
+            final String uri = "http://www.w3.org/2000/xmlns/";
+            String qName =
+                prefix.isNil() ? "xmlns" : "xmlns:" + rubyStringToString(prefix);
+            element.setAttributeNS(uri, qName, rubyStringToString(href));
+        }
         else if (node.getNodeType() == Node.ATTRIBUTE_NODE) namespaceOwner = ((Attr)node).getOwnerElement();
         else namespaceOwner = node.getParentNode();
         XmlNamespace ns = XmlNamespace.createFromPrefixAndHref(namespaceOwner, prefix, href);
@@ -763,7 +779,12 @@ public class XmlNode extends RubyObject {
         String textContent;
         if (content != null) textContent = rubyStringToString(content);
         else if (this instanceof XmlDocument) {
-            textContent = ((Document)this.node).getDocumentElement().getTextContent().trim();
+            Node node = ((Document)this.node).getDocumentElement();
+            if (node == null) {
+                textContent = "";
+            } else {
+                textContent = ((Document)this.node).getDocumentElement().getTextContent().trim();
+            }
         } else {
             textContent = this.node.getTextContent();
         }

data/ext/java/nokogiri/XmlNodeSet.java

@@ -93,7 +93,7 @@ public class XmlNodeSet extends RubyObject implements NodeList {
         setNodes(nodeListToRubyArray(getRuntime(), nodeList));
     }
     
-    private void initialize(Ruby ruby, IRubyObject refNode) {
+    public void initialize(Ruby ruby, IRubyObject refNode) {
         if (refNode instanceof XmlNode) {
             XmlNode n = (XmlNode)refNode;
             doc = n.document(ruby.getCurrentContext());

data/ext/java/nokogiri/XmlXpathContext.java

@@ -94,16 +94,16 @@ public class XmlXpathContext extends RubyObject {
     }
 
     @JRubyMethod(name = "new", meta = true)
-    public static IRubyObject rbNew(ThreadContext context, IRubyObject klazz, IRubyObject node) {
+    public static IRubyObject rbNew(ThreadContext thread_context, IRubyObject klazz, IRubyObject node) {
         XmlNode xmlNode = (XmlNode)node;
-        XmlXpathContext xmlXpathContext = (XmlXpathContext) NokogiriService.XML_XPATHCONTEXT_ALLOCATOR.allocate(context.getRuntime(), (RubyClass)klazz);
+        XmlXpathContext xmlXpathContext = (XmlXpathContext) NokogiriService.XML_XPATHCONTEXT_ALLOCATOR.allocate(thread_context.getRuntime(), (RubyClass)klazz);
         xmlXpathContext.xpath = XPathFactory.newInstance().newXPath();
         xmlXpathContext.setNode(xmlNode);
         return xmlXpathContext;
     }
 
     @JRubyMethod
-    public IRubyObject evaluate(ThreadContext context, IRubyObject expr, IRubyObject handler) {
+    public IRubyObject evaluate(ThreadContext thread_context, IRubyObject expr, IRubyObject handler) {
         String src = (String) expr.toJava(String.class);
         try {
             if(!handler.isNil()) {
@@ -116,7 +116,7 @@ public class XmlXpathContext extends RubyObject {
                 xpath.setXPathFunctionResolver(NokogiriXPathFunctionResolver.create(handler));
             }
             XPathExpression xpathExpression = xpath.compile(src);
-            return node_set(context, xpathExpression);
+            return node_set(thread_context, xpathExpression);
         } catch (XPathExpressionException xpee) {
             xpee = new XPathExpressionException(src);
             RubyException e = XmlSyntaxError.createXPathSyntaxError(getRuntime(), xpee);
@@ -124,10 +124,10 @@ public class XmlXpathContext extends RubyObject {
         }
     }
 
-    protected IRubyObject node_set(ThreadContext rbctx, XPathExpression xpathExpression) {
+    protected IRubyObject node_set(ThreadContext thread_context, XPathExpression xpathExpression) {
         XmlNodeSet result = null;
         try {  
-            result = tryGetNodeSet(xpathExpression);
+            result = tryGetNodeSet(thread_context, xpathExpression);
             return result;
         } catch (XPathExpressionException xpee) {
             try {
@@ -139,10 +139,11 @@ public class XmlXpathContext extends RubyObject {
         }
     }
     
-    private XmlNodeSet tryGetNodeSet(XPathExpression xpathExpression) throws XPathExpressionException {
+    private XmlNodeSet tryGetNodeSet(ThreadContext thread_context, XPathExpression xpathExpression) throws XPathExpressionException {
         NodeList nodeList = (NodeList)xpathExpression.evaluate(context.node, XPathConstants.NODESET);
         XmlNodeSet xmlNodeSet = (XmlNodeSet) NokogiriService.XML_NODESET_ALLOCATOR.allocate(getRuntime(), getNokogiriClass(getRuntime(), "Nokogiri::XML::NodeSet"));
         xmlNodeSet.setNodeList(nodeList);
+        xmlNodeSet.initialize(thread_context.getRuntime(), context);
         return xmlNodeSet;    
     }
 

data/ext/java/nokogiri/internals/NokogiriNamespaceCache.java

@@ -1,7 +1,7 @@
 /**
  * (The MIT License)
  *
- * Copyright (c) 2008 - 2011:
+ * Copyright (c) 2008 - 2012:
  *
  * * {Aaron Patterson}[http://tenderlovemaking.com]
  * * {Mike Dalessio}[http://mike.daless.io]
@@ -32,7 +32,6 @@
 
 package nokogiri.internals;
 
-import static nokogiri.internals.NokogiriHelpers.getNokogiriClass;
 import static nokogiri.internals.NokogiriHelpers.isNamespace;
 
 import java.util.ArrayList;
@@ -40,11 +39,8 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import nokogiri.NokogiriService;
-import nokogiri.XmlDocument;
 import nokogiri.XmlNamespace;
 
-import org.jruby.Ruby;
 import org.w3c.dom.Attr;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;

data/lib/nokogiri/css/parser.rb

@@ -14,100 +14,96 @@ module Nokogiri
 ##### State transition tables begin ###
 
 racc_action_table = [
-     6,    62,     7,    63,    14,    19,    23,    26,    20,     2,
-    71,    14,     6,    63,    85,    17,    14,    22,    25,    28,
-    83,     2,     7,    72,    11,    13,    15,   -26,    20,     7,
-    49,    28,    13,    70,     7,    20,    11,    13,    15,     6,
-    20,    64,    65,    14,    19,    23,    26,    64,     2,    36,
-    59,     6,    60,    67,    17,    14,    22,    25,    28,    90,
-     2,     7,     6,    11,    13,    15,    14,    20,    66,    67,
-    28,     2,    91,     7,    14,    11,    13,    15,    14,    20,
-    69,    28,     6,     2,     7,    68,    11,    13,    15,    14,
-    20,    37,     7,    39,    94,    13,     7,    14,    20,    13,
-    15,    28,    20,     6,    49,    14,    11,     7,    36,    59,
-    13,    60,    53,    20,    14,     7,    36,    59,    13,    60,
-    95,    20,    28,     7,   101,   100,    13,    11,    49,    20,
-    74,    76,     7,    36,    31,    13,    33,    50,    20,    74,
-    76,    75,    77,    79,    98,    80,    32,    99,    42,    73,
-    75,    77,    79,   102,    80,    19,    23,    26,    73,    36,
-    59,   -26,    60,   104,   105,    17,   nil,    22,    25 ]
+    21,     4,     5,     7,    29,     4,     5,     7,    30,    19,
+   -26,     6,    21,     9,     8,     6,    29,     9,     8,    22,
+    31,    19,    20,    21,    23,    15,    17,    29,    24,    83,
+    31,    22,    19,    84,    20,    21,    23,    15,    17,    29,
+    24,    92,    22,    85,    19,    20,    21,    23,    15,    17,
+    20,    24,    82,    90,    22,    59,    24,    20,    89,    23,
+    15,    17,    21,    24,    88,    22,    29,     4,     5,     7,
+    23,    19,    71,    29,    91,    29,    86,     6,    19,     9,
+     8,    22,    29,    29,    20,    89,    23,    15,    17,    35,
+    24,    20,    29,    20,    15,    17,    15,    24,    35,    24,
+    20,    20,    29,    15,    15,    93,    24,    24,    21,    64,
+    20,    95,    29,    15,    97,    96,    24,    43,   -26,    46,
+    20,    52,    53,    15,    51,    98,    24,    22,    79,    80,
+    20,    99,    23,    15,    48,    42,    24,    79,    80,    75,
+    76,    77,   101,    78,    87,    86,    41,    74,    75,    76,
+    77,    35,    78,   104,    52,    56,    74,    55,    52,    56,
+   105,    55,    52,    56,   nil,    55,    52,    56,   nil,    55 ]
 
 racc_action_check = [
-     0,    29,    21,    45,     0,     0,     0,     0,    21,     0,
-    38,    24,    63,    29,    45,     0,    63,     0,     0,     0,
-    42,    63,     0,    39,     0,     0,     0,    37,     0,    24,
-    47,    63,    24,    36,    63,    24,    63,    63,    63,    11,
-    63,    59,    31,    11,    11,    11,    11,    31,    11,    70,
-    70,     9,    70,    60,    11,     9,    11,    11,    11,    61,
-     9,    11,    44,    11,    11,    11,    44,    11,    33,    33,
-     9,    44,    62,     9,    87,     9,     9,     9,    49,     9,
-    35,    44,     7,    49,    44,    34,    44,    44,    44,    12,
-    44,     7,    87,     7,    65,    87,    49,    27,    87,    49,
-    49,     7,    49,    20,    12,    18,     7,    12,    64,    64,
-    12,    64,    20,    12,     1,    27,    28,    28,    27,    28,
-    66,    27,    20,    18,    81,    81,    18,    20,    16,    18,
-    41,    41,     1,     6,     6,     1,     6,    13,     1,    40,
-    40,    41,    41,    41,    71,    41,     6,    78,     8,    41,
-    40,    40,    40,    82,    40,    10,    10,    10,    40,    67,
-    67,     2,    67,    89,    95,    10,   nil,    10,    10 ]
+     0,    14,    14,    14,     0,     0,     0,     0,     1,     0,
+    43,    14,    40,    14,    14,     0,    40,     0,     0,     0,
+     1,    40,     0,    31,     0,     0,     0,    31,     0,    47,
+    57,    40,    31,    49,    40,    13,    40,    40,    40,    13,
+    40,    57,    31,    50,    13,    31,    24,    31,    31,    31,
+    11,    31,    46,    53,    13,    24,    11,    13,    53,    13,
+    13,    13,    23,    13,    52,    24,    23,    23,    23,    23,
+    24,    23,    42,    35,    54,    28,    55,    23,    35,    23,
+    23,    23,    27,    10,    23,    56,    23,    23,    23,    33,
+    23,    35,    26,    28,    35,    35,    28,    35,    10,    28,
+    27,    10,    25,    27,    10,    67,    27,    10,    20,    30,
+    26,    72,    68,    26,    73,    73,    26,    20,    19,    20,
+    25,    21,    21,    25,    21,    81,    25,    20,    45,    45,
+    68,    83,    20,    68,    21,    18,    68,    44,    44,    45,
+    45,    45,    87,    45,    51,    51,    15,    45,    44,    44,
+    44,    12,    44,    90,    89,    89,    44,    89,    86,    86,
+   101,    86,    88,    88,   nil,    88,    22,    22,   nil,    22 ]
 
 racc_action_pointer = [
-    -2,   108,   132,   nil,   nil,   nil,   123,    80,   119,    49,
-   148,    37,    83,   126,   nil,   nil,   107,   nil,    99,   nil,
-   101,   -22,   nil,   nil,     5,   nil,   nil,    91,   106,     1,
-   nil,    35,   nil,    57,    62,    57,    21,    -2,   -19,    -2,
-   136,   127,     9,   nil,    60,    -9,   nil,     9,   nil,    72,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    29,
-    41,    36,    72,    10,    98,    81,   113,   149,   nil,   nil,
-    39,   133,   nil,   nil,   nil,   nil,   nil,   nil,   122,   nil,
-   nil,   114,   128,   nil,   nil,   nil,   nil,    68,   nil,   140,
-   nil,   nil,   nil,   nil,   nil,   151,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil ]
+    -2,     8,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    77,    26,   130,    33,    -6,   135,   nil,   nil,   106,    89,
+   106,   111,   156,    60,    44,    96,    86,    76,    69,   nil,
+   109,    21,   nil,    68,   nil,    67,   nil,   nil,   nil,   nil,
+    10,   nil,    61,   -19,   134,   125,    27,     0,   nil,    10,
+    20,   133,    52,    46,    51,    64,    73,    18,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    82,   106,   nil,
+   nil,   nil,    86,   104,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   100,   nil,   120,   nil,   nil,   148,   135,   152,   144,
+   140,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   147,   nil,   nil,   nil,   nil ]
 
 racc_action_default = [
-   -27,   -56,   -25,    -3,   -22,    -2,   -74,   -27,   -74,   -27,
-   -20,   -27,   -50,   -74,   -59,   -23,   -17,    -6,   -55,    -4,
-   -74,   -13,    -9,    -5,   -58,    -8,    -7,   -57,   -74,   -74,
-   -52,   -43,   -33,   -41,   -74,   -74,   -42,   -32,   -74,   -74,
-   -62,   -62,   -74,   -18,   -27,   -74,   -10,   -49,   -12,   -27,
-   -21,   -16,   -51,   -48,   -47,   -14,   -15,   -54,   -53,   -43,
-   -41,   -74,   -74,   -27,   -74,   -74,   -46,   -74,   -34,   -35,
-   -74,   -74,   -30,   -63,   -68,   -64,   -69,   -65,   -74,   -66,
-   -67,   -74,   -74,   -24,   -19,   -37,   -11,   -71,   -73,   -74,
-   -36,   106,    -1,   -40,   -45,   -74,   -38,   -39,   -31,   -28,
-   -60,   -61,   -29,   -72,   -70,   -44 ]
+   -27,   -74,    -2,    -3,    -4,    -5,    -6,    -7,    -8,    -9,
+   -50,   -13,   -17,   -27,   -20,   -74,   -22,   -23,   -74,   -25,
+   -27,   -74,   -74,   -27,   -74,   -55,   -56,   -57,   -58,   -59,
+   -74,   -27,   -10,   -49,   -12,   -27,   -14,   -15,   -16,   -18,
+   -27,   -21,   -74,   -32,   -62,   -62,   -74,   -74,   -33,   -74,
+   -74,   -41,   -42,   -43,   -74,   -41,   -43,   -74,   -47,   -48,
+   -51,   -52,   -53,   -54,   106,    -1,   -11,   -74,   -71,   -73,
+   -19,   -24,   -74,   -74,   -63,   -64,   -65,   -66,   -67,   -68,
+   -69,   -74,   -30,   -74,   -34,   -35,   -74,   -46,   -74,   -74,
+   -74,   -36,   -37,   -70,   -72,   -28,   -60,   -61,   -29,   -31,
+   -38,   -74,   -39,   -40,   -45,   -44 ]
 
 racc_goto_table = [
-    30,    43,    34,    48,    29,    41,    55,    51,    78,    82,
-    46,    47,    56,    38,    40,    45,    87,    52,    54,    44,
-    35,    89,   nil,    57,    61,   nil,    58,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,    84,   nil,    86,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    88,   nil,
-   nil,   nil,   nil,   nil,   nil,    92,   nil,   nil,   nil,   nil,
-    93,   nil,   nil,    96,   nil,   nil,    97,   nil,   nil,   nil,
+    49,    54,    33,    39,    36,     1,    34,    45,    38,    72,
+    81,    58,    32,    37,    47,    44,    68,    60,    61,    62,
+    63,    65,    40,    50,    67,   nil,   nil,    69,    57,    66,
+    70,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   103 ]
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    94,   nil,   nil,   nil,   nil,   100,   nil,   102,   103 ]
 
 racc_goto_check = [
-     8,     2,    18,     9,     1,    10,    11,     9,    17,    17,
-     7,     8,    12,    15,    16,     1,     6,     8,    10,     4,
-    19,    22,   nil,     8,    18,   nil,     8,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,     2,   nil,     9,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,     8,   nil,
-   nil,   nil,   nil,   nil,   nil,     2,   nil,   nil,   nil,   nil,
-    18,   nil,   nil,    18,   nil,   nil,    18,   nil,   nil,   nil,
+    18,    18,     8,     2,    11,     1,     9,    10,     9,    17,
+    17,    10,     7,    12,    15,    16,     6,     8,     8,     8,
+     8,     2,     4,    19,    22,   nil,   nil,     8,     1,     9,
+     2,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,     8 ]
+     8,   nil,   nil,   nil,   nil,    18,   nil,    18,    18 ]
 
 racc_goto_pointer = [
-   nil,     4,    -8,   nil,     9,   nil,   -33,    -2,    -1,    -9,
-    -2,   -15,    -9,   nil,   nil,     6,     7,   -32,    -4,    14,
-   nil,   nil,   -28 ]
+   nil,     5,   -10,   nil,     8,   nil,   -19,     2,    -8,    -4,
+   -13,    -7,     2,   nil,   nil,    -6,    -5,   -35,   -21,     2,
+   nil,   nil,   -11 ]
 
 racc_goto_default = [
-   nil,   nil,     3,     5,     9,    10,    12,   nil,    16,   nil,
-    21,    24,    27,     1,     4,     8,   nil,   nil,   nil,   nil,
-    18,    81,   nil ]
+   nil,   nil,     3,     2,    13,    14,    10,   nil,    12,   nil,
+    11,    28,    27,    26,    16,    18,   nil,   nil,   nil,   nil,
+    25,    73,   nil ]
 
 racc_reduce_table = [
   0, 0, :racc_error,

data/lib/nokogiri/html/document.rb

@@ -180,7 +180,7 @@ module Nokogiri
             m = chunk.match(/(<meta\s)(.*)(charset\s*=\s*([\w-]+))(.*)/i) and
               return m[4]
             catch(:encoding_found) {
-              Nokogiri::HTML::SAX::Parser.new(JumpSAXHandler.new(:encoding_found.to_s)).parse(chunk)
+              Nokogiri::HTML::SAX::Parser.new(JumpSAXHandler.new(:encoding_found)).parse(chunk)
               nil
             }
           else

data/lib/nokogiri/version.rb

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

data/lib/nokogiri/xml/node.rb

@@ -150,7 +150,7 @@ module Nokogiri
         sets = paths.map { |path|
           ctx = XPathContext.new(self)
           ctx.register_namespaces(ns)
-          path = path.gsub(/\/xmlns:/,'/:') unless Nokogiri.uses_libxml?
+          path = path.gsub(/xmlns:/, ' :') unless Nokogiri.uses_libxml?
 
           binds.each do |key,value|
             ctx.register_variable key.to_s, value

data/test/html/test_document.rb

@@ -517,6 +517,12 @@ eohtml
         assert @html.serialize
         assert @html.to_html
       end
+
+      def test_empty_document
+        # empty document should return "" #699
+        assert_equal "", Nokogiri::HTML.parse(nil).text
+        assert_equal "", Nokogiri::HTML.parse("").text
+      end
     end
   end
 end

data/test/xml/test_xpath.rb

@@ -263,6 +263,33 @@ module Nokogiri
           }.new)
         assert_equal foo, doc.xpath("//foo")
       end
+
+      def test_node_set_should_be_decorated
+        # "called decorate on nill" exception in JRuby issue#514
+        process_output= <<END
+<test>
+ <track type="Image">
+ <Format>LZ77</Format>
+</test>
+END
+        doc = Nokogiri::XML.parse(process_output)
+        node = doc.xpath(%{//track[@type='Video']})
+        assert_equal "[]", node.xpath("Format").inspect
+      end
+
+      def test_very_specific_xml_xpath_making_problems_in_jruby
+        # manually merges pull request #681
+        xml_string = %q{<?xml version="1.0" encoding="UTF-8"?>
+        <ONIXMessage xmlns:elibri="http://elibri.com.pl/ns/extensions" release="3.0" xmlns="http://www.editeur.org/onix/3.0/reference">
+          <Product>
+            <RecordReference>a</RecordReference>
+          </Product>
+        </ONIXMessage>}
+        
+        xml_doc = Nokogiri::XML(xml_string)
+        onix = xml_doc.children.first
+        assert_equal 'a', onix.at_xpath('xmlns:Product').at_xpath('xmlns:RecordReference').text
+      end
     end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: nokogiri
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 1.5.5.rc1
+  version: 1.5.5.rc2
 platform: java
 authors: 
   - Aaron Patterson
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-12 00:00:00 Z
+date: 2012-06-14 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: hoe-bundler
@@ -81,70 +81,48 @@ dependencies:
     requirement: *id006
     prerelease: false
     type: :development
-  - !ruby/object:Gem::Dependency 
-    name: racc
-    version_requirements: &id007 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 1.4.6
-    requirement: *id007
-    prerelease: false
-    type: :development
   - !ruby/object:Gem::Dependency 
     name: rake
-    version_requirements: &id008 !ruby/object:Gem::Requirement 
+    version_requirements: &id007 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
             version: "0.9"
-    requirement: *id008
+    requirement: *id007
     prerelease: false
     type: :development
   - !ruby/object:Gem::Dependency 
     name: rake-compiler
-    version_requirements: &id009 !ruby/object:Gem::Requirement 
+    version_requirements: &id008 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
             version: 0.8.0
-    requirement: *id009
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency 
-    name: rexical
-    version_requirements: &id010 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 1.0.5
-    requirement: *id010
+    requirement: *id008
     prerelease: false
     type: :development
   - !ruby/object:Gem::Dependency 
     name: rdoc
-    version_requirements: &id011 !ruby/object:Gem::Requirement 
+    version_requirements: &id009 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
             version: "3.10"
-    requirement: *id011
+    requirement: *id009
     prerelease: false
     type: :development
   - !ruby/object:Gem::Dependency 
     name: hoe
-    version_requirements: &id012 !ruby/object:Gem::Requirement 
+    version_requirements: &id010 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
             version: "2.16"
-    requirement: *id012
+    requirement: *id010
     prerelease: false
     type: :development
 description: "Nokogiri (\xE9\x8B\xB8) is an HTML, XML, SAX, and Reader parser.  Among Nokogiri's\n\