amistad 0.7.2 → 0.7.3

data/CHANGELOG

@@ -1,3 +1,7 @@
+Version 0.7.3 (19.02.2011)
+--------------------------
+- Fixed a bug occuring with mongoid when the users were created before amistad was activated in the user model (thanks to Drew Baumann for signaling this bug)
+
 Version 0.7.2 (16.02.2011)
 --------------------------
 - Added total_friends() and total_blocked() which count friendships and blocks without loading associations (by David Czarnecki)

data/lib/amistad/mongoid/friend_model.rb

@@ -3,23 +3,28 @@ module Amistad
     module FriendModel
       def self.included(receiver)
         receiver.class_exec do
+          field :friend_ids, :type => Array, :default => [], :accessible => true
+          field :inverse_friend_ids, :type => Array, :default => [], :accessible => true
+          field :pending_friend_ids, :type => Array, :default => [], :accessible => true
+          field :pending_inverse_friend_ids, :type => Array, :default => [], :accessible => true
+          field :blocked_friend_ids, :type => Array, :default => [], :accessible => true
+          field :blocked_inverse_friend_ids, :type => Array, :default => [], :accessible => true
+          field :blocked_pending_friend_ids, :type => Array, :default => [], :accessible => true
+          field :blocked_pending_inverse_friend_ids, :type => Array, :default => [], :accessible => true
+          
+          %w(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).each do |attribute|
+            define_method(attribute.to_sym) do
+              value = read_attribute(attribute)
+              write_attribute(attribute, value = []) if value.nil?
+              value
+            end
+          end
+          
           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
+      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)

data/lib/amistad/version.rb

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

data/spec/activerecord/activerecord_friend_model_spec.rb

@@ -5,5 +5,9 @@ describe Amistad::ActiveRecord::FriendModel do
     Friendship.delete_all
   end
   
+  before(:all) do
+    create_users
+  end
+  
   it_should_behave_like "a friend model"
 end

data/spec/mongoid/mongoid_friend_model_spec.rb

@@ -6,16 +6,42 @@ describe Amistad::Mongoid::FriendModel do
       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
+
+  context "When users are created after activating amistad" do
+    before(:all) do
+      # create a user model with amistad activated
+      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, :require => true
+      end
+      
+      # create the users
+      create_users
     end
+  
+    it_should_behave_like "a friend model"
   end
   
-  it_should_behave_like "a friend model"
+  context "When users are created before activating amistad" do
+    before(:all) do
+      # create a user model without amistad activated
+      Object.send(:remove_const, :User) if Object.const_defined?(:User)
+      User = Class.new
+      User.class_exec do
+        include Mongoid::Document
+        field :name, :require => true
+      end
+      
+      # create the users
+      create_users
+      
+      # activate amistad
+      User.class_exec { include Amistad::FriendModel }
+    end
+  
+    it_should_behave_like "a friend model"
+  end
 end

data/spec/mongoid/mongoid_spec_helper.rb

@@ -8,4 +8,4 @@ Mongoid.configure do |config|
   config.slaves = [
     Mongo::Connection.new(host, 27017, :slave_ok => true).db(name)
   ]
-end
+end

data/spec/spec_helper.rb

@@ -1,3 +1,10 @@
 require 'rspec'
 require 'amistad'
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+Dir["#{File.dirname(__FILE__)}/support/*.rb"].each {|f| require f}
+
+def create_users
+  User.delete_all
+  %w(John Jane David James Peter Mary Victoria Elisabeth).each do |name|
+    instance_variable_set("@#{name.downcase}".to_sym, User.create(:name => name))
+  end
+end

data/spec/support/friend_examples.rb

@@ -1,10 +1,4 @@
 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))
-    end
-  end
-
   context "when creating friendships" do
     before(:each) do
       reset_friendships

metadata

@@ -2,7 +2,7 @@
 name: amistad
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors: 
 - Rawane ZOSSOU
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-16 00:00:00 +01:00
+date: 2011-02-19 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency