mail 1.2.1 → 1.2.5

data/CHANGELOG.rdoc

@@ -1,6 +1,47 @@
+== Fri Nov 13 00:31:04 UTC 2009 Mikel Lindsaar <raasdnil@gmail.com>
+
+* Hacked and mutilated the network section, made it easier to extend out with other
+  delivery and retriever methods.  API changed SLIGHTLY with this.  Please check the
+  readme
+* Version bump to 1.2.5
+
+== Thu Nov 12 02:58:01 UTC 2009 Mikel Lindsaar <raasdnil@gmail.com>
+
+* Resolved Issue #8 - Message ID not handling multiple periods in left hand side
+* Resolved Issue #6 - Ordering of add_file and body items causes invalid emails
+
+== Tue Nov 10 08:15:14 UTC 2009 Mikel Lindsaar <raasdnil@gmail.com>
+
+* Resolved Issue #5 - Message ID generation issue
+* Resolved Issue #7 - README add_file examples don't seem to work - Updated readme and
+  rdoc in Message#add_file
+
+== Mon Nov  9 23:38:33 UTC 2009 Mikel Lindsaar <raasdnil@gmail.com>
+
+* Added ability to create new email via a hash or hash-like object. <mikel>
+* Moved all of the Part init into the Message class.  Part now just uses Message's init,
+  also moved all the attachment related functions into Message.  As Part is a subclass
+  of message, you shouldn't see any interface changes here.
+
+== Fri Nov  6 22:52:10 UTC 2009 Mikel Lindsaar <raasdnil@gmail.com>
+
+* a6ef2b4: Fixed Issue #4 - Can't call encoding on non existant 
+  content-transer-encoding header
+
+== Fri Nov  6 00:51:55 UTC 2009 Mikel Lindsaar <raasdnil@gmail.com>
+
+* Handled unstructured field folding "blank" lines
+* Fixed error in header.rb that created fields into an array, instead of a FieldList, resulting
+  in mail.encode returning a random sort order on the header.
+* Made unstructured fields attempt to decode their values on :decode
+
+== Thu Nov  5 04:45:31 UTC 2009 Mikel Lindsaar <raasdnil@gmail.com>
+
+* 2acb70a: Closes Issue #1 - Handling badly formatted content-type fields <mikel>
+
 == Wed Nov  4 23:24:32 UTC 2009 Mikel Lindsaar <raasdnil@gmail.com>
 
-* Created commit 2b5d608: Closes Issue #2 - Empty header field values not parsing <mikel>
+* 2b5d608: Closes Issue #2 - Empty header field values not parsing <mikel>
 * Version bumb to 1.2.1
 
 == Wed Nov  4 12:54:43 UTC 2009 Mikel Lindsaar <raasdnil@gmail.com>

data/Manifest.txt

@@ -70,7 +70,13 @@ lib/mail/header.rb
 lib/mail/mail.rb
 lib/mail/message.rb
 lib/mail/network/deliverable.rb
+lib/mail/network/delivery_methods/file_delivery.rb
+lib/mail/network/delivery_methods/sendmail.rb
+lib/mail/network/delivery_methods/smtp.rb
+lib/mail/network/delivery_methods/test_mailer.rb
 lib/mail/network/retrievable.rb
+lib/mail/network/retriever_methods/imap.rb
+lib/mail/network/retriever_methods/pop3.rb
 lib/mail/parsers/address_lists.rb
 lib/mail/parsers/address_lists.treetop
 lib/mail/parsers/content_disposition.rb

data/README.rdoc

@@ -23,6 +23,11 @@ Finally, Mail has been designed with a very simple object oriented system
 that really opens up the email messages you are parsing, if you know what
 you are doing, you can fiddle with every last bit of your email directly.
 
+== Discussion
+
+If you want to discuss mail with like minded individuals, please subscribe to
+the Google Group http://groups.google.com/group/mail-ruby
+
 == Current Capabilities of Mail
 
 * RFC2822 Support, Reading and Writing
@@ -205,7 +210,7 @@ what you are doing.
          to 'you@test.lindsaar.net'
     subject 'Here is the image you wanted'
        body File.read('body.txt')
-   add_file 'New Header Image', '/somefile.png'
+   add_file '/somefile.png'
  end
 
 or
@@ -219,7 +224,7 @@ or
          to 'you@test.lindsaar.net'
     subject 'Here is the image you wanted'
        body File.read('body.txt')
-   add_file 'New Header Image', '/somefile.png'
+   add_file {:filename => 'somefile.png', :data => File.read('/somefile.png')}
  end
  
  mail.deliver!

data/lib/mail.rb

@@ -28,7 +28,13 @@ module Mail # :doc:
   require File.join(dir_name, 'utilities')
   require File.join(dir_name, 'configuration')
   require File.join(dir_name, 'network', 'deliverable')
+  require File.join(dir_name, 'network', 'delivery_methods', 'smtp')
+  require File.join(dir_name, 'network', 'delivery_methods', 'file_delivery')
+  require File.join(dir_name, 'network', 'delivery_methods', 'sendmail')
+  require File.join(dir_name, 'network', 'delivery_methods', 'test_mailer')
   require File.join(dir_name, 'network', 'retrievable')
+  require File.join(dir_name, 'network', 'retriever_methods', 'pop3')
+  require File.join(dir_name, 'network', 'retriever_methods', 'imap')
 
   require File.join(dir_name, 'message')
   require File.join(dir_name, 'part')

data/lib/mail/body.rb

@@ -54,6 +54,11 @@ module Mail
     
     alias :to_s :encoded
     
+    # Returns the raw source right now.  Need to implement
+    def decoded
+      raw_source
+    end
+    
     def charset
       @charset
     end

data/lib/mail/configuration.rb

@@ -7,7 +7,11 @@ require 'singleton'
 module Mail
   
   # The Configuration class is a Singleton used to hold the default
-  # configuration for all SMTP, POP3 and IMAP operations handled by Mail.
+  # configuration for all class wide configurations of Mail.
+  # 
+  # This includes things like running in Test mode, the POP3, IMAP,
+  # SMTP, Sendmail and File delivery method information et al.
+  # 
   # See Mail.defaults for more information.
   class Configuration
     include Singleton
@@ -35,11 +39,19 @@ module Mail
     #  Mail.defaults do
     #    smtp '127.0.0.1', 25
     #  end
-    def smtp(*args)
+    def smtp(*args, &block)
       if args.size > 0
-        @smtp = [args[0], (args[1].to_i > 0 ? args[1] : 25)]
+        host_array = [args[0], (args[1].to_i > 0 ? args[1] : 25)]
       end
-      @smtp
+      set_settings(Mail::SMTP, host_array, &block)
+    end
+
+    # Allows you to define the delivery method for mail, defaults to SMTP
+    # 
+    # This can either be a symbol (:smtp, :sendmail, :file, :test) or you can pass
+    # in your own delivery class, in which case this will be set.
+    def delivery_method(value = nil)
+      value ? @delivery_method = lookup_delivery_method(value) : @delivery_method ||= Mail::SMTP
     end
     
     # Allows you to specify the POP3 Server by passing the hostname
@@ -57,38 +69,66 @@ module Mail
     #  Mail.defaults do
     #    pop3 '127.0.0.1', 110
     #  end
-    def pop3(*args)
+    def pop3(*args, &block)
       if args.size > 0
-        @pop3 = [args[0], (args[1].to_i > 0 ? args[1] : 110)]
+        host_array = [args[0], (args[1].to_i > 0 ? args[1] : 110)]
       end
-      @pop3
-    end
-    
-    # Pass in the username to use for POP3 or IMAP access
-    def user(value = nil)
-      value ? @user = value : @user
-    end
-    
-    def pass(value = nil)
-      value ? @pass = value : @pass
-    end
-    
-    def enable_tls
-      @tls = true
-    end
-    
-    def disable_tls
-      @tls = false
+      set_settings(Mail::POP3, host_array, &block)
     end
     
-    def tls?
-      @tls || false
+    # Allows you to define the retriever method for mail, defaults to POP3
+    # 
+    # This can either be a symbol (:pop3, :imap) or you can pass
+    # in your own retriever class, in which case this will be set.
+    def retriever_method(value = nil)
+      value ? @retriever_method = lookup_retriever_method(value) : @retriever_method ||= Mail::POP3
     end
-    
+
     def param_encode_language(value = nil)
       value ? @encode_language = value : @encode_language ||= 'en'
     end
     
+    private
+    
+    def set_settings(klass, host_array = nil, &block)
+      if host_array
+        klass.instance.settings do
+          host host_array[0]
+          port host_array[1]
+        end
+      end
+      if block_given?
+        klass.instance.settings(&block)
+      end
+      klass.instance.settings(&block)
+    end
+
+     def lookup_delivery_method(method)
+       case method
+       when :smtp || nil
+         Mail::SMTP
+       when :sendmail
+         Mail::Sendmail
+       when :file
+         Mail::FileDelivery
+       when :test
+         Mail::TestMailer
+       else
+         method
+       end
+     end
+
+     def lookup_retriever_method(method)
+       case method
+       when :pop3 || nil
+         Mail::POP3
+ #      when :imap
+ #        Mail::IMAP
+       else
+         method
+       end
+     end
+ 
   end
 
 end

data/lib/mail/fields/content_type_field.rb

@@ -29,6 +29,8 @@ module Mail
     
     def element
       @element ||= Mail::ContentTypeElement.new(value)
+    rescue
+      @element ||= Mail::ContentTypeElement.new(sanatize(value))
     end
     
     def main_type
@@ -102,6 +104,15 @@ module Mail
         super
       end
     end
+    
+    def sanatize( val )
+      case
+      when val.chomp =~ /^text$/
+        'text/plain'
+      when val =~ /([\w\d_]+\/[\w\d_]+)\s(.*)/
+        "#{$1}; #{$2}"
+      end
+    end
 
   end
 end

data/lib/mail/fields/unstructured_field.rb

@@ -38,7 +38,7 @@ module Mail
     end
     
     def do_decode
