nokogiri 1.5.0.beta.4-java → 1.5.0-java

data/ext/java/nokogiri/XmlNode.java

@@ -48,7 +48,7 @@ import java.util.List;
 import nokogiri.internals.HtmlDomParserContext;
 import nokogiri.internals.NokogiriHelpers;
 import nokogiri.internals.NokogiriNamespaceCache;
-import nokogiri.internals.SaveContext;
+import nokogiri.internals.SaveContextVisitor;
 import nokogiri.internals.XmlDomParserContext;
 
 import org.jruby.Ruby;
@@ -68,6 +68,7 @@ import org.jruby.runtime.Visibility;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
+import org.w3c.dom.DocumentFragment;
 import org.w3c.dom.Element;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
@@ -430,7 +431,7 @@ public class XmlNode extends RubyObject {
         //this should delegate to subclasses' implementation
     }
 
-    public void saveContent(ThreadContext context, SaveContext ctx) {}
+    public void accept(ThreadContext context, SaveContextVisitor visitor) {}
 
     public void setName(IRubyObject name) {
         this.name = name;
@@ -484,35 +485,6 @@ public class XmlNode extends RubyObject {
         return name;
     }
 
-    protected void saveNodeListContent(ThreadContext context, XmlNodeSet list, SaveContext ctx) {
-        saveNodeListContent(context, (RubyArray) list.to_a(context), ctx);
-    }
-
-    protected void saveNodeListContent(ThreadContext context, RubyArray array, SaveContext ctx) {
-        int length = array.getLength();
-
-        boolean formatIndentation = ctx.format() && ctx.indentString()!=null;
-
-        for(int i = 0; i < length; i++) {
-            Object item = array.get(i);
-            if (item instanceof XmlNode) {
-              XmlNode cur = (XmlNode) item;
-
-            // if(formatIndentation &&
-            //         (cur.isElement() || cur.isComment() || cur.isProcessingInstruction())) {
-            //     ctx.append(ctx.getCurrentIndentString());
-            // }
-
-              cur.saveContent(context, ctx);
-            } else if (item instanceof XmlNamespace) {
-                XmlNamespace cur = (XmlNamespace)item;
-                cur.saveContent(context, ctx);
-            }
-
-            // if(ctx.format()) ctx.append("\n");
-        }
-    }
-
     /**
      * Add a namespace definition to this node.  To the underlying
      * node, add an attribute of the form
@@ -522,16 +494,13 @@ public class XmlNode extends RubyObject {
     public IRubyObject add_namespace_definition(ThreadContext context,
                                                 IRubyObject prefix,
                                                 IRubyObject href) {
-        String prefixString = prefix.isNil() ? "" : rubyStringToString(prefix);
-        String hrefString = rubyStringToString(href);
-        XmlDocument xmlDocument = (XmlDocument) doc;
         Node namespaceOwner;
         if (node.getNodeType() == Node.ELEMENT_NODE) namespaceOwner = node;
         else if (node.getNodeType() == Node.ATTRIBUTE_NODE) namespaceOwner = ((Attr)node).getOwnerElement();
         else namespaceOwner = node.getParentNode();
-        XmlNamespace ns = xmlDocument.getNamespaceCache().put(context.getRuntime(), prefixString, hrefString, namespaceOwner, xmlDocument);
+        XmlNamespace ns = XmlNamespace.createFromPrefixAndHref(namespaceOwner, prefix, href);
         if (node != namespaceOwner) {
-            node.getOwnerDocument().renameNode(node, hrefString, prefixString + node.getLocalName());
+            node.getOwnerDocument().renameNode(node, ns.getHref(), ns.getPrefix() + node.getLocalName());
         }
 
         return ns;
@@ -542,7 +511,7 @@ public class XmlNode extends RubyObject {
         NamedNodeMap attrs = this.node.getAttributes();
         Node attr = attrs.getNamedItem(rubyStringToString(name));
         if(attr == null) {
-            return  context.getRuntime().newString(ERR_INSECURE_SET_INST_VAR);
+            return  context.getRuntime().getNil();
         }
         return getCachedNodeOrCreate(context.getRuntime(), attr);
     }
@@ -621,8 +590,7 @@ public class XmlNode extends RubyObject {
         addElements(node, elementNodes, false);
         if (elementNodes.size() == 0) return XmlNodeSet.newEmptyNodeSet(context);
         RubyArray array = NokogiriHelpers.nodeArrayToRubyArray(context.getRuntime(), elementNodes.toArray(new Node[0]));
-        XmlNodeSet xmlNodeSet = (XmlNodeSet) NokogiriService.XML_NODESET_ALLOCATOR.allocate(context.getRuntime(), getNokogiriClass(getRuntime(), "Nokogiri::XML::NodeSet"));
-        xmlNodeSet.setInitialNodes(array);
+        XmlNodeSet xmlNodeSet = XmlNodeSet.newXmlNodeSet(context, array);
         return xmlNodeSet;
     }
     
@@ -720,8 +688,7 @@ public class XmlNode extends RubyObject {
                 documentErrors.add(docErrors.get(i));
             }
             document.setInstanceVariable("@errors", documentErrors);
-            XmlNodeSet xmlNodeSet = (XmlNodeSet) NokogiriService.XML_NODESET_ALLOCATOR.allocate(runtime, getNokogiriClass(runtime, "Nokogiri::XML::NodeSet"));
-            xmlNodeSet.setInitialNodes(RubyArray.newArray(runtime));
+            XmlNodeSet xmlNodeSet = XmlNodeSet.newXmlNodeSet(context, RubyArray.newArray(runtime));
             return xmlNodeSet;
         }
         
@@ -737,8 +704,7 @@ public class XmlNode extends RubyObject {
         nodeArray.add(NokogiriHelpers.getCachedNodeOrCreate(runtime, first));
         
         NokogiriHelpers.nodeListToRubyArray(runtime, first.getChildNodes(), nodeArray);
-        XmlNodeSet xmlNodeSet = (XmlNodeSet)NokogiriService.XML_NODESET_ALLOCATOR.allocate(runtime, getNokogiriClass(runtime, "Nokogiri::XML::NodeSet"));
-        xmlNodeSet.setInitialNodes(nodeArray);
+        XmlNodeSet xmlNodeSet = XmlNodeSet.newXmlNodeSet(context, nodeArray);
         return xmlNodeSet;
     }
     
@@ -772,8 +738,12 @@ public class XmlNode extends RubyObject {
 
     @JRubyMethod
     public IRubyObject document(ThreadContext context) {
-        if(doc == null) {
+        if (doc == null) {
+            doc = (XmlDocument) node.getOwnerDocument().getUserData(NokogiriHelpers.CACHED_NODE);
+        }
+        if (doc == null) {
             doc = getCachedNodeOrCreate(context.getRuntime(), node.getOwnerDocument());
+            node.getOwnerDocument().setUserData(NokogiriHelpers.CACHED_NODE, doc, null);
         }
         return doc;
     }
@@ -882,7 +852,7 @@ public class XmlNode extends RubyObject {
     public IRubyObject external_subset(ThreadContext context) {
         Document document = getOwnerDocument();
 
-        if(document == null) {
+        if (document == null) {
             return context.getRuntime().getNil();
         }
 
@@ -1014,16 +984,25 @@ public class XmlNode extends RubyObject {
 
         String encString = encoding.isNil() ? null : rubyStringToString(encoding);
 
-        SaveContext ctx = new SaveContext(context, (Integer)options.toJava(Integer.class),
-                rubyStringToString(indentString),
-                encString);
-
-        saveContent(context, ctx);
-
-        RuntimeHelpers.invoke(context, io, "write", ctx.toRubyString(context.getRuntime()));
+        SaveContextVisitor visitor = 
+            new SaveContextVisitor((Integer)options.toJava(Integer.class), rubyStringToString(indentString), encString,
+                    isHtmlDoc(context), isFragment());
+        accept(context, visitor);
+        IRubyObject rubyString = stringOrNil(context.getRuntime(), visitor.toString());
+        RuntimeHelpers.invoke(context, io, "write", rubyString);
 
         return io;
     }
+    
+    private boolean isHtmlDoc(ThreadContext context) {
+        return document(context).getMetaClass().isKindOfModule(getNokogiriClass(context.getRuntime(), "Nokogiri::HTML::Document"));
+    }
+    
+    private boolean isFragment() {
+        if (node instanceof DocumentFragment) return true;
+        if (node.getParentNode() != null && node.getParentNode() instanceof DocumentFragment) return true;
+        return false;
+    }
 
     @JRubyMethod(name = {"next_sibling", "next"})
     public IRubyObject next_sibling(ThreadContext context) {

data/ext/java/nokogiri/XmlNodeSet.java

@@ -57,8 +57,8 @@ import org.w3c.dom.NodeList;
  * @author Yoko Harada <yokolet@gmail.com>
  */
 @JRubyClass(name="Nokogiri::XML::NodeSet")
-public class XmlNodeSet extends RubyObject {
-    private NodeList nodeList;
+public class XmlNodeSet extends RubyObject implements NodeList {
+    private List<?> list;
     private RubyArray nodes;
     private IRubyObject doc;
     
@@ -76,49 +76,21 @@ public class XmlNodeSet extends RubyObject {
         return super.clone();
     }
 
-    public XmlNodeSet(Ruby ruby, NodeList nodes) {
-        this(ruby, getNokogiriClass(ruby, "Nokogiri::XML::NodeSet"), nodes);
-    }
-
-    public XmlNodeSet(Ruby ruby, RubyArray nodes) {
-        this(ruby, getNokogiriClass(ruby, "Nokogiri::XML::NodeSet"), nodes);
-    }
+    void setNodes(RubyArray array) {
+        this.nodes = array;
 
-    public XmlNodeSet(Ruby ruby, RubyClass rubyClass, NodeList nodes) {
-        this(ruby, rubyClass, nodeListToRubyArray(ruby, nodes));
-        nodeList = nodes;
+        IRubyObject first = array.first();
+        initialize(array.getRuntime(), first);
     }
 
-    public XmlNodeSet(Ruby ruby, RubyClass rubyClass, RubyArray nodes){
-        super(ruby, rubyClass);
-        this.nodes = nodes;
-        
-        IRubyObject first = nodes.first();
-        initialize(ruby, first);
-    }
-    
-    public XmlNodeSet(Ruby ruby, XmlNodeSet reference){
-        super(ruby, getNokogiriClass(ruby, "Nokogiri::XML::NodeSet"));
+    private void setReference(XmlNodeSet reference) {
         this.nodes = null;
-        
         IRubyObject first = reference.nodes.first();
-        initialize(ruby, first);
-    }
-    
-    void setNodes(RubyArray nodes) {
-        this.nodes = nodes;
-        nodeList = null;
-    }
-    
-    public void setInitialNodes(RubyArray nodes) {
-        this.nodes = nodes;
-        IRubyObject first = nodes.first();
-        initialize(getRuntime(), first);
+        initialize(reference.getRuntime(), first);
     }
     
     public void setNodeList(NodeList nodeList) {
-        setInitialNodes(nodeListToRubyArray(getRuntime(), nodeList));
-        this.nodeList = nodeList;
+        setNodes(nodeListToRubyArray(getRuntime(), nodeList));
     }
     
     private void initialize(Ruby ruby, IRubyObject refNode) {
@@ -142,7 +114,6 @@ public class XmlNodeSet extends RubyObject {
     }
 
     public void relink_namespace(ThreadContext context) {
-        nodeList = null;
         List<?> n = nodes.getList();
 
         for (int i = 0; i < n.size(); i++) {
@@ -152,63 +123,53 @@ public class XmlNodeSet extends RubyObject {
         }
     }
 
-    public void setDocument(IRubyObject document) {
-        setInstanceVariable("@document", document);
-        this.doc = document;
-    }
-
-    public NodeList toNodeList(Ruby ruby) {
-        if (nodeList != null) return nodeList;
-        return new NokogiriNodeList(ruby, this.nodes);
-    }
-
     @JRubyMethod(name="&")
     public IRubyObject and(ThreadContext context, IRubyObject nodeSet){
-        nodeList = null;
+        if (nodes == null) setNodes(RubyArray.newEmptyArray(context.getRuntime()));
         return newXmlNodeSet(context, (RubyArray) nodes.op_and(asXmlNodeSet(context, nodeSet).nodes));
     }
 
     @JRubyMethod
     public IRubyObject delete(ThreadContext context, IRubyObject node_or_namespace){
-        nodeList = null;
+        if (nodes == null) return context.getRuntime().getNil();
         return nodes.delete(context, asXmlNodeOrNamespace(context, node_or_namespace), Block.NULL_BLOCK);
     }
 
     @JRubyMethod
     public IRubyObject dup(ThreadContext context){
+        if (nodes == null) setNodes(RubyArray.newEmptyArray(context.getRuntime()));
         return newXmlNodeSet(context, nodes.aryDup());
     }
 
     @JRubyMethod(name = "include?")
     public IRubyObject include_p(ThreadContext context, IRubyObject node_or_namespace){
+        if (nodes == null) setNodes(RubyArray.newEmptyArray(context.getRuntime()));
         return nodes.include_p(context, asXmlNodeOrNamespace(context, node_or_namespace));
     }
 
     @JRubyMethod(name = {"length", "size"})
     public IRubyObject length(ThreadContext context) {
-        if (nodes == null) setInitialNodes(RubyArray.newEmptyArray(context.getRuntime()));
-        return nodes.length();
+        if (nodes != null) return nodes.length();
+        else return context.getRuntime().newFixnum(0);
     }
 
     @JRubyMethod(name="-")
     public IRubyObject op_diff(ThreadContext context, IRubyObject nodeSet){
-        nodeList = null;
         XmlNodeSet xmlNodeSet = newXmlNodeSet(context, this);
+        if (nodes == null) setNodes(RubyArray.newEmptyArray(context.getRuntime()));
         xmlNodeSet.setNodes((RubyArray) nodes.op_diff(asXmlNodeSet(context, nodeSet).nodes));
         return xmlNodeSet;
     }
 
     @JRubyMethod(name={"|", "+"})
     public IRubyObject op_or(ThreadContext context, IRubyObject nodeSet){
-        nodeList = null;
-        if (nodes == null) setInitialNodes(RubyArray.newEmptyArray(context.getRuntime()));
+        if (nodes == null) setNodes(RubyArray.newEmptyArray(context.getRuntime()));
         return newXmlNodeSet(context, (RubyArray) nodes.op_or(asXmlNodeSet(context, nodeSet).nodes));
     }
 
     @JRubyMethod(name = {"push", "<<"})
     public IRubyObject push(ThreadContext context, IRubyObject node_or_namespace) {
-        nodeList = null;
-        if (nodes == null) setInitialNodes(RubyArray.newEmptyArray(context.getRuntime()));
+        if (nodes == null) setNodes(RubyArray.newEmptyArray(context.getRuntime()));
         nodes.append(asXmlNodeOrNamespace(context, node_or_namespace));
         return this;
     }
@@ -216,6 +177,7 @@ public class XmlNodeSet extends RubyObject {
     @JRubyMethod(name={"[]", "slice"})
     public IRubyObject slice(ThreadContext context, IRubyObject indexOrRange){
         IRubyObject result;
+        if (nodes == null) return context.getRuntime().getNil();
         if (context.getRuntime().is1_9()) {
             result = nodes.aref19(indexOrRange);
         } else {
@@ -231,6 +193,7 @@ public class XmlNodeSet extends RubyObject {
     @JRubyMethod(name={"[]", "slice"})
     public IRubyObject slice(ThreadContext context, IRubyObject start, IRubyObject length){
         IRubyObject result;
+        if (nodes == null) return context.getRuntime().getNil();
         if (context.getRuntime().is1_9()) {
             result = nodes.aref19(start, length);
         } else {
@@ -241,13 +204,13 @@ public class XmlNodeSet extends RubyObject {
     }
 
     @JRubyMethod(name = {"to_a", "to_ary"})
-    public IRubyObject to_a(ThreadContext context){
-       return nodes;
+    public IRubyObject to_a(ThreadContext context) {
+        return nodes;
     }
 
     @JRubyMethod(name = {"unlink", "remove"})
     public IRubyObject unlink(ThreadContext context){
-        nodeList = null;
+        if (nodes == null) setNodes(RubyArray.newEmptyArray(context.getRuntime()));
         IRubyObject[] arr = this.nodes.toJavaArrayUnsafe();
         long length = arr.length;
         for (int i = 0; i < length; i++) {
@@ -258,15 +221,16 @@ public class XmlNodeSet extends RubyObject {
         return this;
     }
 
-    private XmlNodeSet newXmlNodeSet(ThreadContext context, RubyArray array) {
+    public static XmlNodeSet newXmlNodeSet(ThreadContext context, RubyArray array) {
         XmlNodeSet xmlNodeSet = (XmlNodeSet)NokogiriService.XML_NODESET_ALLOCATOR.allocate(context.getRuntime(), getNokogiriClass(context.getRuntime(), "Nokogiri::XML::NodeSet"));
-        xmlNodeSet.setInitialNodes(array);
+        xmlNodeSet.setNodes(array);
         return xmlNodeSet;
     }
-    
+
     private XmlNodeSet newXmlNodeSet(ThreadContext context, XmlNodeSet reference) {
-        XmlNodeSet result = new XmlNodeSet(context.getRuntime(), reference);
-        return result;
+        XmlNodeSet xmlNodeSet = (XmlNodeSet)NokogiriService.XML_NODESET_ALLOCATOR.allocate(context.getRuntime(), getNokogiriClass(context.getRuntime(), "Nokogiri::XML::NodeSet"));
+        xmlNodeSet.setReference(reference);
+        return xmlNodeSet;
     }
 
     private IRubyObject asXmlNodeOrNamespace(ThreadContext context, IRubyObject possibleNode) {
@@ -284,28 +248,20 @@ public class XmlNodeSet extends RubyObject {
             throw context.getRuntime().newArgumentError("node must be a Nokogiri::XML::NodeSet");
         }
         XmlNodeSet xmlNodeSet = (XmlNodeSet)possibleNodeSet;
-        if (xmlNodeSet.nodes == null) xmlNodeSet.setInitialNodes(RubyArray.newEmptyArray(context.getRuntime()));
+        if (xmlNodeSet.nodes == null) xmlNodeSet.setNodes(RubyArray.newEmptyArray(context.getRuntime()));
         return xmlNodeSet;
     }
-
-    class NokogiriNodeList implements NodeList{
-
-        private final RubyArray nodes;
-        private final Ruby ruby;
-
-        public NokogiriNodeList(Ruby ruby, RubyArray nodes) {
-            this.nodes = nodes;
-            this.ruby = ruby;
-        }
-
-        public Node item(int i) {
-            return XmlNode.getNodeFromXmlNode(ruby.getCurrentContext(),
-                    this.nodes.aref(ruby.newFixnum(i)));
-        }
-
-        public int getLength() {
-            return this.nodes.getLength();
-        }
-
+    
+    public int getLength() {
+        if (nodes == null) return 0 ;
+        return nodes.size();
+    }
+    
+    public Node item(int index) {
+        if (nodes == null) return null ;
+        Object n = nodes.get(index);
+        if (n instanceof XmlNode) return ((XmlNode)n).node;
+        if (n instanceof XmlNamespace) return ((XmlNamespace)n).getNode();
+        return null;
     }
 }

data/ext/java/nokogiri/XmlProcessingInstruction.java

@@ -33,7 +33,7 @@
 package nokogiri;
 
 import static nokogiri.internals.NokogiriHelpers.rubyStringToString;
-import nokogiri.internals.SaveContext;
+import nokogiri.internals.SaveContextVisitor;
 
 import org.jruby.Ruby;
 import org.jruby.RubyClass;
@@ -44,22 +44,28 @@ import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
+import org.w3c.dom.ProcessingInstruction;
 
 /**
  * Class for Nokogiri::XML::ProcessingInstruction
  * 
  * @author sergio
+ * @author Yoko Harada <yokolet@gmail.com>
  */
 @JRubyClass(name="Nokogiri::XML::ProcessingInstruction", parent="Nokogiri::XML::Node")
 public class XmlProcessingInstruction extends XmlNode {
 
-    public XmlProcessingInstruction(Ruby ruby, RubyClass klass, Node node) {
-        super(ruby, klass, node);
+    public XmlProcessingInstruction(Ruby ruby, RubyClass klazz) {
+        super(ruby, klazz);
+    }
+    
+    public XmlProcessingInstruction(Ruby ruby, RubyClass klazz, Node node) {
+        super(ruby, klazz, node);
     }
 
     @JRubyMethod(name="new", meta=true, rest=true, required=3)
     public static IRubyObject rbNew(ThreadContext context,
-                                    IRubyObject klass,
+                                    IRubyObject klazz,
                                     IRubyObject[] args) {
 
         IRubyObject doc = args[0];
@@ -72,7 +78,7 @@ public class XmlProcessingInstruction extends XmlNode {
                                                  rubyStringToString(data));
         XmlProcessingInstruction self =
             new XmlProcessingInstruction(context.getRuntime(),
-                                         (RubyClass) klass,
+                                         (RubyClass) klazz,
                                          node);
 
         RuntimeHelpers.invoke(context, self, "initialize", args);
@@ -84,20 +90,10 @@ public class XmlProcessingInstruction extends XmlNode {
 
     @Override
     public boolean isProcessingInstruction() { return true; }
-
+    
     @Override
-    public void saveContent(ThreadContext context, SaveContext ctx) {
-        ctx.append("<?");
-        ctx.append(node_name(context).convertToString().asJavaString());
-        IRubyObject content = content(context);
-        if(!content.isNil()) {
-            if (ctx.asHtml()) ctx.append(" ");
-            ctx.append(content.convertToString().asJavaString());
-        }
-        if (ctx.asHtml())
-            ctx.append(">");
-        else
-            ctx.append("?>");
+    public void accept(ThreadContext context, SaveContextVisitor visitor) {
+        visitor.enter((ProcessingInstruction)node);
+        visitor.leave((ProcessingInstruction)node);
     }
-
 }