Rename Friend model to Friendship

This better describes what the model represents, which is the relationship
between the two users.

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index e41330c4b40306e808423796c70bf6ef5053a93f..d8e8f6d3a41da6485f2408c01c385e8411ac468b 100644 (file)
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -388,16 +388,16 @@ class UsersController < ApplicationController
 
     if @new_friend
       if request.post?
 
     if @new_friend
       if request.post?

-        friend = Friend.new
-        friend.befriender = current_user
-        friend.befriendee = @new_friend
+        friendship = Friendship.new
+        friendship.befriender = current_user
+        friendship.befriendee = @new_friend

         if current_user.is_friends_with?(@new_friend)
           flash[:warning] = t "users.make_friend.already_a_friend", :name => @new_friend.display_name
         if current_user.is_friends_with?(@new_friend)
           flash[:warning] = t "users.make_friend.already_a_friend", :name => @new_friend.display_name

-        elsif friend.save
+        elsif friendship.save

           flash[:notice] = t "users.make_friend.success", :name => @new_friend.display_name
           flash[:notice] = t "users.make_friend.success", :name => @new_friend.display_name

-          Notifier.friend_notification(friend).deliver_later
+          Notifier.friend_notification(friendship).deliver_later

         else
         else

-          friend.add_error(t("users.make_friend.failed", :name => @new_friend.display_name))
+          friendship.add_error(t("users.make_friend.failed", :name => @new_friend.display_name))

         end
 
         if params[:referer]
         end
 
         if params[:referer]


@@ -417,7 +417,7 @@ class UsersController < ApplicationController
     if @friend
       if request.post?
         if current_user.is_friends_with?(@friend)
     if @friend
       if request.post?
         if current_user.is_friends_with?(@friend)

-          Friend.where(:user_id => current_user.id, :friend_user_id => @friend.id).delete_all
+          Friendship.where(:user_id => current_user.id, :friend_user_id => @friend.id).delete_all

           flash[:notice] = t "users.remove_friend.success", :name => @friend.display_name
         else
           flash[:error] = t "users.remove_friend.not_a_friend", :name => @friend.display_name
           flash[:notice] = t "users.remove_friend.success", :name => @friend.display_name
         else
           flash[:error] = t "users.remove_friend.not_a_friend", :name => @friend.display_name

diff --git a/app/models/friend.rb b/app/models/friendship.rb
similarity index 89%
rename from app/models/friend.rb
rename to app/models/friendship.rb
index 615da10767c1a9c08bf9e2895b8859df195ae239..27b25aee1b31313674db1d1578701873c921f160 100644 (file)
--- a/app/models/friend.rb
+++ b/app/models/friendship.rb
@@ -17,7 +17,9 @@
 #  friends_user_id_fkey         (user_id => users.id)
 #
 
 #  friends_user_id_fkey         (user_id => users.id)
 #
 

-class Friend < ActiveRecord::Base
+class Friendship < ActiveRecord::Base
+  self.table_name = "friends"
+

   belongs_to :befriender, :class_name => "User", :foreign_key => :user_id
   belongs_to :befriendee, :class_name => "User", :foreign_key => :friend_user_id
 end
   belongs_to :befriender, :class_name => "User", :foreign_key => :user_id
   belongs_to :befriendee, :class_name => "User", :foreign_key => :friend_user_id
 end

diff --git a/app/models/user.rb b/app/models/user.rb
index 2979b13d75309cb89a392db02df4fdef3fa6dcb0..36c98ed3eb10d133a94a951e8ed2a8f240bb56fb 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -57,8 +57,8 @@ class User < ActiveRecord::Base
   has_many :messages, -> { where(:to_user_visible => true).order(:sent_on => :desc).preload(:sender, :recipient) }, :foreign_key => :to_user_id
   has_many :new_messages, -> { where(:to_user_visible => true, :message_read => false).order(:sent_on => :desc) }, :class_name => "Message", :foreign_key => :to_user_id
   has_many :sent_messages, -> { where(:from_user_visible => true).order(:sent_on => :desc).preload(:sender, :recipient) }, :class_name => "Message", :foreign_key => :from_user_id
   has_many :messages, -> { where(:to_user_visible => true).order(:sent_on => :desc).preload(:sender, :recipient) }, :foreign_key => :to_user_id
   has_many :new_messages, -> { where(:to_user_visible => true, :message_read => false).order(:sent_on => :desc) }, :class_name => "Message", :foreign_key => :to_user_id
   has_many :sent_messages, -> { where(:from_user_visible => true).order(:sent_on => :desc).preload(:sender, :recipient) }, :class_name => "Message", :foreign_key => :from_user_id

