mailboxer 0.0.8 → 0.0.9

data/mailboxer.gemspec

@@ -1,7 +1,7 @@
 
 Gem::Specification.new do |s|
   s.name = "mailboxer"
-  s.version = "0.0.8"
+  s.version = "0.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eduardo Casanova Cuesta"]

data/spec/dummy/db/migrate/{20110321231559_create_mailboxer.rb → 20110322000127_create_mailboxer.rb}

@@ -1,13 +1,13 @@
 class CreateMailboxer < ActiveRecord::Migration
   def self.up    
-    create_table :mailboxer_conversations do |t|
+    create_table :conversations do |t|
       t.column :subject, :string, :default => ""
       t.column :created_at, :datetime, :null => false
       t.column :updated_at, :datetime, :null => false
     end    
-    create_table :mailboxer_mails do |t|
+    create_table :receipts do |t|
       t.references :receiver, :polymorphic => true
-      t.column :mailboxer_message_id, :integer, :null => false
+      t.column :message_id, :integer, :null => false
       t.column :read, :boolean, :default => false
       t.column :trashed, :boolean, :default => false
       t.column :deleted, :boolean, :default => false
@@ -15,12 +15,12 @@ class CreateMailboxer < ActiveRecord::Migration
       t.column :created_at, :datetime, :null => false
       t.column :updated_at, :datetime, :null => false
     end    
-    create_table :mailboxer_messages do |t|
+    create_table :messages do |t|
       t.column :body, :text
       t.column :subject, :string, :default => ""
       t.column :headers, :text
       t.references :sender, :polymorphic => true
-      t.column :mailboxer_conversation_id, :integer
+      t.column :conversation_id, :integer
       t.column :sent, :boolean, :default => false
       t.column :draft, :boolean, :default => false
       t.column :system, :boolean, :default => false
@@ -30,8 +30,8 @@ class CreateMailboxer < ActiveRecord::Migration
   end
   
   def self.down
-    drop_table :mailboxer_mails
-    drop_table :mailboxer_conversations
-    drop_table :mailboxer_messages
+    drop_table :receipts
+    drop_table :conversations
+    drop_table :messages
   end
 end

data/spec/integration/{mailboxer_message_and_mail_spec.rb → message_and_receipt_spec.rb}

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-describe "Mailboxer Messages And Mails" do 
+describe "Messages And Receipts" do 
   
   describe "two equal entities" do
     before do
@@ -24,7 +24,7 @@ describe "Mailboxer Messages And Mails" do
       
       it "should create proper mails" do
         #Sender Mail
-        mail = MailboxerMail.receiver(@entity1).message(@message1).first
+        mail = Receipt.receiver(@entity1).message(@message1).first
         assert mail
         if mail
           mail.read.should==true
@@ -32,7 +32,7 @@ describe "Mailboxer Messages And Mails" do
           mail.mailbox_type.should=="sentbox"
         end      
         #Receiver Mail
-        mail = MailboxerMail.receiver(@entity2).message(@message1).first
+        mail = Receipt.receiver(@entity2).message(@message1).first
         assert mail
         if mail
           mail.read.should==false
@@ -67,7 +67,7 @@ describe "Mailboxer Messages And Mails" do
       
       it "should create proper mails" do
         #Sender Mail
-        mail = MailboxerMail.receiver(@entity2).message(@message2).first
+        mail = Receipt.receiver(@entity2).message(@message2).first
         assert mail
         if mail
           mail.read.should==true
@@ -75,7 +75,7 @@ describe "Mailboxer Messages And Mails" do
           mail.mailbox_type.should=="sentbox"
         end      
         #Receiver Mail
-        mail = MailboxerMail.receiver(@entity1).message(@message2).first
+        mail = Receipt.receiver(@entity1).message(@message2).first
         assert mail
         if mail
           mail.read.should==false
@@ -113,7 +113,7 @@ describe "Mailboxer Messages And Mails" do
       
       it "should create proper mails" do
         #Sender Mail
