amistad 0.7.5 → 0.9.0

data/spec/support/parameterized_models.rb

@@ -0,0 +1,19 @@
+shared_examples_for "friend with parameterized models" do
+  context "When users are created after activating amistad" do
+    before(:each) do
+      activate_amistad(friend_model_param)
+      create_users(friend_model_param)
+    end
+
+    it_should_behave_like "a friend model"
+  end
+
+  context "When users are created before activating amistad" do
+    before(:each) do
+      create_users(friend_model_param)
+      activate_amistad(friend_model_param)
+    end
+
+    it_should_behave_like "a friend model"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amistad
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-30 00:00:00.000000000 Z
+date: 2012-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70262067526040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70262067526040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70262067541740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70262067541740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70262067540020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70262067540020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70262067537380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,63 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70262067537380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70262067536300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,32 +133,63 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70262067536300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70262067535440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70262067535440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70262067534100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70262067534100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fuubar
-  requirement: &70262067549700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +197,28 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70262067549700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mongo_mapper
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Extends your user model with friendships management methods
 email:
 - dev@raw1z.fr
@@ -115,23 +235,35 @@ files:
 - Rakefile
 - amistad.gemspec
 - lib/amistad.rb
-- lib/amistad/active_record/friend_model.rb
-- lib/amistad/active_record/friendship_model.rb
+- lib/amistad/active_record_friend_model.rb
+- lib/amistad/active_record_friendship_model.rb
+- lib/amistad/config.rb
 - lib/amistad/friend_model.rb
 - lib/amistad/friendship_model.rb
-- lib/amistad/mongoid/friend_model.rb
+- lib/amistad/friendships.rb
+- lib/amistad/mongo_friend_model.rb
+- lib/amistad/mongo_mapper_friend_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/activerecord/activerecord_friend_model_spec.rb
-- spec/activerecord/activerecord_friendship_model_spec.rb
 - spec/activerecord/activerecord_spec_helper.rb
-- spec/mongoid/mongoid_friend_model_spec.rb
+- spec/activerecord/friend_custom_model_spec.rb
+- spec/activerecord/friend_spec.rb
+- spec/activerecord/friendship_spec.rb
+- spec/activerecord/friendship_with_custom_friend_model_spec.rb
+- spec/mongo_mapper/friend_custom_model_spec.rb
+- spec/mongo_mapper/friend_spec.rb
+- spec/mongo_mapper/mongo_mapper_spec_helper.rb
+- spec/mongoid/friend_custom_model_spec.rb
+- spec/mongoid/friend_spec.rb
 - spec/mongoid/mongoid_spec_helper.rb
 - spec/spec_helper.rb
+- spec/support/activerecord/friendship_examples.rb
+- spec/support/activerecord/schema.rb
 - spec/support/friend_examples.rb
-homepage: http://github.com/raw1z/amistad
+- spec/support/parameterized_models.rb
+homepage: https://github.com/raw1z/amistad/wiki
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -145,7 +277,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4081995342441297245
+      hash: 340186368039761558
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -154,18 +286,27 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4081995342441297245
+      hash: 340186368039761558
 requirements: []
 rubyforge_project: amistad
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Adds friendships management into a rails 3.0 application
 test_files:
-- spec/activerecord/activerecord_friend_model_spec.rb
-- spec/activerecord/activerecord_friendship_model_spec.rb
 - spec/activerecord/activerecord_spec_helper.rb
-- spec/mongoid/mongoid_friend_model_spec.rb
+- spec/activerecord/friend_custom_model_spec.rb
+- spec/activerecord/friend_spec.rb
+- spec/activerecord/friendship_spec.rb
+- spec/activerecord/friendship_with_custom_friend_model_spec.rb
+- spec/mongo_mapper/friend_custom_model_spec.rb
+- spec/mongo_mapper/friend_spec.rb
+- spec/mongo_mapper/mongo_mapper_spec_helper.rb
+- spec/mongoid/friend_custom_model_spec.rb
+- spec/mongoid/friend_spec.rb
 - spec/mongoid/mongoid_spec_helper.rb
 - spec/spec_helper.rb
+- spec/support/activerecord/friendship_examples.rb
+- spec/support/activerecord/schema.rb
 - spec/support/friend_examples.rb
+- spec/support/parameterized_models.rb

data/lib/amistad/active_record/friend_model.rb

@@ -1,146 +0,0 @@
-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
-
-        # total # of invited and invited_by without association loading
-        def total_friends
-          self.invited(false).count + self.invited_by(false).count
-        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
-
-        # total # of blockades and blockedes_by without association loading
-        def total_blocked
-          self.blockades(false).count + self.blockades_by(false).count
-        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