amistad 0.5.0 → 0.5.8

data/.gitignore

@@ -0,0 +1,6 @@
+pkg/*
+*.gem
+.bundle
+spec/db/*.db
+Gemfile.lock
+nbproject

data/.rspec

@@ -0,0 +1,4 @@
+--colour
+--format
+progress
+mtime

data/CHANGELOG

@@ -1 +1,22 @@
-A history of changes to the gem...
+Version 0.5.8 (08.12.2010)
+--------------------------
+- made find_any_friendship_with public
+
+Version 0.5.7 (07.12.2010)
+--------------------------
+- fixed bug with invitation approving
+- cleaned up the invite and approve methods
+
+Version 0.5.6 (30.11.2010)
+--------------------------
+- added has_invited? method in FriendModel
+- added is_connected_with? method in FriendModel
+- improved was_invited_by?
+
+Version 0.5.5 (29.11.2010)
+--------------------------
+- added unblock method in FriendModel
+
+Version 0.5.2 (28.11.2010)
+--------------------------
+- Migrated gem to bundler

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in amistad.gemspec
+gemspec

data/README.markdown

@@ -11,7 +11,11 @@ Just run the following command :
 Then in your Gemfile add the following line :
 
     gem 'amistad'
-  
+
+And run
+
+    bundle install
+
 ## Usage ##
 
 First generate a friendship model :
@@ -26,7 +30,7 @@ This commands create a new model called __friendship__ in *'app/models'* :
 
 It also creates a new migration for the friendship model so don't forget to migrate your database :
 
-    db:migrate
+    rake db:migrate
 
 Then activate __amistad__ in your user model :
 
@@ -80,15 +84,24 @@ It is also possible to check if two users are friends :
 
     @john.is_friend_with? @jane #=> true
     @victoria.is_friend_with? @john #=> false
-    
-You can also check if a user invited anoter :
+
+You can also check if a user is somehow connected to another :
+
+    @john.is_connected_with? @jane #=> true
+    @victoria.is_connected_with? @john #=> true
+
+You can also check if a user was invited by anoter :
 
     @john.was_invited_by? @john #=> true
     @victoria.was_invited_by? @john #=> false
-    
+
+You can also check if a user invited another :
+
+    @john.has_invited? @jane #=> true
+
 You can also find the friends that two users have in common :
 
-    @john.common_friend_with(@peter) #=> [@jane]
+    @john.common_friends_with(@peter) #=> [@jane]
     
 ### Removing friendships ###
 
@@ -108,7 +121,17 @@ The __block()__ method allow a user to block a friendship with another user :
 To get the blocked users :
 
     @jane.blocked #=> [@john]
-    
+
+### Unblocking friendship ###
+
+The __unblock()__ method allow a user to unblock previously blocked friendship with another user :
+
+    @jane.block @john
+    @jane.blocked #=> [@john]
+
+    @jane.unblock @john
+    @jane.blocked #=> []
+
 ## Testing the gem ##
 
 It is possible to test amistad by running the following command from the gem directory:
@@ -117,6 +140,10 @@ It is possible to test amistad by running the following command from the gem dir
     
 Remember that amistad is only compatible with ActiveRecord 3.x.
 
+## Acknowledgement ##
+
+* David Czarnecki : block friendships
+* Adrian Dulić : unblock friendships (and many other improvements)
 
 ## Note on Patches/Pull Requests ##
  
@@ -128,4 +155,4 @@ Remember that amistad is only compatible with ActiveRecord 3.x.
 
 ## Copyright ##
 
-Copyright © 2010 Rawane ZOSSOU. See LICENSE for details.
+Copyright © 2010 Rawane ZOSSOU. See LICENSE for details.

data/Rakefile

@@ -1,28 +1,7 @@
-require 'rake'
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "amistad"
-    gemspec.summary = "Adds friendships management into a rails 3.0 application"
-    gemspec.description = "Extends your user model with friendships management methods"
-    gemspec.email = "dev@raw1z.fr"
-    gemspec.homepage = "http://github.com/raw1z/amistad"
-    gemspec.authors = ["Rawane ZOSSOU"]
-    gemspec.files =  FileList["[A-Z]*", "{lib}/**/*"]
-  end
-rescue LoadError
-  puts "Jeweler not available. Install it with: gem install jeweler"
-end
-
-require 'rspec/core'
+require 'rspec'
 require 'rspec/core/rake_task'
-Rspec::Core::RakeTask.new(:spec) do |spec|
-end
-
-Rspec::Core::RakeTask.new(:rcov) do |spec|
-end
-
-task :spec => :check_dependencies
 
-task :default => :spec
+Rspec::Core::RakeTask.new(:spec)

data/amistad.gemspec

