mailboxer 0.6.5 → 0.7.0

data/.travis.yml

@@ -5,4 +5,6 @@ rvm:
   - 1.9.3
   - ree
   - rbx-18mode
+  - rbx-19mode
   - jruby-18mode
+  - jruby-19mode

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Eduardo Casanova Cuesta
+Copyright (c) 2012 Universidad Politécnica de Madrid
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,4 +1,4 @@
-# Mailboxer 0.6.x [![](https://secure.travis-ci.org/ging/mailboxer.png)](http://travis-ci.org/ging/mailboxer) [![](https://gemnasium.com/ging/mailboxer.png)](https://gemnasium.com/ging/mailboxer)
+# Mailboxer 0.7.x [![](https://secure.travis-ci.org/ging/mailboxer.png)](http://travis-ci.org/ging/mailboxer) [![](https://gemnasium.com/ging/mailboxer.png)](https://gemnasium.com/ging/mailboxer)
 
 This project is based on the need of a private message system for [ging
 / social\_stream](https://github.com/ging/social_stream). Instead of creating our core message system heavily
@@ -72,6 +72,16 @@ Mailboxer.setup do |config|
 end
 ````
 
+You can change the way in which emails are delivered by specifying a custom implementation for notification and message mailer 
+
+````ruby
+Mailboxer.setup do |config|
+  config.notification_mailer = CustomNotificationMailer
+  config.message_mailer = CustomMessageMailer
+  ...
+end
+````
+
 ### User identities
 
 Users must have an identity defined by a `name` and an `email`. We must assure that Messageable models have some specific methods. These methods are:
@@ -219,6 +229,10 @@ This is done this way because receipts save the information about the relation b
 
 You can take a look at the full documentation of Mailboxer in [rubydoc.info](http://rubydoc.info/gems/mailboxer/frames).
 
+## Do you want to test Mailboxer?
+
+Thanks to [Roman Kushnir (@RKushnir)](https://github.com/RKushnir/) you can test Mailboxer with this [sample app](https://github.com/RKushnir/mailboxer-app).
+
 ## I need a GUI!
 
 If you need a GUI you should take a look a this links:
@@ -229,16 +243,9 @@ If you need a GUI you should take a look a this links:
 ## Contributors
 * [Roendal](https://github.com/ging/mailboxer/commits/master?author=Roendal) (Eduardo Casanova)
 * [dickeyxxx](https://github.com/ging/mailboxer/commits/master?author=dickeyxxx) (Jeff Dickey)
+* [RKushnir](https://github.com/ging/mailboxer/commits/master?author=RKushnir) (Roman Kushnir)
+* [amaierhofer](https://github.com/ging/mailboxer/commits/master?author=amaierhofer) (Andreas Maierhofer)
 * [tonydewan](https://github.com/ging/mailboxer/commits/master?author=tonydewan) (Tony Dewan)
 * [plentz](https://github.com/ging/mailboxer/commits/master?author=plentz) (Diego Plentz)
 * [laserlemon](https://github.com/ging/mailboxer/commits/master?author=laserlemon) (Steve Richert)
-
-## License
-
-Copyright © 2012 Eduardo Casanova Cuesta
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+* [daveworth](https://github.com/ging/mailboxer/commits/master?author=daveworth) (Dave Worth)

data/app/models/conversation.rb

@@ -1,4 +1,6 @@
 class Conversation < ActiveRecord::Base
+  attr_accessible :subject
+
 	has_many :messages, :dependent => :destroy
 	has_many :receipts, :through => :messages
 
@@ -6,20 +8,23 @@ class Conversation < ActiveRecord::Base
 
 	before_validation :clean
 
-	scope :participant, lambda {|participant|
-    joins(:receipts).select('DISTINCT conversations.*').where('notifications.type'=> Message.to_s,'receipts.receiver_id' => participant.id,'receipts.receiver_type' => participant.class.to_s).order("conversations.updated_at DESC")
+  scope :participant, lambda {|participant|
+    select('DISTINCT conversations.*').
+    where('notifications.type'=> Message.name).
+    order("conversations.updated_at DESC").
+    joins(:receipts).merge(Receipt.recipient(participant))
   }
-	scope :inbox, lambda {|participant|
-    joins(:receipts).select('DISTINCT conversations.*').where('notifications.type'=> Message.to_s,'receipts.receiver_id' => participant.id,'receipts.receiver_type' => participant.class.to_s, 'receipts.mailbox_type' => 'inbox','receipts.trashed' => false).order("conversations.updated_at DESC")
+  scope :inbox, lambda {|participant|
+    participant(participant).merge(Receipt.inbox.not_trash)
   }
-	scope :sentbox, lambda {|participant|
-    joins(:receipts).select('DISTINCT conversations.*').where('notifications.type'=> Message.to_s,'receipts.receiver_id' => participant.id,'receipts.receiver_type' => participant.class.to_s, 'receipts.mailbox_type' => 'sentbox','receipts.trashed' => false).order("conversations.updated_at DESC")
+  scope :sentbox, lambda {|participant|
+    participant(participant).merge(Receipt.sentbox.not_trash)
   }
-	scope :trash, lambda {|participant|
-    joins(:receipts).select('DISTINCT conversations.*').where('notifications.type'=> Message.to_s,'receipts.receiver_id' => participant.id,'receipts.receiver_type' => participant.class.to_s,'receipts.trashed' => true).order("conversations.updated_at DESC")
+  scope :trash, lambda {|participant|
+    participant(participant).merge(Receipt.trash)
   }
-	scope :unread,  lambda {|participant|
-    joins(:receipts).select('DISTINCT conversations.*').where('notifications.type'=> Message.to_s,'receipts.receiver_id' => participant.id,'receipts.receiver_type' => participant.class.to_s,'receipts.read' => false).order("conversations.updated_at DESC")
+  scope :unread,  lambda {|participant|
+    participant(participant).merge(Receipt.unread)
   }
 
   #Mark the conversation as read for one of the participants
@@ -55,7 +60,7 @@ class Conversation < ActiveRecord::Base
 		end
 		return []
 	end
-	
+
   #Returns an array of participants
 	def participants
 	  return recipients
@@ -110,13 +115,17 @@ class Conversation < ActiveRecord::Base
   #Returns true if the participant has trashed all the messages of the conversation
 	def is_completely_trashed?(participant)
 		return false if participant.nil?
-		return self.receipts_for(participant).trash.count==self.receipts(participant).count
+		return self.receipts_for(participant).trash.count == self.receipts_for(participant).count
+	end
+
+	def is_read?(participant)
+		!self.is_unread?(participant)
 	end
 
   #Returns true if the participant has at least one unread message of the conversation
 	def is_unread?(participant)
 		return false if participant.nil?
-		return self.receipts_for(participant).unread.count!=0
+		return self.receipts_for(participant).not_trash.unread.count!=0
 	end
 
 	protected

data/app/models/mailbox.rb

@@ -42,7 +42,7 @@ class Mailbox
       end
     end
 
-    if (options[:read].present? and options[:read]==false) or (options[:unread].present? and options[:unread]==true)
+    if (options.has_key?(:read) && options[:read]==false) || (options.has_key?(:unread) && options[:unread]==true)
       conv = conv.unread(@messageable)
     end
 

data/app/models/message.rb

@@ -1,5 +1,6 @@
 class Message < Notification
-  #
+  attr_accessible :attachment
+
   belongs_to :conversation, :validate => true, :autosave => true
   validates_presence_of :sender
 
@@ -10,6 +11,8 @@ class Message < Notification
   }
 
   mount_uploader :attachment, AttachmentUploader
+  
+  include Concerns::ConfigurableMailer
 
   class << self
     #Sets the on deliver callback method.
@@ -45,15 +48,15 @@ class Message < Notification
       temp_receipts.each(&:save!) 	#Save receipts
       self.recipients.each do |r|
       #Should send an email?
-        if Mailboxer.uses_emails 
+        if Mailboxer.uses_emails
           email_to = r.send(Mailboxer.email_method,self)
           unless email_to.blank?
-            MessageMailer.send_email(self,r).deliver
+            get_mailer.send_email(self,r).deliver
           end
         end
       end
       if reply
-        self.conversation.update_attribute(:updated_at, Time.now)
+        self.conversation.touch
       end
       self.recipients=nil
     self.on_deliver_callback.call(self) unless self.on_deliver_callback.nil?

data/app/models/notification.rb

@@ -1,24 +1,27 @@
 class Notification < ActiveRecord::Base
-
   attr_accessor :recipients
+  attr_accessible :body, :subject
+
   belongs_to :sender, :polymorphic => :true
   belongs_to :notified_object, :polymorphic => :true
   validates_presence_of :subject, :body
   has_many :receipts, :dependent => :destroy
-  
+
   scope :recipient, lambda { |recipient|
     joins(:receipts).where('receipts.receiver_id' => recipient.id,'receipts.receiver_type' => recipient.class.to_s)
   }
   scope :with_object, lambda { |obj|
     where('notified_object_id' => obj.id,'notified_object_type' => obj.class.to_s)
-  }    
+  }
   scope :not_trashed, lambda {
     joins(:receipts).where('receipts.trashed' => false)
   }
   scope :unread,  lambda {
     joins(:receipts).where('receipts.read' => false)
   }
-  
+
+  include Concerns::ConfigurableMailer
+
   class << self
     #Sends a Notification to all the recipients
     def notify_all(recipients,subject,body,obj = nil,sanitize_text = true,notification_code=nil)
@@ -29,7 +32,7 @@ class Notification < ActiveRecord::Base
       notification.notification_code = notification_code if notification_code.present?
       return notification.deliver sanitize_text
     end
-    
+
     #Takes a +Receipt+ or an +Array+ of them and returns +true+ if the delivery was
     #successful or +false+ if some error raised
     def successful_delivery? receipts
@@ -42,7 +45,7 @@ class Notification < ActiveRecord::Base
          return receipts.all? { |t| t.errors.empty? }
        else
          return false
-       end      
+       end
     end
   end
 
@@ -57,17 +60,17 @@ class Notification < ActiveRecord::Base
       msg_receipt.notification = self
       msg_receipt.read = false
       msg_receipt.receiver = r
-      temp_receipts << msg_receipt      
+      temp_receipts << msg_receipt
     end
     temp_receipts.each(&:valid?)
     if temp_receipts.all? { |t| t.errors.empty? }
       temp_receipts.each(&:save!)   #Save receipts
       self.recipients.each do |r|
         #Should send an email?
-        if Mailboxer.uses_emails 
+        if Mailboxer.uses_emails
           email_to = r.send(Mailboxer.email_method,self)
           unless email_to.blank?
-            NotificationMailer.send_email(self,r).deliver
+            get_mailer.send_email(self,r).deliver
           end
         end
       end
@@ -76,7 +79,7 @@ class Notification < ActiveRecord::Base
     return temp_receipts if temp_receipts.size > 1
     return temp_receipts.first
   end
-  
+
   #Returns the recipients of the Notification
   def recipients
     if @recipients.blank?
@@ -93,7 +96,7 @@ class Notification < ActiveRecord::Base
   def receipt_for(participant)
     return Receipt.notification(self).recipient(participant)
   end
-  
+
   #Returns the receipt for the participant. Alias for receipt_for(participant)
   def receipts_for(participant)
     return receipt_for(participant)
@@ -105,11 +108,15 @@ class Notification < ActiveRecord::Base
     return !self.receipt_for(participant).first.read
   end
 
+  def is_read?(participant)
+    !self.is_unread?(participant)
+  end
+
   #Returns if the participant have trashed the Notification
   def is_trashed?(participant)
     return false if participant.nil?
     return self.receipt_for(participant).first.trashed
-  end  
+  end
 
   #Mark the notification as read
   def mark_as_read(participant)
@@ -129,7 +136,7 @@ class Notification < ActiveRecord::Base
     return self.receipt_for(participant).move_to_trash
   end
 
-  #Takes the notification out of the trash 
+  #Takes the notification out of the trash
   def untrash(participant)
     return if participant.nil?
     return self.receipt_for(participant).untrash
@@ -145,7 +152,7 @@ class Notification < ActiveRecord::Base
     end
     self.body = sanitize self.body
   end
-  
+
   #Returns notified_object. DEPRECATED
   def object
     warn "DEPRECATION WARNING: use 'notify_object' instead of 'object' to get the object associated with the Notification"

data/app/models/receipt.rb

@@ -59,13 +59,13 @@ class Receipt < ActiveRecord::Base
 
     #This methods helps to do a update_all with table joins, not currently supported by rails.
     #Acording to the github ticket https://github.com/rails/rails/issues/522 it should be
-    #supported with 3.2. 
+    #supported with 3.2.
     def update_receipts(updates,options={})
       ids = Array.new
       where(options).each do |rcp|
         ids << rcp.id
       end
-      return if ids.empty?      
+      return if ids.empty?
       conditions = [""].concat(ids)
       condition = "id = ? "
       ids.drop(1).each do
@@ -120,9 +120,9 @@ class Receipt < ActiveRecord::Base
   #Returns if the participant have trashed the Notification
   def is_trashed?
     return self.trashed
-  end  
+  end
+
 
-  
   protected
 
   #Removes the duplicate error about not present subject from Conversation if it has been already

data/lib/mailboxer.rb

@@ -15,7 +15,9 @@ module Mailboxer
   @@email_method = :mailboxer_email
   mattr_accessor :name_method
   @@name_method = :name
-  
+  mattr_accessor :notification_mailer
+  mattr_accessor :message_mailer
+
    class << self
     def setup
       yield self
@@ -26,3 +28,4 @@ end
 # reopen ActiveRecord and include all the above to make
 # them available to all our models if they want it
 require 'mailboxer/engine' 
+require 'mailboxer/concerns/configurable_mailer'

data/lib/mailboxer/concerns/configurable_mailer.rb

@@ -0,0 +1,13 @@
+require 'active_support/inflections'
+
+module Concerns
+  module ConfigurableMailer
+
+    def get_mailer
+      return @mailer if @mailer
+      method = "#{self.class.to_s.downcase}_mailer".to_sym
+      @mailer = Mailboxer.send(method) ||  "#{self.class}Mailer".constantize
+    end
+
+  end
+end

data/lib/mailboxer/engine.rb

@@ -3,7 +3,6 @@ require 'foreigner'
 require 'carrierwave'
 begin 
   require 'sunspot_rails'
-  Logger.new(STDOUT).debug 'The sunspot_rails gem is present. Loading it into mailboxer. You can know use Solr search engine.'
 rescue LoadError
 end
 

data/lib/mailboxer/models/messageable.rb

@@ -16,7 +16,7 @@ module Mailboxer
         end
       end
 
-      module InstanceMethods        
+      module InstanceMethods
           eval <<-EOM
            #Returning any kind of identification you want for the model
            def #{Mailboxer.name_method}
@@ -26,7 +26,7 @@ module Mailboxer
            end
 
            #Returning the email address of the model if an email should be sent for this object (Message or Notification).
-           #If no mail has to be sent, return nil. 
+           #If no mail has to be sent, return nil.
            def #{Mailboxer.email_method}(object)
              super
            rescue NameError
@@ -49,7 +49,8 @@ module Mailboxer
         #as originator
         def send_message(recipients, msg_body, subject, sanitize_text=true, attachment=nil)
           convo = Conversation.new({:subject => subject})
-          message = Message.new({:sender => self, :conversation => convo,  :body => msg_body, :subject => subject, :attachment => attachment})
+          message = messages.new({:body => msg_body, :subject => subject, :attachment => attachment})
+          message.conversation = convo
           message.recipients = recipients.is_a?(Array) ? recipients : [recipients]
           message.recipients = message.recipients.uniq
           return message.deliver false,sanitize_text
@@ -59,7 +60,8 @@ module Mailboxer
         #Use reply_to_sender, reply_to_all and reply_to_conversation instead.
         def reply(conversation, recipients, reply_body, subject=nil, sanitize_text=true, attachment=nil)
           subject = subject || "RE: #{conversation.subject}"
-          response = Message.new({:sender => self, :conversation => conversation, :body => reply_body, :subject => subject, :attachment => attachment})
+          response = messages.new({:body => reply_body, :subject => subject, :attachment => attachment})
+          response.conversation = conversation
           response.recipients = recipients.is_a?(Array) ? recipients : [recipients]
           response.recipients = response.recipients.uniq
           response.recipients.delete(self)

data/mailboxer.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "mailboxer"
-  s.version = "0.6.5"
+  s.version = "0.7.0"
   s.authors = ["Eduardo Casanova Cuesta"]
   s.summary = "Messaging system for rails apps."
   s.description = "A Rails engine that allows any model to act as messageable, adding the ability to exchange messages " +
@@ -27,7 +27,11 @@ Gem::Specification.new do |s|
   # Specs
   s.add_development_dependency('rspec-rails', '>= 2.6.1')
   # Fixtures
-  s.add_development_dependency('factory_girl', '>= 2.6.0')
+  if RUBY_VERSION >= '1.9.2'
+    s.add_development_dependency('factory_girl', '>= 3.0.0')
+  else
+    s.add_development_dependency('factory_girl', '~> 2.6.0')
+  end
   # Population
   s.add_development_dependency('forgery', '>= 0.3.6')
   # Integration testing

data/spec/integration/message_and_receipt_spec.rb

@@ -4,8 +4,8 @@ describe "Messages And Receipts" do
   
   describe "two equal entities" do
     before do
-      @entity1 = Factory(:user)
-      @entity2 = Factory(:user)
+      @entity1 = FactoryGirl.create(:user)
+      @entity2 = FactoryGirl.create(:user)
     end
     
     describe "message sending" do    
@@ -190,8 +190,8 @@ describe "Messages And Receipts" do
   
   describe "two different entities" do
     before do
-      @entity1 = Factory(:user)
-      @entity2 = Factory(:duck)
+      @entity1 = FactoryGirl.create(:user)
+      @entity2 = FactoryGirl.create(:duck)
     end
     
     describe "message sending" do    
@@ -352,9 +352,9 @@ describe "Messages And Receipts" do
   
   describe "three equal entities" do
     before do
-      @entity1 = Factory(:user)
-      @entity2 = Factory(:user)
-      @entity3 = Factory(:user)
+      @entity1 = FactoryGirl.create(:user)
+      @entity2 = FactoryGirl.create(:user)
+      @entity3 = FactoryGirl.create(:user)
       @recipients = Array.new
       @recipients << @entity2
       @recipients << @entity3
@@ -534,9 +534,9 @@ describe "Messages And Receipts" do
   
   describe "three different entities" do
     before do
-      @entity1 = Factory(:user)
-      @entity2 = Factory(:duck)
-      @entity3 = Factory(:cylon)
+      @entity1 = FactoryGirl.create(:user)
+      @entity2 = FactoryGirl.create(:duck)
+      @entity3 = FactoryGirl.create(:cylon)
       @recipients = Array.new
       @recipients << @entity2
       @recipients << @entity3

data/spec/mailboxer/concerns/configurable_mailer_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+describe Concerns::ConfigurableMailer do
+
+  describe "Notification instance#get_mailer" do
+    before { @obj = Notification.new }
+    it "returns default_mailer" do
+      @obj.get_mailer.should eq NotificationMailer
+    end
+    it "returns 'foo' from Mailerbox.notification_mailer" do
+      Mailboxer.notification_mailer = 'foo'
+      @obj.get_mailer.should eq 'foo'
+    end
+    after { Mailboxer.notification_mailer = nil }
+  end
+
+  describe "Message instance#get_mailer" do
+    before { @obj = Message.new }
+    it "returns default_mailer" do
+      @obj.get_mailer.should eq MessageMailer
+    end
+    it "returns 'foo' from Mailerbox.message_mailer" do
+      Mailboxer.message_mailer = 'foo'
+      @obj.get_mailer.should eq 'foo'
+    end
+    after { Mailboxer.message_mailer = nil }
+  end
+end

data/spec/mailboxer_spec.rb

@@ -4,4 +4,4 @@ describe Mailboxer do
   it "should be valid" do
     Mailboxer.should be_a(Module)
   end
-end
+end

data/spec/mailers/message_mailer_spec.rb

@@ -3,10 +3,10 @@ require 'spec_helper'
 describe MessageMailer do
   describe "when sending new message" do
     before do
-      @sender = Factory(:user)
-      @entity1 = Factory(:user)
-      @entity2 = Factory(:duck)
-      @entity3 = Factory(:cylon)
+      @sender = FactoryGirl.create(:user)
+      @entity1 = FactoryGirl.create(:user)
+      @entity2 = FactoryGirl.create(:duck)
+      @entity3 = FactoryGirl.create(:cylon)
       @receipt1 = @sender.send_message([@entity1,@entity2,@entity3], "Body Body Body Body Body Body Body Body Body Body Body Body","Subject")
     end
 
@@ -48,10 +48,10 @@ describe MessageMailer do
 
   describe "when replying" do
     before do
-      @sender = Factory(:user)
-      @entity1 = Factory(:user)
-      @entity2 = Factory(:duck)
-      @entity3 = Factory(:cylon)
+      @sender = FactoryGirl.create(:user)
+      @entity1 = FactoryGirl.create(:user)
+      @entity2 = FactoryGirl.create(:duck)
+      @entity3 = FactoryGirl.create(:cylon)
       @receipt1 = @sender.send_message([@entity1,@entity2,@entity3], "Body","Subject")
       @receipt2 = @sender.reply_to_all(@receipt1, "Body")
     end

data/spec/mailers/notification_mailer_spec.rb

@@ -2,9 +2,9 @@ require 'spec_helper'
 
 describe NotificationMailer do
   before do
-    @entity1 = Factory(:user)
-    @entity2 = Factory(:duck)
-    @entity3 = Factory(:cylon)
+    @entity1 = FactoryGirl.create(:user)
+    @entity2 = FactoryGirl.create(:duck)
+    @entity3 = FactoryGirl.create(:cylon)
     @receipt1 = Notification.notify_all([@entity1,@entity2,@entity3],"Subject", "Body Body Body Body Body Body Body Body Body Body Body Body")
   end
 

data/spec/models/conversation_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
 describe Conversation do
-  
+
   before do
-    @entity1 = Factory(:user)
-    @entity2 = Factory(:user)
+    @entity1 = FactoryGirl.create(:user)
+    @entity2 = FactoryGirl.create(: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")
@@ -13,37 +13,89 @@ describe Conversation do
     @message4 = @receipt4.notification
     @conversation = @message1.conversation
   end
-  
+
   it "should have proper original message" do
     @conversation.original_message.should==@message1
   end
-  
+
   it "should have proper originator (first sender)" do
     @conversation.originator.should==@entity1
   end
-  
+
   it "should have proper last message" do
     @conversation.last_message.should==@message4
   end
-  
+
   it "should have proper last sender" do
     @conversation.last_sender.should==@entity2
   end
-  
-  it "should have all conversation users" do   
+
+  it "should have all conversation users" do
     @conversation.recipients.count.should==2
     @conversation.recipients.count.should==2
     @conversation.recipients.count(@entity1).should==1
     @conversation.recipients.count(@entity2).should==1
   end
-  
-    it "should be able to be marked as read" do
-    @conversation.move_to_trash(@entity1)
+
+  it "should be able to be marked as read" do
+    #@conversation.move_to_trash(@entity1)
+    @conversation.mark_as_read(@entity1)
+    @conversation.should be_is_read(@entity)
   end
-  
+
   it "should be able to be marked as unread" do
-    @conversation.move_to_trash(@entity1)
-    @conversation.untrash(@entity1)
+    @conversation.mark_as_read(@entity1)
+    @conversation.mark_as_unread(@entity1)
+    @conversation.should be_is_unread(@entity1)
+  end
+
+  describe "scopes" do
+    let(:participant) { FactoryGirl.create(:user) }
+    let!(:inbox_conversation) { @entity1.send_message(participant, "Body", "Subject").notification.conversation }
+    let!(:sentbox_conversation) { participant.send_message(@entity1, "Body", "Subject").notification.conversation }
+
+
+    describe ".participant" do
+      it "finds conversations with receipts for participant" do
+        Conversation.participant(participant).should == [sentbox_conversation, inbox_conversation]
+      end
+    end
+
+    describe ".inbox" do
+      it "finds inbox conversations with receipts for participant" do
+        Conversation.inbox(participant).should == [inbox_conversation]
+      end
+    end
+
+    describe ".sentbox" do
+      it "finds sentbox conversations with receipts for participant" do
+        Conversation.sentbox(participant).should == [sentbox_conversation]
+      end
+    end
+
+    describe ".trash" do
+      it "finds trash conversations with receipts for participant" do
+        trashed_conversation = @entity1.send_message(participant, "Body", "Subject").notification.conversation
+        trashed_conversation.move_to_trash(participant)
+
+        Conversation.trash(participant).should == [trashed_conversation]
+      end
+    end
+
+    describe ".unread" do
+      it "finds unread conversations with receipts for participant" do
+        [sentbox_conversation, inbox_conversation].each {|c| c.mark_as_read(participant) }
+        unread_conversation = @entity1.send_message(participant, "Body", "Subject").notification.conversation
+
+        Conversation.unread(participant).should == [unread_conversation]
+      end
+    end
+  end
+
+  describe "#is_completely_trashed?" do
+    it "returns true if all receipts in conversation are trashed for participant" do
+      @conversation.move_to_trash(@entity1)
+      @conversation.is_completely_trashed?(@entity1).should be_true
+    end
   end
-  
 end

data/spec/models/mailbox_spec.rb

@@ -3,8 +3,8 @@ require 'spec_helper'
 describe Mailbox do
   
   before do
-    @entity1 = Factory(:user)
-    @entity2 = Factory(:user)
+    @entity1 = FactoryGirl.create(:user)
+    @entity2 = FactoryGirl.create(: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")
@@ -67,6 +67,12 @@ describe Mailbox do
     @entity2.mailbox.receipts.inbox[0].should==Receipt.recipient(@entity2).inbox.conversation(@conversation)[0]
     @entity2.mailbox.receipts.inbox[1].should==Receipt.recipient(@entity2).inbox.conversation(@conversation)[1]
   end
+
+  it "should understand the read option" do
+    @entity1.mailbox.inbox({:read => false}).count.should_not == 0
+    @conversation.mark_as_read(@entity1)
+    @entity1.mailbox.inbox({:read => false}).count.should == 0
+  end
   
   it "should return trashed mails" do 
     @entity1.mailbox.receipts.move_to_trash

data/spec/models/mailboxer_models_messageable_spec.rb

@@ -3,8 +3,8 @@ require 'spec_helper'
 describe "Mailboxer::Models::Messageable through User" do
   
   before do
-    @entity1 = Factory(:user)
-    @entity2 = Factory(:user)
+    @entity1 = FactoryGirl.create(:user)
+    @entity2 = FactoryGirl.create(:user)
   end
   
   it "should have a mailbox" do

data/spec/models/message_spec.rb

@@ -3,8 +3,8 @@ require 'spec_helper'
 describe Message do
   
   before do
-    @entity1 = Factory(:user)
-    @entity2 = Factory(:user)
+    @entity1 = FactoryGirl.create(:user)
+    @entity2 = FactoryGirl.create(: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")

data/spec/models/notification_spec.rb

@@ -3,9 +3,9 @@ require 'spec_helper'
 describe Message do
   
   before do
-    @entity1 = Factory(:user)
-    @entity2 = Factory(:user)
-    @entity3 = Factory(:user)
+    @entity1 = FactoryGirl.create(:user)
+    @entity2 = FactoryGirl.create(:user)
+    @entity3 = FactoryGirl.create(:user)
   end  
   
   it "should notify one user" do
@@ -24,6 +24,21 @@ describe Message do
     notification.subject.should=="Subject"
     notification.body.should=="Body"       
   end
+
+  it "should be unread by default" do
+    @entity1.notify("Subject", "Body")
+    @entity1.mailbox.receipts.size.should==1
+    notification = @entity1.mailbox.receipts.first.notification
+    notification.should be_is_unread(@entity1)
+  end
+
+  it "should be able to marked as read" do
+    @entity1.notify("Subject", "Body")
+    @entity1.mailbox.receipts.size.should==1
+    notification = @entity1.mailbox.receipts.first.notification
+    notification.mark_as_read(@entity1)
+    notification.should be_is_read(@entity1)
+  end
   
   it "should notify several users" do
     Notification.notify_all([@entity1,@entity2,@entity3],"Subject","Body")
@@ -60,5 +75,5 @@ describe Message do
     notification.body.should=="Body"
           
   end
-    
+
 end

data/spec/models/receipt_spec.rb

@@ -3,8 +3,8 @@ require 'spec_helper'
 describe Receipt do
   
   before do
-    @entity1 = Factory(:user)
-    @entity2 = Factory(:user)
+    @entity1 = FactoryGirl.create(:user)
+    @entity2 = FactoryGirl.create(:user)
     @mail1 = @entity1.send_message(@entity2,"Body","Subject")   
   end
   

metadata

@@ -1,115 +1,173 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: mailboxer
-version: !ruby/object:Gem::Version
-  version: 0.6.5
+version: !ruby/object:Gem::Version 
+  hash: 3
   prerelease: 
+  segments: 
+  - 0
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
-authors:
+authors: 
 - Eduardo Casanova Cuesta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-22 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-06-18 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: foreigner
-  requirement: &74888040 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 57
+        segments: 
+        - 0
+        - 9
+        - 1
         version: 0.9.1
   type: :runtime
-  prerelease: false
-  version_requirements: *74888040
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rails
-  requirement: &74877970 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>'
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
         version: 3.0.0
   type: :runtime
-  prerelease: false
-  version_requirements: *74877970
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: carrierwave
-  requirement: &74876920 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 5
+        - 8
         version: 0.5.8
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: ruby-debug
   prerelease: false
-  version_requirements: *74876920
-- !ruby/object:Gem::Dependency
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 0
+        - 10
+        - 3
+        version: 0.10.3
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: rspec-rails
-  requirement: &74875050 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 2
+        - 6
+        - 1
         version: 2.6.1
   type: :development
-  prerelease: false
-  version_requirements: *74875050
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: factory_girl
-  requirement: &74862190 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 2
+        - 6
+        - 0
         version: 2.6.0
   type: :development
-  prerelease: false
-  version_requirements: *74862190
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: forgery
-  requirement: &74857660 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 0
+        - 3
+        - 6
         version: 0.3.6
   type: :development
-  prerelease: false
-  version_requirements: *74857660
-- !ruby/object:Gem::Dependency
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: capybara
-  requirement: &74856860 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 0
+        - 3
+        - 9
         version: 0.3.9
   type: :development
-  prerelease: false
-  version_requirements: *74856860
-- !ruby/object:Gem::Dependency
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
-  requirement: &74849270 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *74849270
-description: A Rails engine that allows any model to act as messageable, adding the
-  ability to exchange messages with any other messageable model, even different ones.
-  It supports the use of conversations with two or more recipients to organize the
-  messages. You have a complete use of a mailbox object for each messageable model
-  that manages an inbox, sentbox and trash for conversations. It also supports sending
-  notifications to messageable models, intended to be used as system notifications.
+  version_requirements: *id009
+description: A Rails engine that allows any model to act as messageable, adding the ability to exchange messages with any other messageable model, even different ones. It supports the use of conversations with two or more recipients to organize the messages. You have a complete use of a mailbox object for each messageable model that manages an inbox, sentbox and trash for conversations. It also supports sending notifications to messageable models, intended to be used as system notifications.
 email: ecasanovac@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .rspec
 - .travis.yml
@@ -141,6 +199,7 @@ files:
 - lib/generators/mailboxer/templates/initializer.rb
 - lib/generators/mailboxer/views_generator.rb
 - lib/mailboxer.rb
+- lib/mailboxer/concerns/configurable_mailer.rb
 - lib/mailboxer/engine.rb
 - lib/mailboxer/models/messageable.rb
 - mailboxer.gemspec
@@ -195,6 +254,7 @@ files:
 - spec/factories/user.rb
 - spec/integration/message_and_receipt_spec.rb
 - spec/integration/navigation_spec.rb
+- spec/mailboxer/concerns/configurable_mailer_spec.rb
 - spec/mailboxer_spec.rb
 - spec/mailers/message_mailer_spec.rb
 - spec/mailers/notification_mailer_spec.rb
@@ -208,27 +268,36 @@ files:
 - spec/testfile.txt
 homepage: https://github.com/ging/mailboxer
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Messaging system for rails apps.
 test_files: []
-has_rdoc: 
+