mail 2.1.5 → 2.1.5.1

data/CHANGELOG.rdoc

@@ -1,3 +1,10 @@
+== Sun Mar 28 07:01:07 UTC 2010 Mikel Lindsaar <raasdnil@gmail.com>
+
+* Version bump to 2.1.5
+* Changed guess encoding to short circuit to binary if the mime type is unknown, should be safe
+* Renaming spec to match the file for attachment_lists.rb
+* Adding Message#decoded returns Message#body#decoded if the message is not multipart
+
 == Sun Mar 28 02:55:42 UTC 2010 Mikel Lindsaar <raasdnil@gmail.com>
 
 * Version bump to 2.1.4

data/Rakefile

@@ -1,7 +1,4 @@
-environment = File.expand_path('../../vendor/gems/environment')
-if File.exist?("#{environment}.rb")
-  require environment
-end
+require File.expand_path('../spec/environment', __FILE__)
 
 require 'rake/rdoctask'
 require 'rake/gempackagetask'
@@ -11,7 +8,7 @@ require 'cucumber/rake/task'
 
 spec = Gem::Specification.new do |s|
   s.name        = "mail"
-  s.version     = "2.1.5"
+  s.version     = "2.1.5.1"
   s.author      = "Mike Lindsaar"
   s.email       = "raasdnil@gmail.com"
   s.homepage    = "http://github.com/mikel/mail"
@@ -30,7 +27,7 @@ spec = Gem::Specification.new do |s|
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|
-    pkg.gem_spec = spec
+  pkg.gem_spec = spec
 end
 
 task :default => :spec
@@ -46,7 +43,7 @@ end
 
 Spec::Rake::SpecTask.new(:spec) do |t|
   t.warning = true
-  t.spec_files = FileList['spec/**/*_spec.rb']
+  t.spec_files = FileList["#{File.dirname(__FILE__)}/spec/**/*_spec.rb"]
   t.spec_opts = %w(--backtrace --diff --color)
   t.libs << "#{File.dirname(__FILE__)}/spec"
   t.libs << "#{File.dirname(__FILE__)}/spec/mail"

data/lib/mail.rb

@@ -4,13 +4,8 @@ module Mail # :doc:
   require 'date'
 
   require 'active_support'
-
-  # Have to handle ActiveSupport 2.3 and 3.0
-  # Following two lines make sure that HashWithIndifferentAccess is available
-  # regardless of having activesupport 3 or 2.3 loaded
   require 'active_support/core_ext/hash/indifferent_access'
-
-  require 'mail/vendor/treetop'
+  require 'active_support/core_ext/object/blank'
 
   require 'uri'
   require 'net/smtp'
@@ -25,33 +20,24 @@ module Mail # :doc:
   end
 
   if RUBY_VERSION >= "1.9.1"
-    require 'mail/version_specific/ruby_1_9.rb'
+    require 'mail/version_specific/ruby_1_9'
     RubyVer = Mail::Ruby19
   else
-    require 'mail/version_specific/ruby_1_8.rb'
+    require 'mail/version_specific/ruby_1_8'
     RubyVer = Mail::Ruby18
   end
 
   require 'mail/version'
 
-  begin
-    require 'active_support/core_ext/object/blank'
-  rescue LoadError
-    # Unneeded for Active Support <= 3.0.pre
-  end
-
   require 'mail/core_extensions/nil'
   require 'mail/core_extensions/string'
 
   require 'mail/patterns'
   require 'mail/utilities'
   require 'mail/configuration'
-  require 'mail/network/delivery_methods/smtp'
-  require 'mail/network/delivery_methods/file_delivery'
-  require 'mail/network/delivery_methods/sendmail'
-  require 'mail/network/delivery_methods/test_mailer'
-  require 'mail/network/retriever_methods/pop3'
-  require 'mail/network/retriever_methods/imap'
+
+  # Autoload mail send and receive classes.
+  require 'mail/network'
 
   require 'mail/message'
   require 'mail/part'
@@ -62,55 +48,32 @@ module Mail # :doc:
   require 'mail/field'
   require 'mail/field_list'
 
-  # Load in all common header fields modules
-  require 'mail/fields/common/address_container'
-  require 'mail/fields/common/common_address'
-  require 'mail/fields/common/common_date'
-  require 'mail/fields/common/common_field'
-  require 'mail/fields/common/common_message_id'
-  require 'mail/fields/common/parameter_hash'
-
-  require 'mail/fields/structured_field'
-  require 'mail/fields/unstructured_field'
   require 'mail/envelope'
 
+  require 'mail/vendor/treetop'
   parsers = %w[ rfc2822_obsolete rfc2822 address_lists phrase_lists
                 date_time received message_ids envelope_from rfc2045 
                 mime_version content_type content_disposition
                 content_transfer_encoding content_location ]