@@ -0,0 +1,26 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "amistad/version"
+
+Gem::Specification.new do |s|
+  s.name        = "amistad"
+  s.version     = Amistad::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Rawane ZOSSOU"]
+  s.email       = ["dev@raw1z.fr"]
+  s.homepage    = "http://github.com/raw1z/amistad"
+  s.summary     = %q{Adds friendships management into a rails 3.0 application}
+  s.description = %q{Extends your user model with friendships management methods}
+
+  s.rubyforge_project = "amistad"
+
+  s.add_development_dependency "bundler", ">= 1.0.0"
+  s.add_development_dependency "rspec", "~> 2.2.0"
+  s.add_development_dependency "activerecord", "~> 3.0.0"
+  s.add_development_dependency "sqlite3-ruby", ">= 1.3.2"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+end

data/lib/amistad.rb

@@ -1,2 +1,5 @@
-require File.join(File.dirname(__FILE__), 'amistad/friend_model')
-require File.join(File.dirname(__FILE__), 'amistad/friendship_model')
+require 'amistad/friend_model'
+require 'amistad/friendship_model'
+
+module Amistad
+end

data/lib/amistad/friend_model.rb

@@ -38,21 +38,15 @@ module Amistad
     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
-        
-        friendship = find_any_friendship_with(user)
-        return false if not friendship.nil?
-        
-        friendship = Friendship.new(:user_id => self.id, :friend_id => user.id)
-        friendship.save
+        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?
-        friendship.pending = false
-        friendship.save
+        return false if friendship.nil? || has_invited?(user)
+        friendship.update_attribute(:pending, false)
       end
       
       # returns the list of approved friends
@@ -63,9 +57,16 @@ module Amistad
       # blocks a friendship request
       def block(user)
         friendship = find_any_friendship_with(user)
-        return false if friendship.nil?
+        return false if friendship.nil? || friendship.user == self
         friendship.blocked = true
-        friendship.pending = false
+        friendship.save
+      end
+
+      # unblocks a friendship
+      def unblock(user)
+        friendship = find_any_friendship_with(user)
+        return false if friendship.nil? || friendship.user == self
+        friendship.blocked = false
         friendship.save
       end
       
@@ -81,22 +82,29 @@ module Amistad
       def is_friend_with?(user)
         friends.include?(user)
       end
-      
+
+      def is_connected_with?(user)
+        !find_any_friendship_with(user).nil?
+      end
+
       # checks if a user send a friendship's invitation
       def was_invited_by?(user)
-        inverse_friendships.each do |friendship|
-          return true if friendship.user == user
-        end
-        false
+        friendship = find_any_friendship_with(user)
+        return false if friendship.nil?
+        friendship.user == user
+      end
+
+      def has_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
-      
-      private
-      
+          
       def find_any_friendship_with(user)
         friendship = Friendship.where(:user_id => self.id, :friend_id => user.id).first
         if friendship.nil?
@@ -104,8 +112,6 @@ module Amistad
         end
         friendship
       end
-      
     end    
   end
 end
-

data/lib/amistad/version.rb

@@ -0,0 +1,3 @@
+module Amistad
+  VERSION = "0.5.8"
+end

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

@@ -6,9 +6,11 @@ class CreateFriendships < ActiveRecord::Migration
       t.boolean :pending, :default => true
       t.boolean :blocked, :default => false
     end
+
+    add_index :friendships, [:user_id, :friend_id], :unique => true
   end
 
   def self.down
     drop_table :friendships
   end
-end
+end

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

@@ -1,3 +1,3 @@
 class Friendship < ActiveRecord::Base
   include Amistad::FriendshipModel
-end
+end

data/spec/friend_model_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 describe Amistad::FriendModel do
   
@@ -25,13 +25,21 @@ describe Amistad::FriendModel do
       @jane.approve(@john).should == true
       @john.approve(@victoria).should == true
     end
-    
+
     it "could not create a new friendship with a user which is already a friend" do
       @john.invite(@jane).should == true
       @john.invite(@jane).should == false
       @jane.invite(@john).should == false
     end
-    
+
+    it "could not approve self requested friendship" do
+      @john.invite(@jane).should == true
+      @victoria.invite(@john).should == true
+
+      @john.approve(@jane).should == false
+      @victoria.approve(@john).should == false
+    end
+
     it "could not create a friendship with himself" do
       @john.invite(@john).should == false
     end
@@ -44,6 +52,7 @@ describe Amistad::FriendModel do
   context "when listing friendships" do
     before(:each) do
       Friendship.delete_all
+
       @john.invite(@jane).should == true
       @john.invite(@james).should == true
       
@@ -83,11 +92,22 @@ describe Amistad::FriendModel do
     it "checks if a user is a friend" do
       @john.is_friend_with?(@james).should == true
       @john.is_friend_with?(@mary).should == true
-      
+
       @john.is_friend_with?(@jane).should == false
       @john.is_friend_with?(@peter).should == false
     end
-    
+
+    it "checks if a user has any connection with another user" do
+      @john.is_connected_with?(@jane).should == true
+      @jane.is_connected_with?(@john).should == true
+
+      @john.is_connected_with?(@peter).should == true
+      @peter.is_connected_with?(@john).should == true
+
+      @victoria.is_connected_with?(@john).should == false
+      @john.is_connected_with?(@victoria).should == false
+    end
+
     it "checks if a user was invited by another" do
       @jane.was_invited_by?(@john).should == true
       @james.was_invited_by?(@john).should == true
@@ -95,7 +115,18 @@ describe Amistad::FriendModel do
       @john.was_invited_by?(@jane).should == false
       @victoria.was_invited_by?(@john).should == false
     end
-    
+
+    it "checks if a user has invited another user" do
+      @john.has_invited?(@jane).should == true
+      @john.has_invited?(@james).should == true
+
+      @jane.has_invited?(@john).should == false
+      @james.has_invited?(@john).should == false
+
+      @victoria.has_invited?(@john).should == false
+      @john.has_invited?(@victoria).should == false
+    end
+
     it "lists the friends he has in common with another user" do
       @james.common_friends_with(@mary).count.should == 1
       @james.common_friends_with(@mary).should include(@john)
@@ -105,6 +136,7 @@ describe Amistad::FriendModel do
   context "when removing friendships" do
     before(:each) do
       Friendship.delete_all
+
       @victoria.invite(@mary).should == true
       @victoria.invite(@john).should == true
       @victoria.invite(@elisabeth).should == true
@@ -166,6 +198,11 @@ describe Amistad::FriendModel do
       @david.block(@victoria).should == false
     end
     
+    it "should allow to block only invited user" do
+      @jane.block(@john).should == true
+      @john.block(@jane).should == false
+    end
+    
     it "should return the correct number of friends blocked" do
       @david.blocked.count.should == 1
       @david.blocked.should include(@john)
@@ -192,4 +229,43 @@ describe Amistad::FriendModel do
     end    
   end
 
-end
+  context "when unblocking friendships" do
+    before(:each) do
+      Friendship.delete_all
+
+      @john.invite(@jane).should == true
+      @john.invite(@david).should == true
+      @david.approve(@john).should == true
+      @david.block(@john).should == true
+      @david.unblock(@john).should == true
+      @john.unblock(@victoria).should == false
+    end
+
+    it "should allow to unblock only invited user" do
+      @jane.approve(@john).should == true
+      @jane.block(@john).should == true
+      @john.unblock(@jane).should == false
+      @jane.unblock(@john).should == true
+    end
+
+    it "should return the correct number of friends blocked" do
+      @john.blocked.count.should == 0
+      @david.blocked.count.should == 0
+    end
+
+    it "should return unblocked users in friends" do
+      @john.friends.count.should == 1
+      @john.friends.should include(@david)
+      @john.friends.should_not include(@victoria)
+
+      @john.invited.count.should == 1
+      @john.invited.should include(@david)
+      @john.invited.should_not include(@victoria)
+      
+      @john.pending_invited.count.should == 1
+      @john.pending_invited.should include(@jane)
+      @john.pending_invited.should_not include(@david)
+      @john.pending_invited.should_not include(@victoria)
+    end
+  end
+end

data/spec/friendship_model_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 describe Amistad::FriendshipModel do
   
@@ -23,4 +23,4 @@ describe Amistad::FriendshipModel do
     friendship = Friendship.create(:user_id => 1, :friend_id => 2)
     friendship.blocked?.should == false
   end
-end
+end

data/spec/spec_helper.rb

@@ -1,9 +1,5 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'rspec/core'
-require 'rspec/autorun'
+require 'rspec'
 require 'active_record'
-require 'logger'
 require 'amistad'
 
 ActiveRecord::Base.establish_connection(

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 8
+  version: 0.5.8
 platform: ruby
 authors: 
 - Rawane ZOSSOU
@@ -14,27 +14,91 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-24 00:00:00 +02:00
+date: 2010-12-08 00:00:00 +01:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 2
+        - 0
+        version: 2.2.0
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 3
+        - 2
+        version: 1.3.2
+  type: :development
+  version_requirements: *id004
 description: Extends your user model with friendships management methods
-email: dev@raw1z.fr
+email: 
+- dev@raw1z.fr
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.markdown
+extra_rdoc_files: []
+
 files: 
+- .gitignore
+- .rspec
 - CHANGELOG
+- Gemfile
 - LICENCE
 - README.markdown
 - Rakefile
-- VERSION
+- amistad.gemspec
 - lib/amistad.rb
 - lib/amistad/friend_model.rb
 - lib/amistad/friendship_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
@@ -68,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: amistad
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3

data/VERSION

@@ -1 +0,0 @@
-0.5.0