facteur 0.3.1 → 0.3.2

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/lib/facteur/addressee_model.rb

@@ -22,15 +22,22 @@ module Facteur
         mailbox = {:name => name}
         mailbox.merge! options
         mailboxes << mailbox
-        all.each do |addressee|
-          addressee.create_mailbox(name, options)
-        end
       end
       
       # Returns the mailboxes defined for the class
       def mailboxes
         @mailboxes ||= []
       end
+      
+      def update_addressees_mailboxes
+        all.each do |addressee|
+          @mailboxes.each do |mailbox|
+            options = {}.merge(mailbox)
+            name = options.delete(:name)
+            addressee.create_mailbox(name, options)
+          end
+        end
+      end
     end
     
     module InstanceMethods

data/spec/facteur_spec.rb

@@ -31,6 +31,21 @@ describe Facteur::AddresseeModel do
     it "creates the addressee's mailboxes" do
       @john.mailboxes.where(:name => 'private_mailbox').first.should_not be_nil
       @john.mailboxes.where(:name => 'public_mailbox').first.should_not be_nil
+      
+      @peter.mailboxes.where(:name => 'private_mailbox').first.should_not be_nil
+      @peter.mailboxes.where(:name => 'public_mailbox').first.should_not be_nil
+      
+      @james.mailboxes.where(:name => 'private_mailbox').first.should_not be_nil
+      @james.mailboxes.where(:name => 'public_mailbox').first.should_not be_nil
+      
+      @mary.mailboxes.where(:name => 'private_mailbox').first.should_not be_nil
+      @mary.mailboxes.where(:name => 'public_mailbox').first.should_not be_nil
+      
+      @jane.mailboxes.where(:name => 'private_mailbox').first.should_not be_nil
+      @jane.mailboxes.where(:name => 'public_mailbox').first.should_not be_nil
+      
+      @victoria.mailboxes.where(:name => 'private_mailbox').first.should_not be_nil
+      @victoria.mailboxes.where(:name => 'public_mailbox').first.should_not be_nil
     end
     
     it "defines the mailboxes accessors" do
@@ -38,6 +53,71 @@ describe Facteur::AddresseeModel do
       @john.should respond_to :public_mailbox
       @john.private_mailbox.should_not be_nil
       @john.public_mailbox.should_not be_nil
+      
+      @peter.should respond_to :private_mailbox
+      @peter.should respond_to :public_mailbox
+      @peter.private_mailbox.should_not be_nil
+      @peter.public_mailbox.should_not be_nil
+      
+      @james.should respond_to :private_mailbox
+      @james.should respond_to :public_mailbox
+      @james.private_mailbox.should_not be_nil
+      @james.public_mailbox.should_not be_nil
+      
+      @mary.should respond_to :private_mailbox
+      @mary.should respond_to :public_mailbox
+      @mary.private_mailbox.should_not be_nil
+      @mary.public_mailbox.should_not be_nil
+      
+      @jane.should respond_to :private_mailbox
+      @jane.should respond_to :public_mailbox
+      @jane.private_mailbox.should_not be_nil
+      @jane.public_mailbox.should_not be_nil
+      
+      @victoria.should respond_to :private_mailbox
+      @victoria.should respond_to :public_mailbox
+      @victoria.private_mailbox.should_not be_nil
+      @victoria.public_mailbox.should_not be_nil
+    end
+  end
+  
+  context "When adding a new mailbox" do
+    before(:all) do
+      create_users
+      class User < ActiveRecord::Base
+        mailbox :added_mailbox
+      end
+      User.update_addressees_mailboxes
+    end
+    
+    it "should add the new mailbox to the class mailboxes" do
+      User.mailboxes.should include({:name=>:added_mailbox})
+    end
+    
+    it "should add the new mailbox to all the existing users" do
+      @john.mailboxes.where(:name => 'private_mailbox').first.should_not be_nil
+      @john.mailboxes.where(:name => 'public_mailbox').first.should_not be_nil
+      @john.mailboxes.where(:name => 'added_mailbox').first.should_not be_nil
+      
+      @peter.mailboxes.where(:name => 'private_mailbox').first.should_not be_nil
+      @peter.mailboxes.where(:name => 'public_mailbox').first.should_not be_nil
+      @peter.mailboxes.where(:name => 'added_mailbox').first.should_not be_nil
+      
+      @james.mailboxes.where(:name => 'private_mailbox').first.should_not be_nil
+      @james.mailboxes.where(:name => 'public_mailbox').first.should_not be_nil
+      @james.mailboxes.where(:name => 'added_mailbox').first.should_not be_nil
+      
+      @mary.mailboxes.where(:name => 'private_mailbox').first.should_not be_nil
+      @mary.mailboxes.where(:name => 'public_mailbox').first.should_not be_nil
+      @mary.mailboxes.where(:name => 'added_mailbox').first.should_not be_nil
+      
+      @jane.mailboxes.where(:name => 'private_mailbox').first.should_not be_nil
+      @jane.mailboxes.where(:name => 'public_mailbox').first.should_not be_nil
+      @jane.mailboxes.where(:name => 'added_mailbox').first.should_not be_nil
+      
+      @victoria.mailboxes.where(:name => 'private_mailbox').first.should_not be_nil
+      @victoria.mailboxes.where(:name => 'public_mailbox').first.should_not be_nil
+      @victoria.mailboxes.where(:name => 'added_mailbox').first.should_not be_nil
     end
   end
   
