mailboxer 0.0.8 → 0.0.9

data/spec/models/{mailboxer_mail_spec.rb → receipt_spec.rb}

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mailboxer
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Eduardo Casanova Cuesta
@@ -193,10 +193,10 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
-- app/models/mailboxer_conversation.rb
-- app/models/mailboxer_mail.rb
-- app/models/mailboxer_mailbox.rb
-- app/models/mailboxer_message.rb
+- app/models/conversation.rb
+- app/models/mailbox.rb
+- app/models/message.rb
+- app/models/receipt.rb
 - lib/generators/mailboxer/install_generator.rb
 - lib/generators/mailboxer/templates/migration.rb
 - lib/mailboxer.rb
@@ -231,7 +231,7 @@ files:
 - spec/dummy/db/migrate/20110228120600_create_users.rb
 - spec/dummy/db/migrate/20110306002940_create_ducks.rb
 - spec/dummy/db/migrate/20110306015107_create_cylons.rb
-- spec/dummy/db/migrate/20110321231559_create_mailboxer.rb
+- spec/dummy/db/migrate/20110322000127_create_mailboxer.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -249,13 +249,13 @@ files:
 - spec/factories/cylon.rb
 - spec/factories/duck.rb
 - spec/factories/user.rb
-- spec/integration/mailboxer_message_and_mail_spec.rb
+- spec/integration/message_and_receipt_spec.rb
 - spec/integration/navigation_spec.rb
 - spec/mailboxer_spec.rb
-- spec/models/mailboxer_conversation_spec.rb
-- spec/models/mailboxer_mail_spec.rb
-- spec/models/mailboxer_mailbox_spec.rb
+- spec/models/conversation_spec.rb
+- spec/models/mailbox_spec.rb
 - spec/models/mailboxer_models_messageable_spec.rb
+- spec/models/receipt_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/ging/mailboxer

data/app/models/mailboxer_conversation.rb

@@ -1,106 +0,0 @@
-class MailboxerConversation < ActiveRecord::Base
-  attr_reader :originator, :original_message, :last_sender, :last_message, :users
-  has_many :mailboxer_messages
-  has_many :mailboxer_mails, :through => :mailboxer_messages
-  #  before_create :clean
-  scope :participant, lambda {|participant|
-    joins(:mailboxer_mails).select('DISTINCT mailboxer_conversations.*').where('mailboxer_mails.receiver_id' => participant.id,'mailboxer_mails.receiver_type' => participant.class.to_s).order("mailboxer_conversations.updated_at DESC")
-  }
-  scope :inbox, lambda {|participant|
-    joins(:mailboxer_mails).select('DISTINCT mailboxer_conversations.*').where('mailboxer_mails.receiver_id' => participant.id,'mailboxer_mails.receiver_type' => participant.class.to_s, 'mailboxer_mails.mailbox_type' => 'inbox','mailboxer_mails.trashed' => false).order("mailboxer_conversations.updated_at DESC")
-  }
-  scope :sentbox, lambda {|participant|
-    joins(:mailboxer_mails).select('DISTINCT mailboxer_conversations.*').where('mailboxer_mails.receiver_id' => participant.id,'mailboxer_mails.receiver_type' => participant.class.to_s, 'mailboxer_mails.mailbox_type' => 'sentbox','mailboxer_mails.trashed' => false).order("mailboxer_conversations.updated_at DESC")    
-  }
-  scope :trash, lambda {|participant|
-    joins(:mailboxer_mails).select('DISTINCT mailboxer_conversations.*').where('mailboxer_mails.receiver_id' => participant.id,'mailboxer_mails.receiver_type' => participant.class.to_s,'mailboxer_mails.trashed' => true).order("mailboxer_conversations.updated_at DESC")
-  }
-  scope :unread,  lambda {|participant|
-    joins(:mailboxer_mails).select('DISTINCT mailboxer_conversations.*').where('mailboxer_mails.receiver_id' => participant.id,'mailboxer_mails.receiver_type' => participant.class.to_s,'mailboxer_mails.read' => false).order("mailboxer_conversations.updated_at DESC")
-  }
-  
-  class << self
-    def total
-      count('DISTINCT mailboxer_conversations.id')
-    end
-  end
-  
-  def mark_as_read(participant)
-    return if participant.nil?
-    return MailboxerMail.conversation(self).receiver(participant).mark_as_read
-  end
-  
-  def mark_as_unread(participant)
-    return if participant.nil?
-    return MailboxerMail.conversation(self).receiver(participant).mark_as_unread
-  end
-  
-  def move_to_trash(participant)
-    return if participant.nil?
-    return MailboxerMail.conversation(self).receiver(participant).move_to_trash
-  end
-  
-  def untrash(participant)
-    return if participant.nil?
-    return MailboxerMail.conversation(self).receiver(participant).untrash
-  end
-  
-  #originator of the conversation.
-  def originator
-    @orignator = self.original_message.sender if @originator.nil?
-    return @orignator
-  end
-  
-  #first message of the conversation.
-  def original_message
-    @original_message = self.mailboxer_messages.find(:first, :order => 'created_at') if @original_message.nil?
-    return @original_message
-  end
-  
-  #sender of the last message.
-  def last_sender
-    @last_sender = self.last_message.sender if @last_sender.nil?
-    return @last_sender
-  end
-  
-  #last message in the conversation.
-  def last_message
-    @last_message = self.mailboxer_messages.find(:first, :order => 'created_at DESC') if @last_message.nil?
-    return @last_message
-  end
-  
-  def mails(participant=nil)
-    return MailboxerMail.conversation(self).receiver(participant) if participant
-    return MailboxerMail.conversation(self)
-  end
-  
-  #all users involved in the conversation.
-  def recipients
-    return last_message.get_recipients
-  end
-  
-  def get_recipients
-    return self.recipients
-  end
-  
-  def messages
-    self.mailboxer_messages
-  end
-  
-  def count_messages
-    return MailboxerMessage.conversation(self).count
-  end
-  
-  def is_participant?(participant)
-    return false if participant.nil?
-    return MailboxerMail.conversation(self).receiver(participant).count != 0
-  end
-  #  protected
-  #  #[empty method]
-  #  #
-  #  #this gets called before_create. Implement this if you wish to clean out illegal content such as scripts or anything that will break layout. This is left empty because what is considered illegal content varies.
-  #  def clean
-  #    return if subject.nil?
-  #    #strip all illegal content here. (scripts, shit that will break layout, etc.)
-  #  end
-end

