amistad 0.6.0 → 0.7.0

data/CHANGELOG

@@ -1,3 +1,8 @@
+Version 0.6.0 (13.01.2011)
+--------------------------
+- add mongoid support
+- method remove changed to remove_friendship
+
 Version 0.6.0 (06.01.2011)
 --------------------------
 - improved blocking and unblocking friends

data/README.markdown

@@ -1,28 +1,24 @@
 # amistad #
 
-Amistad adds friendships management into a rails 3.0 application.
+Amistad adds friendships management into a rails 3.0 application. it supports ActiveRecord and Mongoid.
 
 ## Installation ##
 
-Just run the following command :
-
-    gem install amistad
-  
-Then in your Gemfile add the following line :
+Add the following line in your Gemfile:
 
     gem 'amistad'
 
-And run
+Then run:
 
     bundle install
 
 ## Usage ##
 
-First generate a friendship model :
+If you are using ActiveRecord, you need to generate a friendship model. Amistad has a generator for this task :
 
     rails generate amistad:install  
     
-This commands create a new model called __friendship__ in *'app/models'* :
+This command creates a new model called __friendship__ in *'app/models'* :
 
     class Friendship < ActiveRecord::Base
       include Amistad::FriendshipModel
@@ -32,12 +28,19 @@ It also creates a new migration for the friendship model so don't forget to migr
 
     rake db:migrate
 
-Then activate __amistad__ in your user model :
+If you are using Mongoig, you don't need a friendship model. Finally, activate __amistad__ in your user model :
 
     class User < ActiveRecord::Base  
       include Amistad::FriendModel
     end
     
+or :
+
+    class User
+      include Mongoid::Document
+      include Amistad::FriendModel
+    end
+    
 ## Friendships management ##
 
 ### Creating friendships ###

data/amistad.gemspec

@@ -15,9 +15,11 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "amistad"
 
   s.add_development_dependency "bundler", "~>1.0.7"
-  s.add_development_dependency "rspec", "~> 2.4.0"
-  s.add_development_dependency "activerecord", "~> 3.0.3"
+  s.add_development_dependency "rspec", "~> 2.5.0"
+  s.add_development_dependency "activerecord", "~> 3.0.4"
   s.add_development_dependency "sqlite3-ruby", "1.3.2"
+  s.add_development_dependency "mongoid", "~> 2.0.0.rc.7"
+  s.add_development_dependency "bson_ext", "~> 1.2"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/amistad.rb

@@ -1,2 +1,5 @@
+require 'amistad/active_record/friend_model'
+require 'amistad/active_record/friendship_model'
+require 'amistad/mongoid/friend_model'
 require 'amistad/friend_model'
 require 'amistad/friendship_model'

data/lib/amistad/active_record/friend_model.rb

@@ -0,0 +1,136 @@
+module Amistad
+  module ActiveRecord
+    module FriendModel
+      def self.included(receiver)
+        receiver.class_exec do
+          include InstanceMethods
+
+          has_many  :friendships
+
+          has_many  :pending_invited,
+                    :through => :friendships,
+                    :source => :friend,
+                    :conditions => { :'friendships.pending' => true, :'friendships.blocker_id' => nil }
+
+          has_many  :invited,
+                    :through => :friendships,
+                    :source => :friend,
+                    :conditions => { :'friendships.pending' => false, :'friendships.blocker_id' => nil }
+
+          has_many  :inverse_friendships, :class_name => "Friendship", :foreign_key => "friend_id"
+
+          has_many  :pending_invited_by,
+                    :through => :inverse_friendships,
+                    :source => :user,
+                    :conditions => { :'friendships.pending' => true, :'friendships.blocker_id' => nil }
+
+          has_many  :invited_by,
+                    :through => :inverse_friendships,
+                    :source => :user,
+                    :conditions => { :'friendships.pending' => false, :'friendships.blocker_id' => nil }
+
+          has_many  :blocked_friendships, :class_name => "Friendship", :foreign_key => "blocker_id"
+
+          has_many  :blockades,
+                    :through => :blocked_friendships,
+                    :source => :friend,
+                    :conditions => "friend_id <> blocker_id"
+
+          has_many  :blockades_by,
+                    :through => :blocked_friendships,
+                    :source => :user,
+                    :conditions => "user_id <> blocker_id"
+        end
+      end
+
+      module InstanceMethods
+        # suggest a user to become a friend. If the operation succeeds, the method returns true, else false
+        def invite(user)
+          return false if user == self || find_any_friendship_with(user)
+          Friendship.new(:user_id => self.id, :friend_id => user.id).save
+        end
+
+        # approve a friendship invitation. If the operation succeeds, the method returns true, else false
+        def approve(user)
+          friendship = find_any_friendship_with(user)
+          return false if friendship.nil? || invited?(user)
+          friendship.update_attribute(:pending, false)
+        end
+
+        # deletes a friendship
+        def remove_friendship(user)
+          friendship = find_any_friendship_with(user)
+          return false if friendship.nil?
+          friendship.destroy && friendship.destroyed?
+        end
+
+        # returns the list of approved friends
+        def friends
+          self.invited(true) + self.invited_by(true)
+        end
+
+        # blocks a friendship
+        def block(user)
+          friendship = find_any_friendship_with(user)
+          return false if friendship.nil? || !friendship.can_block?(self)
+          friendship.update_attribute(:blocker, self)
+        end
+
+        # unblocks a friendship
+        def unblock(user)
+          friendship = find_any_friendship_with(user)
+          return false if friendship.nil? || !friendship.can_unblock?(self)
+          friendship.update_attribute(:blocker, nil)
+        end
+
+        # returns the list of blocked friends
+        def blocked
+          self.blockades(true) + self.blockades_by(true)
+        end
+
+        # checks if a user is blocked
+        def blocked?(user)
+          blocked.include?(user)
+        end
+
+        # checks if a user is a friend
+        def friend_with?(user)
+          friends.include?(user)
+        end
+
+        # checks if a current user is connected to given user
+        def connected_with?(user)
+          find_any_friendship_with(user).present?
+        end
+
+        # checks if a current user received invitation from given user
+        def invited_by?(user)
+          friendship = find_any_friendship_with(user)
+          return false if friendship.nil?
+          friendship.user == user
+        end
+
+        # checks if a current user invited given user
+        def invited?(user)
+          friendship = find_any_friendship_with(user)
+          return false if friendship.nil?
+          friendship.friend == user
+        end
+
+        # return the list of the ones among its friends which are also friend with the given use
+        def common_friends_with(user)
+          self.friends & user.friends
+        end
+
+        # returns friendship with given user or nil
+        def find_any_friendship_with(user)
+          friendship = Friendship.where(:user_id => self.id, :friend_id => user.id).first
+          if friendship.nil?
+            friendship = Friendship.where(:user_id => user.id, :friend_id => self.id).first
+          end
+          friendship
+        end
+      end    
+    end
+  end
+end

data/lib/amistad/active_record/friendship_model.rb

@@ -0,0 +1,50 @@
+module Amistad
+  module ActiveRecord
+    module FriendshipModel
+      def self.included(receiver)
+        receiver.class_exec do
+          include InstanceMethods
+
+          belongs_to :user
+          belongs_to :friend, :class_name => "User", :foreign_key => "friend_id"
+          belongs_to :blocker, :class_name => "User", :foreign_key => "blocker_id"
+
+          validates_presence_of :user_id, :friend_id
+          validates_uniqueness_of :friend_id, :scope => :user_id
+        end
+      end
+
+      module InstanceMethods
+        # returns true if a friendship has been approved, else false
+        def approved?
+          !self.pending
+        end
+
+        # returns true if a friendship has not been approved, else false
+        def pending?
+          self.pending
+        end
+
+        # returns true if a friendship has been blocked, else false
+        def blocked?
+          self.blocker_id.present?
+        end
+
+        # returns true if a friendship has not beed blocked, else false
+        def active?
+          self.blocker_id.nil?
+        end
+
+        # returns true if a friendship can be blocked by given user
+        def can_block?(user)
+          active? && (approved? || (pending? && self.friend == user))
+        end
+
+        # returns true if a friendship can be unblocked by given user
+        def can_unblock?(user)
+          blocked? && self.blocker == user
+        end
+      end
+    end
+  end
+end

