mailboxer 0.0.2 → 0.0.3

data/app/models/mailboxer_conversation.rb

@@ -45,6 +45,10 @@ class MailboxerConversation < ActiveRecord::Base
     return self.recipients
   end
   
+  def messages
+    self.mailboxer_messages
+  end
+  
   def count_messages
     return MailboxerMessage.conversation(self).count
   end

data/app/models/mailboxer_mail.rb

@@ -67,4 +67,12 @@ class MailboxerMail < ActiveRecord::Base
     update_attributes(:mailbox_type => :sentbox, :trashed => false)
   end
   
+  def message
+    self.mailboxer_message
+  end
+  
+  def conversation
+    self.mailboxer_conversation
+  end
+  
 end

data/app/models/mailboxer_message.rb

@@ -39,4 +39,12 @@ class MailboxerMessage < ActiveRecord::Base
     return recipients_array
   end
   
+  def conversation
+    self.mailboxer_conversation
+  end
+  
+  def mails
+    self.mailboxer_mails
+  end
+  
 end

data/mailboxer.gemspec

@@ -1,11 +1,11 @@
 
 Gem::Specification.new do |s|
   s.name = "mailboxer"
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eduardo Casanova Cuesta"]
-  s.date = %q{2011-03-10}
+  s.date = %q{2011-03-11}
   s.description = %q{A Rails engine that allows any model to act as messageable, permitting it interchange messages with any other messageable model. }
   s.email = %q{ecasanovac@gmail.com}
   s.extra_rdoc_files = [
@@ -30,5 +30,6 @@ Gem::Specification.new do |s|
   s.add_dependency(%q<rcov>, [">= 0"])
   s.add_development_dependency('factory_girl', '~> 1.3.2')
   s.add_development_dependency('forgery', '~> 0.3.6')
+  s.add_development_dependency('capybara', '~> 0.3.9')
 end
 

data/spec/integration/mailboxer_message_and_mail_spec.rb

@@ -12,7 +12,7 @@ describe "Mailboxer Messages And Mails" do
       
       before do
         @mail1 = @entity1.send_message(@entity2,"Body","Subject")
-        @message1 = @mail1.mailboxer_message
+        @message1 = @mail1.message
       end
       
       it "should create proper message" do
@@ -54,8 +54,8 @@ describe "Mailboxer Messages And Mails" do
       before do
         @mail1 = @entity1.send_message(@entity2,"Body","Subject")
         @mail2 = @entity2.reply_to_sender(@mail1,"Reply body")
-        @message1 = @mail1.mailboxer_message
-        @message2 = @mail2.mailboxer_message
+        @message1 = @mail1.message
+        @message2 = @mail2.message
       end
       
       it "should create proper message" do
@@ -75,7 +75,7 @@ describe "Mailboxer Messages And Mails" do
           mail.mailbox_type.should=="sentbox"
         end      
         #Receiver Mail
-        mail = MailboxerMail.find(:first,:conditions=>["mailboxer_message_id=? AND receiver_id=? AND receiver_type=?",@message2.id,@entity1.id,@entity1.class])
+        mail = MailboxerMail.receiver(@entity1).message(@message2).first
         assert mail
         if mail
           mail.read.should==false
@@ -92,7 +92,7 @@ describe "Mailboxer Messages And Mails" do
       end
       
       it "should be associated to the same conversation" do
-        @message1.mailboxer_conversation.id.should==@message2.mailboxer_conversation.id      
+        @message1.conversation.id.should==@message2.conversation.id      
       end           
     end
     
@@ -100,8 +100,8 @@ describe "Mailboxer Messages And Mails" do
       before do
         @mail1 = @entity1.send_message(@entity2,"Body","Subject")
         @mail2 = @entity2.reply_to_all(@mail1,"Reply body")
-        @message1 = @mail1.mailboxer_message
-        @message2 = @mail2.mailboxer_message
+        @message1 = @mail1.message
+        @message2 = @mail2.message
       end
       
       it "should create proper message" do
@@ -121,7 +121,7 @@ describe "Mailboxer Messages And Mails" do
           mail.mailbox_type.should=="sentbox"
         end      
         #Receiver Mail
-        mail = MailboxerMail.find(:first,:conditions=>["mailboxer_message_id=? AND receiver_id=? AND receiver_type=?",@message2.id,@entity1.id,@entity1.class])
+        mail = MailboxerMail.receiver(@entity1).message(@message2).first
         assert mail
         if mail
           mail.read.should==false
@@ -138,15 +138,15 @@ describe "Mailboxer Messages And Mails" do
       end
       
       it "should be associated to the same conversation" do
-        @message1.mailboxer_conversation.id.should==@message2.mailboxer_conversation.id      
+        @message1.conversation.id.should==@message2.conversation.id      
       end           
     end
     describe "message replying to conversation" do
       before do
         @mail1 = @entity1.send_message(@entity2,"Body","Subject")
-        @mail2 = @entity2.reply_to_conversation(@mail1.mailboxer_conversation,"Reply body")
-        @message1 = @mail1.mailboxer_message
-        @message2 = @mail2.mailboxer_message
+        @mail2 = @entity2.reply_to_conversation(@mail1.conversation,"Reply body")
+        @message1 = @mail1.message
+        @message2 = @mail2.message
       end
       
       it "should create proper message" do
@@ -166,7 +166,7 @@ describe "Mailboxer Messages And Mails" do
           mail.mailbox_type.should=="sentbox"
         end      
         #Receiver Mail
-        mail = MailboxerMail.find(:first,:conditions=>["mailboxer_message_id=? AND receiver_id=? AND receiver_type=?",@message2.id,@entity1.id,@entity1.class])
+        mail = MailboxerMail.receiver(@entity1).message(@message2).first
         assert mail
         if mail
           mail.read.should==false
@@ -183,7 +183,7 @@ describe "Mailboxer Messages And Mails" do
       end
       
       it "should be associated to the same conversation" do
-        @message1.mailboxer_conversation.id.should==@message2.mailboxer_conversation.id      
+        @message1.conversation.id.should==@message2.conversation.id      
       end              
     end
   end
@@ -198,7 +198,7 @@ describe "Mailboxer Messages And Mails" do
       
       before do
         @mail1 = @entity1.send_message(@entity2,"Body","Subject")
-        @message1 = @mail1.mailboxer_message
+        @message1 = @mail1.message
       end
       
       it "should create proper message" do
@@ -240,8 +240,8 @@ describe "Mailboxer Messages And Mails" do
       before do
         @mail1 = @entity1.send_message(@entity2,"Body","Subject")
         @mail2 = @entity2.reply_to_sender(@mail1,"Reply body")
-        @message1 = @mail1.mailboxer_message
-        @message2 = @mail2.mailboxer_message
+        @message1 = @mail1.message
+        @message2 = @mail2.message
       end
       
       it "should create proper message" do
@@ -261,7 +261,7 @@ describe "Mailboxer Messages And Mails" do
           mail.mailbox_type.should=="sentbox"
         end      
         #Receiver Mail
-        mail = MailboxerMail.find(:first,:conditions=>["mailboxer_message_id=? AND receiver_id=? AND receiver_type=?",@message2.id,@entity1.id,@entity1.class])
+        mail = MailboxerMail.receiver(@entity1).message(@message2).first
         assert mail
         if mail
           mail.read.should==false
@@ -278,7 +278,7 @@ describe "Mailboxer Messages And Mails" do
       end
       
       it "should be associated to the same conversation" do
-        @message1.mailboxer_conversation.id.should==@message2.mailboxer_conversation.id      
+        @message1.conversation.id.should==@message2.conversation.id      
       end           
     end
     
@@ -286,8 +286,8 @@ describe "Mailboxer Messages And Mails" do
       before do
         @mail1 = @entity1.send_message(@entity2,"Body","Subject")
         @mail2 = @entity2.reply_to_all(@mail1,"Reply body")
-        @message1 = @mail1.mailboxer_message
-        @message2 = @mail2.mailboxer_message
+        @message1 = @mail1.message
+        @message2 = @mail2.message
       end
       
       it "should create proper message" do
@@ -307,7 +307,7 @@ describe "Mailboxer Messages And Mails" do
           mail.mailbox_type.should=="sentbox"
         end      
         #Receiver Mail
-        mail = MailboxerMail.find(:first,:conditions=>["mailboxer_message_id=? AND receiver_id=? AND receiver_type=?",@message2.id,@entity1.id,@entity1.class])
+        mail = MailboxerMail.receiver(@entity1).message(@message2).first
         assert mail
         if mail
           mail.read.should==false
@@ -324,7 +324,7 @@ describe "Mailboxer Messages And Mails" do
       end
       
       it "should be associated to the same conversation" do
-        @message1.mailboxer_conversation.id.should==@message2.mailboxer_conversation.id      
+        @message1.conversation.id.should==@message2.conversation.id      
       end           
     end
     describe "message replying to conversation (TODO)" do
@@ -364,7 +364,7 @@ describe "Mailboxer Messages And Mails" do
       
       before do
         @mail1 = @entity1.send_message(@recipients,"Body","Subject")
-        @message1 = @mail1.mailboxer_message
+        @message1 = @mail1.message
       end
       
       it "should create proper message" do
@@ -385,7 +385,7 @@ describe "Mailboxer Messages And Mails" do
         end      
         #Receiver Mails
         @recipients.each do |receiver|
-          mail = MailboxerMail.find(:first,:conditions=>["mailboxer_message_id=? AND receiver_id=? AND receiver_type=?",@message1.id,receiver.id,receiver.class])
+          mail = MailboxerMail.receiver(receiver).message(@message1).first
           assert mail
           if mail
             mail.read.should==false
@@ -409,8 +409,8 @@ describe "Mailboxer Messages And Mails" do
       before do
         @mail1 = @entity1.send_message(@recipients,"Body","Subject")
         @mail2 = @entity2.reply_to_sender(@mail1,"Reply body")
-        @message1 = @mail1.mailboxer_message
-        @message2 = @mail2.mailboxer_message
+        @message1 = @mail1.message
+        @message2 = @mail2.message
       end
       
       it "should create proper message" do
@@ -430,7 +430,7 @@ describe "Mailboxer Messages And Mails" do
           mail.mailbox_type.should=="sentbox"
         end      
         #Receiver Mail
-        mail = MailboxerMail.find(:first,:conditions=>["mailboxer_message_id=? AND receiver_id=? AND receiver_type=?",@message2.id,@entity1.id,@entity1.class])
+        mail = MailboxerMail.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.find(:first,:conditions=>["mailboxer_message_id=? AND receiver_id=? AND receiver_type=?",@message2.id,@entity3.id,@entity3.class])
+        mail = MailboxerMail.receiver(@entity3).message(@message2).first
         assert mail.nil?
         
       end
@@ -453,7 +453,7 @@ describe "Mailboxer Messages And Mails" do
       end
       
       it "should be associated to the same conversation" do
-        @message1.mailboxer_conversation.id.should==@message2.mailboxer_conversation.id      
+        @message1.conversation.id.should==@message2.conversation.id      
       end           
     end
     
@@ -461,8 +461,8 @@ describe "Mailboxer Messages And Mails" do
       before do
         @mail1 = @entity1.send_message(@recipients,"Body","Subject")
         @mail2 = @entity2.reply_to_all(@mail1,"Reply body")
-        @message1 = @mail1.mailboxer_message
-        @message2 = @mail2.mailboxer_message
+        @message1 = @mail1.message
+        @message2 = @mail2.message
         @recipients2 = Array.new
         @recipients2 << @entity1
         @recipients2 << @entity3
@@ -506,7 +506,7 @@ describe "Mailboxer Messages And Mails" do
       end
       
       it "should be associated to the same conversation" do
-        @message1.mailboxer_conversation.id.should==@message2.mailboxer_conversation.id      
+        @message1.conversation.id.should==@message2.conversation.id      
       end           
     end
     describe "message replying to conversation (TODO)" do
@@ -546,7 +546,7 @@ describe "Mailboxer Messages And Mails" do
       
       before do
         @mail1 = @entity1.send_message(@recipients,"Body","Subject")
-        @message1 = @mail1.mailboxer_message
+        @message1 = @mail1.message
       end
       
       it "should create proper message" do
@@ -567,7 +567,7 @@ describe "Mailboxer Messages And Mails" do
         end      
         #Receiver Mails
         @recipients.each do |receiver|
-          mail = MailboxerMail.find(:first,:conditions=>["mailboxer_message_id=? AND receiver_id=? AND receiver_type=?",@message1.id,receiver.id,receiver.class])
+          mail = MailboxerMail.receiver(receiver).message(@message1).first
           assert mail
           if mail
             mail.read.should==false
@@ -591,8 +591,8 @@ describe "Mailboxer Messages And Mails" do
       before do
         @mail1 = @entity1.send_message(@recipients,"Body","Subject")
         @mail2 = @entity2.reply_to_sender(@mail1,"Reply body")
-        @message1 = @mail1.mailboxer_message
-        @message2 = @mail2.mailboxer_message
+        @message1 = @mail1.message
+        @message2 = @mail2.message
       end
       
       it "should create proper message" do
@@ -612,7 +612,7 @@ describe "Mailboxer Messages And Mails" do
           mail.mailbox_type.should=="sentbox"
         end      
         #Receiver Mail
-        mail = MailboxerMail.find(:first,:conditions=>["mailboxer_message_id=? AND receiver_id=? AND receiver_type=?",@message2.id,@entity1.id,@entity1.class])
+        mail = MailboxerMail.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.find(:first,:conditions=>["mailboxer_message_id=? AND receiver_id=? AND receiver_type=?",@message2.id,@entity3.id,@entity3.class])
+        mail = MailboxerMail.receiver(@entity3).message(@message2).first
         assert mail.nil?
         
       end
@@ -635,7 +635,7 @@ describe "Mailboxer Messages And Mails" do
       end
       
       it "should be associated to the same conversation" do
-        @message1.mailboxer_conversation.id.should==@message2.mailboxer_conversation.id      
+        @message1.conversation.id.should==@message2.conversation.id      
       end           
     end
     
@@ -643,8 +643,8 @@ describe "Mailboxer Messages And Mails" do
       before do
         @mail1 = @entity1.send_message(@recipients,"Body","Subject")
         @mail2 = @entity2.reply_to_all(@mail1,"Reply body")
-        @message1 = @mail1.mailboxer_message
-        @message2 = @mail2.mailboxer_message
+        @message1 = @mail1.message
+        @message2 = @mail2.message
         @recipients2 = Array.new
         @recipients2 << @entity1
         @recipients2 << @entity3
@@ -688,7 +688,7 @@ describe "Mailboxer Messages And Mails" do
       end
       
       it "should be associated to the same conversation" do
-        @message1.mailboxer_conversation.id.should==@message2.mailboxer_conversation.id      
+        @message1.conversation.id.should==@message2.conversation.id      
       end           
     end
     

data/spec/models/mailboxer_conversation_spec.rb

@@ -9,9 +9,9 @@ describe MailboxerConversation do
     @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.mailboxer_message
-    @message4 = @mail4.mailboxer_message
-    @conversation = @message1.mailboxer_conversation
+    @message1 = @mail1.message
+    @message4 = @mail4.message
+    @conversation = @message1.conversation
   end
   
   it "should have proper original message" do

data/spec/models/mailboxer_mail_spec.rb

@@ -9,11 +9,11 @@ describe MailboxerMail do
   end
   
   it "should belong to a message" do
-    assert @mail1.mailboxer_message
+    assert @mail1.message
   end
   
   it "should belong to a conversation" do
-    assert @mail1.mailboxer_conversation    
+    assert @mail1.conversation    
   end
   
   it "should be able to be marked as unread" do

data/spec/models/mailboxer_mailbox_spec.rb

@@ -9,15 +9,15 @@ describe MailboxerMailbox do
     @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.mailboxer_message
-    @message4 = @mail4.mailboxer_message
-    @conversation = @message1.mailboxer_conversation
+    @message1 = @mail1.message
+    @message4 = @mail4.message
+    @conversation = @message1.conversation
   end  
   
   it "should return all conversations" do
-    @conv2 = @entity1.send_message(@entity2,"Body","Subject").mailboxer_conversation
-    @conv3 = @entity2.send_message(@entity1,"Body","Subject").mailboxer_conversation
-    @conv4 =  @entity1.send_message(@entity2,"Body","Subject").mailboxer_conversation
+    @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
     

data/spec/models/mailboxer_models_messageable_spec.rb

@@ -64,12 +64,12 @@ describe "Mailboxer::Models::Messageable through User" do
     @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.mailboxer_message
-    @conversation = @message1.mailboxer_conversation
+    @message1 = @mail1.message
+    @conversation = @message1.conversation
     
     @entity1.read_conversation(@conversation)
     
-    @mails = @conversation.mailboxer_mails.receiver(@entity1)
+    @mails = @conversation.mails.receiver(@entity1)
     
     @mails.each do |mail|
       mail.read.should==true
@@ -82,13 +82,13 @@ describe "Mailboxer::Models::Messageable through User" do
     @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.mailboxer_message
-    @conversation = @message1.mailboxer_conversation
+    @message1 = @mail1.message
+    @conversation = @message1.conversation
     
     @entity2.read_conversation(@conversation)
     
-    @mails = @conversation.mailboxer_mails.receiver(@entity1)
-    @mails_total = @conversation.mailboxer_mails
+    @mails = @conversation.mails.receiver(@entity1)
+    @mails_total = @conversation.mails
     
     unread_mails = 0
     

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mailboxer
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Eduardo Casanova Cuesta
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-10 00:00:00 +01:00
+date: 2011-03-11 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -160,6 +160,22 @@ dependencies:
         version: 0.3.6
   type: :development
   version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: capybara
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 0
+        - 3
+        - 9
+        version: 0.3.9
+  type: :development
+  version_requirements: *id010
 description: "A Rails engine that allows any model to act as messageable, permitting it interchange messages with any other messageable model. "
 email: ecasanovac@gmail.com
 executables: []