mailboxer 0.4.0 → 0.4.1

data/app/models/message.rb

@@ -28,12 +28,6 @@ class Message < Notification
       msg_receipt.receiver = r
       msg_receipt.mailbox_type = "inbox"
       temp_receipts << msg_receipt
-      #Should send an email?
-      if Mailboxer.uses_emails and r.send(Mailboxer.should_email_method,self)
-        unless r.send(Mailboxer.email_method).blank?
-          MessageMailer.send_email(self,r).deliver
-        end
-      end
     end
     #Sender receipt
     sender_receipt = Receipt.new
@@ -46,6 +40,14 @@ class Message < Notification
     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 and r.send(Mailboxer.should_email_method,self)
+          unless r.send(Mailboxer.email_method).blank?
+            MessageMailer.send_email(self,r).deliver
+          end
+        end
+      end
       if reply
         self.conversation.update_attribute(:updated_at, Time.now)
       end

data/app/models/notification.rb

@@ -42,16 +42,18 @@ class Notification < ActiveRecord::Base
       msg_receipt.read = false
       msg_receipt.receiver = r
       temp_receipts << msg_receipt      
-      #Should send an email?
-      if Mailboxer.uses_emails and r.send(Mailboxer.should_email_method,self)
-        unless r.send(Mailboxer.email_method).blank?
-          NotificationMailer.send_email(self,r).deliver
-        end
-      end
     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 and r.send(Mailboxer.should_email_method,self)
+          unless r.send(Mailboxer.email_method).blank?
+            NotificationMailer.send_email(self,r).deliver
+          end
+        end
+      end
       self.recipients=nil
     end
     return temp_receipts if temp_receipts.size > 1

data/mailboxer.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
 	s.name = "mailboxer"
-	s.version = "0.4.0"
+	s.version = "0.4.1"
 	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, allowing it to exchange messages " +

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mailboxer
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Eduardo Casanova Cuesta