data/lib/amistad/friend_model.rb

@@ -1,134 +1,17 @@
 module Amistad
   module FriendModel
     def self.included(receiver)
-      receiver.class_exec do
-        include InstanceMethods
-
-        has_many  :friendships
-
-        has_many  :pending_invited,
-                  :through => :friendships,
-                  :source => :friend,
-                  :conditions => { :'friendships.pending' => true, :'friendships.blocker_id' => nil }
-
-        has_many  :invited,
-                  :through => :friendships,
-                  :source => :friend,
-                  :conditions => { :'friendships.pending' => false, :'friendships.blocker_id' => nil }
-
-        has_many  :inverse_friendships, :class_name => "Friendship", :foreign_key => "friend_id"
-
-        has_many  :pending_invited_by,
-                  :through => :inverse_friendships,
-                  :source => :user,
-                  :conditions => { :'friendships.pending' => true, :'friendships.blocker_id' => nil }
-
-        has_many  :invited_by,
-                  :through => :inverse_friendships,
-                  :source => :user,
-                  :conditions => { :'friendships.pending' => false, :'friendships.blocker_id' => nil }
-
-        has_many  :blocked_friendships, :class_name => "Friendship", :foreign_key => "blocker_id"
-
-        has_many  :blockades,
-                  :through => :blocked_friendships,
-                  :source => :friend,
-                  :conditions => "friend_id <> blocker_id"
-
-        has_many  :blockades_by,
-                  :through => :blocked_friendships,
-                  :source => :user,
-                  :conditions => "user_id <> blocker_id"
-      end
-    end
-
-    module InstanceMethods
-      # suggest a user to become a friend. If the operation succeeds, the method returns true, else false
-      def invite(user)
-        return false if user == self || find_any_friendship_with(user)
-        Friendship.new(:user_id => self.id, :friend_id => user.id).save
-      end
-
-      # approve a friendship invitation. If the operation succeeds, the method returns true, else false
-      def approve(user)
-        friendship = find_any_friendship_with(user)
-        return false if friendship.nil? || invited?(user)
-        friendship.update_attribute(:pending, false)
-      end
-
-      # deletes a friendship
-      def remove(user)
-        friendship = find_any_friendship_with(user)
-        return false if friendship.nil?
-        friendship.destroy && friendship.destroyed?
-      end
-
-      # returns the list of approved friends
-      def friends
-        self.invited(true) + self.invited_by(true)
-      end
-
-      # blocks a friendship
-      def block(user)
-        friendship = find_any_friendship_with(user)
-        return false if friendship.nil? || !friendship.can_block?(self)
-        friendship.update_attribute(:blocker, self)
-      end
-
-      # unblocks a friendship
-      def unblock(user)
-        friendship = find_any_friendship_with(user)
-        return false if friendship.nil? || !friendship.can_unblock?(self)
-        friendship.update_attribute(:blocker, nil)
-      end
-
-      # returns the list of blocked friends
-      def blocked
-        self.blockades(true) + self.blockades_by(true)
-      end
-
-      # checks if a user is blocked
-      def blocked?(user)
-        blocked.include?(user)
-      end
-
-      # checks if a user is a friend
-      def friend_with?(user)
-        friends.include?(user)
-      end
-
-      # checks if a current user is connected to given user
-      def connected_with?(user)
-        find_any_friendship_with(user).present?
-      end
-
-      # checks if a current user received invitation from given user
-      def invited_by?(user)
-        friendship = find_any_friendship_with(user)
-        return false if friendship.nil?
-        friendship.user == user
-      end
-
-      # checks if a current user invited given user
-      def invited?(user)
-        friendship = find_any_friendship_with(user)
-        return false if friendship.nil?
-        friendship.friend == user
-      end
-
-      # return the list of the ones among its friends which are also friend with the given use
-      def common_friends_with(user)
-        self.friends & user.friends
-      end
-
-      # returns friendship with given user or nil
-      def find_any_friendship_with(user)
-        friendship = Friendship.where(:user_id => self.id, :friend_id => user.id).first
-        if friendship.nil?
-          friendship = Friendship.where(:user_id => user.id, :friend_id => self.id).first
+      if receiver.ancestors.map(&:to_s).include?("ActiveRecord::Base")
+        receiver.class_exec do
+          include Amistad::ActiveRecord::FriendModel
         end