-      value.blank? ? nil : value
+      value.blank? ? nil : Encodings.decode_encode(value, :decode)
     end
     
     # 2.2.3. Long Header Fields
@@ -77,7 +77,7 @@ module Mail
         @folded_line = []
         @unfolded_line = value.clone
         fold("#{name}: ".length)
-        folded = @folded_line.compact.join("\r\n\t")
+        folded = @folded_line.map { |l| l unless l.blank? }.compact.join("\r\n\t")
         "#{name}: #{folded}"
       end
     end

data/lib/mail/header.rb

@@ -47,7 +47,7 @@ module Mail
     # Returns an array of all the fields in the header in order that they
     # were read in.
     def fields
-      @fields ||= []
+      @fields ||= FieldList.new
     end
     
     #  3.6. Field definitions

data/lib/mail/mail.rb

@@ -26,6 +26,17 @@ module Mail
   #    body 'This is the body'
   #  end
   # 
+  # Or creating via a hash (or hash like object):
+  # 
+  #  message = Mail.new({:to => 'mikel@test.lindsaar.net',
+  #                      'from' => 'bob@test.lindsaar.net',
+  #                       :subject 'This is an email',
+  #                       :body 'This is the body' })
+  # 
+  # Note, the hash keys can be strings or symbols, the passed in object
+  # does not need to be a hash, it just needs to respond to :each_pair
+  # and yield each key value pair.
+  # 
   # As a side note, you can also create a new email through creating
   # a Mail::Message object directly and then passing in values via string,
   # symbol or direct method calls.  See Mail::Message for more information.
@@ -36,11 +47,7 @@ module Mail
   #  mail['subject'] = 'This is an email'
   #  mail.body = 'This is the body'
   def Mail.new(*args, &block)
-    if block_given?
-      Mail::Message.new(args, &block)
-    else
-      Mail::Message.new(args)
-    end
+    Mail::Message.new(args, &block)
   end
 
   # Set the default configuration to send and receive emails.  The defaults
@@ -48,19 +55,37 @@ module Mail
   # if port values are omitted from the SMTP and POP3 method calls, then it
   # is assumed to use the default ports of 25 and 110 respectively.
   # 
-  # The methods you can call in the default configuration are:
+  # You call defaults in a block, then you can set the basic host and port,
+  # by passing arguments, also, if the method you are using required more
+  # information (like pop3), then pass a block to it and call methods like
+  # user, pass, enable_tls etc.
   # 
-  # smtp(server_name, port):: Sets the SMTP server domain name and port
-  # pop3(server_name, port):: Sets the POP3 server domain name and port
-  # user(username):: Sets the username used for POP3 sessions
-  # pass(password):: Sets the password used for POP3 sessions
+  # The arguments and block are both optional.
   #
   #  Mail.defaults do
   #    smtp 'smtp.myhost.fr', 587
-  #    pop3 'pop.myhost.fr'
-  #    user 'bernardo'
-  #    pass 'mypass'
-  #    enable_tls
+  #    pop3 'pop.myhost.fr' do
+  #      user 'bernardo'
+  #      pass 'mypass'
+  #      enable_tls
+  #    end
+  #  end
+  # 
+  # You will also want to specify a delivery and retriever type, the defaults
+  # are SMTP and POP3.  You set the types by passing a symbol:
+  # 
+  #  Mail.defaults do
+  #    retriever_method :pop3
+  #    delivery_method :smtp
+  #  end
+  # 
+  # The only implemented methods at the moment are :pop3, :smtp and :test
+  # 
+  # You can also specify your own delivery class which must respond to :deliver!
+  # or a retriever class which must respond to :get_messages
+  # 
+  #  Mail.defaults do
+  #    retriever_method MyOwnRetriever.new
   #  end
   # 
   # Once you have set defaults, you can call Mail.deliver to send an email
@@ -68,6 +93,8 @@ module Mail
   def Mail.defaults(&block)
     if block_given?
       Mail::Configuration.instance.defaults(&block)
+    else
+      Mail::Configuration.instance
     end
   end
 
@@ -75,6 +102,8 @@ module Mail
   # configuration first before you use Mail.deliver, if you don't, an appropriate
   # error will be raised telling you to.
   # 
+  # If you do not specify a delivery type, SMTP will be used.
+  # 
   #  Mail.deliver do
   #   to 'mikel@test.lindsaar.net'
   #   from 'ada@test.lindsaar.net'
@@ -82,27 +111,46 @@ module Mail
   #   body 'Not much to say here'
   #  end
   # 
+  # You can also do:
+  # 
+  #  mail = Mail.read('email.eml')
+  #  mail.deliver!
+  # 
   # And your email object will be created and sent.
-  
   def Mail.deliver(*args, &block)
-    Mail.new(args, &block).deliver!
+    mail = Mail.new(args, &block)
+    Deliverable.perform_delivery!(mail)
+    mail
   end
 
+  # Returns all the messages on the server using the retriever method set up
+  # in Mail.defaults
   def Mail.get_all_mail(&block)
-    Mail::Message.get_all_mail(&block)
+    if block_given?
+      Retrievable.get_messages.each do |message|
+        yield message
+      end
+    else
+      Retrievable.get_messages
+    end
   end
 
   def Mail.read(filename)
     Mail.new(File.read(filename))
   end
 
+  # Provides a store of all the emails sent
+  def Mail.deliveries
+    @@deliveries ||= []
+  end
+  
   protected
   
   def Mail.random_tag
     t = Time.now
     sprintf('%x%x_%x%x%d%x',
             t.to_i, t.tv_usec,
-            $$, Thread.current.object_id, Mail.uniq, rand(255))
+            $$, Thread.current.object_id.abs, Mail.uniq, rand(255))
   end
   
   private

data/lib/mail/message.rb

@@ -46,21 +46,43 @@ module Mail
     
     include Patterns
     include Utilities
-    include Deliverable
-    include Retrievable
     
     # Creates a new Mail::Message object through .new
     def initialize(*args, &block)
-      self.raw_source = args.flatten[0].to_s.strip
-      set_envelope_header
-      parse_message
-      separate_parts if multipart?
+
+      if args.flatten.first.respond_to?(:each_pair)
+        init_with_hash(args.flatten.first)
+      else
+        init_with_string(args.flatten[0].to_s.strip)
+      end
+
       if block_given?
         instance_eval(&block)
       end
+
       self
     end
     
+    def deliver!
+      Deliverable.perform_delivery!(self)
+    end
+    
+    def <=>(other)
+      if other.nil?
+        1
+      else
+        self.date <=> other.date
+      end
+    end
+    
+    def ==(other)
+      unless other.respond_to?(:encoded)
+        false
+      else
+        self.encoded == other.encoded
+      end
+    end
+    
     # Provides access to the raw source of the message as it was when it
     # was instantiated. This is set at initialization and so is untouched
     # by the parsers or decoder / encoders
@@ -133,8 +155,34 @@ module Mail
     # 
     #  mail.body = 'This is the body'
     #  mail.body #=> #<Mail::Body:0x13919c @raw_source="This is the bo...
+    # 
+    # You can also reset the body of an Message object by setting body to nil
+    # 
+    # Example:
+    # 
+    #  mail.body = 'this is the body'
+    #  mail.body.encoded #=> 'this is the body'
+    #  mail.body = nil
+    #  mail.body.encoded #=> ''
+    # 
+    # If you try and set the body of an email that is a multipart email, then instead
+    # of deleting all the parts of your email, mail will add a text/plain part to
+    # your email:
+    # 
+    #  mail.add_file 'somefilename.png'
+    #  mail.parts.length #=> 1
+    #  mail.body = "This is a body"
+    #  mail.parts.length #=> 2
+    #  mail.parts.last.content_type.content_type #=> 'This is a body'
     def body=(value)
-      @body = Mail::Body.new(value)
+      case
+      when value == nil
+        @body = Mail::Body.new('')
+      when @body && !@body.parts.empty?
+        @body << Mail::Part.new(value)
+      else
+        @body = Mail::Body.new(value)
+      end
     end
 
     # Returns the body of the message object. Or, if passed
@@ -561,8 +609,39 @@ module Mail
       self.body << part
     end
     
-    # Adds a part to the parts list or creates the part list
+    # Adds a file to the message.  You have two options with this method, you can
+    # just pass in the absolute path to the file you want and Mail will read the file,
+    # get the filename from the path you pass in and guess the mime type, or you
+    # can pass in the filename as a string, and pass in the file data as a blob.
+    # 
+    # Example:
+    # 
+    #  m = Mail.new
+    #  m.add_file('/path/to/filename.png')
+    # 
+    # or
+    # 
+    #  m = Mail.new
+    #  m.add_file(:filename => 'filename.png', :data => File.read('/path/to/filename.png'))
+    # 
+    # The above two alternatives will produce the same email message.
+    # 
+    # Note also that if you add a file to an existing message, Mail will convert that message
+    # to a MIME multipart email, moving whatever plain text body you had into it's own text
+    # plain part.
+    # 
+    # Example:
+    # 
+    #  m = Mail.new do
+    #    body 'this is some text'
+    #  end
+    #  m.multipart? #=> false
+    #  m.add_file('/path/to/filename.png')
+    #  m.multipart? #=> true
+    #  m.parts.first.content_type.content_type #=> 'text/plain'
+    #  m.parts.last.content_type.content_type #=> 'image/png'
     def add_file(options)
+      convert_to_multipart unless self.multipart? || self.body.decoded.blank?
       add_multipart_mixed_header
       if options.is_a?(Hash)
         self.body << Mail::Part.new(options)
@@ -571,6 +650,14 @@ module Mail
       end
     end
 
+    def convert_to_multipart
+      text = @body.decoded
+      self.body = ''
+      text_part = Mail::Part.new({:content_type => 'text/plain;',
+                                  :body => text})
+      self.body << text_part
+    end
+
     # Encodes the message, calls encode on all it's parts, gets an email message
     # ready to send
     def ready_to_send!
@@ -600,6 +687,25 @@ module Mail
       raise NoMethodError, 'Can not decode an entire message, try calling #decoded on the various fields and body or parts if it is a multipart message.'
     end
     
