mailboxer 0.10.3 → 0.11.0

data/app/models/mailbox.rb

@@ -1,6 +1,7 @@
 class Mailbox
   attr_accessor :type
   attr_reader :messageable
+
   #Initializer method
   def initialize(messageable)
     @messageable = messageable
@@ -13,7 +14,8 @@ class Mailbox
     if (options[:read].present? and options[:read]==false) or (options[:unread].present? and options[:unread]==true)
       notifs = notifs.unread
     end
-    return notifs
+
+    notifs
   end
 
   #Returns the conversations for the messageable
@@ -39,6 +41,8 @@ class Mailbox
         conv = Conversation.sentbox(@messageable)
       when 'trash'
         conv = Conversation.trash(@messageable)
+      when  'not_trash'
+        conv = Conversation.not_trash(@messageable)
       end
     end
 
@@ -46,7 +50,7 @@ class Mailbox
       conv = conv.unread(@messageable)
     end
 
-    return conv
+    conv
   end
 
   #Returns the conversations in the inbox of messageable
@@ -54,7 +58,7 @@ class Mailbox
   #Same as conversations({:mailbox_type => 'inbox'})
   def inbox(options={})
     options = options.merge(:mailbox_type => 'inbox')
-    return self.conversations(options)
+    self.conversations(options)
   end
 
   #Returns the conversations in the sentbox of messageable
@@ -62,7 +66,7 @@ class Mailbox
   #Same as conversations({:mailbox_type => 'sentbox'})
   def sentbox(options={})
     options = options.merge(:mailbox_type => 'sentbox')
-    return self.conversations(options)
+    self.conversations(options)
   end
 
   #Returns the conversations in the trash of messageable
@@ -70,33 +74,33 @@ class Mailbox
   #Same as conversations({:mailbox_type => 'trash'})
   def trash(options={})
     options = options.merge(:mailbox_type => 'trash')
-    return self.conversations(options)
+    self.conversations(options)
   end
 
   #Returns all the receipts of messageable, from Messages and Notifications
   def receipts(options = {})
-    return Receipt.where(options).recipient(@messageable)
+    Receipt.where(options).recipient(@messageable)
   end
 
   #Deletes all the messages in the trash of messageable. NOT IMPLEMENTED.
   def empty_trash(options = {})
     #TODO
-    return false
+    false
   end
 
   #Returns if messageable is a participant of conversation
   def has_conversation?(conversation)
-    return conversation.is_participant?(@messageable)
+    conversation.is_participant?(@messageable)
   end
 
   #Returns true if messageable has at least one trashed message of the conversation
   def is_trashed?(conversation)
-    return conversation.is_trashed?(@messageable)
+    conversation.is_trashed?(@messageable)
   end
 
   #Returns true if messageable has trashed all the messages of the conversation
   def is_completely_trashed?(conversation)
-    return conversation.is_completely_trashed?(@messageable)
+    conversation.is_completely_trashed?(@messageable)
   end
 
   #Returns the receipts of object for messageable as a ActiveRecord::Relation
@@ -110,12 +114,9 @@ class Mailbox
   def receipts_for(object)
     case object
     when Message, Notification
-      return object.receipt_for(@messageable)
+      object.receipt_for(@messageable)
     when Conversation
-      return object.receipts_for(@messageable)
-    else
-    return nil
+      object.receipts_for(@messageable)
     end
   end
-
 end

data/app/models/message.rb

@@ -1,5 +1,5 @@
 class Message < Notification
-  attr_accessible :attachment
+  attr_accessible :attachment if Mailboxer.protected_attributes?
 
   belongs_to :conversation, :validate => true, :autosave => true
   validates_presence_of :sender
@@ -25,33 +25,25 @@ class Message < Notification
   #Use Mailboxer::Models::Message.send_message instead.
   def deliver(reply = false, should_clean = true)
     self.clean if should_clean
-    temp_receipts = Array.new
+
     #Receiver receipts
-    self.recipients.each do |r|
-      msg_receipt = Receipt.new
-      msg_receipt.notification = self
-      msg_receipt.is_read = false
-      msg_receipt.receiver = r
-      msg_receipt.mailbox_type = "inbox"
-      temp_receipts << msg_receipt
-    end
+    temp_receipts = recipients.map { |r| build_receipt(r, 'inbox') }
+
     #Sender receipt
-    sender_receipt = Receipt.new
-    sender_receipt.notification = self
-    sender_receipt.is_read = true
-    sender_receipt.receiver = self.sender
-    sender_receipt.mailbox_type = "sentbox"
+    sender_receipt = build_receipt(sender, 'sentbox', true)
     temp_receipts << sender_receipt
 
     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
