zena 1.0.0.beta3 → 1.0.0.rc1

data/test/unit/note_test.rb

@@ -1,22 +1,14 @@
 require 'test_helper'
 
 class NoteTest < Zena::Unit::TestCase
-  
+
   def test_create_simplest
     login(:ant)
-    test_page = secure!(Note) { Note.create(:node_name => "yoba", :parent_id => nodes_id(:cleanWater), :inherit=>1 ) }
+    test_page = secure!(Note) { Note.create(:title => "yoba", :parent_id => nodes_id(:cleanWater), :inherit=>1 ) }
     assert ! test_page.new_record? , "Not a new record"
     assert_equal nodes_id(:cleanWater), test_page.parent[:id]
-    assert_equal 'projects/cleanWater/yoba', test_page.fullpath
-    assert_equal 'projects/cleanWater', test_page.basepath
-  end
-
-  def test_create_with_node_name
-    login(:tiger)
-    note = nil
-    assert_nothing_raised { note = secure!(Note) { Note.create(:node_name => "asdf", :parent_id=>nodes_id(:zena), :log_at=>"2006-06-20", :set_tag_ids=>[nodes_id(:news)])} }
-    assert note , "Note created"
-    assert ! note.new_record? , "Not a new record"
+    assert_equal '18/21/64', test_page.fullpath
+    assert_equal '18/21', test_page.basepath
   end
 
   def test_create_with_title
@@ -25,68 +17,68 @@ class NoteTest < Zena::Unit::TestCase
     assert_nothing_raised { note = secure!(Note) { Note.create(:title=>"Monday is nice", :parent_id=>nodes_id(:zena), :log_at=>"2006-06-20", :set_tag_ids=>[nodes_id(:news)])} }
     assert note , "Note created"
     assert ! note.new_record? , "Not a new record"
-    assert_equal "MondayIsNice", note[:node_name]
+    assert_equal "Monday is nice", note.title
   end
 
-  def test_create_same_node_name
+  def test_create_same_title
     login(:tiger)
     note, note2, note3 = nil, nil, nil
-    assert_nothing_raised { note = secure!(Note) { Note.create(:node_name => "test", :parent_id=>nodes_id(:zena), :log_at=>"2006-06-20", :set_tag_ids=>[nodes_id(:news)])} }
+    assert_nothing_raised { note = secure!(Note) { Note.create(:title => "test", :parent_id=>nodes_id(:zena), :log_at=>"2006-06-20", :set_tag_ids=>[nodes_id(:news)])} }
     assert note , "Note created"
     assert ! note.new_record? , "Not a new record"
-    assert_equal "test", note[:node_name]
+    assert_equal "test", note.title
 
-    assert_nothing_raised { note2 = secure!(Note) { Note.create(:node_name => "test", :parent_id=>nodes_id(:zena), :log_at=>"2006-06-20", :set_tag_ids=>[nodes_id(:news)])} }
-    assert ! note2.new_record? , "Not a new record" # same node_name allowed for notes
+    assert_nothing_raised { note2 = secure!(Note) { Note.create(:title => "test", :parent_id=>nodes_id(:zena), :log_at=>"2006-06-20", :set_tag_ids=>[nodes_id(:news)])} }
+    assert ! note2.new_record? , "Not a new record" # same title allowed for notes
   end
 
-  def test_create_same_node_name_other_day
+  def test_create_same_title_other_day
     login(:tiger)
     note, note2, note3 = nil, nil, nil
-    assert_nothing_raised { note = secure!(Note) { Note.create(:node_name => "test", :parent_id=>nodes_id(:zena), :log_at=>"2006-06-20", :set_tag_ids=>[nodes_id(:news)])} }
+    assert_nothing_raised { note = secure!(Note) { Note.create(:title => "test", :parent_id=>nodes_id(:zena), :log_at=>"2006-06-20", :set_tag_ids=>[nodes_id(:news)])} }
     assert note , "Note created"
     assert ! note.new_record? , "Not a new record"
-    assert_equal "test", note[:node_name]
+    assert_equal "test", note.title
 
-    assert_nothing_raised { note2 = secure!(Note) { Note.create(:node_name => "test", :parent_id=>nodes_id(:zena), :log_at=>"2006-07-20", :set_tag_ids=>[nodes_id(:news)])} }
+    assert_nothing_raised { note2 = secure!(Note) { Note.create(:title => "test", :parent_id=>nodes_id(:zena), :log_at=>"2006-07-20", :set_tag_ids=>[nodes_id(:news)])} }
     assert !note2.new_record? , "Not a new record"
-    assert_equal "test", note2[:node_name]
+    assert_equal "test", note2.title
   end
 
 
-  def test_update_same_node_name
+  def test_update_same_title
     login(:tiger)
     note, note2 = nil, nil
-    assert_nothing_raised { note = secure!(Note) { Note.create(:node_name => "test", :parent_id=>nodes_id(:zena), :log_at=>"2006-06-20", :set_tag_ids=>[nodes_id(:news)])} }
+    assert_nothing_raised { note = secure!(Note) { Note.create(:title => "test", :parent_id=>nodes_id(:zena), :log_at=>"2006-06-20", :set_tag_ids=>[nodes_id(:news)])} }
     assert note , "Note created"
     assert ! note.new_record? , "Not a new record"
-    assert_equal "test", note[:node_name]
+    assert_equal "test", note.title
 
-    assert_nothing_raised { note2 = secure!(Note) { Note.create(:node_name => "asdf", :parent_id=>nodes_id(:zena), :log_at=>"2006-06-20", :set_tag_ids=>[nodes_id(:news)])} }
+    assert_nothing_raised { note2 = secure!(Note) { Note.create(:title => "asdf", :parent_id=>nodes_id(:zena), :log_at=>"2006-06-20", :set_tag_ids=>[nodes_id(:news)])} }
     assert note , "Note created"
     assert ! note2.new_record? , "Not a new record"
 
-    note2.node_name = "test"
+    note2.title = "test"
     assert note2.save
   end
 
   def test_default_set_event_at
     login(:tiger)
-    note = secure!(Note) { Note.create(:node_name => 'test', :parent_id => nodes_id(:zena), :event_at => '2009-06-15')}
+    note = secure!(Note) { Note.create(:title => 'test', :parent_id => nodes_id(:zena), :event_at => '2009-06-15')}
     assert_equal '2009-06-15', note.event_at.strftime('%Y-%m-%d')
     assert_equal '2009-06-15', note.log_at.strftime('%Y-%m-%d')
   end
 
   def test_default_set_log_at
     login(:tiger)
-    note = secure!(Note) { Note.create(:node_name => 'test', :parent_id => nodes_id(:zena), :log_at => '2009-06-15')}
+    note = secure!(Note) { Note.create(:title => 'test', :parent_id => nodes_id(:zena), :log_at => '2009-06-15')}
     assert_equal '2009-06-15', note.event_at.strftime('%Y-%m-%d')
     assert_equal '2009-06-15', note.log_at.strftime('%Y-%m-%d')
   end
 
   def test_default_set_log_at_and_event_at
     login(:tiger)
-    note = secure!(Note) { Note.create(:node_name => 'test', :parent_id => nodes_id(:zena), :event_at => '2009-06-15', :log_at => '2009-06-16')}
+    note = secure!(Note) { Note.create(:title => 'test', :parent_id => nodes_id(:zena), :event_at => '2009-06-15', :log_at => '2009-06-16')}
     assert_equal '2009-06-15', note.event_at.strftime('%Y-%m-%d')
     assert_equal '2009-06-16', note.log_at.strftime('%Y-%m-%d')
   end

data/test/unit/page_test.rb

@@ -2,67 +2,25 @@ require 'test_helper'
 
 class PageTest < Zena::Unit::TestCase
 
-  def test_create_just_title
-    login(:tiger)
-    node = secure!(Page) { Page.create(:parent_id=>nodes_id(:projects), :title=>'lazy node')}
-    err node
-    assert !node.new_record?
-    assert_equal 'lazyNode', node.node_name
-    assert_equal 'lazy node', node.title
-  end
-
-  def test_create_same_node_name
-    login(:tiger)
-    node = secure!(Page) { Page.create(:parent_id=>nodes_id(:projects), :node_name =>'wiki')}
-    assert node.new_record?
-    assert_equal 'has already been taken', node.errors[:node_name]
-  end
-
-  def test_create_same_node_name_other_parent
-    login(:tiger)
-    node = secure!(Page) { Page.create(:parent_id=>nodes_id(:cleanWater), :node_name =>'wiki')}
-    err node
-    assert ! node.new_record?, 'Not a new record'
-    assert_nil node.errors[:node_name] #.empty?
-  end
-
-  def test_create_same_node_name_other_parent_with_cache
-    with_caching do
+  context 'Creating a page' do
+    setup do
       login(:tiger)
-      node = secure!(Page) { Page.create(:parent_id=>nodes_id(:cleanWater), :node_name =>'wiki')}
-      err node
-      assert ! node.new_record?, 'Not a new record'
-      assert_nil node.errors[:node_name] #.empty?
     end