+    # Returns true if this part is an attachment
+    def attachment?
+      find_attachment
+    end
+    
+    # Returns the attachment data if there is any
+    def attachment
+      @attachment
+    end
+    
+    # Returns the filename of the attachment
+    def filename
+      if attachment?
+        attachment.filename
+      else
+        nil
+      end
+    end
+    
     private
 
     #  2.1. General Description
@@ -651,17 +757,64 @@ module Mail
     def add_multipart_mixed_header
       unless header['content-type']
         header['content-type'] = ContentTypeField.with_boundary('multipart/mixed').value
+        
         body.boundary = boundary
       end
     end
     
-    class << self
-
-      # Only POP3 is supported for now
-      def get_all_mail(&block)
-        self.pop3_get_all_mail(&block)
+    def init_with_hash(hash)
+      self.raw_source = ''
+      @header = Mail::Header.new
+      @body = Mail::Body.new
+      hash.each_pair do |k,v|
+        next if k.to_sym == :data
+        if k.to_sym == :filename
+          add_attachment(hash)
+        else
+          self[k] = v
+        end
       end
+    end
+    
+    def add_attachment(options_hash)
+      @attachment = Mail::Attachment.new(options_hash)
+      self.content_type = "#{attachment.mime_type}; filename=\"#{attachment.filename}\""
+      self.content_transfer_encoding = "Base64"
+      self.content_disposition = "attachment; filename=\"#{attachment.filename}\""
+      self.body = attachment.encoded
+    end
+    
+    def init_with_string(string)
+      self.raw_source = string
+      set_envelope_header
+      parse_message
+      separate_parts if multipart?
+      if filename = attachment?
+        encoding = content_transfer_encoding.encoding if content_transfer_encoding
+        @attachment = Mail::Attachment.new(:filename => filename,
+                                           :data => body.to_s,
+                                           :encoding => encoding)
+      end
+    end
+    
+    # Returns the filename of the attachment (if it exists) or returns nil
+    def find_attachment
+      case
+      when content_type && content_type.filename
+        filename = content_type.filename
+      when content_disposition && content_disposition.filename
+        filename = content_disposition.filename
+      when content_location && content_location.location
+        filename = content_location.location
+      else
+        filename = nil
+      end
+      filename
+    end
 
+    # Only POP3 is supported for now
+    def Message.get_all_mail(&block)
+      self.pop3_get_all_mail(&block)
     end
 
   end

data/lib/mail/network/deliverable.rb

@@ -1,46 +1,15 @@
 # encoding: utf-8
-
-# Include this module to make a class "deliverable".
-# It uses the defaults set in Configuration to retrieve SMTP settings.
-#
-# Thanks to Nicolas Fouché for this wrapper
-#
 module Mail
+  # The deliverable class provides the way mail will send an email out when you
+  # are using the Mail.deliver! &block command or when you call Mail.deliver!(message)
+  # 
+  # The default delivery is SMTP, localhost, port 25.  You can change this through the
+  # Mail.defaults call.s
   module Deliverable
 
-    # Send the message via SMTP.
-    # The from and to attributes are optional. If not set, they are retrieve from the Message.
-    def deliver!(from = nil, to = nil, rfc2822 = nil)
-      config = Mail::Configuration.instance
-      if config.smtp.blank? || config.smtp[0].blank?
-        raise ArgumentError.new('Please call +Mail.defaults+ to set the SMTP configuration')
-      end
-      
-      # TODO: use the "return-path" field by default instead of the "from" field ? (see ActionMailer)
-      from ||= self.from.addresses.first if self.respond_to?(:from) && self.from
-      raise ArgumentError.new('An author -from- is required to send a message') if from.blank?
-      to ||= self.to.addresses if self.respond_to?(:to) && self.to
-      raise ArgumentError.new('At least one recipient -from- is required to send a message') if to.blank?
-      rfc2822 ||= self.encoded if self.respond_to?(:encoded)
-      raise ArgumentError.new('A encoded content is required to send a message') if rfc2822.blank?
-      
-      smtp = Net::SMTP.new(config.smtp[0], config.smtp[1] || 25)
-      if config.tls?
-        if OpenSSL::SSL::VERIFY_NONE.kind_of?(OpenSSL::SSL::SSLContext)
-          smtp.enable_tls(OpenSSL::SSL::VERIFY_NONE)
-        else
-          smtp.enable_tls
-        end
-      else
-        smtp.enable_starttls_auto if smtp.respond_to?(:enable_starttls_auto)
-      end
-      
-      smtp.start(helo = 'localhost.localdomain', config.user, config.pass, authentication = :plain) do |smtp|
-        smtp.sendmail(rfc2822, from, to)
-      end
-      
-      self
+    def self.perform_delivery!(mail)
+      Mail.defaults.delivery_method.deliver!(mail)
     end
-  end
 
+  end
 end

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

@@ -0,0 +1,18 @@
+module Mail
+  class FileDelivery
+    include Singleton
+    
+    def settings(&block)
+      if block_given?
+        instance_eval(&block)
+      end
+      self
+    end
+    
+    def FileDelivery.deliver!(mail)
+      # To be implemented
+      Mail.deliveries << mail
+    end
+    
+  end
+end

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