-          email_to = r.send(Mailboxer.email_method,self)
-          unless email_to.blank?
-            get_mailer.send_email(self,r).deliver
+      if Mailboxer.uses_emails
+        if Mailboxer.mailer_wants_array
+          get_mailer.send_email(self, recipients).deliver
+        else
+          recipients.each do |recipient|
+            email_to = recipient.send(Mailboxer.email_method, self)
+            get_mailer.send_email(self, recipient).deliver if email_to.present?
           end
         end
       end
@@ -59,8 +51,18 @@ class Message < Notification
         self.conversation.touch
       end
       self.recipients=nil
-    self.on_deliver_callback.call(self) unless self.on_deliver_callback.nil?
+      self.on_deliver_callback.call(self) unless self.on_deliver_callback.nil?
+    end
+    sender_receipt
+  end
+
+  private
+  def build_receipt(receiver, mailbox_type, is_read = false)
+    Receipt.new.tap do |receipt|
+      receipt.notification = self
+      receipt.is_read = is_read
+      receipt.receiver = receiver
+      receipt.mailbox_type = mailbox_type
     end
-    return sender_receipt
   end
 end

data/app/models/notification.rb

@@ -1,14 +1,15 @@
 class Notification < ActiveRecord::Base
   attr_accessor :recipients
-  attr_accessible :body, :subject, :global, :expires
+  attr_accessible :body, :subject, :global, :expires if Mailboxer.protected_attributes?
 
   belongs_to :sender, :polymorphic => :true
   belongs_to :notified_object, :polymorphic => :true
-  validates_presence_of :subject, :body
   has_many :receipts, :dependent => :destroy
 
+  validates_presence_of :subject, :body
+
   scope :recipient, lambda { |recipient|
-    joins(:receipts).where('receipts.receiver_id' => recipient.id,'receipts.receiver_type' => recipient.class.to_s)
+    joins(:receipts).where('receipts.receiver_id' => recipient.id,'receipts.receiver_type' => recipient.class.base_class.to_s)
   }
   scope :with_object, lambda { |obj|
     where('notified_object_id' => obj.id,'notified_object_type' => obj.class.to_s)
@@ -35,7 +36,7 @@ class Notification < ActiveRecord::Base
       notification.recipients = notification.recipients.uniq if recipients.respond_to?(:uniq)
       notification.notified_object = obj if obj.present?
       notification.notification_code = notification_code if notification_code.present?
-      return notification.deliver sanitize_text, send_mail
+      notification.deliver sanitize_text, send_mail
     end
 
     #Takes a +Receipt+ or an +Array+ of them and returns +true+ if the delivery was
@@ -44,18 +45,18 @@ class Notification < ActiveRecord::Base
       case receipts
       when Receipt
         receipts.valid?
-        return receipts.errors.empty?
-       when Array
-         receipts.each(&:valid?)
-         return receipts.all? { |t| t.errors.empty? }
-       else
-         return false
-       end
+        receipts.errors.empty?
+      when Array
+        receipts.each(&:valid?)
+        receipts.all? { |t| t.errors.empty? }
+      else
+        false
+      end
     end
   end
 
   def expired?
-    return self.expires.present? && (self.expires < Time.now)
+    self.expires.present? && (self.expires < Time.now)
   end
 
   def expire!
@@ -99,7 +100,7 @@ class Notification < ActiveRecord::Base
       self.recipients=nil
     end
     return temp_receipts if temp_receipts.size > 1
-    return temp_receipts.first
+    temp_receipts.first
   end
 
   #Returns the recipients of the Notification
@@ -109,25 +110,27 @@ class Notification < ActiveRecord::Base
       self.receipts.each do |receipt|
         recipients_array << receipt.receiver
       end
-    return recipients_array
+
+      recipients_array
+    else
+      @recipients
     end
-    return @recipients
   end
 
   #Returns the receipt for the participant
   def receipt_for(participant)
-    return Receipt.notification(self).recipient(participant)
+    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)
+    receipt_for(participant)
   end
 
   #Returns if the participant have read the Notification
   def is_unread?(participant)
     return false if participant.nil?
-    return !self.receipt_for(participant).first.is_read
+    !self.receipt_for(participant).first.is_read
   end
 
   def is_read?(participant)
@@ -137,33 +140,44 @@ class Notification < ActiveRecord::Base
   #Returns if the participant have trashed the Notification
   def is_trashed?(participant)
     return false if participant.nil?
-    return self.receipt_for(participant).first.trashed
+    self.receipt_for(participant).first.trashed
+  end
+
+  #Returns if the participant have deleted the Notification
+  def is_deleted?(participant)
+    return false if participant.nil?
+    return self.receipt_for(participant).first.deleted
   end
 
   #Mark the notification as read
   def mark_as_read(participant)
     return if participant.nil?
-    return self.receipt_for(participant).mark_as_read
+    self.receipt_for(participant).mark_as_read
   end
 
   #Mark the notification as unread
   def mark_as_unread(participant)
     return if participant.nil?