-        mail = MailboxerMail.receiver(@entity2).message(@message2).first
+        mail = Receipt.receiver(@entity2).message(@message2).first
         assert mail
         if mail
           mail.read.should==true
@@ -121,7 +121,7 @@ describe "Mailboxer Messages And Mails" do
           mail.mailbox_type.should=="sentbox"
         end      
         #Receiver Mail
-        mail = MailboxerMail.receiver(@entity1).message(@message2).first
+        mail = Receipt.receiver(@entity1).message(@message2).first
         assert mail
         if mail
           mail.read.should==false
@@ -158,7 +158,7 @@ describe "Mailboxer Messages And Mails" do
       
       it "should create proper mails" do
         #Sender Mail
-        mail = MailboxerMail.receiver(@entity2).message(@message2).first
+        mail = Receipt.receiver(@entity2).message(@message2).first
         assert mail
         if mail
           mail.read.should==true
@@ -166,7 +166,7 @@ describe "Mailboxer Messages And Mails" do
           mail.mailbox_type.should=="sentbox"
         end      
         #Receiver Mail
-        mail = MailboxerMail.receiver(@entity1).message(@message2).first
+        mail = Receipt.receiver(@entity1).message(@message2).first
         assert mail
         if mail
           mail.read.should==false
@@ -210,7 +210,7 @@ describe "Mailboxer Messages And Mails" do
       
       it "should create proper mails" do
         #Sender Mail
-        mail = MailboxerMail.receiver(@entity1).message(@message1).first
+        mail = Receipt.receiver(@entity1).message(@message1).first
         assert mail
         if mail
           mail.read.should==true
@@ -218,7 +218,7 @@ describe "Mailboxer Messages And Mails" do
           mail.mailbox_type.should=="sentbox"
         end      
         #Receiver Mail
-        mail = MailboxerMail.receiver(@entity2).message(@message1).first
+        mail = Receipt.receiver(@entity2).message(@message1).first
         assert mail
         if mail
           mail.read.should==false
@@ -253,7 +253,7 @@ describe "Mailboxer Messages And Mails" do
       
       it "should create proper mails" do
         #Sender Mail
-        mail = MailboxerMail.receiver(@entity2).message(@message2).first
+        mail = Receipt.receiver(@entity2).message(@message2).first
         assert mail
         if mail
           mail.read.should==true
@@ -261,7 +261,7 @@ describe "Mailboxer Messages And Mails" do
           mail.mailbox_type.should=="sentbox"
         end      
         #Receiver Mail
-        mail = MailboxerMail.receiver(@entity1).message(@message2).first
+        mail = Receipt.receiver(@entity1).message(@message2).first
         assert mail
         if mail
           mail.read.should==false
@@ -299,7 +299,7 @@ describe "Mailboxer Messages And Mails" do
       
       it "should create proper mails" do
         #Sender Mail
-        mail = MailboxerMail.receiver(@entity2).message(@message2).first
+        mail = Receipt.receiver(@entity2).message(@message2).first
         assert mail
         if mail
           mail.read.should==true
@@ -307,7 +307,7 @@ describe "Mailboxer Messages And Mails" do
           mail.mailbox_type.should=="sentbox"
         end      
         #Receiver Mail
-        mail = MailboxerMail.receiver(@entity1).message(@message2).first
+        mail = Receipt.receiver(@entity1).message(@message2).first
         assert mail
         if mail
           mail.read.should==false
@@ -376,7 +376,7 @@ describe "Mailboxer Messages And Mails" do
       
       it "should create proper mails" do
         #Sender Mail
-        mail = MailboxerMail.receiver(@entity1).message(@message1).first
+        mail = Receipt.receiver(@entity1).message(@message1).first
         assert mail
         if mail
           mail.read.should==true
@@ -385,7 +385,7 @@ describe "Mailboxer Messages And Mails" do
         end      
         #Receiver Mails
         @recipients.each do |receiver|
-          mail = MailboxerMail.receiver(receiver).message(@message1).first
+          mail = Receipt.receiver(receiver).message(@message1).first
           assert mail
           if mail
             mail.read.should==false
@@ -422,7 +422,7 @@ describe "Mailboxer Messages And Mails" do
       
       it "should create proper mails" do
         #Sender Mail
-        mail = MailboxerMail.receiver(@entity2).message(@message2).first
+        mail = Receipt.receiver(@entity2).message(@message2).first
         assert mail
         if mail
           mail.read.should==true
@@ -430,7 +430,7 @@ describe "Mailboxer Messages And Mails" do
           mail.mailbox_type.should=="sentbox"
         end      
         #Receiver Mail
-        mail = MailboxerMail.receiver(@entity1).message(@message2).first
+        mail = Receipt.receiver(@entity1).message(@message2).first
         assert mail
         if mail
           mail.read.should==false
@@ -439,7 +439,7 @@ describe "Mailboxer Messages And Mails" do
         end
         
         #No Receiver, No Mail
-        mail = MailboxerMail.receiver(@entity3).message(@message2).first
+        mail = Receipt.receiver(@entity3).message(@message2).first
         assert mail.nil?
         
       end
@@ -478,7 +478,7 @@ describe "Mailboxer Messages And Mails" do
       
       it "should create proper mails" do
         #Sender Mail
-        mail = MailboxerMail.receiver(@entity2).message(@message2).first
+        mail = Receipt.receiver(@entity2).message(@message2).first
         assert mail
         if mail
           mail.read.should==true
@@ -487,7 +487,7 @@ describe "Mailboxer Messages And Mails" do
         end      
         #Receiver Mails
         @recipients2.each do |receiver|
-          mail = MailboxerMail.receiver(receiver).message(@message2).first
+          mail = Receipt.receiver(receiver).message(@message2).first
           assert mail
           if mail
             mail.read.should==false
@@ -558,7 +558,7 @@ describe "Mailboxer Messages And Mails" do
       
       it "should create proper mails" do
         #Sender Mail
-        mail = MailboxerMail.receiver(@entity1).message(@message1).first
+        mail = Receipt.receiver(@entity1).message(@message1).first
         assert mail
         if mail
           mail.read.should==true
@@ -567,7 +567,7 @@ describe "Mailboxer Messages And Mails" do
         end      
         #Receiver Mails
         @recipients.each do |receiver|
-          mail = MailboxerMail.receiver(receiver).message(@message1).first
+          mail = Receipt.receiver(receiver).message(@message1).first
           assert mail
           if mail
             mail.read.should==false
@@ -604,7 +604,7 @@ describe "Mailboxer Messages And Mails" do
       
       it "should create proper mails" do
         #Sender Mail
-        mail = MailboxerMail.receiver(@entity2).message(@message2).first
+        mail = Receipt.receiver(@entity2).message(@message2).first
         assert mail
         if mail
           mail.read.should==true
@@ -612,7 +612,7 @@ describe "Mailboxer Messages And Mails" do
           mail.mailbox_type.should=="sentbox"
         end      
         #Receiver Mail
-        mail = MailboxerMail.receiver(@entity1).message(@message2).first
+        mail = Receipt.receiver(@entity1).message(@message2).first
         assert mail
         if mail
           mail.read.should==false
@@ -621,7 +621,7 @@ describe "Mailboxer Messages And Mails" do
         end
         
         #No Receiver, No Mail
-        mail = MailboxerMail.receiver(@entity3).message(@message2).first
+        mail = Receipt.receiver(@entity3).message(@message2).first
         assert mail.nil?
         
       end
@@ -660,7 +660,7 @@ describe "Mailboxer Messages And Mails" do
       
       it "should create proper mails" do
         #Sender Mail
-        mail = MailboxerMail.receiver(@entity2).message(@message2).first
+        mail = Receipt.receiver(@entity2).message(@message2).first
         assert mail
         if mail
           mail.read.should==true
