connected page and node model + some minor tweaks

5 files changed, 59 insertions, 4 deletions

diff --git a/app/models/node.rb b/app/models/node.rb
index e2ff973..cac4495 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -1,6 +1,8 @@
 class Node < ActiveRecord::Base
   acts_as_nested_set
   
+  has_many :pages
+  
   # returns array with pages up to root excluding root
   def path_to_root
     parent.nil? && [slug] || parent.path_to_root.push(slug)
diff --git a/config/routes.rb b/config/routes.rb
index cbad5cc..96d56de 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,4 +1,6 @@
 ActionController::Routing::Routes.draw do |map|
+  map.resources :pages
+
   
   map.connect   ':language/*pagepath',
                 :controller => 'content', :action => 'render_page', 
diff --git a/test/fixtures/nodes.yml b/test/fixtures/nodes.yml
index 9879d9f..3f89f6d 100644
--- a/test/fixtures/nodes.yml
+++ b/test/fixtures/nodes.yml
@@ -3,6 +3,16 @@
 one:
   id: 1
   lft: 1
-  rgt: 2
+  rgt: 4
+  parent_id:
+  slug:
+  unique_name:
+
+
+two:
+  id: 2
+  lft: 2
+  rgt: 3
+  parent_id: 1
   slug: my_first_page
   unique_name: root/my_first_page
diff --git a/test/unit/node_test.rb b/test/unit/node_test.rb
index a311b84..14fdad0 100644
--- a/test/unit/node_test.rb
+++ b/test/unit/node_test.rb
@@ -1,8 +1,49 @@
 require 'test_helper'
 
 class NodeTest < ActiveSupport::TestCase
-  # Replace this with your real tests.
-  test "the truth" do
-    assert true
+  
+  def setup
+    @root = Node.find(1)
+    @first_child = Node.find(2)
+  end
+  
+  def test_creation_of_unique_name
+    node = Node.create :slug => 'child'
+    node.move_to_child_of @root
+    node.reload
+    assert_equal 'child', node.unique_name
+    
+    node = Node.create :slug => 'deep_child'
+    node.move_to_child_of @first_child
+    node.reload
+    assert_equal 'my_first_page/deep_child', node.unique_name
+  end
+  
+  def test_retrieving_page_current
+    
+  end
+  
+  def test_retrieving_page_by_revision
+    
+  end
+  
+  def test_behavior_of_acts_as_list
+    one   = @first_child.pages.create :title => "one"
+    two   = @first_child.pages.create :title => "two"
+    three = @first_child.pages.create :title => "three"
+    
+    assert_equal 1, one.revision
+    assert_equal 2, two.revision
+    assert_equal 3, three.revision
+    
+    assert_equal three, @first_child.pages.last
+    
+    assert one.move_to_bottom
+    
+    one.reload; two.reload; three.reload;
+    
+    assert_equal 3, one.revision
+    assert_equal 1, two.revision
+    assert_equal 2, three.revision
   end
 end
diff --git a/vendor/rails b/vendor/rails
-Subproject 8761663a68bd7ddd918f78fb3def4697784024f
+Subproject 2dedb5b03ab88a1c31068f71c8d4cad7c5a5d9a