-    return self.receipt_for(participant).mark_as_unread
+    self.receipt_for(participant).mark_as_unread
   end
 
   #Move the notification to the trash
   def move_to_trash(participant)
     return if participant.nil?
-    return self.receipt_for(participant).move_to_trash
+    self.receipt_for(participant).move_to_trash
   end
 
   #Takes the notification out of the trash
   def untrash(participant)
     return if participant.nil?
-    return self.receipt_for(participant).untrash
+    self.receipt_for(participant).untrash
   end
 
+  #Mark the notification as deleted for one of the participant
+  def mark_as_deleted(participant)
+    return if participant.nil?
+    return self.receipt_for(participant).mark_as_deleted
+  end
 
   include ActionView::Helpers::SanitizeHelper
 
@@ -180,5 +194,4 @@ class Notification < ActiveRecord::Base
     warn "DEPRECATION WARNING: use 'notify_object' instead of 'object' to get the object associated with the Notification"
     notified_object
   end
-
 end

data/app/models/receipt.rb

@@ -1,10 +1,11 @@
 class Receipt < ActiveRecord::Base
+  attr_accessible :trashed, :is_read, :deleted if Mailboxer.protected_attributes?
+
   belongs_to :notification, :validate => true, :autosave => true
   belongs_to :receiver, :polymorphic => :true
   belongs_to :message, :foreign_key => "notification_id"
 
   validates_presence_of :receiver
-  attr_accessible :trashed, :is_read
 
   scope :recipient, lambda { |recipient|
     where(:receiver_id => recipient.id,:receiver_type => recipient.class.base_class.to_s)
@@ -21,8 +22,10 @@ class Receipt < ActiveRecord::Base
   }
   scope :sentbox, lambda { where(:mailbox_type => "sentbox") }
   scope :inbox, lambda { where(:mailbox_type => "inbox") }
-  scope :trash, lambda { where(:trashed => true) }
+  scope :trash, lambda { where(:trashed => true, :deleted => false) }
   scope :not_trash, lambda { where(:trashed => false) }
+  scope :deleted, lambda { where(:deleted => true) }
+  scope :not_deleted, lambda { where(:deleted => false) }
   scope :is_read, lambda { where(:is_read => true) }
   scope :is_unread, lambda { where(:is_read => false) }
 
@@ -48,6 +51,16 @@ class Receipt < ActiveRecord::Base
       update_receipts({:trashed => false}, options)
     end
 
+    #Marks the receipt as deleted
+    def mark_as_deleted(options={})
+      update_receipts({:deleted => true}, options)
+    end
+
+    #Marks the receipt as not deleted
+    def mark_as_not_deleted(options={})
+      update_receipts({:deleted => false}, options)
+    end
+
     #Moves all the receipts from the relation to inbox
     def move_to_inbox(options={})
       update_receipts({:mailbox_type => :inbox, :trashed => false}, options)
@@ -66,17 +79,29 @@ class Receipt < ActiveRecord::Base
       where(options).each do |rcp|
         ids << rcp.id
       end
-      return if ids.empty?
-      conditions = [""].concat(ids)
-      condition = "id = ? "
-      ids.drop(1).each do
-        condition << "OR id = ? "
+      unless ids.empty?
+        conditions = [""].concat(ids)
+        condition = "id = ? "
+        ids.drop(1).each do
+          condition << "OR id = ? "
+        end
+        conditions[0] = condition
+        Receipt.except(:where).except(:joins).where(conditions).update_all(updates)
       end
-      conditions[0] = condition
-      Receipt.except(:where).except(:joins).where(conditions).update_all(updates)
     end
   end
 
+
+  #Marks the receipt as deleted
+  def mark_as_deleted
+    update_attributes(:deleted => true)
+  end
+
+  #Marks the receipt as not deleted
+  def mark_as_not_deleted
+    update_attributes(:deleted => false)
+  end
+
   #Marks the receipt as read
   def mark_as_read
     update_attributes(:is_read => true)
@@ -109,21 +134,19 @@ class Receipt < ActiveRecord::Base
 
   #Returns the conversation associated to the receipt if the notification is a Message
   def conversation
-    return message.conversation if message.is_a? Message
-    return nil
+    message.conversation if message.is_a? Message
   end
 
   #Returns if the participant have read the Notification
   def is_unread?
-    return !self.is_read
+    !self.is_read
   end
 
   #Returns if the participant have trashed the Notification
   def is_trashed?
-    return self.trashed
+    self.trashed
   end
 
-
   protected
 
   #Removes the duplicate error about not present subject from Conversation if it has been already
@@ -147,5 +170,4 @@ class Receipt < ActiveRecord::Base
       integer :receiver_id
     end
   end
-
 end

data/gemfiles/rails3.0.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 3.0.15"
+gem "mailboxer", :path=>"../"
+
+gemspec :path=>"../"

data/gemfiles/rails3.1.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 3.1.6"
+gem "mailboxer", :path=>"../"
+
+gemspec :path=>"../"