nokogiri 1.5.5.rc2-java → 1.5.5.rc3-java

data/ext/java/nokogiri/XmlSyntaxError.java

@@ -75,23 +75,27 @@ public class XmlSyntaxError extends RubyException {
     }
 
     public static XmlSyntaxError createWarning(Ruby runtime, SAXParseException e) {
-        XmlSyntaxError xmlSyntaxError = (XmlSyntaxError) NokogiriService.XML_SYNTAXERROR_ALLOCATOR.allocate(runtime, getNokogiriClass(runtime, "Nokogiri::XML::SyntaxError"));
+        XmlSyntaxError xmlSyntaxError = createNokogiriXmlSyntaxError(runtime);
         xmlSyntaxError.setException(runtime, e, 1);
         return xmlSyntaxError;
     }
 
     public static XmlSyntaxError createError(Ruby runtime, SAXParseException e) {
-        XmlSyntaxError xmlSyntaxError = (XmlSyntaxError) NokogiriService.XML_SYNTAXERROR_ALLOCATOR.allocate(runtime, getNokogiriClass(runtime, "Nokogiri::XML::SyntaxError"));
+        XmlSyntaxError xmlSyntaxError = createNokogiriXmlSyntaxError(runtime);
         xmlSyntaxError.setException(runtime, e, 2);
         return xmlSyntaxError;
     }
 
     public static XmlSyntaxError createFatalError(Ruby runtime, SAXParseException e) {
-        XmlSyntaxError xmlSyntaxError = (XmlSyntaxError) NokogiriService.XML_SYNTAXERROR_ALLOCATOR.allocate(runtime, getNokogiriClass(runtime, "Nokogiri::XML::SyntaxError"));
+        XmlSyntaxError xmlSyntaxError = createNokogiriXmlSyntaxError(runtime);
         xmlSyntaxError.setException(runtime, e, 3);
         return xmlSyntaxError;
     }
-    
+
+    public static XmlSyntaxError createNokogiriXmlSyntaxError(Ruby runtime) {
+      return (XmlSyntaxError) NokogiriService.XML_SYNTAXERROR_ALLOCATOR.allocate(runtime, getNokogiriClass(runtime, "Nokogiri::XML::SyntaxError"));
+    }
+
     public void setException(Exception exception) {
         this.exception = exception;
     }
@@ -112,6 +116,7 @@ public class XmlSyntaxError extends RubyException {
     //@Override
     //"to_s" method was branched in 1.8 and 1.9 since JRuby 1.6.6
     // to support older version of JRuby, the annotation is commented out
+    @Override
     @JRubyMethod(name = "to_s", compat = CompatVersion.RUBY1_8)
     public IRubyObject to_s(ThreadContext context) {
         if (exception != null && exception.getMessage() != null)

data/ext/java/nokogiri/internals/NokogiriHandler.java

@@ -92,7 +92,13 @@ public class NokogiriHandler extends DefaultHandler2 implements XmlDeclHandler {
         String objectName = object.getMetaClass().getName();
         if (htmlParserName.equals(objectName)) needEmptyAttrCheck = true;
     }
-    
+
+    @Override
+    public void skippedEntity(String skippedEntity) {
+        call("error", ruby.newString("Entity '" + skippedEntity + "' not defined\n"));
+    }
+
+    @Override
     public void setDocumentLocator(Locator locator) {
         this.locator = locator;
     }

data/ext/java/nokogiri/internals/NokogiriNamespaceContext.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]

data/ext/java/nokogiri/internals/NokogiriXPathVariableResolver.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]

data/ext/java/nokogiri/internals/NokogiriXsltErrorListener.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]

data/ext/java/nokogiri/internals/ParserContext.java

@@ -17,10 +17,10 @@
  * distribute, sublicense, and/or sell copies of the Software, and to
  * permit persons to whom the Software is furnished to do so, subject to
  * the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be
  * included in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
@@ -33,7 +33,6 @@
 package nokogiri.internals;
 
 import static nokogiri.internals.NokogiriHelpers.rubyStringToString;
-import static nokogiri.internals.NokogiriHelpers.adjustSystemIdIfNecessary;
 import static org.jruby.javasupport.util.RuntimeHelpers.invoke;
 
 import java.io.ByteArrayInputStream;
@@ -59,7 +58,6 @@ import org.jruby.util.ByteList;
 import org.jruby.util.TypeConverter;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
