renamed the module containing friendship model from 'Friendship' to '…

…Friendships'
kevinansfield · Mar 6, 2012 · aef9f05 · aef9f05
1 parent 6de57b6
commit aef9f05
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/lib/amistad.rb b/lib/amistad.rb
@@ -10,5 +10,5 @@ module Amistad
   autoload :MongoidFriendModel
   autoload :FriendshipModel
   autoload :FriendModel
-  autoload :Friendship
+  autoload :Friendships
 end
diff --git a/lib/amistad/active_record_friend_model.rb b/lib/amistad/active_record_friend_model.rb
@@ -7,7 +7,7 @@ module ActiveRecordFriendModel
       # friendships
       #####################################################################################
       has_many  :friendships,
-        :class_name => "Amistad::Friendship::#{Amistad.friendship_model}",
+        :class_name => "Amistad::Friendships::#{Amistad.friendship_model}",
         :foreign_key => "friendable_id"
 
       has_many  :pending_invited,
@@ -24,7 +24,7 @@ module ActiveRecordFriendModel
       # inverse friendships
       #####################################################################################
       has_many  :inverse_friendships,
-        :class_name => "Amistad::Friendship::#{Amistad.friendship_model}",
+        :class_name => "Amistad::Friendships::#{Amistad.friendship_model}",
         :foreign_key => "friend_id"
 
       has_many  :pending_invited_by,
@@ -41,7 +41,7 @@ module ActiveRecordFriendModel
       # blocked friendships
       #####################################################################################
       has_many  :blocked_friendships,
-        :class_name => "Amistad::Friendship::#{Amistad.friendship_model}",
+        :class_name => "Amistad::Friendships::#{Amistad.friendship_model}",
         :foreign_key => "blocker_id"
 
       has_many  :blockades,

diff --git a/lib/amistad/config.rb b/lib/amistad/config.rb
@@ -15,7 +15,7 @@ def friendship_model
     end
 
     def friendship_class
-      Amistad::Friendship.const_get(self.friendship_model)
+      Amistad::Friendships.const_get(self.friendship_model)
     end
   end
 end
diff --git a/lib/amistad/friendship.rb → lib/amistad/friendships.rb b/lib/amistad/friendship.rb → lib/amistad/friendships.rb
@@ -1,5 +1,5 @@
 module Amistad
-  module Friendship
+  module Friendships
     if Object.const_defined? :ActiveRecord
       const_set Amistad.friendship_model, Class.new(ActiveRecord::Base)
       const_get(Amistad.friendship_model.to_sym).class_exec do