@@ -0,0 +1,18 @@
+module Mail
+  class Sendmail
+    include Singleton
+    
+    def settings(&block)
+      if block_given?
+        instance_eval(&block)
+      end
+      self
+    end
+    
+    def Sendmail.deliver!(mail)
+      # To be implemented
+      Mail.deliveries << mail
+    end
+    
+  end
+end

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

@@ -0,0 +1,87 @@
+module Mail
+  class SMTP
+    include Singleton
+    
+    def settings(&block)
+      if block_given?
+        instance_eval(&block)
+      end
+      self
+    end
+    
+    # This is the host that you will send your SMTP mails to, defaults to 'localhost'
+    def host(value = nil)
+      value ? @host = value : @host ||= 'localhost'
+    end
+
+    # This is the port that SMTP email get sent to, default is 25
+    def port(value = nil)
+      value ? @port = value.to_i : @port ||= 25
+    end
+    
+    # The username to use during SMTP authentication
+    def user(value = nil)
+      value ? @user = value : @user
+    end
+    
+    # Password to use during SMTP authentication
+    def pass(value = nil)
+      value ? @pass = value : @pass
+    end
+    
+    # The helo domain used at the begining of an SMTP conversation,
+    # default is 'localhost.localdomain'
+    def helo(value = nil)
+      value ? @help = value : @helo ||= 'localhost.localdomain'
+    end
+    
+    # Turn on TLS
+    def enable_tls
+      @tls = true
+    end
+    
+    # Turn on TLS
+    def disable_tls
+      @tls = false
+    end
+    
+    # TLS Enabled?  Default is false
+    def tls?
+      @tls || false
+    end
+    
+    # Send the message via SMTP.
+    # The from and to attributes are optional. If not set, they are retrieve from the Message.
+    def SMTP.deliver!(mail)
+      
+      config = Mail.defaults
+
+      # TODO: use the "return-path" field by default instead of the "from" field ? (see ActionMailer)
+      from = mail.from.addresses.first if mail.respond_to?(:from) && mail.from
+      raise ArgumentError.new('An author -from- is required to send a message') if from.blank?
+      to ||= mail.destinations if mail.respond_to?(:destinations) && mail.destinations
+      raise ArgumentError.new('At least one recipient -to, cc, bcc- is required to send a message') if to.blank?
+      msg_str ||= mail.encoded if mail.respond_to?(:encoded)
+      raise ArgumentError.new('A encoded content is required to send a message') if msg_str.blank?
+      
+      smtp = Net::SMTP.new(config.smtp.host, config.smtp.port)
+      if config.smtp.tls?
+        if OpenSSL::SSL::VERIFY_NONE.kind_of?(OpenSSL::SSL::SSLContext)
+          smtp.enable_tls(OpenSSL::SSL::VERIFY_NONE)
+        else
+          smtp.enable_tls
+        end
+      else
+        smtp.enable_starttls_auto if smtp.respond_to?(:enable_starttls_auto)
+      end
+      
+      smtp.start(config.smtp.helo, config.smtp.user, config.smtp.pass, authentication = :plain) do |smtp|
+        smtp.sendmail(msg_str, from, to)
+      end
+      
+      self
+    end
+    
+    
+  end
+end

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

@@ -0,0 +1,10 @@
+module Mail
+  class TestMailer
+    include Singleton
+    
+    def TestMailer.deliver!(mail)
+      Mail.deliveries << mail
+    end
+    
+  end
+end

data/lib/mail/network/retrievable.rb

@@ -7,55 +7,9 @@
 #
 module Mail
   module Retrievable
-    
-    module ClassMethods
-    
-      # Get all emails via POP3.
-      # TODO :limit option
-      # TODO :order option
-      def pop3_get_all_mail(&block)
-        config = Mail::Configuration.instance
-        if config.pop3.blank? || config.pop3[0].blank?
-          raise ArgumentError.new('Please call +Mail.defaults+ to set the POP3 configuration')
-        end
-        
-        pop3_start do |pop3|
-          if block_given?
-            pop3.each_mail do |pop_mail|
-              yield self.new(pop_mail.pop)
-            end
-          else
-            emails = []
-            pop3.each_mail do |pop_mail|
-              emails << self.new(pop_mail.pop)
-            end
-            emails
-          end
-        end
-        
-      end
-      
-    private
-      
-      def pop3_start(config = Mail::Configuration.instance, &block)
-        raise ArgumentError.new("Mail::Retrievable#pop3_start takes a block") unless block_given?
-        
-        pop3 = Net::POP3.new(config.pop3[0], config.pop3[1] || 110, isapop = false)
-        pop3.enable_ssl(verify = OpenSSL::SSL::VERIFY_NONE) if config.tls?
-        pop3.start(config.user, config.pass)
-        
-        yield pop3
-      ensure
-        if defined?(pop3) && pop3 && pop3.started?
-          pop3.reset # This clears all "deleted" marks from messages.
-          pop3.finish
-        end
-      end
-      
-    end
-    
-    def self.included(receiver)
-      receiver.extend ClassMethods
+
+    def self.get_messages
+      Mail.defaults.retriever_method.get_messages
     end
   
   end