data/spec/models/mailboxer_mailbox_spec.rb

@@ -1,99 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-
-describe MailboxerMailbox do
-  
-  before do
-    @entity1 = Factory(:user)
-    @entity2 = Factory(:user)
-    @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
-    @message4 = @mail4.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.mail
-    @entity1.mailbox.mail.count.should==4
-    @entity1.mailbox.mail[0].should==MailboxerMail.receiver(@entity1).conversation(@conversation)[0]
-    @entity1.mailbox.mail[1].should==MailboxerMail.receiver(@entity1).conversation(@conversation)[1]
-    @entity1.mailbox.mail[2].should==MailboxerMail.receiver(@entity1).conversation(@conversation)[2]
-    @entity1.mailbox.mail[3].should==MailboxerMail.receiver(@entity1).conversation(@conversation)[3]
-    
-    assert @entity2.mailbox.mail
-    @entity2.mailbox.mail.count.should==4
-    @entity2.mailbox.mail[0].should==MailboxerMail.receiver(@entity2).conversation(@conversation)[0]
-    @entity2.mailbox.mail[1].should==MailboxerMail.receiver(@entity2).conversation(@conversation)[1]
-    @entity2.mailbox.mail[2].should==MailboxerMail.receiver(@entity2).conversation(@conversation)[2]
-    @entity2.mailbox.mail[3].should==MailboxerMail.receiver(@entity2).conversation(@conversation)[3]    
-  end
-  
-  it "should return sentbox" do
-    assert @entity1.mailbox.mail.inbox
-    @entity1.mailbox.mail.sentbox.count.should==2
-    @entity1.mailbox.mail.sentbox[0].should==@mail1
-    @entity1.mailbox.mail.sentbox[1].should==@mail3
-    
-    assert @entity2.mailbox.mail.inbox
-    @entity2.mailbox.mail.sentbox.count.should==2
-    @entity2.mailbox.mail.sentbox[0].should==@mail2
-    @entity2.mailbox.mail.sentbox[1].should==@mail4
-  end
-  
-  it "should return inbox" do
-    assert @entity1.mailbox.mail.inbox
-    @entity1.mailbox.mail.inbox.count.should==2
-    @entity1.mailbox.mail.inbox[0].should==MailboxerMail.receiver(@entity1).inbox.conversation(@conversation)[0]
-    @entity1.mailbox.mail.inbox[1].should==MailboxerMail.receiver(@entity1).inbox.conversation(@conversation)[1]
-    
-    assert @entity2.mailbox.mail.inbox
-    @entity2.mailbox.mail.inbox.count.should==2
-    @entity2.mailbox.mail.inbox[0].should==MailboxerMail.receiver(@entity2).inbox.conversation(@conversation)[0]
-    @entity2.mailbox.mail.inbox[1].should==MailboxerMail.receiver(@entity2).inbox.conversation(@conversation)[1]
-  end
-  
-  it "should return trashed mails" do 
-    @entity1.mailbox.mail.move_to_trash
-    
-    assert @entity1.mailbox.mail.trash
-    @entity1.mailbox.mail.trash.count.should==4
-    @entity1.mailbox.mail.trash[0].should==MailboxerMail.receiver(@entity1).conversation(@conversation)[0]
-    @entity1.mailbox.mail.trash[1].should==MailboxerMail.receiver(@entity1).conversation(@conversation)[1]
-    @entity1.mailbox.mail.trash[2].should==MailboxerMail.receiver(@entity1).conversation(@conversation)[2]
-    @entity1.mailbox.mail.trash[3].should==MailboxerMail.receiver(@entity1).conversation(@conversation)[3]
-    
-    assert @entity2.mailbox.mail.trash
-    @entity2.mailbox.mail.trash.count.should==0    
-  end
-  
-  it "should delete trashed mails" do 
-    @entity1.mailbox.mail.move_to_trash
-    @entity1.mailbox.empty_trash
-    
-    assert @entity1.mailbox.mail.trash
-    @entity1.mailbox.mail.trash.count.should==0    
-    
-    assert @entity2.mailbox.mail
-    @entity2.mailbox.mail.count.should==4
-    
-    assert @entity2.mailbox.mail.trash
-    @entity2.mailbox.mail.trash.count.should==0    
-  end
-  
-end