mail 2.0.3 → 2.0.5

data/CHANGELOG.rdoc

@@ -1,3 +1,15 @@
+== Sat Jan 23 23:49:50 UTC 2010 Mikel Lindsaar <raasdnil@gmail.com>
+
+* Version bump to 2.0.5
+* Added :raise_delivery_errors to Mail::Message, if set to false will silently rescue all errors raised by the delivery methods, set to true by default
+
+== Sat Jan 23 23:28:42 UTC 2010 Mikel Lindsaar <raasdnil@gmail.com>
+
+* Version bump to 2.0.4
+* Added :perform_deliveries to mail, will not actually call deliver on the delivery method if this is set to false, set to true by default.
+* Added @delivery_notification_observers to mail messages, you can register an observer with mail by calling mail.register_for_delivery_notification(observer) and then when mail is told to :deliver it will call your observer with observer.delivered_email(self).  It will call your observer if it actually performed the delivery or not (that is, irregardless of the :perform_deliveries flag)
+* Added ability to overwrite the Mail.deliveries store with an object of your choice instead of just an array, this is a good way to find out if something actually got delivered as if :perform_deliveries is false, this collection will not get the mail message appended
+
 == Sat Jan 23 05:32:53 UTC 2010 Mikel Lindsaar <raasdnil@gmail.com>
 
 * Version bump to 2.0.3

data/Rakefile

@@ -12,7 +12,7 @@ require 'bundler'
 
 spec = Gem::Specification.new do |s|
   s.name        = "mail"
-  s.version     = "2.0.3"
+  s.version     = "2.0.5"
   s.author      = "Mike Lindsaar"
   s.email       = "raasdnil@gmail.com"
   s.homepage    = "http://github.com/mikel/mail"

data/lib/mail/mail.rb

@@ -137,7 +137,7 @@ module Mail
   # And your email object will be created and sent.
   def Mail.deliver(*args, &block)
     mail = Mail.new(args, &block)
-    delivery_method.deliver!(mail)
+    mail.deliver
     mail
   end
 
@@ -174,6 +174,20 @@ module Mail
   def Mail.deliveries
     @@deliveries ||= []
   end
+
+  # Allows you to over write the default deliveries store from an array to some
+  # other object.  If you just want to clear the store, call Mail.deliveries.clear.
+  # 
+  # If you place another object here, please make sure it responds to:
+  # 
+  # * << (message)
+  # * clear
+  # * length
+  # * size
+  # * and other common Array methods
+  def Mail.deliveries=(val)
+    @@deliveries = val
+  end
   
   protected
   

data/lib/mail/message.rb

@@ -99,8 +99,11 @@ module Mail
       @body = nil
       @text_part = nil
       @html_part = nil
-      
-      @delivery_method = Mail.delivery_method.clone
+
+      @perform_deliveries = true
+      @raise_delivery_errors = true
+      @delivery_method = Mail.delivery_method.dup
+      @delivery_notification_observers = []
       
       if args.flatten.first.respond_to?(:each_pair)
         init_with_hash(args.flatten.first)
@@ -114,6 +117,21 @@ module Mail
 
       self
     end
+
+    attr_accessor :perform_deliveries
+    attr_accessor :raise_delivery_errors
+
+    def register_for_delivery_notification(observer)
+      unless @delivery_notification_observers.include?(observer)
+        @delivery_notification_observers << observer
+      end
+    end
+    
+    def inform_observers
+      @delivery_notification_observers.each do |observer|
+        observer.delivered_email(self)
+      end
+    end
     
     # Delivers an mail object.
     # 
@@ -122,7 +140,16 @@ module Mail
     #  mail = Mail.read('file.eml')
     #  mail.deliver!
     def deliver
-      @delivery_method.deliver!(self)
+      if perform_deliveries
+        begin
+          delivery_method.deliver!(self)
+          Mail.deliveries << self
+        rescue Exception => e # Net::SMTP errors or sendmail pipe errors
+          raise e if raise_delivery_errors
+        end
+      end
+      inform_observers
+      self
     end
     
     alias :deliver! :deliver

data/lib/mail/network/delivery_methods/test_mailer.rb

@@ -1,4 +1,9 @@
 module Mail
+  # The TestMailer is a bare bones mailer that does nothing.  It is useful
+  # when you are testing.
+  # 
+  # It also provides a template of the minimum methods you require to implement
+  # if you want to make a custom mailer for Mail
   class TestMailer
 
     def initialize(values)
@@ -7,14 +12,7 @@ module Mail
     
     attr_accessor :settings
 
-    # The Test Mailer provides a mail delivery method that does not hit
-    # your network or mail agent, in this way you can send all the emails
-    # you want and they will just be appended to Mail.deliveries
-    # 
-    # See the README under Using Mail with Testing or Spec'ing Libraries
-    # for more information.
     def deliver!(mail)
-      Mail.deliveries << mail
     end
     
   end

data/lib/mail/version.rb

@@ -3,7 +3,7 @@ module Mail
   module VERSION
     MAJOR = 2
     MINOR = 0
-    TINY  = 3
+    TINY  = 5
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mail
 version: !ruby/object:Gem::Version 
-  version: 2.0.3
+  version: 2.0.5
 platform: ruby
 authors: 
 - Mike Lindsaar
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-23 00:00:00 +11:00
+date: 2010-01-24 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency