amistad 0.7.1 → 0.7.2

data/CHANGELOG

@@ -1,3 +1,9 @@
+Version 0.7.2 (16.02.2011)
+--------------------------
+- Added total_friends() and total_blocked() which count friendships and blocks without loading associations (by David Czarnecki)
+- Added namespaced rake tasks spec:activerecord and spec:mongoid (suggested by Adrian Dulić)
+- Use fuubar
+
 Version 0.7.1 (12.02.2011)
 --------------------------
 - Totally mess the previous relase. This one fix it.

data/README.markdown

@@ -28,7 +28,7 @@ It also creates a new migration for the friendship model so don't forget to migr
 
     rake db:migrate
 
-If you are using Mongoig, you don't need a friendship model. Finally, activate __amistad__ in your user model :
+If you are using Mongoid, you don't need a friendship model. Finally, activate __amistad__ in your user model :
 
     class User < ActiveRecord::Base  
       include Amistad::FriendModel
@@ -139,17 +139,18 @@ The __unblock()__ method allow a user to unblock previously blocked friendship w
     @jane.unblock @john
     @jane.blocked #=> []
 
-## Testing the gem ##
+## Testing ##
 
-It is possible to test amistad by running the following command from the gem directory:
+It is possible to test amistad by running one of the following commands from the gem directory:
 
-    rake spec
+    rake spec:activerecord # activerecord tests
+    rake spec:mongoid      # mongoid tests
     
-Remember that amistad is only compatible with ActiveRecord 3.x.
+Remember that amistad is only compatible with ActiveRecord 3.x and Mongoid.
 
-## Acknowledgement ##
+## Contributors ##
 
-* David Czarnecki : block friendships
+* David Czarnecki : block friendships (and many other improvements)
 * Adrian Dulić : unblock friendships (and many other improvements)
 
 ## Note on Patches/Pull Requests ##

data/Rakefile

@@ -4,4 +4,15 @@ Bundler::GemHelper.install_tasks
 require 'rspec'
 require 'rspec/core/rake_task'
 
-Rspec::Core::RakeTask.new(:spec)
+namespace :spec do
+  Rspec::Core::RakeTask.new(:activerecord) do |t|
+    t.pattern = "./spec/activerecord/**/*_spec.rb"
+    t.rspec_opts = "--format Fuubar"
+  end
+
+  Rspec::Core::RakeTask.new(:mongoid) do |t|
+    t.pattern = "./spec/mongoid/**/*_spec.rb"
+    t.rspec_opts = "--format Fuubar"
+  end
+end
+

data/amistad.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   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.add_development_dependency "fuubar", "~> 0.0.3"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/amistad/active_record/friend_model.rb

@@ -8,38 +8,38 @@ module Amistad
           has_many  :friendships
 
           has_many  :pending_invited,
-                    :through => :friendships,
-                    :source => :friend,
-                    :conditions => { :'friendships.pending' => true, :'friendships.blocker_id' => nil }
+          :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 }
+          :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 }
+          :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 }
+          :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"
+          :through => :blocked_friendships,
+          :source => :friend,
+          :conditions => "friend_id <> blocker_id"
 
           has_many  :blockades_by,
-                    :through => :blocked_friendships,
-                    :source => :user,
-                    :conditions => "user_id <> blocker_id"
+          :through => :blocked_friendships,
+          :source => :user,
+          :conditions => "user_id <> blocker_id"
         end
       end
 
@@ -69,6 +69,11 @@ module Amistad
           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)
@@ -88,6 +93,11 @@ module Amistad
           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)

data/lib/amistad/mongoid/friend_model.rb

@@ -9,12 +9,12 @@ module Amistad
           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
@@ -43,6 +43,11 @@ module Amistad
           self.invited + self.invited_by
         end
 
+        # total # of invited and invited_by without association loading
+        def total_friends
+          (friend_ids + inverse_friend_ids).count
+        end
+
         # return the list of invited friends
         def invited
           self.class.find(friend_ids)
@@ -119,7 +124,7 @@ module Amistad
           else
             return false
           end
-          
+
           self.save
         end
 
@@ -142,16 +147,21 @@ module Amistad
           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
         
+        # total # of blockades and blockedes_by without association loading
+        def total_blocked
+          (blocked_friend_ids + blocked_inverse_friend_ids + blocked_pending_inverse_friend_ids).count
+        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)

data/lib/amistad/version.rb

@@ -1,3 +1,3 @@
 module Amistad
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end

data/spec/{activerecord_friend_model_spec.rb → activerecord/activerecord_friend_model_spec.rb}

@@ -1,4 +1,4 @@
-require 'activerecord_spec_helper'
+require File.dirname(__FILE__) + "/activerecord_spec_helper"
 
 describe Amistad::ActiveRecord::FriendModel do
   def reset_friendships

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

@@ -1,4 +1,4 @@
-require 'activerecord_spec_helper'
+require File.dirname(__FILE__) + "/activerecord_spec_helper"
 
 describe Amistad::ActiveRecord::FriendshipModel do
 

data/spec/{mongoid_friend_model_spec.rb → mongoid/mongoid_friend_model_spec.rb}

@@ -1,4 +1,4 @@
-require 'mongoid_spec_helper'
+require File.dirname(__FILE__) + '/mongoid_spec_helper'
 
 describe Amistad::Mongoid::FriendModel do
   def reset_friendships

data/spec/support/friend_examples.rb

@@ -389,4 +389,33 @@ shared_examples_for "a friend model" do
       @david.pending_invited_by.should == [@victoria]
     end
   end
+
+  context "when counting friendships and blocks" do
+    before do
+      reset_friendships
+      @john.invite(@james).should be_true
+      @james.approve(@john).should be_true
+      @john.invite(@victoria).should be_true
+      @victoria.approve(@john).should be_true      
+      @elisabeth.invite(@john).should be_true
+      @john.approve(@elisabeth).should be_true
+
+      @victoria.invite(@david).should be_true
+      @david.block(@victoria).should be_true
+      @mary.invite(@victoria).should be_true
+      @victoria.block(@mary).should be_true
+    end
+
+    it "should return the correct count for total_friends" do
+      @john.total_friends.should == 3
+      @elisabeth.total_friends.should == 1
+      @james.total_friends.should == 1
+      @victoria.total_friends.should == 1
+    end
+
+    it "should return the correct count for total_blocked" do
+      @david.total_blocked.should == 1
+      @victoria.total_blocked.should == 1
+    end
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: amistad
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors: 
 - Rawane ZOSSOU
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-12 00:00:00 +01:00
+date: 2011-02-16 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -79,6 +79,17 @@ dependencies:
         version: "1.2"
   type: :development
   version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: fuubar
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.0.3
+  type: :development
+  version_requirements: *id007
 description: Extends your user model with friendships management methods
 email: 
 - dev@raw1z.fr
@@ -106,11 +117,11 @@ files:
 - lib/generators/amistad/install/install_generator.rb
 - lib/generators/amistad/install/templates/create_friendships.rb
 - lib/generators/amistad/install/templates/friendship.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/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/mongoid/mongoid_spec_helper.rb
 - spec/spec_helper.rb
 - spec/support/friend_examples.rb
 has_rdoc: true
@@ -142,10 +153,10 @@ signing_key:
 specification_version: 3
 summary: Adds friendships management into a rails 3.0 application
 test_files: 
-- 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/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/mongoid/mongoid_spec_helper.rb
 - spec/spec_helper.rb
 - spec/support/friend_examples.rb