7 files changed, 65 insertions, 4 deletions

diff --git a/app/helpers/nodes_helper.rb b/app/helpers/nodes_helper.rb
index 79e75dc..d889719 100644
--- a/app/helpers/nodes_helper.rb
+++ b/app/helpers/nodes_helper.rb
@@ -21,6 +21,9 @@ module NodesHelper
     Page.custom_templates.map {|x| [x.gsub("_", " ").titlecase, x]}
   end
   
+  def user_list
+    User.all.map {|u| [u.login, u.id]}
+  end
   
   def event_information
     if @node.event
diff --git a/app/models/node.rb b/app/models/node.rb
index db484f9..7a79594 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -80,7 +80,7 @@ class Node < ActiveRecord::Base
   
   def create_new_draft user
     empty_page = self.pages.create!
-    empty_page.user = user
+    empty_page.user = user unless (self.head && self.head.user)
     empty_page.save
     
     empty_page.clone_attributes_from self.head
@@ -159,6 +159,10 @@ class Node < ActiveRecord::Base
     !children.empty? && !children.first.path_to_root.include?(self.slug)
   end
   
+  def head?
+    head_id
+  end
+  
   protected
     def lock_for! current_user
       self.lock_owner = current_user
diff --git a/app/models/page.rb b/app/models/page.rb
index 29fcae6..8eeab53 100644
--- a/app/models/page.rb
+++ b/app/models/page.rb
@@ -38,7 +38,7 @@ class Page < ActiveRecord::Base
   before_save   :rewrite_links_in_body
   
   # Security
-  attr_accessible :title, :abstract, :body, :template_name, :published_at
+  attr_accessible :title, :abstract, :body, :template_name, :published_at, :user_id
   
   # Class Methods
   
@@ -126,6 +126,7 @@ class Page < ActiveRecord::Base
     self.tag_list = page.tag_list
     self.template_name = page.template_name
     self.published_at = page.published_at
+    self.user = page.user
     
     # Getting rid of the auto-generated empty translations
     self.globalize_translations.delete_all
diff --git a/app/views/nodes/edit.html.erb b/app/views/nodes/edit.html.erb
index 0063dd9..8e27d0f 100644
--- a/app/views/nodes/edit.html.erb
+++ b/app/views/nodes/edit.html.erb
@@ -55,6 +55,10 @@
         <td><%= d.select :template_name, custom_page_templates, {:prompt => 'Select Template'} %></td>
       </tr>
       <tr>
+        <td class="description">Author</td>
+        <td><%= d.select :user_id, user_list %></td>
+      </tr>
+      <tr>
         <td class="description">Images</td>
         <td> 
           <ul id="image_box" rel="<%= @draft.id %>">
diff --git a/test/functional/nodes_controller_test.rb b/test/functional/nodes_controller_test.rb
index f8d42da..8710c0b 100644
--- a/test/functional/nodes_controller_test.rb
+++ b/test/functional/nodes_controller_test.rb
@@ -57,12 +57,12 @@ class NodesControllerTest < ActionController::TestCase
       post( 
         :create,
         :kind => "top_level",
-        :title => "Hello Spaceboy"
+        :title => "Hello My Spaceboy"
       )
     end
     
     assert_response :redirect
-    expected = "hello-spaceboy"
+    expected = "hello-my-spaceboy"
     assert_equal expected, Node.last.unique_name
     assert_equal 1, Node.last.level
   end
@@ -261,6 +261,29 @@ class NodesControllerTest < ActionController::TestCase
     node.publish_draft!
     
     assert Node.valid?
+  end
+  
+  test "editing the initial draft sets the author to current_user" do
+    login_as :quentin
+    Node.root.descendants.destroy_all
+    node  = create_node_with_draft
+    get :edit, :id => node.id
+    assert_equal "quentin", node.draft.user.login
+  end
+  
+  test "updating the author of a node with existing head" do
+    login_as :quentin
+    Node.root.descendants.destroy_all
+    node  = create_node_with_published_page
+    assert_equal "quentin", node.head.user.login
+    node.find_or_create_draft users(:quentin)
+    assert node.draft.valid?
+    assert node.valid?
+    
+    put :update, :id => node.id, :page => {:user_id => users(:aaron).id}
+    assert_response :redirect
+    assert_equal "aaron", node.reload.draft.user.login
+
     
   end
 end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 023ed96..cda54bc 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -45,6 +45,7 @@ class ActiveSupport::TestCase
     draft.title = "Test"
     draft.abstract = "Test"
     draft.body = "Test"
+    draft.user = users(:quentin)
     node.publish_draft!
     node
   end
diff --git a/test/unit/node_test.rb b/test/unit/node_test.rb
index 92870aa..77e9cad 100644
--- a/test/unit/node_test.rb
+++ b/test/unit/node_test.rb
@@ -230,6 +230,31 @@ class NodeTest < ActiveSupport::TestCase
     assert_equal 4, test_node.draft.revision
   end
   
+  test "a new revision keeps the initial user" do
+    Node.root.descendants.destroy_all
+    node  = create_node_with_draft
+    draft = node.draft
+    draft.user = users(:aaron)
+    draft.save
+    node.publish_draft!
+    new_draft = node.find_or_create_draft( users(:quentin) )
+    assert_equal "aaron", new_draft.user.login
+  end
+  
+  test "a new revision can overwrite the initial author" do
+    Node.root.descendants.destroy_all
+    node  = create_node_with_draft
+    draft = node.draft
+    draft.user = users(:aaron)
+    draft.save
+    node.publish_draft!
+    new_draft = node.find_or_create_draft( users(:quentin) )
+    new_draft.user_id = users(:quentin).id
+    new_draft.save
+    node.publish_draft!
+    assert_equal "quentin", node.head.user.login
+  end
+  
   def create_revisions node, count
     count.times do
       node.find_or_create_draft @user1