data/lib/mail/network/retriever_methods/imap.rb

@@ -0,0 +1,17 @@
+module Mail
+  class IMAP
+    include Singleton
+    
+    def settings(&block)
+      if block_given?
+        instance_eval(&block)
+      end
+      self
+    end
+    
+    def IMAP.get_messages(&block)
+      # To be implemented
+    end
+    
+  end
+end

data/lib/mail/network/retriever_methods/pop3.rb

@@ -0,0 +1,92 @@
+module Mail
+  class POP3
+    include Singleton
+    
+    require 'net/pop'
+    
+    def settings(&block)
+      if block_given?
+        instance_eval(&block)
+      end
+      self
+    end
+    
+    # This is the host that you will send your POP3 mails to, defaults to 'localhost'
+    def host(value = nil)
+      value ? @host = value : @host ||= 'localhost'
+    end
+
+    # This is the port that POP3 email get sent to, default is 110
+    def port(value = nil)
+      value ? @port = value.to_i : @port ||= 110
+    end
+    
+    # The username to use during POP3 authentication
+    def user(value = nil)
+      value ? @user = value : @user
+    end
+    
+    # Password to use during POP3 authentication
+    def pass(value = nil)
+      value ? @pass = value : @pass
+    end
+    
+    # Turn on TLS
+    def enable_tls
+      @tls = true
+    end
+    
+    # Turn on TLS
+    def disable_tls
+      @tls = false
+    end
+    
+    # TLS Enabled?  Default is false
+    def tls?
+      @tls || false
+    end
+    
+    # Get all emails via POP3.
+    # TODO :limit option
+    # TODO :order option
+    def POP3.get_messages(&block)
+      config = Mail.defaults
+      if config.pop3.host.blank? || config.pop3.port.blank?
+        raise ArgumentError.new('Please call +Mail.defaults+ to set the POP3 configuration')
+      end
+      
+      start do |pop3|
+        if block_given?
+          pop3.each_mail do |pop_mail|
+            yield Mail.new(pop_mail.pop)
+          end
+        else
+          emails = []
+          pop3.each_mail do |pop_mail|
+            emails << Mail.new(pop_mail.pop)
+          end
+          emails
+        end
+      end
+      
+    end
+    
+    private
+    
+    def POP3.start(config = Mail::Configuration.instance, &block)
+      raise ArgumentError.new("Mail::Retrievable#pop3_start takes a block") unless block_given?
+      
+      pop3 = Net::POP3.new(config.pop3.host, config.pop3.port, isapop = false)
+      pop3.enable_ssl(verify = OpenSSL::SSL::VERIFY_NONE) if config.pop3.tls?
+      pop3.start(config.pop3.user, config.pop3.pass)
+      
+      yield pop3
+    ensure
+      if defined?(pop3) && pop3 && pop3.started?
+        pop3.reset # This clears all "deleted" marks from messages.
+        pop3.finish
+      end
+    end
+  
+  end
+end

data/lib/mail/parsers/rfc2822.rb

@@ -961,6 +961,53 @@ module Mail
       r0
     end
 
+    def _nt_mtext
+      start_index = index
+      if node_cache[:mtext].has_key?(index)
+        cached = node_cache[:mtext][index]
+        @index = cached.interval.end if cached
+        return cached
+      end
+
+      s0, i0 = [], index
+      loop do
+        i1 = index
+        r2 = _nt_atext
+        if r2
+          r1 = r2
+        else
+          if has_terminal?(".", false, index)
+            r3 = instantiate_node(SyntaxNode,input, index...(index + 1))
+            @index += 1
+          else
+            terminal_parse_failure(".")
+            r3 = nil
+          end
+          if r3
+            r1 = r3
+          else
+            @index = i1
+            r1 = nil
+          end
+        end
+        if r1
+          s0 << r1
+        else
+          break
+        end
+      end
+      if s0.empty?
+        @index = i0
+        r0 = nil
+      else
+        r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+      end
+
+      node_cache[:mtext][start_index] = r0
+
+      r0
+    end
+
     module Atom0
     end
 
@@ -1118,6 +1165,35 @@ module Mail
       r0
     end
 
+    def _nt_message_id_text
+      start_index = index
+      if node_cache[:message_id_text].has_key?(index)
+        cached = node_cache[:message_id_text][index]
+        @index = cached.interval.end if cached
+        return cached
+      end
+
+      s0, i0 = [], index
+      loop do
+        r1 = _nt_mtext
+        if r1
+          s0 << r1
+        else
+          break
+        end
+      end
+      if s0.empty?
+        @index = i0
+        r0 = nil
+      else
+        r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+      end
+
+      node_cache[:message_id_text][start_index] = r0
+
+      r0
+    end
+
     module DotAtomText0
       def domain_text
         elements[0]
@@ -4378,7 +4454,7 @@ module Mail
       end
 
       i0 = index
-      r1 = _nt_dot_atom_text
+      r1 = _nt_message_id_text
       if r1
         r0 = r1
       else