-  end
 
-  def test_update_same_node_name
-    login(:tiger)
-    node = secure!(Node) { nodes(:cleanWater) }
-    # publish so that we change node_name and check uniqueness
-    assert !node.update_attributes('title' => 'wiki', :v_status => Zena::Status[:pub])
-    assert_equal 'has already been taken', node.errors[:node_name]
-  end
-
-  def test_update_same_node_name_other_parent
-    login(:tiger)
-    node = secure!(Node) { nodes(:cleanWater) }
-    node.node_name = 'wiki'
-    node[:parent_id] = nodes_id(:zena)
-    assert node.save
-    assert_nil node.errors[:node_name] #.empty?
-  end
+    should 'work with just a title' do
+      assert_difference('Node.count', 1) do
+        secure(Page) { Page.create(:parent_id=>nodes_id(:projects), :title=>'lazy node')}
+      end
+    end
 
-  def test_update_same_node_name_other_parent_with_cache
-    with_caching do
-      login(:tiger)
-      node = secure!(Node) { nodes(:cleanWater) }
-      node.node_name = 'wiki'
-      node[:parent_id] = nodes_id(:zena)
-      assert node.save
-      assert_nil node.errors[:node_name] #.empty?
+    should 'allow same title' do
+      wiki_title = nodes(:wiki).title
+      assert_difference('Node.count', 1) do
+        page = secure(Page) { Page.create(:parent_id=>nodes_id(:projects), :title => wiki_title)}
+        assert_equal page.title, wiki_title
+      end
     end
-  end
+  end # Creating a page
 
   def test_custom_base_path
     login(:tiger)
@@ -72,8 +30,8 @@ class PageTest < Zena::Unit::TestCase
     assert_equal '', bird.basepath
     assert_equal node[:id], bird[:parent_id]
     assert node.update_attributes(:custom_base => true)
-    assert_equal 'projects/aWikiWithZena', node.basepath
+    assert_equal '18/29', node.basepath
     bird = secure!(Node) { nodes(:bird_jpg)}
-    assert_equal 'projects/aWikiWithZena', bird.basepath
+    assert_equal '18/29', bird.basepath
   end
 end

data/test/unit/project_test.rb

@@ -5,11 +5,11 @@ class ProjectTest < Zena::Unit::TestCase
 
   def test_project_id_on_create
     login(:tiger)
-    node = secure!(Project) { Project.create(:parent_id=>nodes_id(:status), :node_name =>'SuperProject') }
+    node = secure!(Project) { Project.create(:parent_id=>nodes_id(:status), :title =>'SuperProject') }
     assert ! node.new_record?, 'Not a new record'
     assert_equal node[:id], node.get_project_id
     assert_equal nodes_id(:cleanWater), node[:project_id]
-    child = secure!(Page) { Page.create(:parent_id=>node[:id], :node_name =>'child')}
+    child = secure!(Page) { Page.create(:parent_id=>node[:id], :title =>'child')}
     assert ! node.new_record?, "Not a new record"
     assert_equal node[:id], child[:project_id]
   end

data/test/unit/relation_proxy_test.rb

@@ -84,6 +84,21 @@ class RelationProxyTest < Zena::Unit::TestCase
     assert_equal [nodes_zip(:art)], node.set_tag_zips
   end
 
+  context 'On a new node' do
+    subject do
+      secure(Node) { Node.new_node(:class => 'Contact')}
+    end
+
+    should 'not fail to find node proxy' do
+      assert_kind_of RelationProxy, subject.rel['icon']
+    end
+
+    should 'resolve zip values without query' do
+      assert_nil subject.rel['icon'].other_zip
+    end
+  end # On a new node
+
+
   def test_relation_proxy
     node = secure!(Node) { nodes(:status) }
     assert node.relation_proxy('hot_for')
@@ -96,12 +111,12 @@ class RelationProxyTest < Zena::Unit::TestCase
   end
 
   def test_relation_proxy_new_node
-    node = secure!(Node) { Node.new_from_class('Post') }
+    node = secure!(Node) { Node.new_node('class' => 'Post') }
     assert rel = node.relation_proxy('blog')
     assert_equal relations_id(:post_has_blogs), rel[:id]
 
     # Any new node can have a relation_proxy (used when forms contain the 'klass' attribute selected by the user).
-    node = secure!(Node) { Node.new_from_class('Node') }
+    node = secure!(Node) { Node.new_node('class' => 'Node') }
     assert rel = node.relation_proxy('blog')
     assert_equal relations_id(:post_has_blogs), rel[:id]
   end
