Merge pull request #357 from joshk/assign_attributes.

Assign protected attributes with create/new and control the role.

1 files changed, 17 insertions, 6 deletions

diff --git a/activerecord/test/models/person.rb b/activerecord/test/models/person.rb
index 9c4794902d..a58c9bf572 100644
--- a/activerecord/test/models/person.rb
+++ b/activerecord/test/models/person.rb
@@ -1,6 +1,6 @@
 class Person < ActiveRecord::Base
   has_many :readers
-  has_one :reader
+  has_one  :reader
 
   has_many :posts, :through => :readers
   has_many :posts_with_no_comments, :through => :readers, :source => :post, :include => :comments, :conditions => 'comments.id is null'
@@ -8,23 +8,23 @@ class Person < ActiveRecord::Base
   has_many :references
   has_many :bad_references
   has_many :fixed_bad_references, :conditions => { :favourite => true }, :class_name => 'BadReference'
-  has_one :favourite_reference, :class_name => 'Reference', :conditions => ['favourite=?', true]
+  has_one  :favourite_reference, :class_name => 'Reference', :conditions => ['favourite=?', true]
   has_many :posts_with_comments_sorted_by_comment_id, :through => :readers, :source => :post, :include => :comments, :order => 'comments.id'
 
   has_many :jobs, :through => :references
-  has_many :jobs_with_dependent_destroy, :source => :job, :through => :references, :dependent => :destroy
+  has_many :jobs_with_dependent_destroy,    :source => :job, :through => :references, :dependent => :destroy
   has_many :jobs_with_dependent_delete_all, :source => :job, :through => :references, :dependent => :delete_all
-  has_many :jobs_with_dependent_nullify, :source => :job, :through => :references, :dependent => :nullify
+  has_many :jobs_with_dependent_nullify,    :source => :job, :through => :references, :dependent => :nullify
 
   belongs_to :primary_contact, :class_name => 'Person'
   has_many :agents, :class_name => 'Person', :foreign_key => 'primary_contact_id'
   has_many :agents_of_agents, :through => :agents, :source => :agents
   belongs_to :number1_fan, :class_name => 'Person'
 
-  has_many :agents_posts, :through => :agents, :source => :posts
+  has_many :agents_posts,         :through => :agents,       :source => :posts
   has_many :agents_posts_authors, :through => :agents_posts, :source => :author
 
-  scope :males, :conditions => { :gender => 'M' }
+  scope :males,   :conditions => { :gender => 'M' }
   scope :females, :conditions => { :gender => 'F' }
 end
 
@@ -56,14 +56,25 @@ class LoosePerson < ActiveRecord::Base
 
   attr_protected :comments
   attr_protected :as => :admin
+
+  has_one    :best_friend,    :class_name => 'LoosePerson', :foreign_key => :best_friend_id
+  belongs_to :best_friend_of, :class_name => 'LoosePerson', :foreign_key => :best_friend_of_id
+
+  has_many   :best_friends,   :class_name => 'LoosePerson', :foreign_key => :best_friend_id
 end
 
 class LooseDescendant < LoosePerson; end
 
 class TightPerson < ActiveRecord::Base
   self.table_name = 'people'
+
   attr_accessible :first_name, :gender
   attr_accessible :first_name, :gender, :comments, :as => :admin
+
+  has_one    :best_friend,    :class_name => 'TightPerson', :foreign_key => :best_friend_id
+  belongs_to :best_friend_of, :class_name => 'TightPerson', :foreign_key => :best_friend_of_id
+
+  has_many   :best_friends,   :class_name => 'TightPerson', :foreign_key => :best_friend_id
 end
 
 class TightDescendant < TightPerson; end
\ No newline at end of file