smile-xml 1.0.2-jruby → 1.0.3-jruby

data/src/main/java/smile/xml/AttrJ.java

@@ -38,6 +38,11 @@ public class AttrJ extends NodeJ {
 		return (AttrJ) getRubyClass(context.getRuntime()).newInstance(context,
 				new IRubyObject[0], null);
 	}
+	
+	public static AttrJ newInstance(ThreadContext context, NodeJ node, RubyString name, RubyString value, NamespaceJ ns) {
+		IRubyObject[] args = { node, name, value, ns };
+		return (AttrJ) getRubyClass(context.getRuntime()).newInstance(context, args, null);
+	}
 
 	private NodeJ parent;
 	
@@ -51,7 +56,7 @@ public class AttrJ extends NodeJ {
 	
 	@JRubyMethod(name = "initialize", optional = 4)
 	public void initialize(ThreadContext context, IRubyObject[] args) {
-		NodeJ node = (NodeJ) (NodeJ) (args.length > 0 ? args[0] : null);
+		NodeJ node = (NodeJ) (args.length > 0 ? args[0] : null);
 		RubyString name = (RubyString) (args.length > 1 ? args[1] : null);
 		RubyString value = (RubyString) (args.length > 2 ? args[2] : null);
 		NamespaceJ ns = (NamespaceJ) (args.length > 3 ? args[3] : null);

data/src/main/java/smile/xml/AttributesJ.java

@@ -122,14 +122,18 @@ public class AttributesJ extends BaseJ<Node> {
 
 	@JRubyMethod(name = { "first" })
 	public IRubyObject first(ThreadContext context) {
-		if (getJavaObject().getAttributes().getLength() == 0) {
-			return context.getRuntime().getNil();
+		AttrJ attr = null;
+		NamedNodeMap attributes = getJavaObject().getAttributes();
+		for (int i = 0; i < attributes.getLength(); i++) {
+			Node item = attributes.item(i);
+			if (UtilJ.isAttr(item)) {
+				attr = AttrJ.newInstance(context);
+				attr.setJavaObject(item);
+				attr.setParent(parent);
+				break;
+			}
 		}
-		AttrJ attr = AttrJ.newInstance(context);
-		NamedNodeMap aa = getJavaObject().getAttributes();
-		attr.setJavaObject(aa.item(0));
-		attr.setParent(parent);
-		return attr;
+		return UtilJ.nvl(attr, context.getRuntime().getNil());
 	}
 
 	@JRubyMethod(name = { "get_attribute" })
@@ -172,9 +176,8 @@ public class AttributesJ extends BaseJ<Node> {
 
 	@JRubyMethod(name = { "length" })
 	public RubyFixnum getLength(ThreadContext context) {
-		int r = ((Node) getJavaObject()).getAttributes() == null ? 0
-				: ((Node) getJavaObject()).getAttributes().getLength();
-		return context.getRuntime().newFixnum(r);
+		int length = attributesAsList(context).size();
+		return context.getRuntime().newFixnum(length);
 	}
 
 	@JRubyMethod(name = { "node" })
@@ -199,14 +202,18 @@ public class AttributesJ extends BaseJ<Node> {
 	}
 
 	private List<AttrJ> attributesAsList(ThreadContext context) {
-		NamedNodeMap list = ((Node) getJavaObject()).getAttributes();
-		List array = new ArrayList(list.getLength());
-		for (int i = 0; i < list.getLength(); i++) {
+		NamedNodeMap attributes = ((Node) getJavaObject()).getAttributes();
+		List<AttrJ> list = new ArrayList<AttrJ>();
+		for (int i = 0; i < attributes.getLength(); i++) {
+			Node item = attributes.item(i);
+			if (! UtilJ.isAttr(item)) {
+				continue;
+			}
 			AttrJ node = AttrJ.newInstance(context);
-			node.setJavaObject(list.item(i));
+			node.setJavaObject(item);
 			node.setParent(parent);
-			array.add(node);
+			list.add(node);
 		}
-		return array;
+		return list;
 	}
 }

data/src/main/java/smile/xml/DocumentJ.java

@@ -321,25 +321,25 @@ public class DocumentJ extends BaseJ<Document> {
 
 	@JRubyMethod(name="to_s", rest=true)
 	public RubyString toString(ThreadContext context, IRubyObject[] args ) throws Exception {
-		RubyBoolean indent;
-		EncodingJ   encoding = null;
+		Boolean indent = null;
+		EncodingJ encoding = null;
 		if( args.length > 0 ) {
 			if( args[0] instanceof RubyHash ) {
 				RubyHash hash = (RubyHash) args[0];
 				RubySymbol key = context.getRuntime().newSymbol( "indent" );
-				indent = toRubyBool( context, hash.get( key ) );
+				indent = UtilJ.toJavaBoolean(context, hash.get(key));
 				key = context.getRuntime().newSymbol( "encoding" );
 				encoding = EncodingJ.get(context, hash.get( key ) );
 			} else if( args[0] instanceof RubyBoolean ) {
-				indent = (RubyBoolean) args[0];
+				indent = UtilJ.toJavaBoolean(context, args[0]);
 			} else if( args[0] instanceof RubyNil ) {
-				
+				// do nothing
 			} else {
 				throw context.getRuntime().newArgumentError("");
 			}
 		}
 
-		String string = UtilJ.toString( getJavaObject(), true, encoding );
+		String string = UtilJ.toString( getJavaObject(), nvl(indent, true), encoding );
 		return context.getRuntime().newString(string);
 	}
 

data/src/main/java/smile/xml/ErrorJ.java

@@ -5,7 +5,6 @@ import java.util.concurrent.atomic.AtomicReference;
 import org.jruby.Ruby;
 import org.jruby.RubyClass;
 import org.jruby.RubyException;
-import org.jruby.RubyModule;
 import org.jruby.anno.JRubyClass;
 import org.jruby.anno.JRubyConstant;
 import org.jruby.anno.JRubyMethod;
@@ -29,26 +28,6 @@ public class ErrorJ extends RubyException {
 	};
 
 	private static final AtomicReference<Block> handler = new AtomicReference<Block>();
-
-	public static RubyClass define(Ruby runtime) {
-		return UtilJ.defineClass(runtime, ErrorJ.class, ALLOCATOR);
-	}
-
-	private static RubyClass getRubyClass(Ruby runtime) {
-		return UtilJ.getClass(runtime, ErrorJ.class );
-	}
-
-	public static RaiseException newRaiseException(ThreadContext context,
-			String message) {
-		Ruby run = context.getRuntime();
-		return new RaiseException(run, getRubyClass(context.getRuntime()), message, true);
-	}
-
-	public static RubyException newInstance(ThreadContext context,
-			String message) {
-		return RubyException.newException(context.getRuntime(),getRubyClass(context.getRuntime()), message);
-	}
-
 	
 	@JRubyConstant
 	public static final IRubyObject VERBOSE_HANDLER = null;
@@ -77,8 +56,23 @@ public class ErrorJ extends RubyException {
 	@JRubyConstant
 	public static final IRubyObject ERROR = null;
 	
+	public static RubyClass define(Ruby runtime) {
+		return UtilJ.defineClass(runtime, ErrorJ.class, ALLOCATOR);
+	}
 
-	
+	private static RubyClass getRubyClass(Ruby runtime) {
+		return UtilJ.getClass(runtime, ErrorJ.class );
+	}
+
+	public static RaiseException newRaiseException(ThreadContext context, String message) {
+		Ruby run = context.getRuntime();
+		return new RaiseException(run, getRubyClass(run), message, true);
+	}
+
+	public static RubyException newInstance(ThreadContext context, String message) {
+		Ruby run = context.getRuntime();
+		return RubyException.newException(run, getRubyClass(run), message);
+	}
 	
 	private ErrorJ(Ruby runtime, RubyClass metaClass) {
 		super(runtime, metaClass);
@@ -151,7 +145,6 @@ public class ErrorJ extends RubyException {
 
 	@JRubyMethod(name = "reset_handler", module=true)
 	public static void resetHandler(ThreadContext context, IRubyObject self) {
-
 		handler.set(null);
 	}
 

data/src/main/java/smile/xml/NamespaceJ.java

@@ -2,66 +2,131 @@ package smile.xml;
 
 import org.jruby.Ruby;
 import org.jruby.RubyClass;
-import org.jruby.RubyModule;
+import org.jruby.RubyFixnum;
 import org.jruby.RubyObject;
 import org.jruby.RubyString;
+import org.jruby.anno.JRubyClass;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.runtime.ObjectAllocator;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
+
 import smile.xml.util.UtilJ;
 
-public class NamespaceJ extends RubyObject
-{
-  private static final long serialVersionUID = 4128551928821799987L;
-  private static final ObjectAllocator ALLOCATOR = new ObjectAllocator()
-  {
-    public IRubyObject allocate(Ruby runtime, RubyClass klass)
-    {
-      return new NamespaceJ(runtime, klass); }  } ;
-  private NodeJ node;
-  private RubyString prefix;
-  private RubyString href;
+@JRubyClass( name="LibXML::XML::Namespace" )
+public class NamespaceJ extends RubyObject {
+	
+	private static final long serialVersionUID = 4128551928821799987L;
+	
+	private static final ObjectAllocator ALLOCATOR = new ObjectAllocator() {
+		public IRubyObject allocate(Ruby runtime, RubyClass klass) {
+			return new NamespaceJ(runtime, klass);
+		}
+	};
+
+	public static RubyClass define(Ruby runtime) {
+		return UtilJ.defineClass(runtime, NamespaceJ.class, ALLOCATOR);
+	}
+
+	private static RubyClass getRubyClass(Ruby runtime) {
+		return UtilJ.getClass(runtime, NamespaceJ.class);
+	}
+	
+	public static NamespaceJ newInstance(ThreadContext context) {
+		return new NamespaceJ(context.getRuntime(), getRubyClass(context.getRuntime()));
+	}
+
+	public static NamespaceJ newInstance(ThreadContext context,	IRubyObject node, IRubyObject prefix, IRubyObject href) {
+		IRubyObject[] args = { node, prefix, href };
+		return (NamespaceJ) getRubyClass(context.getRuntime()).newInstance(context, args, null);
+	}
+	
+	private NodeJ node;
+	private RubyString prefix;
+	private RubyString href;
 
-  public static RubyClass define(Ruby runtime) { RubyModule module = UtilJ.getModule(runtime, new String[] { "LibXML", "XML" });
-    RubyClass result = module.defineClassUnder("Namespace", runtime.getObject(), ALLOCATOR);
-    result.defineAnnotatedMethods(NamespaceJ.class);
-    return result; }
+	public NamespaceJ(Ruby runtime, RubyClass metaClass) {
+		super(runtime, metaClass);
+	}
 
-  private static RubyClass getRubyClass(Ruby runtime)
-  {
-    return UtilJ.getClass(runtime, new String[] { "LibXML", "XML", "Namespace" });
-  }
+	@JRubyMethod(name = { "initialize" })
+	public void initialize(ThreadContext context, IRubyObject pNode, IRubyObject pPrefix, IRubyObject pHref) {
+		if ( ! (pNode instanceof NodeJ)) {
+			throw context.getRuntime().newTypeError("wrong argument type " + UtilJ.getRubyClassName(pNode) + " (expected Data)");
+		}
+		
+		node = ((NodeJ) pNode);
+		if (! pPrefix.isNil()) {
+			prefix = (RubyString) pPrefix;	
+		}
+		href = (RubyString) pHref;
+		
+		// define namespace as "xmlns" attribute
+		String name = prefix == null ? "xmlns" : "xmlns:" + prefix.asJavaString();
+		String value = href.asJavaString();
+		AttrJ.newInstance(context, node, UtilJ.toRubyString(context, name).asString(), 
+				UtilJ.toRubyString(context, value).asString(), this);
+	}
 
-  public static NamespaceJ newInstance(ThreadContext context, IRubyObject node, IRubyObject prefix, IRubyObject uri)
-  {
-    IRubyObject[] args = { node, uri, prefix };
-    return (NamespaceJ)getRubyClass(context.getRuntime()).newInstance(context, args, null);
-  }
+	@JRubyMethod(name = { "prefix" })
+	public IRubyObject getPrefix(ThreadContext context) {
+		return UtilJ.nvl(this.prefix, context.getRuntime().getNil());
+	}
 
-  public NamespaceJ(Ruby runtime, RubyClass metaClass)
-  {
-    super(runtime, metaClass);
-  }
-  @JRubyMethod(name={"initialize"})
-  public void initialize(ThreadContext context, IRubyObject pNode, IRubyObject pHref, IRubyObject pPrefix) {
-    this.node = ((NodeJ)pNode);
-    if (!pHref.isNil())
-      this.href = ((RubyString)pHref);
-    if (!pPrefix.isNil())
-      this.prefix = ((RubyString)pPrefix); 
-  }
+	@JRubyMethod(name = { "href" })
+	public IRubyObject getHref(ThreadContext context) {
+		return UtilJ.nvl(this.href, context.getRuntime().getNil());
+	}
 
-  @JRubyMethod(name={"prefix"})
-  public IRubyObject getPrefix(ThreadContext context) {
-    return this.prefix == null ? context.getRuntime().getNil() : this.prefix;
-  }
-  @JRubyMethod(name={"href"})
-  public IRubyObject getHref(ThreadContext context) {
-    return this.href == null ? context.getRuntime().getNil() : this.href;
-  }
-  @JRubyMethod(name={"node"})
-  public IRubyObject getNode(ThreadContext context) {
-    return this.node;
-  }
+	@JRubyMethod(name = { "node" })
+	public IRubyObject getNode(ThreadContext context) {
+		return this.node;
+	}
+	
+	@JRubyMethod(name = { "node_type" })
+	public IRubyObject getNodeType(ThreadContext context) {
+		return new RubyFixnum(context.getRuntime(), NodeJ.NAMESPACE_DECL);
+	}
+	
+	@JRubyMethod(name = { "next" })
+	public IRubyObject getNext(ThreadContext context) {
+		// TODO
+		return context.getRuntime().getNil();
+	}
+	
+	@JRubyMethod(name = { "==" })
+	public IRubyObject isEqual(ThreadContext context, IRubyObject pOther) {
+		if (pOther instanceof NamespaceJ) {
+			NamespaceJ otherNS = (NamespaceJ) pOther;
+			if (href.equals(otherNS.href) && node.equals(otherNS.node)
+					&& (prefix == null && otherNS.prefix == null 
+					|| prefix.equals(otherNS.prefix))) {
+				return context.getRuntime().getTrue();
+			}
+		}
+		return context.getRuntime().getFalse();
+	}
+	
+	@JRubyMethod(name = { "to_s" })
+	public IRubyObject toS(ThreadContext context) {
+		String str;
+		if (prefix != null) {
+			str = prefix.asJavaString() + ":" + href.asJavaString();
+		} else {
+			str = href.asJavaString();
+		}		
+		return context.getRuntime().newString(str);
+	}
+	
+	public void setNode(NodeJ node) {
+		this.node = node;
+	}
+	
+	public void setPrefix(RubyString prefix) {
+		this.prefix = prefix;
+	}
+	
+	public void setHref(RubyString href) {
+		this.href = href;
+	}
 }

data/src/main/java/smile/xml/NamespacesJ.java

@@ -1,62 +1,158 @@
 package smile.xml;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.jruby.Ruby;
 import org.jruby.RubyClass;
-import org.jruby.RubyModule;
 import org.jruby.RubyObject;
+import org.jruby.anno.JRubyClass;
 import org.jruby.anno.JRubyMethod;
+import org.jruby.runtime.Block;
 import org.jruby.runtime.ObjectAllocator;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
+
 import smile.xml.util.UtilJ;
 
-public class NamespacesJ extends RubyObject
-{
-  private static final long serialVersionUID = 4673137342270845475L;
-  private static final ObjectAllocator ALLOCATOR = new ObjectAllocator()
-  {
-    public IRubyObject allocate(Ruby runtime, RubyClass klass)
-    {
-      return new NamespacesJ(runtime, klass);
-    } } ;
-  private NodeJ node;
-
-  public static RubyClass define(Ruby runtime) { RubyModule module = UtilJ.getModule(runtime, new String[] { "LibXML", "XML" });
-    RubyClass result = module.defineClassUnder("Namespaces", runtime.getObject(), ALLOCATOR);
-    result.defineAnnotatedMethods(NamespacesJ.class);
-    return result; }
-
-  private static RubyClass getRubyClass(Ruby runtime)
-  {
-    return UtilJ.getClass(runtime, new String[] { "LibXML", "XML", "Namespaces" });
-  }
-
-  public static NamespacesJ newInstance(ThreadContext context, NodeJ node)
-  {
-    IRubyObject[] args = { node };
-    return (NamespacesJ)getRubyClass(context.getRuntime()).newInstance(context, args, null);
-  }
-
-  public NamespacesJ(Ruby runtime, RubyClass metaClass)
-  {
-    super(runtime, metaClass);
-  }
-  @JRubyMethod(name={"initialize"})
-  public void initialize(ThreadContext context, IRubyObject pNode) {
-    this.node = ((NodeJ)pNode);
-  }
-
-  @JRubyMethod(name={"namespace"})
-  public IRubyObject getNamespace(ThreadContext context) {
-    Ruby run = context.getRuntime();
-
-    String tmp = ((Node)this.node.getJavaObject()).getPrefix();
-    IRubyObject prefix = tmp == null ? run.getNil() : run.newString(tmp);
-
-    tmp = ((Node)this.node.getJavaObject()).getNamespaceURI();
-    IRubyObject uri = tmp == null ? run.getNil() : run.newString(tmp);
-
-    return NamespaceJ.newInstance(context, this.node, prefix, uri);
-  }
+@JRubyClass( name = "LibXML::XML::Namespaces", include = "Enumerable" )
+public class NamespacesJ extends RubyObject {
+	
+	private static final long serialVersionUID = 4673137342270845475L;
+	
+	private static final ObjectAllocator ALLOCATOR = new ObjectAllocator() {
+		public IRubyObject allocate(Ruby runtime, RubyClass klass) {
+			return new NamespacesJ(runtime, klass);
+		}
+	};
+
+	public static RubyClass define(Ruby runtime) {
+		return UtilJ.defineClass(runtime, NamespacesJ.class, ALLOCATOR);
+	}
+
+	private static RubyClass getRubyClass(Ruby runtime) {
+		return UtilJ.getClass(runtime, NamespacesJ.class);
+	}
+
+	public static NamespacesJ newInstance(ThreadContext context, NodeJ node) {
+		IRubyObject[] args = { node };
+		return (NamespacesJ) getRubyClass(context.getRuntime()).newInstance(context, args, null);
+	}
+	
+	private NodeJ node;
+
+	public NamespacesJ(Ruby runtime, RubyClass metaClass) {
+		super(runtime, metaClass);
+	}
+
+	@JRubyMethod(name = { "initialize" })
+	public void initialize(ThreadContext context, IRubyObject pNode) {
+		this.node = (NodeJ) pNode;
+	}
+	
+	@JRubyMethod(name = { "default" })
+	public IRubyObject getDefault(ThreadContext context) {
+		return findByPrefix(context, context.getRuntime().getNil());
+	}
+	
+	@JRubyMethod(name = { "default_prefix=" })
+	public void setDefaultPrefix(ThreadContext context, IRubyObject pPrefix) {
+		// TODO
+		throw context.getRuntime().newRuntimeError("not yet implemented");
+	}
+	
+	@JRubyMethod(name = { "definitions" })
+	public IRubyObject getDefinitions(ThreadContext context) {
+		// TODO
+		throw context.getRuntime().newRuntimeError("not yet implemented");
+	}
+	
+	@JRubyMethod(name = { "each" })
+	public void iterateOver(ThreadContext context, Block block) {
+		UtilJ.iterateOver(context, block, namespacesAsList(context));
+	}
+	
+	@JRubyMethod(name = { "find_by_href" })
+	public IRubyObject findByHref(ThreadContext context, IRubyObject pHref) {
+		// TODO
+		throw context.getRuntime().newRuntimeError("not yet implemented");
+	}
+	
+	@JRubyMethod(name = { "find_by_prefix" }, optional = 1)
+	public IRubyObject findByPrefix(ThreadContext context, IRubyObject pPrefix) {
+		// TODO
+		throw context.getRuntime().newRuntimeError("not yet implemented");
+	}
+
+	@JRubyMethod(name = { "namespace" })
+	public IRubyObject getNamespace(ThreadContext context) {
+		Ruby run = context.getRuntime();
+
+		String prefixStr = ((Node) node.getJavaObject()).getPrefix();
+		IRubyObject prefix = prefixStr == null ? run.getNil() : run.newString(prefixStr);
+
+		String uriStr = ((Node) node.getJavaObject()).getNamespaceURI();
+		IRubyObject uri = uriStr == null ? run.getNil() : run.newString(uriStr);
+		
+		if (uri.isNil()) {
+			return run.getNil();
+		} else {
+			return NamespaceJ.newInstance(context, node, prefix, uri);
+		}
+	}
+	
+	@JRubyMethod(name = { "namespace=" })
+	public void setNamespace(ThreadContext context, IRubyObject pNamespace) {
+		if ( ! (pNamespace instanceof NamespaceJ)) {
+			throw context.getRuntime().newTypeError("wrong argument type " + UtilJ.getRubyClassName(pNamespace) + " (expected Data)");
+		}
+		
+		NamespaceJ namespace = (NamespaceJ) pNamespace;
+		Document doc = node.getJavaObject().getOwnerDocument();
+		
+		String namespaceURI = "";
+		String qualifiedName = node.getJavaObject().getNodeName();
+		if (! namespace.getHref(context).isNil()) {
+			namespaceURI = namespace.getHref(context).asJavaString();
+		}
+		if (! namespace.getPrefix(context).isNil()) {
+			qualifiedName = namespace.getPrefix(context).asJavaString() + ":" + node.getJavaObject().getNodeName();
+		}
+		node.setJavaObject(doc.renameNode(node.getJavaObject(), namespaceURI, qualifiedName));
+	}
+	
+	@JRubyMethod(name = { "node" })
+	public IRubyObject getNode(ThreadContext context) {
+		return this.node;
+	}
+	
+	private List<NamespaceJ> namespacesAsList(ThreadContext context) {
+		NamedNodeMap attributes = node.getJavaObject().getAttributes();
+		List<NamespaceJ> list = new ArrayList<NamespaceJ>();
+		for (int i = 0; i < attributes.getLength(); i++) {
+			Node item = attributes.item(i);
+			String name = item.getNodeName();
+			if (name.startsWith("xmlns")) {
+				NamespaceJ ns = NamespaceJ.newInstance(context);
+				String prefix;
+				if (name.startsWith("xmlns:")) {
+					prefix = name.substring("xmlns:".length());
+					ns.setPrefix(context.getRuntime().newString(prefix));
+				} else if (name.equals("xmlns")) {
+					prefix = null;
+					ns.setPrefix(null);
+				} else {
+					continue;
+				}
+				ns.setNode(node);
+				String href = item.getNodeValue();
+				ns.setHref(context.getRuntime().newString(href));
+				list.add(ns);
+			}
+		}
+		return list;
+	}
 }

data/src/main/java/smile/xml/NodeJ.java

@@ -75,11 +75,13 @@ public class NodeJ extends BaseJ<Node> {
 
 	@JRubyConstant
 	public static final int NOTATION_NODE = 12;
+	
+	@JRubyConstant
+	public static final int NAMESPACE_DECL = 18;
 
 	@JRubyConstant
 	public static final int PROCESSING_INSTRUCTION_NODE = 7;
 
-
 	@JRubyConstant
 	public static final int FRAGMENT_NODE = 11;
 
@@ -126,16 +128,28 @@ public class NodeJ extends BaseJ<Node> {
 
 	@JRubyMethod(name = { "initialize" }, optional = 3)
 	public void initialize(ThreadContext context, IRubyObject[] args) {
-		RubyString name = (RubyString) (RubyString) (args.length > 0 ? args[0] : null);
-		RubyString content = (RubyString) (RubyString) (args.length > 1 ? args[1] : null);
-		NamespaceJ namespace = (NamespaceJ) (NamespaceJ) (args.length > 2 ? args[2] : null);
-
+		RubyString name = (RubyString) (args.length > 0 && ! args[0].isNil() ? args[0] : null);
+		RubyString content = (RubyString) (args.length > 1 && ! args[1].isNil() ? args[1] : null);
+		NamespaceJ ns = (NamespaceJ) (args.length > 2 && ! args[2].isNil() ? args[2] : null);
+		
 		if (name != null) {
 			Document doc = UtilJ.getBuilder().newDocument();
-			Element elemet = doc.createElement(name.asJavaString());
+			Element element = doc.createElement(name.asJavaString());
 			if ((content != null) && (!content.isNil()))
-				elemet.setTextContent(content.asJavaString());
-			setJavaObject(elemet);
+				element.setTextContent(content.asJavaString());
+			setJavaObject(element);
+			
+			if (ns != null && ! ns.isNil()) {
+				String namespaceURI = "";
+				String qualifiedName = getJavaObject().getNodeName();
+				if (! ns.getHref(context).isNil()) {
+					namespaceURI = ns.getHref(context).asJavaString();
+				}
+				if (! ns.getPrefix(context).isNil()) {
+					qualifiedName = ns.getPrefix(context).asJavaString() + ":" + getJavaObject().getNodeName();
+				}
+				setJavaObject(doc.renameNode(getJavaObject(), namespaceURI, qualifiedName));
+			}
 		}
 	}
 
@@ -210,7 +224,7 @@ public class NodeJ extends BaseJ<Node> {
 	}
 
 	@JRubyMethod(name = "equal?")
-	public RubyBoolean isEqlual(ThreadContext context, IRubyObject arg)
+	public RubyBoolean isEqual(ThreadContext context, IRubyObject arg)
 			throws Exception {
 
 		if (arg.isNil()) {
@@ -252,8 +266,7 @@ public class NodeJ extends BaseJ<Node> {
 		boolean r = toString(context, new IRubyObject[0]).equals(
 				other.toString(context, new IRubyObject[0]));
 
-		return r ? context.getRuntime().getTrue() : context.getRuntime()
-				.getFalse();
+		return UtilJ.toBool(context, r);
 	}
 
 	@JRubyMethod(name ="detect")
@@ -333,9 +346,8 @@ public class NodeJ extends BaseJ<Node> {
 
 	@JRubyMethod(name = { "attribute?" })
 	public RubyBoolean isAttribute(ThreadContext context) {
-		boolean r = ((Node) getJavaObject()).getNodeType() == 2;
-		return r ? context.getRuntime().getTrue() : context.getRuntime()
-				.getFalse();
+		boolean r = ((Node) getJavaObject()).getNodeType() == ATTRIBUTE_NODE;
+		return UtilJ.toBool(context, r);
 	}
 
 	@JRubyMethod(name = { "attribute_decl?" })
@@ -354,8 +366,7 @@ public class NodeJ extends BaseJ<Node> {
 	@JRubyMethod(name = { "attributes?" }, alias = { "properties?" })
 	public RubyBoolean hasAttributes(ThreadContext context) {
 		boolean r = ((Node) getJavaObject()).getAttributes().getLength() != 0;
-		return r ? context.getRuntime().getTrue() : context.getRuntime()
-				.getFalse();
+		return UtilJ.toBool(context, r);
 	}
 
 //	@JRubyMethod(name ="base_uri")
@@ -681,7 +692,7 @@ public class NodeJ extends BaseJ<Node> {
 		return UtilJ.toBool(context, false);
 	}
 
-	@JRubyMethod(name = { "namespacess=" })
+	@JRubyMethod(name = { "namespaces" })
 	public NamespacesJ getNamespaces(ThreadContext context) {
 		return NamespacesJ.newInstance(context, this);
 	}