@@ -120,7 +135,6 @@ class RelationProxyTest < Zena::Unit::TestCase
       Note    => ["blog", "calendar", "favorite_for", "home_for", "hot_for", "icon", "reference", "reference_for", "set_tag"],
       Image   => ["favorite_for", "home_for", "hot_for", "icon", "icon_for", "reference", "reference_for", "set_tag"],
       Project => ["added_note", "collaborator", "favorite_for", "home", "home_for", "hot", "hot_for", "icon", "news", "reference", "reference_for", "set_tag"],
-      BaseContact => ["collaborator_for", "favorite", "favorite_for", "home_for", "hot_for", "icon", "reference", "reference_for", "set_tag"],
     }.each do |klass, roles|
       node = secure!(klass) { klass.find(:first) }
       assert_equal roles, node.relations_for_form.map{|a,b| a}
@@ -228,22 +242,101 @@ class RelationProxyTest < Zena::Unit::TestCase
     assert_equal 'woopi', wiki.comment
   end
 
+  context 'Adding a link' do
+    setup do
+      login(:lion)
+    end
+
+    subject do
+      secure(Node) { nodes(:letter) }
+    end
+
+    context 'with an invalid id' do
+      setup do
+        subject.add_link('calendar', :other_id => 1)
+      end
+
+      should 'not save' do
+        assert !subject.save
+      end
+
+      should 'set an error on the relation' do
+        assert !subject.save
+        assert_equal 'id => invalid target', subject.errors['calendar']
+      end
+    end # with an invalid id
+
+    context 'with an invalid zip' do
+      setup do
+        subject.add_link('calendar', :other_zip => 1, :comment => 'haha')
+      end
+
+      should 'not create links' do
+        assert_difference('Link.count', 0) do
+          assert !subject.save
+        end
+      end
+
+      should 'set an error on the relation' do
+        subject.save
+        assert_equal '1 => could not be found', subject.errors['calendar']
+      end
+    end # with an invalid zip
+  end # Adding a link
+
+  context 'With a user' do
+    setup do
+      login(:tiger)
+    end
+
+    context 'adding many links from qb' do
+      subject do
+        visitor.node
+      end
+
+      should 'create links' do
+        assert_difference('Link.count', 4) do
+          subject.update_attributes('rel' => {'reference' => "images in site"})
+        end
+      end
+
+      should 'clear with empty qb' do
+        subject.update_attributes('rel' => {'reference' => "images in site"})
+
+        # clear
+        assert_difference('Link.count', -4) do
+          subject.update_attributes('rel' => {'reference' => ''})
+        end
+      end
+
+      should 'clear with empty found list' do
+        subject.update_attributes('rel' => {'reference' => "images in site"})
+
+        # clear
+        assert_difference('Link.count', -4) do
+          subject.update_attributes('rel' => {'reference' => 'nodes where title = "scrumbled eggs" in site'})
+        end
+      end
+    end # Adding many links from qb
+  end # With a user
+
+
   def test_add_link_bad_target
     login(:lion)
     node = secure!(Node) { nodes(:letter) }
     node.add_link('calendar', :other_id => 1) # bad id
     assert !node.save
-    assert_equal 'invalid target', node.errors['calendar']
+    assert_equal 'id => invalid target', node.errors['calendar']
 
     node = secure!(Node) { nodes(:letter) }
     node.add_link('calendar', :other_id => 1, :comment => 'woopi')
     assert !node.save
-    assert_equal 'invalid target', node.errors['calendar']
+    assert_equal 'id => invalid target', node.errors['calendar']
 
     node = secure!(Node) { nodes(:letter) }
     node.add_link('calendar', :other_id => nil, :comment => 'woopi')
     assert !node.save
-    assert_equal 'invalid target', node.errors['calendar']
+    assert_equal 'id => invalid target', node.errors['calendar']
   end
 
   def test_set_link_many_targets
@@ -407,25 +500,59 @@ class RelationProxyTest < Zena::Unit::TestCase
     assert_equal Time.gm(2009,7,17), references.first.l_date
   end
 
