user_notifier 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cb454c6c1c482a948d1f588878a24833712fd1a
-  data.tar.gz: 0cad09d1c573dd3d186c2d98250c9dcbf6fc8088
+  metadata.gz: c67f420cf3b88c32472cc72effbadd1c1f5dbc9c
+  data.tar.gz: e4840b6a7f8c8525c38d513c476d2e99561ebf65
 SHA512:
-  metadata.gz: 4b60d65e3695cb8a5372a3321c7558d853e180c303e65a1225edfe0b03c17b55b3e9193e6ca70362a94d04bdac11669bdb7cd0399f7fb1cb5fc8f1213774935a
-  data.tar.gz: 5af36e65df4dac3b6b12b0e5e560ecd9dcd7e105f8bcb87d01cadec812df38e37e673902fab480e8a0c125564eaf14eaac8920d8694164129f0b966767dd5dec
+  metadata.gz: 9be4c5461ad44be42337bae9c207ce7651f6b618927b64257d99ef30caf88582c32dea887b50e9a5d193d45b9fa59b35fc75f0997101a26c8b32ef1dd5cc7a77
+  data.tar.gz: e0e125cdd66e2e536df4bda766183be1e778868beb5461671b238f557e1a5845e65b5ffd666ddd2c71940c6386c24447f9516773554826c3a4bb047eb92fc103

data/lib/user_notifier/configuration.rb

@@ -1,13 +1,14 @@
 module UserNotifier
   module Configuration
-    VALID_CONFIG_KEYS    = [:system_email, :email_layout, :user_class_name, :from_email, :from_name, :use_xsmtp_api].freeze
+    VALID_CONFIG_KEYS    = [:system_email, :email_layout, :user_class_name, :from_email, :from_name, :use_xsmtp_api, :auto_deliver].freeze
 
     DEFAULT_SYSTEM_EMAIL      = nil
     DEFAULT_EMAIL_LAYOUT      = 'email'
     DEFAULT_USER_CLASS_NAME   = 'User'
     DEFAULT_FROM_EMAIL        = 'no-reply@yourdomain'
     DEFAULT_FROM_NAME         = 'please configure a default from name'
-    DEFAULT_USE_XSMTP_API      = false
+    DEFAULT_USE_XSMTP_API     = false
+    DEFAULT_AUTO_DELIVER      = true
 
     # Build accessor methods for every config options so we can do this, for example:
     #   Awesome.format = <img src="http://s2.wp.com/wp-includes/images/smilies/icon_mad.gif?m=1129645325g" alt=":x" class="wp-smiley"> ml
@@ -33,6 +34,7 @@ module UserNotifier
       self.from_email         = DEFAULT_FROM_EMAIL
       self.from_name          = DEFAULT_FROM_NAME
       self.use_xsmtp_api      = DEFAULT_USE_XSMTP_API
+      self.auto_deliver       = DEFAULT_AUTO_DELIVER
     end
 
   end # Configuration

data/lib/user_notifier/models/base.rb

@@ -1,6 +1,7 @@
 class UserNotifier::Base < ActiveRecord::Base
   self.abstract_class = true
-  after_commit :deliver
+
+  after_commit :deliver if UserNotifier.auto_deliver
 
   def self.notify_once(template_name, user, source = nil, params = {})
     notify(template_name, user, source, params) if is_unique?(template_name, {self.user_association_name => user})

data/lib/user_notifier/version.rb

@@ -1,3 +1,3 @@
 module UserNotifier
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end