-  
   parsers.each do |parser|
     begin
       # Try requiring the pre-compiled ruby version first
+      require 'treetop/runtime'
       require "mail/parsers/#{parser}"
     rescue LoadError
       # Otherwise, get treetop to compile and load it
+      require 'treetop/runtime'
+      require 'treetop/compiler'
       Treetop.load("mail/parsers/#{parser}")
     end
   end
 
-  # Load in all header field elements
-  elems = Dir.glob(File.join(File.dirname(__FILE__), 'mail', 'elements', '*.rb'))
-  elems.each do |elem|
-    require "mail/elements/#{File.basename(elem, '.rb')}"
-  end
-  
-  # Load in all header fields
-  fields = Dir.glob(File.join(File.dirname(__FILE__), 'mail', 'fields', '*.rb'))
-  fields.each do |field|
-    require "mail/fields/#{File.basename(field, '.rb')}"
-  end
-  
-  # Load in all transfer encodings
-  require "mail/encodings/encodings"
-  require "mail/encodings/transfer_encoding"
-  require "mail/encodings/binary"
-  require "mail/encodings/8bit"
-  require "mail/encodings/7bit"
-  require "mail/encodings/base64"
-  require "mail/encodings/quoted_printable"
-  
-  # Finally... require all the Mail.methods
-  require File.join('mail', 'mail')
+  # Autoload header field elements and transfer encodings.
+  require 'mail/elements'
+  require 'mail/encodings'
+  require 'mail/encodings/base64'
+  require 'mail/encodings/quoted_printable'
 
+  # Finally... require all the Mail.methods
+  require 'mail/mail'
 end

data/lib/mail/elements.rb

@@ -0,0 +1,15 @@
+module Mail
+  autoload :Address, 'mail/elements/address'
+  autoload :AddressList, 'mail/elements/address_list'
+  autoload :ContentDispositionElement, 'mail/elements/content_disposition_element'
+  autoload :ContentLocationElement, 'mail/elements/content_location_element'
+  autoload :ContentTransferEncodingElement, 'mail/elements/content_transfer_encoding_element'
+  autoload :ContentTypeElement, 'mail/elements/content_type_element'
+  autoload :DateTimeElement, 'mail/elements/date_time_element'
+  autoload :EnvelopeFromElement, 'mail/elements/envelope_from_element'
+  autoload :MessageIdsElement, 'mail/elements/message_ids_element'
+  autoload :MimeVersionElement, 'mail/elements/mime_version_element'
+  autoload :PhraseList, 'mail/elements/phrase_list'
+  autoload :ReceivedElement, 'mail/elements/received_element'
+  autoload :ReceivedElement, 'mail/elements/received_element'
+end

data/lib/mail/{encodings/encodings.rb → encodings.rb}

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 module Mail
   # Raised when attempting to decode an unknown encoding type
   class UnknownEncodingType < StandardError #:nodoc:

data/lib/mail/encodings/7bit.rb

@@ -1,4 +1,6 @@
 # encoding: utf-8
+require 'mail/encodings/8bit'
+
 module Mail
   module Encodings
     class SevenBit < EightBit

data/lib/mail/encodings/8bit.rb

@@ -1,4 +1,6 @@
 # encoding: utf-8
+require 'mail/encodings/binary'
+
 module Mail
   module Encodings
     class EightBit < Binary

data/lib/mail/encodings/base64.rb

@@ -1,4 +1,6 @@
 # encoding: utf-8
+require 'mail/encodings/7bit'
+
 module Mail
   module Encodings
     class Base64 < SevenBit

data/lib/mail/encodings/binary.rb

@@ -1,4 +1,6 @@
 # encoding: utf-8
+require 'mail/encodings/transfer_encoding'
+
 module Mail
   module Encodings
     class Binary < TransferEncoding

data/lib/mail/encodings/quoted_printable.rb

@@ -1,4 +1,6 @@
 # encoding: utf-8
+require 'mail/encodings/7bit'
+
 module Mail
   module Encodings
     class QuotedPrintable < SevenBit

data/lib/mail/field.rb

@@ -1,3 +1,5 @@
+require 'mail/fields'
+
 # encoding: utf-8
 module Mail
   # Provides a single class to call to create a new structured or unstructured

data/lib/mail/fields.rb

@@ -0,0 +1,35 @@
+module Mail
+  autoload :UnstructuredField, 'mail/fields/unstructured_field'
+  autoload :StructuredField, 'mail/fields/structured_field'
+  autoload :OptionalField, 'mail/fields/optional_field'
+
+  autoload :BccField, 'mail/fields/bcc_field'
+  autoload :CcField, 'mail/fields/cc_field'
+  autoload :CommentsField, 'mail/fields/comments_field'
+  autoload :ContentDescriptionField, 'mail/fields/content_description_field'
+  autoload :ContentDispositionField, 'mail/fields/content_disposition_field'
+  autoload :ContentIdField, 'mail/fields/content_id_field'
+  autoload :ContentLocationField, 'mail/fields/content_location_field'
+  autoload :ContentTransferEncodingField, 'mail/fields/content_transfer_encoding_field'
+  autoload :ContentTypeField, 'mail/fields/content_type_field'
+  autoload :DateField, 'mail/fields/date_field'
+  autoload :FromField, 'mail/fields/from_field'
+  autoload :InReplyToField, 'mail/fields/in_reply_to_field'
+  autoload :KeywordsField, 'mail/fields/keywords_field'
+  autoload :MessageIdField, 'mail/fields/message_id_field'
+  autoload :MimeVersionField, 'mail/fields/mime_version_field'
+  autoload :ReceivedField, 'mail/fields/received_field'
+  autoload :ReferencesField, 'mail/fields/references_field'
+  autoload :ReplyToField, 'mail/fields/reply_to_field'
+  autoload :ResentBccField, 'mail/fields/resent_bcc_field'
+  autoload :ResentCcField, 'mail/fields/resent_cc_field'
+  autoload :ResentDateField, 'mail/fields/resent_date_field'
+  autoload :ResentFromField, 'mail/fields/resent_from_field'
+  autoload :ResentMessageIdField, 'mail/fields/resent_message_id_field'
+  autoload :ResentSenderField, 'mail/fields/resent_sender_field'
+  autoload :ResentToField, 'mail/fields/resent_to_field'
+  autoload :ReturnPathField, 'mail/fields/return_path_field'
+  autoload :SenderField, 'mail/fields/sender_field'
+  autoload :SubjectField, 'mail/fields/subject_field'
+  autoload :ToField, 'mail/fields/to_field'
+end

data/lib/mail/fields/bcc_field.rb

@@ -26,6 +26,8 @@
 #  mail[:bcc].addresses #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
 #  mail[:bcc].formatted #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
 # 
+require 'mail/fields/common/common_address'
+
 module Mail
   class BccField < StructuredField
     

data/lib/mail/fields/cc_field.rb

@@ -26,6 +26,8 @@
 #  mail[:cc].addresses #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
 #  mail[:cc].formatted #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
 # 
+require 'mail/fields/common/common_address'
+
 module Mail
   class CcField < StructuredField
     

data/lib/mail/fields/common/common_address.rb

@@ -1,128 +1,116 @@
 # encoding: utf-8
+require 'mail/fields/common/address_container'
+
 module Mail
   module CommonAddress # :nodoc:
-    
-    module ClassMethods # :nodoc:
-      
-    end
-  
-    module InstanceMethods # :doc:
-      
-      def parse(val = value)
-        unless val.blank?
-          @tree = AddressList.new(val)
-        else
-          nil
-        end
-      end
-      
-      # Allows you to iterate through each address object in the syntax tree
-      def each
-        tree.addresses.each do |address|
-          yield(address)
-        end
+    def parse(val = value)
+      unless val.blank?
+        @tree = AddressList.new(val)
+      else
+        nil
       end
-
-      # Returns the address string of all the addresses in the address list
-      def addresses
-        list = tree.addresses.map { |a| a.address }
-        Mail::AddressContainer.new(self, list)
+    end
+    
+    # Allows you to iterate through each address object in the syntax tree
+    def each
+      tree.addresses.each do |address|
+        yield(address)
       end
+    end
 
-      # Returns the formatted string of all the addresses in the address list
-      def formatted
-        list = tree.addresses.map { |a| a.format }
-        Mail::AddressContainer.new(self, list)
-      end
-      
-      # Returns the display name of all the addresses in the address list
-      def display_names
-        list = tree.addresses.map { |a| a.display_name }
-        Mail::AddressContainer.new(self, list)
-      end
-      
-      # Returns the actual address objects in the address list
-      def addrs
-        list = tree.addresses
-        Mail::AddressContainer.new(self, list)
-      end
-      
-      # Returns a hash of group name => address strings for the address list
-      def groups
-        @groups = Hash.new
-        tree.group_recipients.each do |group|
-          @groups[group.group_name.text_value] = get_group_addresses(group.group_list)
-        end
-        @groups
-      end
-      
-      # Returns the addresses that are part of groups
-      def group_addresses
-        groups.map { |k,v| v.map { |a| a.format } }.flatten
-      end
+    # Returns the address string of all the addresses in the address list
+    def addresses
+      list = tree.addresses.map { |a| a.address }
+      Mail::AddressContainer.new(self, list)
+    end
 
-      # Returns the name of all the groups in a string
-      def group_names # :nodoc:
-        tree.group_names
-      end
-      
-      def default
-        addresses
+    # Returns the formatted string of all the addresses in the address list
+    def formatted
+      list = tree.addresses.map { |a| a.format }
+      Mail::AddressContainer.new(self, list)
+    end
+    
+    # Returns the display name of all the addresses in the address list
+    def display_names
+      list = tree.addresses.map { |a| a.display_name }
+      Mail::AddressContainer.new(self, list)
+    end
+    
+    # Returns the actual address objects in the address list
+    def addrs
+      list = tree.addresses
+      Mail::AddressContainer.new(self, list)
+    end
+    
+    # Returns a hash of group name => address strings for the address list
+    def groups
+      @groups = Hash.new
+      tree.group_recipients.each do |group|
+        @groups[group.group_name.text_value] = get_group_addresses(group.group_list)
       end
+      @groups
+    end
+    
+    # Returns the addresses that are part of groups
+    def group_addresses
+      groups.map { |k,v| v.map { |a| a.format } }.flatten
+    end
 
-      def <<(val)
-        case
-        when val.nil?
-          raise ArgumentError, "Need to pass an address to <<"
-        when val.blank?
-          parse(encoded)
-        else
-          parse((formatted + [val]).join(", "))
-        end
-      end
-      
-      private
-      
-      def do_encode(field_name)
-        return '' if value.blank?
-        address_array = tree.addresses.reject { |a| group_addresses.include?(a.encoded) }.compact.map { |a| a.encoded }
-        address_text  = address_array.join(", \r\n\t")
-        group_array = groups.map { |k,v| "#{k}: #{v.map { |a| a.encoded }.join(", \r\n\t")};" }
-        group_text  = group_array.join(" \r\n\t")
-        return_array = [address_text, group_text].reject { |a| a.blank? }
-        "#{field_name}: #{return_array.join(", \r\n\t")}\r\n"
-      end
+    # Returns the name of all the groups in a string
+    def group_names # :nodoc:
+      tree.group_names
+    end
+    
+    def default
+      addresses
+    end
 
-      def do_decode
-        return nil if value.blank?
-        address_array = tree.addresses.reject { |a| group_addresses.include?(a.decoded) }.map { |a| a.decoded }
-        address_text  = address_array.join(", ")
-        group_array = groups.map { |k,v| "#{k}: #{v.map { |a| a.decoded }.join(", ")};" }
-        group_text  = group_array.join(" ")
-        return_array = [address_text, group_text].reject { |a| a.blank? }
-        return_array.join(", ")
+    def <<(val)
+      case
+      when val.nil?
+        raise ArgumentError, "Need to pass an address to <<"
+      when val.blank?
+        parse(encoded)
+      else
+        parse((formatted + [val]).join(", "))
       end
+    end
+    
+    private
+    
+    def do_encode(field_name)
+      return '' if value.blank?
+      address_array = tree.addresses.reject { |a| group_addresses.include?(a.encoded) }.compact.map { |a| a.encoded }
+      address_text  = address_array.join(", \r\n\t")
+      group_array = groups.map { |k,v| "#{k}: #{v.map { |a| a.encoded }.join(", \r\n\t")};" }
+      group_text  = group_array.join(" \r\n\t")
+      return_array = [address_text, group_text].reject { |a| a.blank? }
+      "#{field_name}: #{return_array.join(", \r\n\t")}\r\n"
+    end
 
-      # Returns the syntax tree of the Addresses
-      def tree # :nodoc:
-        @tree ||= AddressList.new(value)
-      end
-      
-      def get_group_addresses(group_list)
-        if group_list.respond_to?(:addresses)
-          group_list.addresses.map do |address_tree|
-            Mail::Address.new(address_tree)
-          end
-        else
-          []
-        end
-      end
+    def do_decode
+      return nil if value.blank?
+      address_array = tree.addresses.reject { |a| group_addresses.include?(a.decoded) }.map { |a| a.decoded }
+      address_text  = address_array.join(", ")
+      group_array = groups.map { |k,v| "#{k}: #{v.map { |a| a.decoded }.join(", ")};" }
+      group_text  = group_array.join(" ")
+      return_array = [address_text, group_text].reject { |a| a.blank? }
+      return_array.join(", ")
+    end
 
+    # Returns the syntax tree of the Addresses
+    def tree # :nodoc:
+      @tree ||= AddressList.new(value)
     end
     
-    def self.included(receiver) # :nodoc:
-      receiver.send :include, InstanceMethods
+    def get_group_addresses(group_list)
+      if group_list.respond_to?(:addresses)
+        group_list.addresses.map do |address_tree|
+          Mail::Address.new(address_tree)
+        end
+      else
+        []
+      end
     end
-    
   end
-end
+end