-import org.xml.sax.ext.EntityResolver2;
 
 /**
  * Base class for the various parser contexts.  Handles converting
@@ -73,22 +71,6 @@ public class ParserContext extends RubyObject {
     protected IRubyObject detected_encoding = null;
     protected int stringDataSize = -1;
 
-    /**
-     * Create a file base input source taking into account the current
-     * directory of <code>runtime</code>.
-     */
-    public static InputSource resolveEntity(Ruby runtime, String publicId, String baseURI, String systemId)
-        throws IOException {
-        InputSource s = new InputSource();
-        String adjusted = adjustSystemIdIfNecessary(runtime.getCurrentDirectory(), runtime.getInstanceConfig().getScriptFileName(), baseURI, systemId);
-        if (adjusted == null && publicId == null) {
-            throw runtime.newRuntimeError("SystemId \"" + systemId + "\" is not correct.");
-        }
-        s.setSystemId(adjusted);
-        s.setPublicId(publicId);
-        return s;
-    }
-
     public ParserContext(Ruby runtime) {
         // default to class 'Object' because this class isn't exposed to Ruby
         super(runtime, runtime.getObject());
@@ -107,37 +89,17 @@ public class ParserContext extends RubyObject {
      * which may be an IO object, a String, or a StringIO.
      */
     public void setInputSource(ThreadContext context, IRubyObject data, IRubyObject url) {
+        source = new InputSource();
+
         Ruby ruby = context.getRuntime();
-        String path = (String) url.toJava(String.class);
-        if (data.getType().respondsTo("detect_encoding")) {
-            // data is EnocodingReader
-            try {
-                data.callMethod(context, "read", RubyFixnum.newFixnum(context.getRuntime(), 1024));
-            } catch (RaiseException e) {
-                detected_encoding = e.getException().getInstanceVariable("@found_encoding");
-            }
-        }
 
-        // Dir.chdir might be called at some point before this.
-        if (path != null) {
-          try {
-            URI uri = URI.create(path);
-            returnWithSystemId(uri.toURL().toString());
-            return;
-          } catch (Exception ex) {
-            // fallback to the old behavior
-            if (isAbsolutePath(path)) {
-                returnWithSystemId(path);
-                return;
-            }
-            String currentDir = context.getRuntime().getCurrentDirectory();
-            String absPath = currentDir + "/" + path;
-            if (isAbsolutePath(absPath)) {
-                returnWithSystemId(absPath);
-                return;
-            }
-          }
-        }
+        ParserContext.setUrl(context, source, url);
+
+        // if setEncoding returned true, then the stream is set
+        // to the EncodingReaderInputStream
+        if (setEncoding(context, data))
+          return;
+
         RubyString stringData = null;
         if (invoke(context, data, "respond_to?",
                    ruby.newSymbol("to_io").to_sym()).isTrue()) {
@@ -146,17 +108,7 @@ public class ParserContext extends RubyObject {
                 (RubyIO) TypeConverter.convertToType(data,
                                                      ruby.getIO(),
                                                      "to_io");
-            source = new InputSource(io.getInStream());
-        } else if (((RubyObject)data).getInstanceVariable("@io") != null) {
-            // in case of EncodingReader is used
-            // since EncodingReader won't respond to :to_io
-            RubyObject dataObject = (RubyObject) ((RubyObject)data).getInstanceVariable("@io");
-            if (dataObject instanceof RubyIO) {
-                RubyIO io = (RubyIO)dataObject;
-                source = new InputSource(io.getInStream());
-            } else if (dataObject instanceof RubyStringIO) {
-                stringData = (RubyString)((RubyStringIO)dataObject).string();
-            }
+            source.setByteStream(io.getInStream());
         } else {
             if (invoke(context, data, "respond_to?",
                           ruby.newSymbol("string").to_sym()).isTrue()) {
@@ -185,41 +137,64 @@ public class ParserContext extends RubyObject {
             ByteList bytes = stringData.getByteList();
             if (charset != null) {
                 StringReader reader = new StringReader(new String(bytes.unsafeBytes(), bytes.begin(), bytes.length(), charset));
-                source = new InputSource(reader);
+                source.setCharacterStream(reader);
                 source.setEncoding(charset.name());
             } else {
                 stringDataSize = bytes.length() - bytes.begin();
-                source = new InputSource(new ByteArrayInputStream(bytes.unsafeBytes(), bytes.begin(), bytes.length()));
+                ByteArrayInputStream stream = new ByteArrayInputStream(bytes.unsafeBytes(), bytes.begin(), bytes.length());
+                source.setByteStream(stream);
             }
         }
     }
-    
-    private boolean isAbsolutePath(String url) {
-        if (url == null) return false;
-        return (new File(url)).isAbsolute();
+
+    public static void setUrl(ThreadContext context, InputSource source, IRubyObject url) {
+        String path = rubyStringToString(url);
+        // Dir.chdir might be called at some point before this.
+        if (path != null) {
+          try {
+            URI uri = URI.create(path);
+            source.setSystemId(uri.toURL().toString());
+          } catch (Exception ex) {
+            // fallback to the old behavior
+            File file = new File(path);
+            if (file.isAbsolute()) {
+              source.setSystemId(path);
+            } else {
+              String pwd = context.getRuntime().getCurrentDirectory();
+              String absolutePath;
+              try {
+                absolutePath = new File(pwd, path).getCanonicalPath();
+              } catch (IOException e) {
+                absolutePath = new File(pwd, path).getAbsolutePath();
+              }
+              source.setSystemId(absolutePath);
+            }
+          }
+        }
     }
-    
-    private void returnWithSystemId(String url) {
-        source = new InputSource();
-        if (detected_encoding != null) {
-            source.setEncoding((String) detected_encoding.toJava(String.class));
+
+    private boolean setEncoding(ThreadContext context, IRubyObject data) {
+        if (data.getType().respondsTo("detect_encoding")) {
+            // in case of EncodingReader is used
+            // since EncodingReader won't respond to :to_io
+            NokogiriEncodingReaderWrapper reader = new NokogiriEncodingReaderWrapper(context, (RubyObject) data);
+            source.setByteStream(reader);
+            // data is EnocodingReader
+            if(reader.detectEncoding()) {
+              detected_encoding = reader.getEncoding();
+              source.setEncoding(detected_encoding.asJavaString());
+            }
+            return true;
         }
-        source.setSystemId(url);
-        return;
+        return false;
     }
 
     /**
      * Set the InputSource to read from <code>file</code>, a String filename.
      */
     public void setInputSourceFile(ThreadContext context, IRubyObject file) {
-        String filename = rubyStringToString(file);
-
-        try{
-            source = resolveEntity(context.getRuntime(), null, null, filename);
-        } catch (Exception e) {
-            throw RaiseException.createNativeRaiseException(context.getRuntime(), e);
-        }
-
+        source = new InputSource();
+        ParserContext.setUrl(context, source, file);
     }
 
     /**
@@ -295,41 +270,19 @@ public class ParserContext extends RubyObject {
         }
     }
 
-    /**
-     * An entity resolver aware of the fact that the Ruby runtime can
-     * change directory but the JVM cannot.  Thus any file based
-     * entity resolution that uses relative paths must be translated
-     * to be relative to the current directory of the Ruby runtime.
-     */
-    public static class ChdirEntityResolver implements EntityResolver2 {
-        protected Ruby runtime;
-
-        public ChdirEntityResolver(Ruby runtime) {
-            super();
-            this.runtime = runtime;
-        }
-
-        @Override
-        public InputSource getExternalSubset(String name, String baseURI)
-            throws SAXException, IOException {
-            return null;
+    public static class NokogiriXInlcudeEntityResolver implements org.xml.sax.EntityResolver {
+        InputSource source;
+        public NokogiriXInlcudeEntityResolver(InputSource source) {
+            this.source = source;
         }
 
         @Override
         public InputSource resolveEntity(String publicId, String systemId)
-            throws SAXException, IOException {
-            return resolveEntity(null, publicId, null, systemId);
+                throws SAXException, IOException {
+            if (systemId != null) source.setSystemId(systemId);
+            if (publicId != null) source.setPublicId(publicId);
+            return source;
         }
-
-        @Override
-        public InputSource resolveEntity(String name,
-                                         String publicId,
-                                         String baseURI,
-                                         String systemId)
-            throws SAXException, IOException {
-            return ParserContext.resolveEntity(runtime, publicId, baseURI, systemId);
-        }
-
     }
 
 }

data/ext/java/nokogiri/internals/XmlDeclHandler.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]

data/ext/java/nokogiri/internals/XmlDomParser.java

@@ -35,18 +35,16 @@ package nokogiri.internals;
 import java.io.IOException;
 
 import nokogiri.XmlDocument;
-import nokogiri.internals.ParserContext.Options;
 
 import org.apache.xerces.parsers.DOMParser;
 import org.apache.xerces.parsers.XIncludeParserConfiguration;
-import org.apache.xerces.xni.XMLResourceIdentifier;
-import org.apache.xerces.xni.XNIException;
-import org.apache.xerces.xni.parser.XMLEntityResolver;
-import org.apache.xerces.xni.parser.XMLInputSource;
 import org.apache.xerces.xni.parser.XMLParserConfiguration;
 import org.cyberneko.dtd.DTDConfiguration;
 import org.w3c.dom.Document;
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
 import org.xml.sax.InputSource;
+import org.xml.sax.Locator;
 import org.xml.sax.SAXException;
 
 /**
@@ -80,7 +78,7 @@ public class XmlDomParser extends DOMParser {
     public void parse(InputSource source) throws SAXException, IOException {
         dtd.reset();
         if (options.xInclude) {
-            super.setEntityResolver(new NokogiriXInlcudeEntityResolver(source));
+            setEntityResolver(new NokogiriXInlcudeEntityResolver(source));
         }
         super.parse(source);
         Document doc = getDocument();

data/ext/java/nokogiri/internals/XmlDomParserContext.java

@@ -68,8 +68,12 @@ import org.xml.sax.SAXException;
 public class XmlDomParserContext extends ParserContext {
     protected static final String FEATURE_LOAD_EXTERNAL_DTD =
         "http://apache.org/xml/features/nonvalidating/load-external-dtd";
+    protected static final String FEATURE_LOAD_DTD_GRAMMAR =
+        "http://apache.org/xml/features/nonvalidating/load-dtd-grammar";
     protected static final String FEATURE_INCLUDE_IGNORABLE_WHITESPACE =
         "http://apache.org/xml/features/dom/include-ignorable-whitespace";
+    protected static final String FEATURE_NOT_EXPAND_ENTITY =
+        "http://apache.org/xml/features/dom/create-entity-ref-nodes";
     protected static final String FEATURE_VALIDATION = "http://xml.org/sax/features/validation";
     private static final String XINCLUDE_FEATURE_ID = "http://apache.org/xml/features/xinclude";
     private static final String SECURITY_MANAGER = "http://apache.org/xml/properties/security-manager";
@@ -120,22 +124,18 @@ public class XmlDomParserContext extends ParserContext {
         if (options.dtdValid) {
             setFeature(FEATURE_VALIDATION, true);
         }
+
+        if (!options.noEnt) {
+          setFeature(FEATURE_NOT_EXPAND_ENTITY, true);
+      }
         // If we turn off loading of external DTDs complete, we don't
         // getthe publicID.  Instead of turning off completely, we use
         // an entity resolver that returns empty documents.
         if (options.dtdLoad) {
             setFeature(FEATURE_LOAD_EXTERNAL_DTD, true);
-            parser.setEntityResolver(new ChdirEntityResolver(runtime));
-        } else {
-            parser.setEntityResolver(new EntityResolver() {
-                    public InputSource resolveEntity(String arg0, String arg1)
-                        throws SAXException, IOException {
-                        ByteArrayInputStream empty =
-                            new ByteArrayInputStream(new byte[0]);
-                        return new InputSource(empty);
-                    }
-                });
+            setFeature(FEATURE_LOAD_DTD_GRAMMAR, true);
         }
+        parser.setEntityResolver(new NokogiriEntityResolver(runtime, errorHandler, options));
     }
 
     /**
@@ -210,8 +210,11 @@ public class XmlDomParserContext extends ParserContext {
         xmlDocument.setEncoding(ruby_encoding);
 
         if (options.dtdLoad) {
-            XmlDtd xmlDtd = (XmlDtd) XmlDtd.newFromExternalSubset(context.getRuntime(), doc);
-            doc.setUserData(XmlDocument.DTD_EXTERNAL_SUBSET, xmlDtd, null);
+            IRubyObject xmlDtdOrNil = XmlDtd.newFromExternalSubset(context.getRuntime(), doc);
+            if (!xmlDtdOrNil.isNil()) {
+                XmlDtd xmlDtd = (XmlDtd) xmlDtdOrNil;
+                doc.setUserData(XmlDocument.DTD_EXTERNAL_SUBSET, xmlDtd, null);
+            }
         }
         return xmlDocument;
     }

data/ext/nokogiri/xml_node.c

@@ -1329,8 +1329,8 @@ VALUE Nokogiri_wrap_xml_node(VALUE klass, xmlNodePtr node)
       return DOC_RUBY_OBJECT(node->doc);
 
   /* It's OK if the node doesn't have a fully-realized document (as in XML::Reader). */
-  /* see https://github.com/tenderlove/nokogiri/issues/95 */
-  /* and https://github.com/tenderlove/nokogiri/issues/439 */
+  /* see https://github.com/sparklemotion/nokogiri/issues/95 */
+  /* and https://github.com/sparklemotion/nokogiri/issues/439 */
   doc = node->doc;
   if (doc->type == XML_DOCUMENT_FRAG_NODE) doc = doc->doc;
   node_has_a_document = DOC_RUBY_OBJECT_TEST(doc);

data/lib/nokogiri/version.rb

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