nokogiri 1.5.0.beta.2 → 1.5.0.beta.3

data/ext/java/nokogiri/HtmlSaxParserContext.java

@@ -1,5 +1,39 @@
+/**
+ * (The MIT License)
+ *
+ * Copyright (c) 2008 - 2010:
+ *
+ * * {Aaron Patterson}[http://tenderlovemaking.com]
+ * * {Mike Dalessio}[http://mike.daless.io]
+ * * {Charles Nutter}[http://blog.headius.com]
+ * * {Sergio Arbeo}[http://www.serabe.com]
+ * * {Patrick Mahoney}[http://polycrystal.org]
+ * * {Yoko Harada}[http://yokolet.blogspot.com]
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * 'Software'), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * 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.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
 package nokogiri;
 
+import static nokogiri.internals.NokogiriHelpers.rubyStringToString;
+
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.nio.charset.Charset;
@@ -22,9 +56,13 @@ import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.xml.sax.SAXException;
 
+/**
+ * Class for Nokogiri::HTML::SAX::ParserContext.
+ *
+ */
+
 @JRubyClass(name="Nokogiri::HTML::SAX::ParserContext", parent="Nokogiri::XML::SAX::ParserContext")
 public class HtmlSaxParserContext extends XmlSaxParserContext {
-    private SAXParser parser;
 
     public HtmlSaxParserContext(Ruby ruby, RubyClass rubyClass) {
         super(ruby, rubyClass);
@@ -55,7 +93,7 @@ public class HtmlSaxParserContext extends XmlSaxParserContext {
             new HtmlSaxParserContext(context.getRuntime(), (RubyClass) klazz);
         String javaEncoding = findEncoding(context, encoding);
         if (javaEncoding != null) {
-            String input = applyEncoding((String) data.toJava(String.class), javaEncoding);
+            String input = applyEncoding(rubyStringToString(data), javaEncoding);
             ByteArrayInputStream istream = new ByteArrayInputStream(input.getBytes());
             ctx.setInputSource(istream);
             ctx.getInputSource().setEncoding(javaEncoding);
@@ -115,7 +153,7 @@ public class HtmlSaxParserContext extends XmlSaxParserContext {
     private static String findEncoding(ThreadContext context, IRubyObject encoding) {
         String rubyEncoding = null;
         if (encoding instanceof RubyString) {
-            rubyEncoding = (String)encoding.toJava(String.class);
+            rubyEncoding = rubyStringToString(encoding);
         } else if (encoding instanceof RubyFixnum) {
             int value = (Integer)encoding.toJava(Integer.class);
             rubyEncoding = findName(value);

data/ext/java/nokogiri/NokogiriService.java

@@ -1,7 +1,36 @@
-package nokogiri;
+/**
+ * (The MIT License)
+ *
+ * Copyright (c) 2008 - 2010:
+ *
+ * * {Aaron Patterson}[http://tenderlovemaking.com]
+ * * {Mike Dalessio}[http://mike.daless.io]
+ * * {Charles Nutter}[http://blog.headius.com]
+ * * {Sergio Arbeo}[http://www.serabe.com]
+ * * {Patrick Mahoney}[http://polycrystal.org]
+ * * {Yoko Harada}[http://yokolet.blogspot.com]
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * 'Software'), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * 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.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
 
-import java.util.Collections;
-import java.util.List;
+package nokogiri;
 
 import org.jruby.Ruby;
 import org.jruby.RubyArray;
@@ -14,7 +43,9 @@ import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.runtime.load.BasicLibraryService;
 
 /**
- *
+ * Class to provide Nokogiri. This class is used to make "require 'nokogiri'" work
+ * in JRuby. Also, this class holds a Ruby type cache and allocators of Ruby types.
+ * 
  * @author headius
  */
 public class NokogiriService implements BasicLibraryService {
@@ -183,6 +214,7 @@ public class NokogiriService implements BasicLibraryService {
     private void createXsltModule(Ruby ruby, RubyModule xsltModule) {
         RubyClass stylesheet = xsltModule.defineClassUnder("Stylesheet", ruby.getObject(), XSLT_STYLESHEET_ALLOCATOR);
         stylesheet.defineAnnotatedMethods(XsltStylesheet.class);
+        xsltModule.defineAnnotatedMethod(XsltStylesheet.class, "register");
     }
 
     private static ObjectAllocator ENCODING_HANDLER_ALLOCATOR = new ObjectAllocator() {
@@ -192,8 +224,16 @@ public class NokogiriService implements BasicLibraryService {
     };
 
     private static ObjectAllocator HTML_DOCUMENT_ALLOCATOR = new ObjectAllocator() {
+        private HtmlDocument htmlDocument = null;
         public IRubyObject allocate(Ruby runtime, RubyClass klazz) {
-            return new HtmlDocument(runtime, klazz);
+            if (htmlDocument == null) htmlDocument = new HtmlDocument(runtime, klazz);
+            try {
+                HtmlDocument clone = (HtmlDocument) htmlDocument.clone();
+                clone.setMetaClass(klazz);
+                return clone;
+            } catch (CloneNotSupportedException e) {
+                return new HtmlDocument(runtime, klazz);
+            }
         }
     };
 
@@ -218,20 +258,44 @@ public class NokogiriService implements BasicLibraryService {
         };
 
     private static ObjectAllocator XML_ATTR_ALLOCATOR = new ObjectAllocator() {
-        public IRubyObject allocate(Ruby runtime, RubyClass klazz){
-            return new XmlAttr(runtime, klazz);
+        private XmlAttr xmlAttr = null;
+        public IRubyObject allocate(Ruby runtime, RubyClass klazz) {
+            if (xmlAttr == null) xmlAttr = new XmlAttr(runtime, klazz);
+            try {
+                XmlAttr clone = (XmlAttr) xmlAttr.clone();
+                clone.setMetaClass(klazz);
+                return clone;
+            } catch (CloneNotSupportedException e) {
+                return new XmlAttr(runtime, klazz);
+            }
         }
     };
 
     private static ObjectAllocator XML_CDATA_ALLOCATOR = new ObjectAllocator() {
+        private XmlCdata xmlCdata = null;
         public IRubyObject allocate(Ruby runtime, RubyClass klazz) {
-            return new XmlCdata(runtime, klazz);
+            if (xmlCdata == null) xmlCdata = new XmlCdata(runtime, klazz);
+            try {
+                XmlCdata clone = (XmlCdata) xmlCdata.clone();
+                clone.setMetaClass(klazz);
+                return clone;
+            } catch (CloneNotSupportedException e) {
+                return new XmlCdata(runtime, klazz);
+            }
         }
     };
 
     private static ObjectAllocator XML_COMMENT_ALLOCATOR = new ObjectAllocator() {
+        private XmlComment xmlComment = null;
         public IRubyObject allocate(Ruby runtime, RubyClass klazz) {
-            return new XmlComment(runtime, klazz);
+            if (xmlComment == null) xmlComment = new XmlComment(runtime, klazz);
+            try {
+                XmlComment clone = (XmlComment) xmlComment.clone();
+                clone.setMetaClass(klazz);
+                return clone;
+            } catch (CloneNotSupportedException e) {
+                return new XmlComment(runtime, klazz);
+            }
         }
     };
 
@@ -243,8 +307,16 @@ public class NokogiriService implements BasicLibraryService {
     };
 
     private static ObjectAllocator XML_DOCUMENT_ALLOCATOR = new ObjectAllocator() {
+        private XmlDocument xmlDocument = null;
         public IRubyObject allocate(Ruby runtime, RubyClass klazz) {
-            throw runtime.newNotImplementedError("not implemented");
+            if (xmlDocument == null) xmlDocument = new XmlDocument(runtime, klazz);
+            try {
+                XmlDocument clone = (XmlDocument) xmlDocument.clone();
+                clone.setMetaClass(klazz);
+                return clone;
+            } catch (CloneNotSupportedException e) {
+                return new XmlDocument(runtime, klazz);
+            }
         }
     };
 
@@ -261,8 +333,16 @@ public class NokogiriService implements BasicLibraryService {
     };
 
     private static ObjectAllocator XML_ELEMENT_ALLOCATOR = new ObjectAllocator() {
+        private XmlElement xmlElement = null;
         public IRubyObject allocate(Ruby runtime, RubyClass klazz) {
-            return new XmlElement(runtime, klazz);
+            if (xmlElement == null) xmlElement = new XmlElement(runtime, klazz);
+            try {
+                XmlElement clone = (XmlElement)xmlElement.clone();
+                clone.setMetaClass(klazz);
+                return clone;
+            } catch (CloneNotSupportedException e) {
+                return new XmlElement(runtime, klazz);
+            }
         }
     };
 
@@ -273,14 +353,30 @@ public class NokogiriService implements BasicLibraryService {
     };
 
     private static ObjectAllocator XML_NAMESPACE_ALLOCATOR = new ObjectAllocator() {
+        private XmlNamespace xmlNamespace = null;
         public IRubyObject allocate(Ruby runtime, RubyClass klazz) {
-            return new XmlNamespace(runtime, klazz);
+            if (xmlNamespace == null) xmlNamespace = new XmlNamespace(runtime, klazz);
+            try {
+                XmlNamespace clone = (XmlNamespace) xmlNamespace.clone();
+                clone.setMetaClass(klazz);
+                return clone;
+            } catch (CloneNotSupportedException e) {
+                return new XmlNamespace(runtime, klazz);
+            }
         }
     };
 
     private static ObjectAllocator XML_NODE_ALLOCATOR = new ObjectAllocator() {
+        private XmlNode xmlNode = null;
         public IRubyObject allocate(Ruby runtime, RubyClass klazz) {
-            return new XmlNode(runtime, klazz);
+            if (xmlNode == null) xmlNode = new XmlNode(runtime, klazz);
+            try {
+                XmlNode clone  = (XmlNode) xmlNode.clone();
+                clone.setMetaClass(klazz);
+                return clone;
+            } catch (CloneNotSupportedException e) {
+                return new XmlNode(runtime, klazz);
+            }
         }
     };
 

data/ext/java/nokogiri/XmlAttr.java

@@ -1,3 +1,35 @@
+/**
+ * (The MIT License)
+ *
+ * Copyright (c) 2008 - 2010:
+ *
+ * * {Aaron Patterson}[http://tenderlovemaking.com]
+ * * {Mike Dalessio}[http://mike.daless.io]
+ * * {Charles Nutter}[http://blog.headius.com]
+ * * {Sergio Arbeo}[http://www.serabe.com]
+ * * {Patrick Mahoney}[http://polycrystal.org]
+ * * {Yoko Harada}[http://yokolet.blogspot.com]
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * 'Software'), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * 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.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
 package nokogiri;
 
 import static nokogiri.internals.NokogiriHelpers.getNokogiriClass;
@@ -10,13 +42,17 @@ import org.jruby.RubyClass;
 import org.jruby.RubyString;
 import org.jruby.anno.JRubyClass;
 import org.jruby.anno.JRubyMethod;
-import org.jruby.javasupport.JavaUtil;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
+/**
+ * Class for Nokogiri::XML::Attr
+ *
+ */
+
 @JRubyClass(name="Nokogiri::XML::Attr", parent="Nokogiri::XML::Node")
 public class XmlAttr extends XmlNode{
 
@@ -56,7 +92,7 @@ public class XmlAttr extends XmlNode{
         XmlDocument xmlDoc = (XmlDocument)doc;
         String str = rubyStringToString(content);
         Node attr = xmlDoc.getDocument().createAttribute(str);
-        setNode(attr);
+        setNode(context, attr);
     }
 
     public boolean isHtmlBooleanAttr() {
@@ -101,13 +137,13 @@ public class XmlAttr extends XmlNode{
         if (node == null) return context.getRuntime().getNil();
         String attrValue = ((Attr)node).getValue();
         if (attrValue == null) return context.getRuntime().getNil();
-        return JavaUtil.convertJavaToUsableRubyObject(context.getRuntime(), attrValue);
+        return RubyString.newString(context.getRuntime(), attrValue);
     }
     
     @JRubyMethod(name = {"value=", "content="})
     public IRubyObject value_set(ThreadContext context, IRubyObject content){
         Attr attr = (Attr) node;
-        attr.setValue((String)XmlNode.encode_special_chars(context, content).toJava(String.class));
+        attr.setValue(rubyStringToString(XmlNode.encode_special_chars(context, content)));
         setContent(content);
         return content;
     }

data/ext/java/nokogiri/XmlAttributeDecl.java

@@ -1,3 +1,35 @@
+/**
+ * (The MIT License)
+ *
+ * Copyright (c) 2008 - 2010:
+ *
+ * * {Aaron Patterson}[http://tenderlovemaking.com]
+ * * {Mike Dalessio}[http://mike.daless.io]
+ * * {Charles Nutter}[http://blog.headius.com]
+ * * {Sergio Arbeo}[http://www.serabe.com]
+ * * {Patrick Mahoney}[http://polycrystal.org]
+ * * {Yoko Harada}[http://yokolet.blogspot.com]
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * 'Software'), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * 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.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
 package nokogiri;
 
 import static nokogiri.internals.NokogiriHelpers.getNokogiriClass;

data/ext/java/nokogiri/XmlCdata.java

@@ -1,5 +1,39 @@
+/**
+ * (The MIT License)
+ *
+ * Copyright (c) 2008 - 2010:
+ *
+ * * {Aaron Patterson}[http://tenderlovemaking.com]
+ * * {Mike Dalessio}[http://mike.daless.io]
+ * * {Charles Nutter}[http://blog.headius.com]
+ * * {Sergio Arbeo}[http://www.serabe.com]
+ * * {Patrick Mahoney}[http://polycrystal.org]
+ * * {Yoko Harada}[http://yokolet.blogspot.com]
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * 'Software'), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * 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.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
 package nokogiri;
 
+import static nokogiri.internals.NokogiriHelpers.rubyStringToString;
+
 import nokogiri.internals.SaveContext;
 
 import org.jruby.Ruby;
@@ -11,6 +45,11 @@ import org.w3c.dom.CDATASection;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
+/**
+ * Class for Nokogiri::XML::CDATA
+ *
+ */
+
 @JRubyClass(name="Nokogiri::XML::CDATA", parent="Nokogiri::XML::Text")
 public class XmlCdata extends XmlText {
     public XmlCdata(Ruby ruby, RubyClass rubyClass) {
@@ -31,8 +70,8 @@ public class XmlCdata extends XmlText {
         XmlDocument xmlDoc =(XmlDocument) ((XmlNode) doc).document(context);
         doc = xmlDoc;
         Document document = xmlDoc.getDocument();
-        Node node = document.createCDATASection((content.isNil()) ? null : (String)content.toJava(String.class));
-        setNode(node);
+        Node node = document.createCDATASection((content.isNil()) ? null : rubyStringToString(content));
+        setNode(context, node);
     }
 
     @Override

data/ext/java/nokogiri/XmlComment.java

@@ -1,3 +1,35 @@
+/**
+ * (The MIT License)
+ *
+ * Copyright (c) 2008 - 2010:
+ *
+ * * {Aaron Patterson}[http://tenderlovemaking.com]
+ * * {Mike Dalessio}[http://mike.daless.io]
+ * * {Charles Nutter}[http://blog.headius.com]
+ * * {Sergio Arbeo}[http://www.serabe.com]
+ * * {Patrick Mahoney}[http://polycrystal.org]
+ * * {Yoko Harada}[http://yokolet.blogspot.com]
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * 'Software'), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * 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.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
 package nokogiri;
 
 import static nokogiri.internals.NokogiriHelpers.rubyStringToString;
@@ -11,6 +43,11 @@ import org.jruby.runtime.builtin.IRubyObject;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
+/**
+ * Class for Nokogiri::XML::Comment
+ *
+ */
+
 @JRubyClass(name="Nokogiri::XML::Comment", parent="Nokogiri::XML::CharacterData")
 public class XmlComment extends XmlNode {
     public XmlComment(Ruby ruby, RubyClass rubyClass, Node node) {
@@ -32,7 +69,7 @@ public class XmlComment extends XmlNode {
         XmlDocument xmlDoc = (XmlDocument) doc;
         Document document = xmlDoc.getDocument();
         Node node = document.createComment(rubyStringToString(text));
-        setNode(node);
+        setNode(context, node);
     }
 
     @Override