@@ -669,7 +669,7 @@ describe "Mailboxer Messages And Mails" do
         end      
         #Receiver Mails
         @recipients2.each do |receiver|
-          mail = MailboxerMail.receiver(receiver).message(@message2).first
+          mail = Receipt.receiver(receiver).message(@message2).first
           assert mail
           if mail
             mail.read.should==false

data/spec/models/{mailboxer_conversation_spec.rb → conversation_spec.rb}

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-describe MailboxerConversation do
+describe Conversation do
   
   before do
     @entity1 = Factory(:user)

data/spec/models/mailbox_spec.rb

@@ -0,0 +1,100 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Mailbox do
+  
+  before do
+    @entity1 = Factory(:user)
+    @entity2 = Factory(:user)
+    @receipt1 = @entity1.send_message(@entity2,"Body","Subject")
+    @receipt2 = @entity2.reply_to_all(@receipt1,"Reply body 1")
+    @receipt3 = @entity1.reply_to_all(@receipt2,"Reply body 2")
+    @receipt4 = @entity2.reply_to_all(@receipt3,"Reply body 3")
+    @message1 = @receipt1.message
+    @message4 = @receipt4.message
+    @conversation = @message1.conversation
+  end  
+  
+  it "should return all conversations" do
+    @conv2 = @entity1.send_message(@entity2,"Body","Subject").conversation
+    @conv3 = @entity2.send_message(@entity1,"Body","Subject").conversation
+    @conv4 =  @entity1.send_message(@entity2,"Body","Subject").conversation
+    
+    assert @entity1.mailbox.conversations
+    
+    @entity1.mailbox.conversations.to_a.count.should==4
+        @entity1.mailbox.conversations.to_a.count(@conversation).should==1
+        @entity1.mailbox.conversations.to_a.count(@conv2).should==1
+        @entity1.mailbox.conversations.to_a.count(@conv3).should==1
+        @entity1.mailbox.conversations.to_a.count(@conv4).should==1    
+  end
+  
+  it "should return all mail" do 
+    assert @entity1.mailbox.receipts
+    @entity1.mailbox.receipts.count.should==4
+    @entity1.mailbox.receipts[0].should==Receipt.receiver(@entity1).conversation(@conversation)[0]
+    @entity1.mailbox.receipts[1].should==Receipt.receiver(@entity1).conversation(@conversation)[1]
+    @entity1.mailbox.receipts[2].should==Receipt.receiver(@entity1).conversation(@conversation)[2]
+    @entity1.mailbox.receipts[3].should==Receipt.receiver(@entity1).conversation(@conversation)[3]
+    
+    assert @entity2.mailbox.receipts
+    @entity2.mailbox.receipts.count.should==4
+    @entity2.mailbox.receipts[0].should==Receipt.receiver(@entity2).conversation(@conversation)[0]
+    @entity2.mailbox.receipts[1].should==Receipt.receiver(@entity2).conversation(@conversation)[1]
+    @entity2.mailbox.receipts[2].should==Receipt.receiver(@entity2).conversation(@conversation)[2]
+    @entity2.mailbox.receipts[3].should==Receipt.receiver(@entity2).conversation(@conversation)[3]    
+  end
+  
+  it "should return sentbox" do
+    assert @entity1.mailbox.receipts.inbox
+    @entity1.mailbox.receipts.sentbox.count.should==2
+    @entity1.mailbox.receipts.sentbox[0].should==@receipt1
+    @entity1.mailbox.receipts.sentbox[1].should==@receipt3
+    
+    assert @entity2.mailbox.receipts.inbox
+    @entity2.mailbox.receipts.sentbox.count.should==2
+    @entity2.mailbox.receipts.sentbox[0].should==@receipt2
+    @entity2.mailbox.receipts.sentbox[1].should==@receipt4
+  end
+  
+  it "should return inbox" do
+    assert @entity1.mailbox.receipts.inbox
+    @entity1.mailbox.receipts.inbox.count.should==2
+    @entity1.mailbox.receipts.inbox[0].should==Receipt.receiver(@entity1).inbox.conversation(@conversation)[0]
+    @entity1.mailbox.receipts.inbox[1].should==Receipt.receiver(@entity1).inbox.conversation(@conversation)[1]
+    
+    assert @entity2.mailbox.receipts.inbox
+    @entity2.mailbox.receipts.inbox.count.should==2
+    @entity2.mailbox.receipts.inbox[0].should==Receipt.receiver(@entity2).inbox.conversation(@conversation)[0]
+    @entity2.mailbox.receipts.inbox[1].should==Receipt.receiver(@entity2).inbox.conversation(@conversation)[1]
+  end
+  
+  it "should return trashed mails" do 
+    @entity1.mailbox.receipts.move_to_trash
+    
+    assert @entity1.mailbox.receipts.trash
+    @entity1.mailbox.receipts.trash.count.should==4
+    @entity1.mailbox.receipts.trash[0].should==Receipt.receiver(@entity1).conversation(@conversation)[0]
+    @entity1.mailbox.receipts.trash[1].should==Receipt.receiver(@entity1).conversation(@conversation)[1]
+    @entity1.mailbox.receipts.trash[2].should==Receipt.receiver(@entity1).conversation(@conversation)[2]
+    @entity1.mailbox.receipts.trash[3].should==Receipt.receiver(@entity1).conversation(@conversation)[3]
+    
+    assert @entity2.mailbox.receipts.trash
+    @entity2.mailbox.receipts.trash.count.should==0    
+  end
+  
+  it "should delete trashed mails (TODO)" do 
+    @entity1.mailbox.receipts.move_to_trash
+    #TODO
+    #@entity1.mailbox.empty_trash
+    
+    assert @entity1.mailbox.receipts.trash
+    #@entity1.mailbox.receipts.trash.count.should==0    
+    
+    assert @entity2.mailbox.receipts
+    @entity2.mailbox.receipts.count.should==4
+    
+    assert @entity2.mailbox.receipts.trash
+    @entity2.mailbox.receipts.trash.count.should==0    
+  end
+  
+end

