nokogiri 1.11.0.rc1-java → 1.11.2-java

data/ext/java/nokogiri/XmlAttr.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.
@@ -55,108 +55,132 @@ import org.w3c.dom.Node;
  * @author Yoko Harada <yokolet@gmail.com>
  */
 
-@JRubyClass(name="Nokogiri::XML::Attr", parent="Nokogiri::XML::Node")
-public class XmlAttr extends XmlNode {
-
-    public static final String[] HTML_BOOLEAN_ATTRS = {
-        "checked", "compact", "declare", "defer", "disabled", "ismap",
-        "multiple", "nohref", "noresize", "noshade", "nowrap", "readonly",
-        "selected"
-    };
-
-    public XmlAttr(Ruby ruby, Node attr){
-        super(ruby, getNokogiriClass(ruby, "Nokogiri::XML::Attr"), attr);
-    }
-
-    public XmlAttr(Ruby ruby, RubyClass rubyClass) {
-        super(ruby, rubyClass);
-    }
-
-    public XmlAttr(Ruby ruby, RubyClass rubyClass, Node attr){
-        super(ruby, rubyClass, attr);
+@JRubyClass(name = "Nokogiri::XML::Attr", parent = "Nokogiri::XML::Node")
+public class XmlAttr extends XmlNode
+{
+
+  public static final String[] HTML_BOOLEAN_ATTRS = {
+    "checked", "compact", "declare", "defer", "disabled", "ismap",
+    "multiple", "nohref", "noresize", "noshade", "nowrap", "readonly",
+    "selected"
+  };
+
+  public
+  XmlAttr(Ruby ruby, Node attr)
+  {
+    super(ruby, getNokogiriClass(ruby, "Nokogiri::XML::Attr"), attr);
+  }
+
+  public
+  XmlAttr(Ruby ruby, RubyClass rubyClass)
+  {
+    super(ruby, rubyClass);
+  }
+
+  public
+  XmlAttr(Ruby ruby, RubyClass rubyClass, Node attr)
+  {
+    super(ruby, rubyClass, attr);
+  }
+
+  @Override
+  protected void
+  init(ThreadContext context, IRubyObject[] args)
+  {
+    if (args.length < 2) {
+      throw context.runtime.newArgumentError(args.length, 2);
     }
 
-    @Override
-    protected void init(ThreadContext context, IRubyObject[] args) {
-        if (args.length < 2) {
-            throw context.runtime.newArgumentError(args.length, 2);
-        }
-
-        IRubyObject doc = args[0];
-        IRubyObject content = args[1];
-
-        if (!(doc instanceof XmlDocument)) {
-            throw context.runtime.newArgumentError("document must be an instance of Nokogiri::XML::Document");
-        }
+    IRubyObject doc = args[0];
+    IRubyObject content = args[1];
 
-        XmlDocument xmlDoc = (XmlDocument)doc;
-        String str = rubyStringToString(content);
-        Node attr = xmlDoc.getDocument().createAttribute(str);
-        setNode(context.runtime, attr);
+    if (!(doc instanceof XmlDocument)) {
+      throw context.runtime.newArgumentError("document must be an instance of Nokogiri::XML::Document");
     }
-    
-    
-    // this method is called from XmlNode.setNode()
-    // if the node is attribute, and its name has prefix "xml"
-    // the default namespace should be registered for this attribute
-    void setNamespaceIfNecessary(Ruby runtime) {
-        if ("xml".equals(node.getPrefix())) {
-            XmlNamespace.createDefaultNamespace(runtime, node);
-        }
-    }
-
-    @Override
-    @JRubyMethod(name = {"content", "value", "to_s"})
-    public IRubyObject content(ThreadContext context) {
-        if (content != null && !content.isNil()) return content;
-        if (node == null) return context.getRuntime().getNil();
-        String attrValue = ((Attr)node).getValue();
-        if (attrValue == null) return context.getRuntime().getNil();
-        return RubyString.newString(context.getRuntime(), attrValue);
-    }
-    
-    @JRubyMethod(name = {"value=", "content="})
-    public IRubyObject value_set(ThreadContext context, IRubyObject content){
-        Attr attr = (Attr) node;
-        if (content != null && !content.isNil()) {
-            attr.setValue(rubyStringToString(XmlNode.encode_special_chars(context, content)));
-        }
-        setContent(content);
-        return content;
-    }
-
-    @Override
-    protected IRubyObject getNodeName(ThreadContext context) {
-        if (name != null) return name;
 
-        String attrName = ((Attr) node).getName();
-        if (attrName == null) return context.nil;
-
-        if (node.getNamespaceURI() != null && !(document(context.runtime) instanceof HtmlDocument)) {
-            attrName = NokogiriHelpers.getLocalPart(attrName);
-            if (attrName == null) return context.nil;
-        }
-
-        return name = RubyString.newString(context.runtime, attrName);
+    XmlDocument xmlDoc = (XmlDocument)doc;
+    String str = rubyStringToString(content);
+    Node attr = xmlDoc.getDocument().createAttribute(str);
+    setNode(context.runtime, attr);
+  }
+
+
+  // this method is called from XmlNode.setNode()
+  // if the node is attribute, and its name has prefix "xml"
+  // the default namespace should be registered for this attribute
+  void
+  setNamespaceIfNecessary(Ruby runtime)
+  {
+    if ("xml".equals(node.getPrefix())) {
+      XmlNamespace.createDefaultNamespace(runtime, node);
     }
-
-    @Override
-    public void accept(ThreadContext context, SaveContextVisitor visitor) {
-        visitor.enter((Attr)node);
-        visitor.leave((Attr)node);
+  }
+
+  @Override
+  @JRubyMethod(name = {"content", "value", "to_s"})
+  public IRubyObject
+  content(ThreadContext context)
+  {
+    if (content != null && !content.isNil()) { return content; }
+    if (node == null) { return context.getRuntime().getNil(); }
+    String attrValue = ((Attr)node).getValue();
+    if (attrValue == null) { return context.getRuntime().getNil(); }
+    return RubyString.newString(context.getRuntime(), attrValue);
+  }
+
+  @JRubyMethod(name = {"value=", "content="})
+  public IRubyObject
+  value_set(ThreadContext context, IRubyObject content)
+  {
+    Attr attr = (Attr) node;
+    if (content != null && !content.isNil()) {
+      attr.setValue(rubyStringToString(XmlNode.encode_special_chars(context, content)));
     }
-    
-    private boolean isHtml(ThreadContext context) {
-        return document(context).getMetaClass().isKindOfModule(getNokogiriClass(context.getRuntime(), "Nokogiri::HTML::Document"));
+    setContent(content);
+    return content;
+  }
+
+  @Override
+  protected IRubyObject
+  getNodeName(ThreadContext context)
+  {
+    if (name != null) { return name; }
+
+    String attrName = ((Attr) node).getName();
+    if (attrName == null) { return context.nil; }
+
+    if (node.getNamespaceURI() != null && !(document(context.runtime) instanceof HtmlDocument)) {
+      attrName = NokogiriHelpers.getLocalPart(attrName);
+      if (attrName == null) { return context.nil; }
     }
 
-    @Override
-    public IRubyObject unlink(ThreadContext context) {
-        Attr attr = (Attr) node;
-        Element parent = attr.getOwnerElement();
-        parent.removeAttributeNode(attr);
-
-        return this;
-    }
+    return name = RubyString.newString(context.runtime, attrName);
+  }
+
+  @Override
+  public void
+  accept(ThreadContext context, SaveContextVisitor visitor)
+  {
+    visitor.enter((Attr)node);
+    visitor.leave((Attr)node);
+  }
+
+  private boolean
+  isHtml(ThreadContext context)
+  {
+    return document(context).getMetaClass().isKindOfModule(getNokogiriClass(context.getRuntime(),
+           "Nokogiri::HTML::Document"));
+  }
+
+  @Override
+  public IRubyObject
+  unlink(ThreadContext context)
+  {
+    Attr attr = (Attr) node;
+    Element parent = attr.getOwnerElement();
+    parent.removeAttributeNode(attr);
+
+    return this;
+  }
 
 }

data/ext/java/nokogiri/XmlAttributeDecl.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.
@@ -49,81 +49,102 @@ import org.w3c.dom.Node;
  *
  * @author Patrick Mahoney <pat@polycrystal.org>
  */
-@JRubyClass(name="Nokogiri::XML::AttributeDecl", parent="Nokogiri::XML::Node")
-public class XmlAttributeDecl extends XmlNode {
-
-    public XmlAttributeDecl(Ruby ruby, RubyClass klass) {
-        super(ruby, klass);
-        throw ruby.newRuntimeError("node required");
-    }
-
-    /**
-     * Initialize based on an attributeDecl node from a NekoDTD parsed
-     * DTD.
-     *
-     * Internally, XmlAttributeDecl combines these into a single node.
-     */
-    public XmlAttributeDecl(Ruby ruby, RubyClass klass, Node attrDeclNode) {
-        super(ruby, klass, attrDeclNode);
-    }
-
-    static XmlAttributeDecl create(ThreadContext context, Node attrDeclNode) {
-        return new XmlAttributeDecl(context.runtime,
-            getNokogiriClass(context.runtime, "Nokogiri::XML::AttributeDecl"),
-            attrDeclNode
-        );
-    }
-
-    @Override
-    @JRubyMethod
-    public IRubyObject node_name(ThreadContext context) {
-        return attribute_name(context);
-    }
-
-    @Override
-    @JRubyMethod(name = "node_name=")
-    public IRubyObject node_name_set(ThreadContext context, IRubyObject name) {
-        throw context.runtime.newRuntimeError("cannot change name of DTD decl");
-    }
-
-    public IRubyObject element_name(ThreadContext context) {
-        return getAttribute(context, "ename");
-    }
-
-    public IRubyObject attribute_name(ThreadContext context) {
-        return getAttribute(context, "aname");
+@JRubyClass(name = "Nokogiri::XML::AttributeDecl", parent = "Nokogiri::XML::Node")
+public class XmlAttributeDecl extends XmlNode
+{
+
+  public
+  XmlAttributeDecl(Ruby ruby, RubyClass klass)
+  {
+    super(ruby, klass);
+    throw ruby.newRuntimeError("node required");
+  }
+
+  /**
+   * Initialize based on an attributeDecl node from a NekoDTD parsed
+   * DTD.
+   *
+   * Internally, XmlAttributeDecl combines these into a single node.
+   */
+  public
+  XmlAttributeDecl(Ruby ruby, RubyClass klass, Node attrDeclNode)
+  {
+    super(ruby, klass, attrDeclNode);
+  }
+
+  static XmlAttributeDecl
+  create(ThreadContext context, Node attrDeclNode)
+  {
+    return new XmlAttributeDecl(context.runtime,
+                                getNokogiriClass(context.runtime, "Nokogiri::XML::AttributeDecl"),
+                                attrDeclNode
+                               );
+  }
+
+  @Override
+  @JRubyMethod
+  public IRubyObject
+  node_name(ThreadContext context)
+  {
+    return attribute_name(context);
+  }
+
+  @Override
+  @JRubyMethod(name = "node_name=")
+  public IRubyObject
+  node_name_set(ThreadContext context, IRubyObject name)
+  {
+    throw context.runtime.newRuntimeError("cannot change name of DTD decl");
+  }
+
+  public IRubyObject
+  element_name(ThreadContext context)
+  {
+    return getAttribute(context, "ename");
+  }
+
+  public IRubyObject
+  attribute_name(ThreadContext context)
+  {
+    return getAttribute(context, "aname");
+  }
+
+  @JRubyMethod
+  public IRubyObject
+  attribute_type(ThreadContext context)
+  {
+    return getAttribute(context, "atype");
+  }
+
+  @JRubyMethod(name = "default")
+  public IRubyObject
+  default_value(ThreadContext context)
+  {
+    return getAttribute(context, "default");
+  }
+
+  /**
+   * FIXME: will enumerations all be of the simple (val1|val2|val3)
+   * type string?
+   */
+  @JRubyMethod
+  public IRubyObject
+  enumeration(ThreadContext context)
+  {
+    final String atype = ((Element) node).getAttribute("atype");
+
+    if (atype != null && atype.length() != 0 && atype.charAt(0) == '(') {
+      // removed enclosing parens
+      String valueStr = atype.substring(1, atype.length() - 1);
+      String[] values = valueStr.split("\\|");
+      RubyArray enumVals = RubyArray.newArray(context.runtime, values.length);
+      for (int i = 0; i < values.length; i++) {
+        enumVals.append(context.runtime.newString(values[i]));
+      }
+      return enumVals;
     }
 
-    @JRubyMethod
-    public IRubyObject attribute_type(ThreadContext context) {
-        return getAttribute(context, "atype");
-    }
-
-    @JRubyMethod(name="default")
-    public IRubyObject default_value(ThreadContext context) {
-        return getAttribute(context, "default");
-    }
-
-    /**
-     * FIXME: will enumerations all be of the simple (val1|val2|val3)
-     * type string?
-     */
-    @JRubyMethod
-    public IRubyObject enumeration(ThreadContext context) {
-        final String atype = ((Element) node).getAttribute("atype");
-
-        if (atype != null && atype.length() != 0 && atype.charAt(0) == '(') {
-            // removed enclosing parens
-            String valueStr = atype.substring(1, atype.length() - 1);
-            String[] values = valueStr.split("\\|");
-            RubyArray enumVals = RubyArray.newArray(context.runtime, values.length);
-            for (int i = 0; i < values.length; i++) {
-                enumVals.append(context.runtime.newString(values[i]));
-            }
-            return enumVals;
-        }
-
-        return context.runtime.newEmptyArray();
-    }
+    return context.runtime.newEmptyArray();
+  }
 
 }

data/ext/java/nokogiri/XmlCdata.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.
@@ -52,31 +52,40 @@ import org.w3c.dom.Node;
  * @author Yoko Harada <yokolet@gmail.com>
  */
 
-@JRubyClass(name="Nokogiri::XML::CDATA", parent="Nokogiri::XML::Text")
-public class XmlCdata extends XmlText {
-    public XmlCdata(Ruby ruby, RubyClass rubyClass) {
-        super(ruby, rubyClass);
-    }
-    
-    public XmlCdata(Ruby ruby, RubyClass rubyClass, Node node) {
-        super(ruby, rubyClass, node);
-    }
+@JRubyClass(name = "Nokogiri::XML::CDATA", parent = "Nokogiri::XML::Text")
+public class XmlCdata extends XmlText
+{
+  public
+  XmlCdata(Ruby ruby, RubyClass rubyClass)
+  {
+    super(ruby, rubyClass);
+  }
 
-    @Override
-    protected void init(ThreadContext context, IRubyObject[] args) {
-        if (args.length < 2) {
-            throw getRuntime().newArgumentError(args.length, 2);
-        }
-        IRubyObject doc = args[0];
-        content = args[1];
-        Document document = ((XmlNode) doc).getOwnerDocument();
-        Node node = document.createCDATASection(rubyStringToString(content));
-        setNode(context.runtime, node);
-    }
+  public
+  XmlCdata(Ruby ruby, RubyClass rubyClass, Node node)
+  {
+    super(ruby, rubyClass, node);
+  }
 
-    @Override
-    public void accept(ThreadContext context, SaveContextVisitor visitor) {
-        visitor.enter((CDATASection)node);
-        visitor.leave((CDATASection)node);
+  @Override
+  protected void
+  init(ThreadContext context, IRubyObject[] args)
+  {
+    if (args.length < 2) {
+      throw getRuntime().newArgumentError(args.length, 2);
     }
+    IRubyObject doc = args[0];
+    content = args[1];
+    Document document = ((XmlNode) doc).getOwnerDocument();
+    Node node = document.createCDATASection(rubyStringToString(content));
+    setNode(context.runtime, node);
+  }
+
+  @Override
+  public void
+  accept(ThreadContext context, SaveContextVisitor visitor)
+  {
+    visitor.enter((CDATASection)node);
+    visitor.leave((CDATASection)node);
+  }
 }