-        friendship
+      elsif receiver.ancestors.map(&:to_s).include?("Mongoid::Document")
+        receiver.class_exec do
+          include Amistad::Mongoid::FriendModel
+        end
+      else
+        raise "Amistad only supports ActiveRecord and Mongoid"
       end
-    end    
+    end
   end
-end
+end

data/lib/amistad/friendship_model.rb

@@ -1,48 +1,13 @@
 module Amistad
   module FriendshipModel
     def self.included(receiver)
-      receiver.class_exec do
-        include InstanceMethods
-
-        belongs_to :user
-        belongs_to :friend, :class_name => "User", :foreign_key => "friend_id"
-        belongs_to :blocker, :class_name => "User", :foreign_key => "blocker_id"
-
-        validates_presence_of :user_id, :friend_id
-        validates_uniqueness_of :friend_id, :scope => :user_id
-      end
-    end
-
-    module InstanceMethods
-      # returns true if a friendship has been approved, else false
-      def approved?
-        !self.pending
-      end
-
-      # returns true if a friendship has not been approved, else false
-      def pending?
-        self.pending
-      end
-
-      # returns true if a friendship has been blocked, else false
-      def blocked?
-        self.blocker_id.present?
-      end
-
-      # returns true if a friendship has not beed blocked, else false
-      def active?
-        self.blocker_id.nil?
-      end
-
-      # returns true if a friendship can be blocked by given user
-      def can_block?(user)
-        active? && (approved? || (pending? && self.friend == user))
-      end
-
-      # returns true if a friendship can be unblocked by given user
-      def can_unblock?(user)
-        blocked? && self.blocker == user
+      if receiver.ancestors.map(&:to_s).include?("ActiveRecord::Base")
+        receiver.class_exec do
+          include Amistad::ActiveRecord::FriendshipModel
+        end
+      else
+        raise "Amistad only supports ActiveRecord and Mongoid"
       end
     end
   end
-end
+end

data/lib/amistad/mongoid/friend_model.rb