-  has_many :friends, -> { joins(:befriendee).where(:users => { :status => %w[active confirmed] }) }
-  has_many :friend_users, :through => :friends, :source => :befriendee
+  has_many :friendships, -> { joins(:befriendee).where(:users => { :status => %w[active confirmed] }) }
+  has_many :friend_users, :through => :friendships, :source => :befriendee

   has_many :tokens, :class_name => "UserToken"
   has_many :preferences, :class_name => "UserPreference"
   has_many :changesets, -> { order(:created_at => :desc) }
   has_many :tokens, :class_name => "UserToken"
   has_many :preferences, :class_name => "UserPreference"
   has_many :changesets, -> { order(:created_at => :desc) }


@@ -224,7 +224,7 @@ class User < ActiveRecord::Base
   end
 
   def is_friends_with?(new_friend)
   end
 
   def is_friends_with?(new_friend)

-    friends.where(:friend_user_id => new_friend.id).exists?
+    friendships.where(:friend_user_id => new_friend.id).exists?

   end
 
   ##
   end
 
   ##

diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 87eb9b45feb1c44027c7317e679820d79e8334c5..b9266c836f08f9184b01f71fe2e4349cfde709f0 100644 (file)
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -194,7 +194,7 @@
       <%= content_tag "div", "", :id => "map", :class => "content_map", :data => { :user => user_data } %>
     <% end %>
 
       <%= content_tag "div", "", :id => "map", :class => "content_map", :data => { :user => user_data } %>
     <% end %>
 

-    <% friends = @user.friends.collect(&:befriendee) %>
+    <% friends = @user.friend_users %>

     <% nearby = @user.nearby - friends %>
 
   <div class="activity-block column-1">
     <% nearby = @user.nearby - friends %>
 
   <div class="activity-block column-1">

diff --git a/test/controllers/changesets_controller_test.rb b/test/controllers/changesets_controller_test.rb
index fad7a97d8387d5e5cc6977fea0f59779accc89f0..4501997b77f7a9219fcefafca487ed6f5d61dc1e 100644 (file)
--- a/test/controllers/changesets_controller_test.rb
+++ b/test/controllers/changesets_controller_test.rb
@@ -130,8 +130,8 @@ class ChangesetsControllerTest < ActionController::TestCase
   # Checks the display of the friends changesets listing
   def test_index_friends
     private_user = create(:user, :data_public => true)
   # Checks the display of the friends changesets listing
   def test_index_friends
     private_user = create(:user, :data_public => true)

-    friend = create(:friend, :befriender => private_user)
-    create(:changeset, :user => friend.befriendee)
+    friendship = create(:friendship, :befriender => private_user)
+    create(:changeset, :user => friendship.befriendee)

 
     get :index, :params => { :friends => true }
     assert_response :redirect
 
     get :index, :params => { :friends => true }
     assert_response :redirect

diff --git a/test/controllers/diary_entries_controller_test.rb b/test/controllers/diary_entries_controller_test.rb
index fd03758233c5699421b8025f8812fb493583a1f0..8414e18a704883272a74027021cb799b0b975879 100644 (file)
--- a/test/controllers/diary_entries_controller_test.rb
+++ b/test/controllers/diary_entries_controller_test.rb
@@ -528,8 +528,8 @@ class DiaryEntriesControllerTest < ActionController::TestCase
   def test_index_friends
     user = create(:user)
     other_user = create(:user)
   def test_index_friends
     user = create(:user)
     other_user = create(:user)

-    friend = create(:friend, :befriender => user)
-    diary_entry = create(:diary_entry, :user => friend.befriendee)
+    friendship = create(:friendship, :befriender => user)
+    diary_entry = create(:diary_entry, :user => friendship.befriendee)

     _other_entry = create(:diary_entry, :user => other_user)
 
     # Try a list of diary entries for your friends when not logged in
     _other_entry = create(:diary_entry, :user => other_user)
 
     # Try a list of diary entries for your friends when not logged in

diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
index 5dbd866a960f6fb74ec423f8bae97822b67c05b5..9b7e0408de99f48f42968c0961daeddf67dc7c90 100644 (file)
--- a/test/controllers/users_controller_test.rb
+++ b/test/controllers/users_controller_test.rb
@@ -988,7 +988,7 @@ class UsersControllerTest < ActionController::TestCase
     # Test a normal user
     user = create(:user, :home_lon => 1.1, :home_lat => 1.1)
     friend_user = create(:user, :home_lon => 1.2, :home_lat => 1.2)
     # Test a normal user
     user = create(:user, :home_lon => 1.1, :home_lat => 1.1)
     friend_user = create(:user, :home_lon => 1.2, :home_lat => 1.2)

-    create(:friend, :befriender => user, :befriendee => friend_user)
+    create(:friendship, :befriender => user, :befriendee => friend_user)

     create(:changeset, :user => friend_user)
 
     get :show, :params => { :display_name => user.display_name }
     create(:changeset, :user => friend_user)
 
     get :show, :params => { :display_name => user.display_name }


@@ -1113,7 +1113,7 @@ class UsersControllerTest < ActionController::TestCase
     friend = create(:user)
 
     # Check that the users aren't already friends
     friend = create(:user)
 
     # Check that the users aren't already friends

-    assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
+    assert_nil Friendship.where(:user_id => user.id, :friend_user_id => friend.id).first

 
     # When not logged in a GET should ask us to login
     get :make_friend, :params => { :display_name => friend.display_name }
 
     # When not logged in a GET should ask us to login
     get :make_friend, :params => { :display_name => friend.display_name }


@@ -1122,7 +1122,7 @@ class UsersControllerTest < ActionController::TestCase
     # When not logged in a POST should error
     post :make_friend, :params => { :display_name => friend.display_name }
     assert_response :forbidden
     # When not logged in a POST should error
     post :make_friend, :params => { :display_name => friend.display_name }
     assert_response :forbidden

-    assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
+    assert_nil Friendship.where(:user_id => user.id, :friend_user_id => friend.id).first

 
     # When logged in a GET should get a confirmation page
     get :make_friend, :params => { :display_name => friend.display_name }, :session => { :user => user }
 
     # When logged in a GET should get a confirmation page
     get :make_friend, :params => { :display_name => friend.display_name }, :session => { :user => user }


@@ -1132,7 +1132,7 @@ class UsersControllerTest < ActionController::TestCase
       assert_select "input[type='hidden'][name='referer']", 0
       assert_select "input[type='submit']", 1
     end
       assert_select "input[type='hidden'][name='referer']", 0
       assert_select "input[type='submit']", 1
     end

-    assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
+    assert_nil Friendship.where(:user_id => user.id, :friend_user_id => friend.id).first

 
     # When logged in a POST should add the friendship
     assert_difference "ActionMailer::Base.deliveries.size", 1 do
 
     # When logged in a POST should add the friendship
     assert_difference "ActionMailer::Base.deliveries.size", 1 do


@@ -1142,7 +1142,7 @@ class UsersControllerTest < ActionController::TestCase
     end
     assert_redirected_to user_path(friend)
     assert_match(/is now your friend/, flash[:notice])
     end
     assert_redirected_to user_path(friend)
     assert_match(/is now your friend/, flash[:notice])

-    assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
+    assert Friendship.where(:user_id => user.id, :friend_user_id => friend.id).first

     email = ActionMailer::Base.deliveries.first
     assert_equal 1, email.to.count
     assert_equal friend.email, email.to.first
     email = ActionMailer::Base.deliveries.first
     assert_equal 1, email.to.count
     assert_equal friend.email, email.to.first


@@ -1156,7 +1156,7 @@ class UsersControllerTest < ActionController::TestCase
     end
     assert_redirected_to user_path(friend)
     assert_match(/You are already friends with/, flash[:warning])
     end
     assert_redirected_to user_path(friend)
     assert_match(/You are already friends with/, flash[:warning])

-    assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
+    assert Friendship.where(:user_id => user.id, :friend_user_id => friend.id).first

   end
 
   def test_make_friend_with_referer
   end
 
   def test_make_friend_with_referer


@@ -1165,7 +1165,7 @@ class UsersControllerTest < ActionController::TestCase
     friend = create(:user)
 
     # Check that the users aren't already friends
     friend = create(:user)
 
     # Check that the users aren't already friends

-    assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
+    assert_nil Friendship.where(:user_id => user.id, :friend_user_id => friend.id).first

 
     # The GET should preserve any referer
     get :make_friend, :params => { :display_name => friend.display_name, :referer => "/test" }, :session => { :user => user }
 
     # The GET should preserve any referer
     get :make_friend, :params => { :display_name => friend.display_name, :referer => "/test" }, :session => { :user => user }