data/spec/models/mailboxer_models_messageable_spec.rb

@@ -16,13 +16,13 @@ describe "Mailboxer::Models::Messageable through User" do
   end
   
   it "should be able to reply to sender" do
-    @mail = @entity1.send_message(@entity2,"Body","Subject")
-    assert @entity2.reply_to_sender(@mail,"Reply body")
+    @receipt = @entity1.send_message(@entity2,"Body","Subject")
+    assert @entity2.reply_to_sender(@receipt,"Reply body")
   end
   
   it "should be able to reply to all" do
-    @mail = @entity1.send_message(@entity2,"Body","Subject")
-    assert @entity2.reply_to_all(@mail,"Reply body")    
+    @receipt = @entity1.send_message(@entity2,"Body","Subject")
+    assert @entity2.reply_to_all(@receipt,"Reply body")    
   end
   
   it "should be able to reply to conversation (TODO)" do
@@ -30,69 +30,69 @@ describe "Mailboxer::Models::Messageable through User" do
   end
   
   it "should be able to unread an owned mail (mark as unread)" do
-    @mail = @entity1.send_message(@entity2,"Body","Subject")
-    @mail.read.should==true
-    @entity1.unread_mail(@mail)
-    @mail.read.should==false
+    @receipt = @entity1.send_message(@entity2,"Body","Subject")
+    @receipt.read.should==true
+    @entity1.unread_message(@receipt)
+    @receipt.read.should==false
   end
   
   it "should be able to read an owned mail (mark as read)" do
-    @mail = @entity1.send_message(@entity2,"Body","Subject")
-    @mail.read.should==true
-    @entity1.unread_mail(@mail)
-    @entity1.read_mail(@mail)
-    @mail.read.should==true
+    @receipt = @entity1.send_message(@entity2,"Body","Subject")
+    @receipt.read.should==true
+    @entity1.unread_message(@receipt)
+    @entity1.read_message(@receipt)
+    @receipt.read.should==true
   end
   
   it "should be able to unread anot owned mail (mark as unread)" do
-    @mail = @entity1.send_message(@entity2,"Body","Subject")
-    @mail.read.should==true
-    @entity2.unread_mail(@mail) #Should not change
-    @mail.read.should==true
+    @receipt = @entity1.send_message(@entity2,"Body","Subject")
+    @receipt.read.should==true
+    @entity2.unread_message(@receipt) #Should not change
+    @receipt.read.should==true
   end
   
   it "should be able to read a not owned mail (mark as read)" do
-    @mail = @entity1.send_message(@entity2,"Body","Subject")
-    @mail.read.should==true
-    @entity1.unread_mail(@mail) #From read to unread
-    @entity2.read_mail(@mail) #Should not change
-    @mail.read.should==false
+    @receipt = @entity1.send_message(@entity2,"Body","Subject")
+    @receipt.read.should==true
+    @entity1.unread_message(@receipt) #From read to unread
+    @entity2.read_message(@receipt) #Should not change
+    @receipt.read.should==false
   end
   
+=begin  
   it "should be able to read owned mails of a conversation" do
-    @mail1 = @entity1.send_message(@entity2,"Body","Subject")
-    @mail2 = @entity2.reply_to_all(@mail1,"Reply body 1")
-    @mail3 = @entity1.reply_to_all(@mail2,"Reply body 2")
-    @mail4 = @entity2.reply_to_all(@mail3,"Reply body 3")
-    @message1 = @mail1.message
+    @receipt1 = @entity1.send_message(@entity2,"Body","Subject")
+    @receipt2 = @entity2.reply_to_all(@receipt1,"Reply body 1")
+    @receipt3 = @entity1.reply_to_all(@receipt2,"Reply body 2")
+    @receipt4 = @entity2.reply_to_all(@receipt3,"Reply body 3")
+    @message1 = @receipt1.message
     @conversation = @message1.conversation
     
-    @entity1.read_conversation(@conversation)
+    @conversation.mark_as_read(@entity1)
     
-    @mails = @conversation.mails.receiver(@entity1)
+    @receipts = @conversation.receipts(@entity1)
     
-    @mails.each do |mail|
+    @receipts.each do |mail|
       mail.read.should==true
-    end
-    
+    end    
   end
   
   it "should not be able to read not owned mails of a conversation" do
-    @mail1 = @entity1.send_message(@entity2,"Body","Subject")
-    @mail2 = @entity2.reply_to_all(@mail1,"Reply body 1")
-    @mail3 = @entity1.reply_to_all(@mail2,"Reply body 2")
-    @mail4 = @entity2.reply_to_all(@mail3,"Reply body 3")
-    @message1 = @mail1.message
+    @receipt1 = @entity1.send_message(@entity2,"Body","Subject")
+    @receipt2 = @entity2.reply_to_all(@receipt1,"Reply body 1")
+    @receipt3 = @entity1.reply_to_all(@receipt2,"Reply body 2")
+    @receipt4 = @entity2.reply_to_all(@receipt3,"Reply body 3")
+    @message1 = @receipt1.message
     @conversation = @message1.conversation
     
-    @entity2.read_conversation(@conversation)
+    @conversation.mark_as_read(@entity2)
     
-    @mails = @conversation.mails.receiver(@entity1)
-    @mails_total = @conversation.mails
+    @receipts = @conversation.receipts(@entity1)
+    @receipts_total = @conversation.receipts
     
     unread_mails = 0
     
-    @mails.each do |mail|
+    @receipts.each do |mail|
       unread_mails+=1 if !mail.read
     end
     
@@ -101,7 +101,7 @@ describe "Mailboxer::Models::Messageable through User" do
     
     
   end
-  
+=end  
   
   
 end