@@ -0,0 +1,180 @@
+module Amistad
+  module Mongoid
+    module FriendModel
+      def self.included(receiver)
+        receiver.class_exec do
+          include InstanceMethods
+
+          field :friend_ids, :type => Array, :default => []
+          field :inverse_friend_ids, :type => Array, :default => []
+          field :pending_friend_ids, :type => Array, :default => []
+          field :pending_inverse_friend_ids, :type => Array, :default => []
+          
+          field :blocked_friend_ids, :type => Array, :default => []
+          field :blocked_inverse_friend_ids, :type => Array, :default => []
+          field :blocked_pending_friend_ids, :type => Array, :default => []
+          field :blocked_pending_inverse_friend_ids, :type => Array, :default => []
+          
+          attr_accessible :friend_ids, :inverse_friend_ids, :pending_friend_ids, :pending_inverse_friend_ids, :blocked_friend_ids, :blocked_inverse_friend_ids, :blocked_pending_friend_ids, :blocked_pending_inverse_friend_ids
+        end
+      end
+
+      module InstanceMethods
+        # suggest a user to become a friend. If the operation succeeds, the method returns true, else false
+        def invite(user)
+          return false if friendshiped_with?(user) or user == self or blocked?(user)
+          pending_friend_ids << user.id
+          user.pending_inverse_friend_ids << self.id
+          self.save && user.save
+        end
+
+        # approve a friendship invitation. If the operation succeeds, the method returns true, else false
+        def approve(user)
+          return false unless pending_inverse_friend_ids.include?(user.id) && user.pending_friend_ids.include?(self.id)
+          pending_inverse_friend_ids.delete(user.id)
+          user.pending_friend_ids.delete(self.id)
+          inverse_friend_ids << user.id
+          user.friend_ids << self.id
+          self.save && user.save
+        end
+
+        # returns the list of approved friends
+        def friends
+          self.invited + self.invited_by
+        end
+
+        # return the list of invited friends
+        def invited
+          self.class.find(friend_ids)
+        end
+
+        # return the list of friends who invited
+        def invited_by
+          self.class.find(inverse_friend_ids)
+        end
+
+        # return the list of pending invited friends
+        def pending_invited
+          self.class.find(pending_friend_ids)
+        end
+
+        # return the list of pending friends who invited
+        def pending_invited_by
+          self.class.find(pending_inverse_friend_ids)
+        end
+
+        # return the list of the ones among its friends which are also friend with the given use
+        def common_friends_with(user)
+          self.friends & user.friends
+        end
+
+        # checks if a user is a friend
+        def friend_with?(user)
+          return false if user == self
+          (friend_ids + inverse_friend_ids).include?(user.id)
+        end
+
+        # checks if a current user is connected to given user
+        def connected_with?(user)
+          friendshiped_with?(user)
+        end
+
+        # checks if a current user received invitation from given user
+        def invited_by?(user)
+          user.friend_ids.include?(self.id) or user.pending_friend_ids.include?(self.id)
+        end
+
+        # checks if a current user invited given user
+        def invited?(user)
+          self.friend_ids.include?(user.id) or self.pending_friend_ids.include?(user.id)
+        end
+
+        # deletes a friendship
+        def remove_friendship(user)
+          friend_ids.delete(user.id)
+          user.inverse_friend_ids.delete(self.id)
+          inverse_friend_ids.delete(user.id)
+          user.friend_ids.delete(self.id)
+          pending_friend_ids.delete(user.id)
+          user.pending_inverse_friend_ids.delete(self.id)
+          pending_inverse_friend_ids.delete(user.id)
+          user.pending_friend_ids.delete(self.id)
+          self.save && user.save
+        end
+
+        # blocks a friendship
+        def block(user)          
+          if inverse_friend_ids.include?(user.id)
+            inverse_friend_ids.delete(user.id)
+            user.friend_ids.delete(self.id)
+            blocked_inverse_friend_ids << user.id
+          elsif pending_inverse_friend_ids.include?(user.id)
+            pending_inverse_friend_ids.delete(user.id)
+            user.pending_friend_ids.delete(self.id)
+            blocked_pending_inverse_friend_ids << user.id
+          elsif friend_ids.include?(user.id)
+            friend_ids.delete(user.id)
+            user.inverse_friend_ids.delete(user.id)
+            blocked_friend_ids << user.id
+          else
+            return false
+          end
+          
+          self.save
+        end
+
+        # unblocks a friendship
+        def unblock(user)
+          if blocked_inverse_friend_ids.include?(user.id)
+            blocked_inverse_friend_ids.delete(user.id)
+            user.blocked_friend_ids.delete(self.id)
+            inverse_friend_ids << user.id
+            user.friend_ids << self.id
+          elsif blocked_pending_inverse_friend_ids.include?(user.id)
+            blocked_pending_inverse_friend_ids.delete(user.id)
+            pending_inverse_friend_ids << user.id
+            user.pending_friend_ids << self.id
+          elsif blocked_friend_ids.include?(user.id)
+            blocked_friend_ids.delete(user.id)
+            user.blocked_inverse_friend_ids.delete(self.id)
+            friend_ids << user.id
+            user.inverse_friend_ids << self.id
+          else
+            return false
+          end
+          
+          self.save && user.save
+        end
+        
+        # returns the list of blocked friends
+        def blocked
+          blocked_ids = blocked_friend_ids + blocked_inverse_friend_ids + blocked_pending_inverse_friend_ids
+          self.class.find(blocked_ids)
+        end
+        
+        # checks if a user is blocked
+        def blocked?(user)
+          (blocked_friend_ids + blocked_inverse_friend_ids + blocked_pending_inverse_friend_ids).include?(user.id) or user.blocked_pending_inverse_friend_ids.include?(self.id)
+        end
+
+        # check if any friendship exists with another user
+        def friendshiped_with?(user)
+          (friend_ids + inverse_friend_ids + pending_friend_ids + pending_inverse_friend_ids + blocked_friend_ids).include?(user.id)
+        end
+
+        # deletes all the friendships
+        def delete_all_friendships
+          friend_ids.clear
+          inverse_friend_ids.clear
+          pending_friend_ids.clear
+          pending_inverse_friend_ids.clear
+          blocked_friend_ids.clear
+          blocked_inverse_friend_ids.clear
+          blocked_pending_friend_ids.clear
+          blocked_pending_inverse_friend_ids.clear
+          self.save
+        end
+      end
+    end
+  end
+end