@@ -1175,7 +1175,7 @@ class UsersControllerTest < ActionController::TestCase
       assert_select "input[type='hidden'][name='referer'][value='/test']", 1
       assert_select "input[type='submit']", 1
     end
       assert_select "input[type='hidden'][name='referer'][value='/test']", 1
       assert_select "input[type='submit']", 1
     end

-    assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
+    assert_nil Friendship.where(:user_id => user.id, :friend_user_id => friend.id).first

 
     # When logged in a POST should add the friendship and refer us
     assert_difference "ActionMailer::Base.deliveries.size", 1 do
 
     # When logged in a POST should add the friendship and refer us
     assert_difference "ActionMailer::Base.deliveries.size", 1 do


@@ -1185,7 +1185,7 @@ class UsersControllerTest < ActionController::TestCase
     end
     assert_redirected_to "/test"
     assert_match(/is now your friend/, flash[:notice])
     end
     assert_redirected_to "/test"
     assert_match(/is now your friend/, flash[:notice])

-    assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
+    assert Friendship.where(:user_id => user.id, :friend_user_id => friend.id).first

     email = ActionMailer::Base.deliveries.first
     assert_equal 1, email.to.count
     assert_equal friend.email, email.to.first
     email = ActionMailer::Base.deliveries.first
     assert_equal 1, email.to.count
     assert_equal friend.email, email.to.first


@@ -1203,10 +1203,10 @@ class UsersControllerTest < ActionController::TestCase
     # Get users to work with
     user = create(:user)
     friend = create(:user)
     # Get users to work with
     user = create(:user)
     friend = create(:user)

-    create(:friend, :befriender => user, :befriendee => friend)
+    create(:friendship, :befriender => user, :befriendee => friend)

 
     # Check that the users are friends
 
     # Check that the users are friends

-    assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
+    assert Friendship.where(:user_id => user.id, :friend_user_id => friend.id).first

 
     # When not logged in a GET should ask us to login
     get :remove_friend, :params => { :display_name => friend.display_name }
 
     # When not logged in a GET should ask us to login
     get :remove_friend, :params => { :display_name => friend.display_name }


@@ -1215,7 +1215,7 @@ class UsersControllerTest < ActionController::TestCase
     # When not logged in a POST should error
     post :remove_friend, :params => { :display_name => friend.display_name }
     assert_response :forbidden
     # When not logged in a POST should error
     post :remove_friend, :params => { :display_name => friend.display_name }
     assert_response :forbidden

-    assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
+    assert Friendship.where(:user_id => user.id, :friend_user_id => friend.id).first

 
     # When logged in a GET should get a confirmation page
     get :remove_friend, :params => { :display_name => friend.display_name }, :session => { :user => user }
 
     # When logged in a GET should get a confirmation page
     get :remove_friend, :params => { :display_name => friend.display_name }, :session => { :user => user }


@@ -1225,29 +1225,29 @@ class UsersControllerTest < ActionController::TestCase
       assert_select "input[type='hidden'][name='referer']", 0
       assert_select "input[type='submit']", 1
     end
       assert_select "input[type='hidden'][name='referer']", 0
       assert_select "input[type='submit']", 1
     end

-    assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
+    assert Friendship.where(:user_id => user.id, :friend_user_id => friend.id).first

 
     # When logged in a POST should remove the friendship
     post :remove_friend, :params => { :display_name => friend.display_name }, :session => { :user => user }
     assert_redirected_to user_path(friend)
     assert_match(/was removed from your friends/, flash[:notice])
 
     # When logged in a POST should remove the friendship
     post :remove_friend, :params => { :display_name => friend.display_name }, :session => { :user => user }
     assert_redirected_to user_path(friend)
     assert_match(/was removed from your friends/, flash[:notice])

-    assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
+    assert_nil Friendship.where(:user_id => user.id, :friend_user_id => friend.id).first

 
     # A second POST should report that the friendship does not exist
     post :remove_friend, :params => { :display_name => friend.display_name }, :session => { :user => user }
     assert_redirected_to user_path(friend)
     assert_match(/is not one of your friends/, flash[:error])
 
     # A second POST should report that the friendship does not exist
     post :remove_friend, :params => { :display_name => friend.display_name }, :session => { :user => user }
     assert_redirected_to user_path(friend)
     assert_match(/is not one of your friends/, flash[:error])

