closes issue 64

Author: mceachen

lib/closure_tree/model.rb

@@ -20,7 +20,6 @@ module Model
         :dependent => _ct.options[:dependent],
         :inverse_of => :parent)
 
-
       has_many :ancestor_hierarchies, *_ct.has_many_without_order_option(
         :class_name => _ct.hierarchy_class_name,
         :foreign_key => "descendant_id",
@@ -49,12 +48,14 @@ def _ct
 
     # Returns true if this node has no parents.
     def root?
-      _ct_parent_id.nil?
+      # Accessing the parent will fetch that row from the database,
+      # so if we are persisted, just check that the parent_id column is nil.
+      persisted? ? _ct_parent_id.nil? : parent.nil?
     end
 
     # Returns true if this node has a parent, and is not a root.
     def child?
-      !parent.nil?
+      !root?
     end
 
     # Returns true if this node has no children.

spec/label_spec.rb

@@ -86,8 +86,8 @@ def create_preorder_tree(suffix = "")
 
   context "Parent/child inverse relationships" do
     it "should associate both sides of the parent and child relationships" do
-      parent = Label.new(:name => '123')
-      child = parent.children.build
+      parent = Label.new(:name => 'parent')
+      child = parent.children.build(:name => 'child')
       parent.should be_root
       parent.should_not be_leaf
       child.should_not be_root