@@ -86,43 +166,4 @@ describe Facteur::AddresseeModel do
     end
   end
   
-  context "When adding a new mailbox" do
-    before(:all) do
-      create_users
-      class User < ActiveRecord::Base
-        mailbox :added_mailbox
-      end
-    end
-    
-    it "should add the new mailbox to the class mailboxes" do
-      User.mailboxes.should include({:name=>:added_mailbox})
-    end
-    
-    it "should add the new mailbox to all the existing users" do
-      @john.mailboxes.where(:name => 'private_mailbox').first.should_not be_nil
-      @john.mailboxes.where(:name => 'public_mailbox').first.should_not be_nil
-      @john.mailboxes.where(:name => 'added_mailbox').first.should_not be_nil
-      
-      @peter.mailboxes.where(:name => 'private_mailbox').first.should_not be_nil
-      @peter.mailboxes.where(:name => 'public_mailbox').first.should_not be_nil
-      @peter.mailboxes.where(:name => 'added_mailbox').first.should_not be_nil
-      
-      @james.mailboxes.where(:name => 'private_mailbox').first.should_not be_nil
-      @james.mailboxes.where(:name => 'public_mailbox').first.should_not be_nil
-      @james.mailboxes.where(:name => 'added_mailbox').first.should_not be_nil
-      
-      @mary.mailboxes.where(:name => 'private_mailbox').first.should_not be_nil
-      @mary.mailboxes.where(:name => 'public_mailbox').first.should_not be_nil
-      @mary.mailboxes.where(:name => 'added_mailbox').first.should_not be_nil
-      
-      @jane.mailboxes.where(:name => 'private_mailbox').first.should_not be_nil
-      @jane.mailboxes.where(:name => 'public_mailbox').first.should_not be_nil
-      @jane.mailboxes.where(:name => 'added_mailbox').first.should_not be_nil
-      
-      @victoria.mailboxes.where(:name => 'private_mailbox').first.should_not be_nil
-      @victoria.mailboxes.where(:name => 'public_mailbox').first.should_not be_nil
-      @victoria.mailboxes.where(:name => 'added_mailbox').first.should_not be_nil
-    end
-  end
-  
 end

data/spec/spec_helper.rb

@@ -60,6 +60,7 @@ end
 
 def create_users
   User.delete_all
+  Mailbox.delete_all
   %w(John Peter James Mary Jane Victoria).each do |name|
     eval "@#{name.downcase} = User.create(:name => '#{name}')"
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Rawane ZOSSOU