mailboxer 0.10.2 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6f8c3c1cb117883b23f63dcd0b539cbc96f0e63
-  data.tar.gz: 4ca5f945d183d2eed59d4404e8bcf4d9a8873a4d
+  metadata.gz: bd3c7b425e191ba6788668307d71c0a472d0db03
+  data.tar.gz: f9910f2a5eae2f12f4daf3a56c5654b89bf8e716
 SHA512:
-  metadata.gz: 10c3c296350557ad682836ebbabde11dd81956efa0895b62f29523a9d7017cce65ea17c312cc0e639483253ae3d44cc43173e6ee94f0083e969df1d94c00bdf6
-  data.tar.gz: 0288431615ef22cd4541c945e007676f9dda03dbe843055f63d7267c36baa2ec98f2481b1d80f58e2e160cc4442b0e931009710d72835895f592b6c88b1b77b2
+  metadata.gz: a0fcdb2b6596e63d82183fbf73f758fb0755bfe2afe1c7e9939a041e35b2959c37bcfa41aceecac62314d16967bf6e77a9dd628d7d7c58361a34b76d82e603d5
+  data.tar.gz: c3ab6f97dfaf4dd8b808cd52f8c66551a576a554231c0a6142d7d37b715e4c04abcc14eb1f7c71ea3590ed494b03de21990cc8834a45f9b6c32c3fb6c3874ce9

data/app/models/notification.rb

@@ -29,13 +29,13 @@ class Notification < ActiveRecord::Base
 
   class << self
     #Sends a Notification to all the recipients
-    def notify_all(recipients,subject,body,obj = nil,sanitize_text = true,notification_code=nil)
+    def notify_all(recipients,subject,body,obj = nil,sanitize_text = true,notification_code=nil,send_mail=true)
       notification = Notification.new({:body => body, :subject => subject})
       notification.recipients = recipients.respond_to?(:each) ? recipients : [recipients]
       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
+      return notification.deliver sanitize_text, send_mail
     end
 
     #Takes a +Receipt+ or an +Array+ of them and returns +true+ if the delivery was
@@ -73,7 +73,7 @@ class Notification < ActiveRecord::Base
 
   #Delivers a Notification. USE NOT RECOMENDED.
   #Use Mailboxer::Models::Message.notify and Notification.notify_all instead.
-  def deliver(should_clean = true)
+  def deliver(should_clean = true, send_mail = true)
     self.clean if should_clean
     temp_receipts = Array.new
     #Receiver receipts
@@ -91,7 +91,7 @@ class Notification < ActiveRecord::Base
         #Should send an email?
         if Mailboxer.uses_emails
           email_to = r.send(Mailboxer.email_method,self)
-          unless email_to.blank?
+          if send_mail && !email_to.blank?
             get_mailer.send_email(self,r).deliver
           end
         end

data/lib/mailboxer/models/messageable.rb

@@ -47,8 +47,8 @@ module Mailboxer
       end
 
       #Sends a notification to the messageable
-      def notify(subject,body,obj = nil,sanitize_text=true,notification_code=nil)
-        return Notification.notify_all([self],subject,body,obj,sanitize_text,notification_code)
+      def notify(subject,body,obj = nil,sanitize_text=true,notification_code=nil,send_mail=true)
+        return Notification.notify_all([self],subject,body,obj,sanitize_text,notification_code,send_mail)
       end
 
       #Sends a messages, starting a new conversation, with the messageable

data/mailboxer.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "mailboxer"
-  s.version = "0.10.2"
+  s.version = "0.10.3"
   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 " +

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mailboxer
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.3
 platform: ruby
 authors:
 - Eduardo Casanova Cuesta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-11 00:00:00.000000000 Z
+date: 2013-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreigner