amistad 0.4.1 → 0.5.0

data/README.markdown

@@ -98,6 +98,17 @@ The __remove()__ method allow a user to remove its friendships :
     @john.remove @peter
     @john.remove @victoria
     
+### Blocking friendships ###
+
+The __block()__ method allow a user to block a friendship with another user :
+
+    @john.invite @jane
+    @jane.block @john
+    
+To get the blocked users :
+
+    @jane.blocked #=> [@john]
+    
 ## Testing the gem ##
 
 It is possible to test amistad by running the following command from the gem directory:

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.5.0

data/lib/amistad/friend_model.rb

@@ -9,24 +9,29 @@ module Amistad
         has_many  :pending_invited,
                   :through => :friendships,
                   :source => :friend,
-                  :conditions => { :'friendships.pending' => true }
+                  :conditions => { :'friendships.pending' => true, :'friendships.blocked' => false }
                   
         has_many  :invited,
                   :through => :friendships,
                   :source => :friend,
-                  :conditions => { :'friendships.pending' => false }
+                  :conditions => { :'friendships.pending' => false, :'friendships.blocked' => false }
 
         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}
+                  :conditions => { :'friendships.pending' => true, :'friendships.blocked' => false }
                   
         has_many  :invited_by,
                   :through => :inverse_friendships,
                   :source => :user,
-                  :conditions => {:'friendships.pending' => false}
+                  :conditions => { :'friendships.pending' => false, :'friendships.blocked' => false }
+                  
+        has_many  :blocked,
+                  :through => :inverse_friendships,
+                  :source => :user,
+                  :conditions => { :'friendships.blocked' => true }
       end
     end
 
@@ -55,6 +60,15 @@ module Amistad
         self.invited(true) + self.invited_by(true)
       end
       
+      # blocks a friendship request
+      def block(user)
+        friendship = find_any_friendship_with(user)
+        return false if friendship.nil?
+        friendship.blocked = true
+        friendship.pending = false
+        friendship.save
+      end
+      
       # deletes a friendship
       def remove(user)
         friendship = find_any_friendship_with(user)

data/lib/amistad/friendship_model.rb

@@ -18,6 +18,11 @@ module Amistad
       def pending?
         self.pending
       end
+      
+      # returns true if a friendship has been blocked, else false
+      def blocked?
+        self.blocked
+      end
     end
     
   end

data/lib/generators/amistad/install/templates/create_friendships.rb

@@ -4,6 +4,7 @@ class CreateFriendships < ActiveRecord::Migration
       t.integer :user_id
       t.integer :friend_id
       t.boolean :pending, :default => true
+      t.boolean :blocked, :default => false
     end
   end
 

data/spec/friend_model_spec.rb

@@ -153,5 +153,43 @@ describe Amistad::FriendModel do
       @peter.pending_invited.should_not include(@victoria)
     end
   end
+  
+  context "when blocking friendships" do
+    before(:each) do
+      Friendship.delete_all
+
+      @john.invite(@jane).should == true
+      @john.invite(@james).should == true
+      @john.invite(@david).should == true
+      @james.approve(@john).should == true
+      @david.block(@john).should == true
+      @david.block(@victoria).should == false
+    end
+    
+    it "should return the correct number of friends blocked" do
+      @david.blocked.count.should == 1
+      @david.blocked.should include(@john)
+    end
+    
+    it "should not return any blocked friends in friends or invited or pending invites" do
+      @john.friends.count.should == 1
+      @john.friends.should include(@james)
+      @john.friends.should_not include(@david)
+
+      @john.invited.count.should == 1
+      @john.invited.should_not include(@david)
+      @john.invited.should include(@james)
+      
+      @john.pending_invited.count.should == 1
+      @john.pending_invited.should_not include(@david)
+      @john.pending_invited.should include(@jane)
+      
+      @david.friends.count.should == 0
+    end
+    
+    it "should not return any blocked friends for the friend who was blocked" do
+      @john.blocked.count.should == 0
+    end    
+  end
 
 end

data/spec/friendship_model_spec.rb

@@ -18,4 +18,9 @@ describe Amistad::FriendshipModel do
     friendship = Friendship.create(:user_id => 1, :friend_id => 2)
     friendship.pending?.should == true
   end
+  
+  it "is not in a blocked state when created" do
+    friendship = Friendship.create(:user_id => 1, :friend_id => 2)
+    friendship.blocked?.should == false
+  end
 end

data/spec/spec_helper.rb

@@ -22,6 +22,7 @@ ActiveRecord::Schema.define do
     t.integer :user_id
     t.integer :friend_id
     t.boolean :pending, :default => true
+    t.boolean :blocked, :default => false
   end
 end
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 4
-  - 1
-  version: 0.4.1
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Rawane ZOSSOU
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-12 00:00:00 +02:00
+date: 2010-10-24 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -46,8 +46,8 @@ homepage: http://github.com/raw1z/amistad
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement