mail 2.1.2 → 2.1.3

data/README.rdoc

@@ -264,49 +264,46 @@ mail.deliver!
 
 The most recent email:
 
- require 'mail'
- 
  Mail.defaults do
-   pop3 'mail.myhost.com.au', 110 do
-     user 'mikel'
-     pass 'mypass'
-   end
- end
- 
- emails = Mail.last do |email|
-   email.reply!("I'll be back on Monday, please be patient!") # +reply!+ still not implemented ^^
+   retriever_method :pop3, { :address             => "pop.gmail.com",
+                             :port                => 995,
+                             :user_name           => '<username>',
+                             :password            => '<password>',
+                             :enable_ssl          => true }
  end
 
-The 3 oldest emails sorted by date in descendent order:
+ Mail.all    #=> Returns an array of all emails
+ Mail.first  #=> Returns the first unread email
+ Mail.last   #=> Returns the first unread email
+
+The first 10 emails sorted by date in ascending order:
 
  require 'mail'
 
  Mail.defaults do
-   pop3 'mail.myhost.co.jp', 995 do
-     user 'mikel'
-     pass 'mypass'
-     enable_tls
-   end
+   retriever_method :pop3, { :address             => "pop.gmail.com",
+                             :port                => 995,
+                             :user_name           => '<username>',
+                             :password            => '<password>',
+                             :enable_ssl          => true }
  end
 
- emails = Mail.first(:count => 3, :order => :desc) do |email|
-   email.date
- end
+ emails = Mail.find(:what => :first, :count => 10, :order => :asc)
+ emails.length #=> 10
 
 Or even all emails:
 
- require 'mail'
-
  Mail.defaults do
-   pop3 'mail.myhost.com.au' do
-     user 'mikel'
-     pass 'mypass'
-   end
+   retriever_method :pop3, { :address             => "pop.gmail.com",
+                             :port                => 995,
+                             :user_name           => '<username>',
+                             :password            => '<password>',
+                             :enable_ssl          => true }
  end
 
  emails = Mail.all
 
- emails.length #=> 12
+ emails.length #=> LOTS!
 
 === Reading an Email
 

data/Rakefile

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

data/lib/mail/header.rb

@@ -174,6 +174,10 @@ module Mail
       raise NoMethodError, 'Can not decode an entire header as there could be character set conflicts, try calling #decoded on the various fields.'
     end
 
+    def field_summary
+      fields.map { |f| "<#{f.name}: #{f.value}>" }.join(", ")
+    end
+
     # Returns true if the header has a Message-ID defined (empty or not)
     def has_message_id?
       !fields.select { |f| f.responsible_for?('Message-ID') }.empty?

data/lib/mail/mail.rb

@@ -170,6 +170,46 @@ module Mail
     Mail.new(File.read(filename))
   end
   
+  # Initialize the observers and interceptors arrays
+  @@delivery_notification_observers = []
+  @@delivery_interceptors = []
+  
+  # You can register an object to be informed of every email that is sent through
+  # this method.
+  # 
+  # Your object needs to respond to a single method #delivered_email(mail)
+  # which receives the email that is sent.
+  def Mail.register_observer(observer)
+    unless @@delivery_notification_observers.include?(observer)
+      @@delivery_notification_observers << observer
+    end
+  end
+
+  # You can register an object to be given every mail object that will be sent,
+  # before it is sent.  So if you want to add special headers or modify any
+  # email that gets sent through the Mail library, you can do so.
+  # 
+  # Your object needs to respond to a single method #delivering_email(mail)
+  # which receives the email that is about to be sent.  Make your modifications
+  # directly to this object.
+  def Mail.register_interceptor(interceptor)
+    unless @@delivery_interceptors.include?(interceptor)
+      @@delivery_interceptors << interceptor
+    end
+  end
+  
+  def Mail.inform_observers(mail)
+    @@delivery_notification_observers.each do |observer|
+      observer.delivered_email(mail)
+    end
+  end
+  
+  def Mail.inform_interceptors(mail)
+    @@delivery_interceptors.each do |interceptor|
+      interceptor.delivering_email(mail)
+    end
+  end
+
   protected
   
   def Mail.random_tag

data/lib/mail/message.rb

@@ -46,7 +46,7 @@ module Mail
     
     include Patterns
     include Utilities
-    
+
     # ==Making an email
     # 
     # You can make an new mail object via a block, passing a string, file or direct assignment.
@@ -106,8 +106,7 @@ module Mail
       @delivery_handler = nil
       
       @delivery_method = Mail.delivery_method.dup
-      @delivery_notification_observers = []
-
+      
       if args.flatten.first.respond_to?(:each_pair)
         init_with_hash(args.flatten.first)
       else
@@ -194,15 +193,16 @@ module Mail
     attr_accessor :raise_delivery_errors
 
     def register_for_delivery_notification(observer)
-      unless @delivery_notification_observers.include?(observer)
-        @delivery_notification_observers << observer
-      end
+      STDERR.puts("Message#register_for_delivery_notification is deprecated, please call Mail.register_observer instead")
+      Mail.register_observer(observer)
     end
     
     def inform_observers
-      @delivery_notification_observers.each do |observer|
-        observer.delivered_email(self)
-      end
+      Mail.inform_observers(self)
+    end
+    
+    def inform_interceptors
+      Mail.inform_interceptors(self)
     end
     
     # Delivers an mail object.
@@ -212,12 +212,13 @@ module Mail
     #  mail = Mail.read('file.eml')
     #  mail.deliver
     def deliver
+      inform_interceptors
       if delivery_handler
         delivery_handler.deliver_mail(self) { do_delivery }
       else
         do_delivery
-        inform_observers
       end
+      inform_observers
       self
     end
 
@@ -1611,6 +1612,10 @@ module Mail
       encoded
     end
 
+    def inspect
+      "#<#{self.class}:#{self.object_id}, Multipart: #{multipart?}, Headers: #{header.field_summary}>"
+    end
+
     def decoded
       if self.attachment?
         decode_body
@@ -1681,7 +1686,7 @@ module Mail
     end
     
     def set_envelope_header
-      if match_data = raw_source.to_s.match(/^From\s(#{TEXT}+)#{CRLF}(.*)/m)
+      if match_data = raw_source.to_s.match(/\AFrom\s(#{TEXT}+)#{CRLF}(.*)/m)
         set_envelope(match_data[1])
         self.raw_source = match_data[2]
       end

data/lib/mail/version.rb

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

metadata

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