data/lib/amistad/version.rb

@@ -1,3 +1,3 @@
 module Amistad
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

data/spec/activerecord_friend_model_spec.rb

@@ -0,0 +1,9 @@
+require 'activerecord_spec_helper'
+
+describe Amistad::ActiveRecord::FriendModel do
+  def reset_friendships
+    Friendship.delete_all
+  end
+  
+  it_should_behave_like "a friend model"
+end

data/spec/{friendship_model_spec.rb → activerecord_friendship_model_spec.rb}

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'activerecord_spec_helper'
 
-describe Amistad::FriendshipModel do
+describe Amistad::ActiveRecord::FriendshipModel do
 
   before(:all) do
     %w(Jane David).each do |name|

data/spec/activerecord_spec_helper.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+require 'active_record'
+
+ActiveRecord::Base.establish_connection(
+  :adapter => "sqlite3",
+  :database => ":memory:"
+)
+
+ActiveRecord::Migration.verbose = false
+
+ActiveRecord::Schema.define do
+  create_table :users, :force => true do |t|
+    t.string :name, :null => false
+  end
+
+  create_table :friendships, :force => true do |t|
+    t.integer :user_id
+    t.integer :friend_id
+    t.integer :blocker_id
+    t.boolean :pending, :default => true
+  end
+
+  add_index :friendships, [:user_id, :friend_id], :unique => true
+end
+
+class User < ActiveRecord::Base
+  include Amistad::FriendModel
+end
+
+class Friendship < ActiveRecord::Base
+  include Amistad::FriendshipModel
+end
+    

data/spec/mongoid_friend_model_spec.rb

@@ -0,0 +1,21 @@
+require 'mongoid_spec_helper'
+
+describe Amistad::Mongoid::FriendModel do
+  def reset_friendships
+    %w(john jane david james peter mary victoria elisabeth).each do |var|
+      eval "@#{var}.delete_all_friendships.should be_true"
+    end
+  end
+  
+  before(:all) do
+    Object.send(:remove_const, :User) if Object.const_defined?(:User)
+    User = Class.new
+    User.class_exec do
+      include Mongoid::Document
+      include Amistad::FriendModel
+      field :name, :required => true
+    end
+  end
+  
+  it_should_behave_like "a friend model"
+end

data/spec/mongoid_spec_helper.rb

@@ -0,0 +1,11 @@
+require "spec_helper"
+require 'mongoid'
+
+Mongoid.configure do |config|
+  name = "amistad_test"
+  host = "localhost"
+  config.master = Mongo::Connection.new.db(name)
+  config.slaves = [
+    Mongo::Connection.new(host, 27017, :slave_ok => true).db(name)
+  ]
+end

data/spec/spec_helper.rb

@@ -1,33 +1,3 @@
 require 'rspec'
-require 'active_record'
 require 'amistad'
-
-ActiveRecord::Base.establish_connection(
-  :adapter => "sqlite3",
-  :database => ":memory:"
-)
-
-ActiveRecord::Migration.verbose = false
-
-ActiveRecord::Schema.define do
-  create_table :users, :force => true do |t|
-    t.string :name, :null => false
-  end
-
-  create_table :friendships, :force => true do |t|
-    t.integer :user_id
-    t.integer :friend_id
-    t.integer :blocker_id
-    t.boolean :pending, :default => true
-  end
-
-  add_index :friendships, [:user_id, :friend_id], :unique => true
-end
-
-class User < ActiveRecord::Base
-  include Amistad::FriendModel
-end
-
-class Friendship < ActiveRecord::Base
-  include Amistad::FriendshipModel
-end
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}

data/spec/{friend_model_spec.rb → support/friend_examples.rb}

@@ -1,7 +1,4 @@
-require 'spec_helper'
-
-describe Amistad::FriendModel do
-
+shared_examples_for "a friend model" do
   before(:all) do
     %w(John Jane David James Peter Mary Victoria Elisabeth).each do |name|
       instance_variable_set("@#{name.downcase}".to_sym, User.create(:name => name))
@@ -9,8 +6,8 @@ describe Amistad::FriendModel do
   end
 
   context "when creating friendships" do
-    before do
-      Friendship.delete_all
+    before(:each) do
+      reset_friendships
     end
 
     it "should invite other users to friends" do
@@ -62,8 +59,8 @@ describe Amistad::FriendModel do
   end
 
   context "when listing friendships" do
-    before do
-      Friendship.delete_all
+    before(:each) do
+      reset_friendships
       @john.invite(@jane).should be_true
       @peter.invite(@john).should be_true
       @john.invite(@james).should be_true
@@ -77,6 +74,7 @@ describe Amistad::FriendModel do
     end
 
     it "should not list non-friended users" do
+      @victoria.friends.should be_empty
       @john.friends.should =~ [@mary, @james]
       @john.friends.should_not include(@peter)
       @john.friends.should_not include(@victoria)
@@ -159,8 +157,8 @@ describe Amistad::FriendModel do
   end
 
   context "when removing friendships" do
-    before do
-      Friendship.delete_all
+    before(:each) do
+      reset_friendships
       @jane.invite(@james).should be_true
       @james.approve(@jane).should be_true
       @james.invite(@victoria).should be_true
@@ -180,7 +178,7 @@ describe Amistad::FriendModel do
       @mary.friends.size.should == 1
       @mary.friends.should include(@victoria)
       @mary.invited_by.should include(@victoria)
-      @victoria.remove(@mary).should be_true
+      @victoria.remove_friendship(@mary).should be_true
       @victoria.friends.size.should == 2
       @victoria.friends.should_not include(@mary)
       @victoria.invited.should_not include(@mary)
@@ -196,7 +194,7 @@ describe Amistad::FriendModel do
       @james.friends.size.should == 2
       @james.friends.should include(@victoria)
       @james.invited.should include(@victoria)
-      @victoria.remove(@james).should be_true
+      @victoria.remove_friendship(@james).should be_true
       @victoria.friends.size.should == 2
       @victoria.friends.should_not include(@james)
       @victoria.invited_by.should_not include(@james)
@@ -210,7 +208,7 @@ describe Amistad::FriendModel do
       @victoria.pending_invited.should include(@elisabeth)
       @elisabeth.pending_invited_by.size.should == 1
       @elisabeth.pending_invited_by.should include(@victoria)
-      @victoria.remove(@elisabeth).should be_true
+      @victoria.remove_friendship(@elisabeth).should be_true
       [@victoria, @elisabeth].map(&:reload)
       @victoria.pending_invited.size.should == 0
       @victoria.pending_invited.should_not include(@elisabeth)