-    assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
+    assert_nil Friendship.where(:user_id => user.id, :friend_user_id => friend.id).first

   end
 
   def test_remove_friend_with_referer
     # Get users to work with
     user = create(:user)
     friend = create(:user)
   end
 
   def test_remove_friend_with_referer
     # Get users to work with
     user = create(:user)
     friend = create(:user)

-    create(:friend, :user_id => user.id, :friend_user_id => friend.id)
+    create(:friendship, :user_id => user.id, :friend_user_id => friend.id)

 
     # Check that the users are friends
 
     # Check that the users are friends

-    assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
+    assert Friendship.where(:user_id => user.id, :friend_user_id => friend.id).first

 
     # The GET should preserve any referer
     get :remove_friend, :params => { :display_name => friend.display_name, :referer => "/test" }, :session => { :user => user }
 
     # The GET should preserve any referer
     get :remove_friend, :params => { :display_name => friend.display_name, :referer => "/test" }, :session => { :user => user }


@@ -1257,13 +1257,13 @@ class UsersControllerTest < ActionController::TestCase
       assert_select "input[type='hidden'][name='referer'][value='/test']", 1
       assert_select "input[type='submit']", 1
     end
       assert_select "input[type='hidden'][name='referer'][value='/test']", 1
       assert_select "input[type='submit']", 1
     end

-    assert Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
+    assert Friendship.where(:user_id => user.id, :friend_user_id => friend.id).first

 
     # When logged in a POST should remove the friendship and refer
     post :remove_friend, :params => { :display_name => friend.display_name, :referer => "/test" }, :session => { :user => user }
     assert_redirected_to "/test"
     assert_match(/was removed from your friends/, flash[:notice])
 
     # When logged in a POST should remove the friendship and refer
     post :remove_friend, :params => { :display_name => friend.display_name, :referer => "/test" }, :session => { :user => user }
     assert_redirected_to "/test"
     assert_match(/was removed from your friends/, flash[:notice])

-    assert_nil Friend.where(:user_id => user.id, :friend_user_id => friend.id).first
+    assert_nil Friendship.where(:user_id => user.id, :friend_user_id => friend.id).first

   end
 
   def test_remove_friend_unkown_user
   end
 
   def test_remove_friend_unkown_user

diff --git a/test/factories/friends.rb b/test/factories/friendships.rb
similarity index 83%
rename from test/factories/friends.rb
rename to test/factories/friendships.rb
index 15317ee0cb51e863b66b7cc21ee98d6d13c117e4..4879373a8de63ee47dd042d145a124e079dfede4 100644 (file)
--- a/test/factories/friends.rb
+++ b/test/factories/friendships.rb
@@ -1,5 +1,5 @@
 FactoryBot.define do
 FactoryBot.define do

-  factory :friend do
+  factory :friendship do

     association :befriender, :factory => :user
     association :befriendee, :factory => :user
   end
     association :befriender, :factory => :user
     association :befriendee, :factory => :user
   end

diff --git a/test/models/user_test.rb b/test/models/user_test.rb
index a17c30deb5eded5191d4e99ff872696d3efc97da..42ea9a8740817154019eaa19ca12a882128870a3 100644 (file)
--- a/test/models/user_test.rb
+++ b/test/models/user_test.rb
@@ -105,7 +105,7 @@ class UserTest < ActiveSupport::TestCase
     alice = create(:user, :active)
     bob = create(:user, :active)
     charlie = create(:user, :active)
     alice = create(:user, :active)
     bob = create(:user, :active)
     charlie = create(:user, :active)

-    create(:friend, :befriender => alice, :befriendee => bob)
+    create(:friendship, :befriender => alice, :befriendee => bob)

 
     assert alice.is_friends_with?(bob)
     assert_not alice.is_friends_with?(charlie)
 
     assert alice.is_friends_with?(bob)
     assert_not alice.is_friends_with?(charlie)


@@ -139,7 +139,7 @@ class UserTest < ActiveSupport::TestCase
   def test_friend_users
     norm = create(:user, :active)
     sec = create(:user, :active)
   def test_friend_users
     norm = create(:user, :active)
     sec = create(:user, :active)

-    create(:friend, :befriender => norm, :befriendee => sec)
+    create(:friendship, :befriender => norm, :befriendee => sec)

 
     assert_equal [sec], norm.friend_users
     assert_equal 1, norm.friend_users.size
 
     assert_equal [sec], norm.friend_users
     assert_equal 1, norm.friend_users.size