-  def test_remove_link_many_targets_different_dates
-    login(:lion)
-    node = secure!(Node) { nodes(:cleanWater) }
-    assert node.update_attributes_with_transformation('rel_attributes' => {'reference_attributes' => {'other_id' => 33, 'date' => '2009-7-17'}})
-    assert node.update_attributes_with_transformation('rel_attributes' => {'reference_attributes' => {'other_id' => 33, 'date' => '2009-7-18 8:0'}})
-    assert node.update_attributes_with_transformation('rel_attributes' => {'reference_attributes' => {'other_id' => 33, 'date' => '2009-7-18 9:0'}})
-    node = secure!(Node) { nodes(:cleanWater) }
-    # remove 9:0
-    assert node.update_attributes_with_transformation('rel_attributes' => {'reference_attributes' => {'other_id' => '', 'date' => '2009-7-18 9:0'}})
-
-    assert references = node.find(:all, 'references')
-    assert_equal 2, references.size
-    assert_equal Time.gm(2009,7,17), references.first.l_date
-    assert_equal Time.gm(2009,7,18,8), references.last.l_date
-  end
+  context 'with many dates for a given target' do
+    setup do
+      login(:lion)
+      node = secure!(Node) { nodes(:cleanWater) }
+      assert node.update_attributes_with_transformation('rel_attributes' => {'reference_attributes' => {'other_id' => 33, 'date' => '2009-7-17'}})
+      assert node.update_attributes_with_transformation('rel_attributes' => {'reference_attributes' => {'other_id' => 33, 'date' => '2009-7-18 8:0'}})
+      assert node.update_attributes_with_transformation('rel_attributes' => {'reference_attributes' => {'other_id' => 33, 'date' => '2009-7-18 9:0'}})
+    end
+    
+    subject do
+      secure!(Node) { nodes(:cleanWater) }
+    end
 
+    should 'remove matching date when setting other_id to blank' do
+      assert_difference('Link.count', -1) do
+        # remove 9:0
+        assert subject.update_attributes_with_transformation('rel_attributes' => {'reference_attributes' => {'other_id' => '', 'date' => '2009-7-18 9:0'}})
+      end      
+      
+      assert references = subject.find(:all, 'references')
+      assert_equal 2, references.size
+      assert_equal Time.gm(2009,7,17), references.first.l_date
+      assert_equal Time.gm(2009,7,18,8), references.last.l_date
+    end
+  end # with many dates for a given target
+  
   def test_attr_public
     assert Node.safe_method_type(['l_status'])
     assert Node.safe_method_type(['l_comment'])
     assert Node.safe_method_type(['l_date'])
   end
+
+  context 'With many links' do
+    subject do
+      node = secure(Node) { nodes(:cleanWater)}
+    end
+
+    setup do
+      login(:lion)
+      node = secure(Node) { nodes(:cleanWater)}
+      assert_difference('Link.count', 3) do
+        node.update_attributes_with_transformation('reference_ids' => [:art, :menu, :bird_jpg].map {|s| nodes_zip(s)})
+      end
+    end
+
+    should 'use other_id to update status' do
+      assert_difference('Link.count', 0) do
+        assert subject.update_attributes_with_transformation('rel' => {'reference' => {'other_id' => nodes_zip(:art), :status => 100}})
+        err subject
+      end
+
+      assert_equal 100, subject.find(:first, 'reference where l_status = 100').l_status
+    end
+  end # With many links
+
 end

data/test/unit/relation_test.rb

@@ -61,6 +61,26 @@ class RelationTest < Zena::Unit::TestCase
         assert_equal sites_id(:zena), subject.site_id
       end
 
+      context 'with a relation group' do
+        subject do
+          Relation.create(
+            :source_role  => 'wife',
+            :target_role  => 'husband',
+            :source_kpath => 'NRC',
+            :target_kpath => 'NRC',
+            :rel_group    => 'marital'
+          )
+        end
+
+        should 'succeed' do
+          assert !subject.new_record?
+        end
+
+        should 'store rel_group info in relation' do
+          assert_equal 'marital', Relation.find(subject).rel_group
+        end
+      end # with a group
+
       context 'with blank source_role' do
         subject do
           Relation.create(
@@ -98,7 +118,7 @@ class RelationTest < Zena::Unit::TestCase
         should 'singularize source role' do
           assert_equal 'wife', subject[:source_role]
         end
-        
+
         should 'show source role as plural' do
           assert_equal 'wives', subject.source_role
         end
@@ -122,7 +142,7 @@ class RelationTest < Zena::Unit::TestCase
         should 'singularize target role' do
           assert_equal 'husband', subject[:target_role]
         end
-        
+
         should 'show target role as plural' do
           assert_equal 'husbands', subject.target_role
         end
@@ -144,7 +164,7 @@ class RelationTest < Zena::Unit::TestCase
         end
 
         should 'use target class as target name' do
-          assert_equal 'base_contact', subject.target_role
+          assert_equal 'contact', subject.target_role
         end
       end # with blank source_role
     end # on relation create