@@ -223,7 +221,7 @@ describe Amistad::FriendModel do
       @victoria.pending_invited_by.should include(@peter)
       @peter.pending_invited.count.should == 1
       @peter.pending_invited.should include(@victoria)
-      @victoria.remove(@peter).should be_true
+      @victoria.remove_friendship(@peter).should be_true
       [@victoria, @peter].map(&:reload)
       @victoria.pending_invited_by.count.should == 0
       @victoria.pending_invited_by.should_not include(@peter)
@@ -233,8 +231,8 @@ describe Amistad::FriendModel do
   end
 
   context "when blocking friendships" do
-    before do
-      Friendship.delete_all
+    before(:each) do
+      reset_friendships
       @john.invite(@james).should be_true
       @james.approve(@john).should be_true
       @james.block(@john).should be_true
@@ -295,7 +293,7 @@ describe Amistad::FriendModel do
       @james.blocked.each do |user|
         @james.friends.should_not include(user)
         user.friends.should_not include(@james)
-    end
+      end
     end
 
     it "should not list blocked users in invited" do
@@ -323,8 +321,8 @@ describe Amistad::FriendModel do
   end
 
   context "when unblocking friendships" do
-    before do
-      Friendship.delete_all
+    before(:each) do
+      reset_friendships
       @john.invite(@james).should be_true
       @james.approve(@john).should be_true
       @john.block(@james).should be_true
@@ -391,4 +389,4 @@ describe Amistad::FriendModel do
       @david.pending_invited_by.should == [@victoria]
     end
   end
-end
+end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: amistad
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 6
-  - 0
-  version: 0.6.0
+  prerelease: 
+  version: 0.7.0
 platform: ruby
 authors: 
 - Rawane ZOSSOU
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-10 00:00:00 +01:00
+date: 2011-02-12 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,10 +21,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 7
         version: 1.0.7
   type: :development
   version_requirements: *id001
@@ -40,11 +32,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 4
-        - 0
-        version: 2.4.0
+        version: 2.5.0
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -55,11 +43,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 3
-        version: 3.0.3
+        version: 3.0.4
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -70,13 +54,31 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        - 2
         version: 1.3.2
   type: :development
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: mongoid
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 2.0.0.rc.7
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: bson_ext
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "1.2"
+  type: :development
+  version_requirements: *id006
 description: Extends your user model with friendships management methods
 email: 
 - dev@raw1z.fr
@@ -95,15 +97,22 @@ files:
 - Rakefile
 - amistad.gemspec
 - lib/amistad.rb
+- lib/amistad/active_record/friend_model.rb
+- lib/amistad/active_record/friendship_model.rb
 - lib/amistad/friend_model.rb
 - lib/amistad/friendship_model.rb
+- lib/amistad/mongoid/friend_model.rb
 - lib/amistad/version.rb
 - lib/generators/amistad/install/install_generator.rb
 - lib/generators/amistad/install/templates/create_friendships.rb
 - lib/generators/amistad/install/templates/friendship.rb
-- spec/friend_model_spec.rb
-- spec/friendship_model_spec.rb
+- spec/activerecord_friend_model_spec.rb
+- spec/activerecord_friendship_model_spec.rb
+- spec/activerecord_spec_helper.rb
+- spec/mongoid_friend_model_spec.rb
+- spec/mongoid_spec_helper.rb
 - spec/spec_helper.rb
+- spec/support/friend_examples.rb
 has_rdoc: true
 homepage: http://github.com/raw1z/amistad
 licenses: []
@@ -118,25 +127,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: amistad
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Adds friendships management into a rails 3.0 application
 test_files: 
-- spec/friend_model_spec.rb
-- spec/friendship_model_spec.rb
+- spec/activerecord_friend_model_spec.rb
+- spec/activerecord_friendship_model_spec.rb
+- spec/activerecord_spec_helper.rb
+- spec/mongoid_friend_model_spec.rb
+- spec/mongoid_spec_helper.rb
 - spec/spec_helper.rb
+- spec/support/friend_examples.rb