data/lib/mail/parsers/rfc2822.treetop

@@ -84,6 +84,10 @@ module Mail
       "|" / "}" /
       "~"
     end
+    
+    rule mtext
+      (atext / ".")+
+    end
 
     rule atom
       CFWS? atext+ CFWS?
@@ -97,6 +101,10 @@ module Mail
       CFWS? local_dot_atom_text CFWS?
     end
     
+    rule message_id_text
+      mtext+
+    end
+    
     rule dot_atom_text
       (domain_text "."?)+
     end
@@ -360,7 +368,7 @@ module Mail
     end
     
     rule id_left
-      dot_atom_text / no_fold_quote / obs_id_left
+      message_id_text / no_fold_quote / obs_id_left
     end
     
     rule id_right

data/lib/mail/part.rb

@@ -2,25 +2,6 @@
 module Mail
   class Part < Message
     
-    def initialize(*args, &block)
-      if args.flatten[0].is_a?(Hash)
-        options_hash = args.flatten[0]
-        super('') # Make an empty message, we are dealing with an attachment
-        @attachment = Mail::Attachment.new(options_hash)
-        self.content_type = "#{attachment.mime_type}; filename=\"#{attachment.filename}\""
-        self.content_transfer_encoding = "Base64"
-        self.content_disposition = "attachment; filename=\"#{attachment.filename}\""
-        self.body = attachment.encoded
-      else
-        super
-        if filename = attachment?
-          @attachment = Mail::Attachment.new(:filename => filename,
-                                             :data => body.to_s,
-                                             :encoding => content_transfer_encoding.encoding)
-        end
-      end
-    end
-    
     # Creates a new empty Content-ID field and inserts it in the correct order
     # into the Header.  The ContentIdField object will automatically generate
     # a unique content ID if you try and encode it or output it to_s without
@@ -31,25 +12,6 @@ module Mail
       header['content-id'] = content_id_val
     end
     
-    # Returns true if this part is an attachment
-    def attachment?
-      find_attachment
-    end
-    
-    # Returns the attachment data if there is any
-    def attachment
-      @attachment
-    end
-    
-    # Returns the filename of the attachment
-    def filename
-      if attachment?
-        attachment.filename
-      else
-        nil
-      end
-    end
-    
     # Returns true if the part has a content ID field, the field may or may
     # not have a value, but the field exists or not.
     def has_content_id?
@@ -115,21 +77,6 @@ module Mail
       @delivery_status_data ||= Header.new(body.to_s.gsub("\r\n\r\n", "\r\n"))
     end
 
-    # Returns the filename of the attachment (if it exists) or returns nil
-    def find_attachment
-      case
-      when content_type && content_type.filename
-        filename = content_type.filename
-      when content_disposition && content_disposition.filename
-        filename = content_disposition.filename
-      when content_location && content_location.location
-        filename = content_location.location
-      else
-        filename = nil
-      end
-      filename
-    end
-
   end
   
 end

data/lib/mail/patterns.rb

@@ -25,6 +25,7 @@ module Mail
     PHRASE_UNSAFE = /[#{Regexp.quote aspecial}#{control}]/n
     TOKEN_UNSAFE  = /[#{Regexp.quote tspecial}#{control}#{lwsp}]/n
     
+    
     module ClassMethods
       
     end

data/lib/mail/utilities.rb

@@ -25,9 +25,13 @@ module Mail
       # in double quotes, otherwise returns the string unmodified
       def quote_phrase( str )
         if RUBY_VERSION >= '1.9'
-          string = str.dup
-          string.force_encoding('ASCII-8BIT')
-          (PHRASE_UNSAFE === string) ? dquote(str) : str
+          original_encoding = str.encoding
+          str.force_encoding('ASCII-8BIT')
+          if (PHRASE_UNSAFE === str)
+            dquote(str).force_encoding(original_encoding)
+          else
+            str.force_encoding(original_encoding)
+          end
         else
           (PHRASE_UNSAFE === str) ? dquote(str) : str
         end

data/lib/mail/version.rb

@@ -3,7 +3,7 @@ module Mail
   module VERSION
     MAJOR = 1
     MINOR = 2
-    TINY  = 1
+    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: 1.2.1
+  version: 1.2.5
 platform: ruby
 authors: 
 - Mikel Lindsaar
@@ -133,7 +133,13 @@ files:
 - ./lib/mail/mail.rb
 - ./lib/mail/message.rb
 - ./lib/mail/network/deliverable.rb
+- ./lib/mail/network/delivery_methods/file_delivery.rb
+- ./lib/mail/network/delivery_methods/sendmail.rb
+- ./lib/mail/network/delivery_methods/smtp.rb
+- ./lib/mail/network/delivery_methods/test_mailer.rb
 - ./lib/mail/network/retrievable.rb
+- ./lib/mail/network/retriever_methods/imap.rb
+- ./lib/mail/network/retriever_methods/pop3.rb
 - ./lib/mail/parsers/address_lists.rb
 - ./lib/mail/parsers/address_lists.treetop
 - ./lib/mail/parsers/content_disposition.rb