mail 2.1.5.3 → 2.2.0

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

@@ -3,14 +3,23 @@ require 'mail/fields/common/address_container'
 
 module Mail
   module CommonAddress # :nodoc:
+      
     def parse(val = value)
       unless val.blank?
-        @tree = AddressList.new(val)
+        @tree = AddressList.new(encode_if_needed(val))
       else
         nil
       end
     end
     
+    def charset
+      @charset
+    end
+    
+    def encode_if_needed(val)
+      Encodings.address_encode(val, charset)
+    end
+    
     # Allows you to iterate through each address object in the syntax tree
     def each
       tree.addresses.each do |address|
@@ -29,28 +38,28 @@ module Mail
       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)
+        @groups[group.group_name.text_value.to_str] = 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
@@ -60,7 +69,7 @@ module Mail
     def group_names # :nodoc:
       tree.group_names
     end
-    
+  
     def default
       addresses
     end
@@ -75,9 +84,9 @@ module Mail
         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 }
@@ -102,7 +111,7 @@ module Mail
     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|

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

@@ -29,20 +29,20 @@ module Mail
     end
     
     def field_length
-      @length ||= name.length + value.length + ': '.length
+      @length ||= "#{name}: #{encode(decoded)}".length
     end
     
     def responsible_for?( val )
       name.to_s.downcase == val.to_s.downcase
     end
-
+    
     private
 
-    def strip_field(field_name, string)
-      if string.is_a?(Array)
-        string.join(', ')
+    def strip_field(field_name, value)
+      if value.is_a?(Array)
+        value
       else
-        string.to_s.gsub(/#{field_name}:\s+/i, '')
+        value.to_s.gsub(/#{field_name}:\s+/i, '')
       end
     end
 

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

@@ -4,7 +4,7 @@ module Mail
     def element
       @element ||= Mail::MessageIdsElement.new(value)
     end
-    
+
     def parse(val = value)
       unless val.blank?
         @element = Mail::MessageIdsElement.new(val)

data/lib/mail/fields/content_description_field.rb

@@ -8,11 +8,11 @@ module Mail
     FIELD_NAME = 'content-description'
     CAPITALIZED_FIELD = 'Content-Description'
     
-    def initialize(*args)
-      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, args.last))
+    def initialize(value = nil, charset = 'utf-8')
+      self.charset = charset
+      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
       self.parse
       self
-
     end
     
   end

data/lib/mail/fields/content_disposition_field.rb

@@ -7,11 +7,11 @@ module Mail
     FIELD_NAME = 'content-disposition'
     CAPITALIZED_FIELD = 'Content-Disposition'
     
-    def initialize(*args)
-      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, args.last))
+    def initialize(value = nil, charset = 'utf-8')
+      self.charset = charset
+      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
       self.parse
       self
-
     end
     
     def parse(val = value)

data/lib/mail/fields/content_id_field.rb

@@ -8,17 +8,17 @@ module Mail
     FIELD_NAME = 'content-id'
     CAPITALIZED_FIELD = "Content-ID"
     
-    def initialize(*args)
+    def initialize(value = nil, charset = 'utf-8')
+      self.charset = charset
       @uniq = 1
-      if args.last.blank?
-        self.name = CAPITALIZED_FIELD
-        self.value = generate_content_id
+      if value.blank?
+        value = generate_content_id
       else
-        super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, args.last))
+        value = strip_field(FIELD_NAME, value)
       end
+      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
       self.parse
       self
-
     end
     
     def parse(val = value)

data/lib/mail/fields/content_location_field.rb

@@ -8,11 +8,11 @@ module Mail
     FIELD_NAME = 'content-location'
     CAPITALIZED_FIELD = 'Content-Location'
     
-    def initialize(*args)
-      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, args.last))
+    def initialize(value = nil, charset = 'utf-8')
+      self.charset = charset
+      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
       self.parse
       self
-
     end
     
     def parse(val = value)

data/lib/mail/fields/content_transfer_encoding_field.rb

@@ -8,9 +8,12 @@ module Mail
     FIELD_NAME = 'content-transfer-encoding'
     CAPITALIZED_FIELD = 'Content-Transfer-Encoding'
     
-    def initialize(*args)
-      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, args.last.to_s.downcase))
-      parse(value)
+    def initialize(value = nil, charset = 'utf-8')
+      self.charset = charset
+      value = '7bit' if value.to_s =~ /7-bit/i
+      value = '8bit' if value.to_s =~ /8-bit/i
+      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
+      self.parse
       self
     end
     

data/lib/mail/fields/content_type_field.rb

@@ -7,18 +7,19 @@ module Mail
     FIELD_NAME = 'content-type'
     CAPITALIZED_FIELD = 'Content-Type'
     
-    def initialize(*args)
-      if args.last.class == Array
-        @main_type = args.last[0]
-        @sub_type = args.last[1]
-        @parameters = ParameterHash.new.merge!(args.last.last)
-        super(CAPITALIZED_FIELD, args.last)
+    def initialize(value = nil, charset = 'utf-8')
+      self.charset = charset
+      if value.class == Array
+        @main_type = value[0]
+        @sub_type = value[1]
+        @parameters = ParameterHash.new.merge!(value.last)
       else
         @main_type = nil
         @sub_type = nil
         @parameters = nil
-        super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, args.last))
+        value = strip_field(FIELD_NAME, value)
       end
+      super(CAPITALIZED_FIELD, value, charset)
       self.parse
       self
     end

data/lib/mail/fields/date_field.rb

@@ -31,16 +31,16 @@ module Mail
     FIELD_NAME = 'date'
     CAPITALIZED_FIELD = "Date"
     
-    def initialize(*args)
-      if args.last.blank?
-        self.name = CAPITALIZED_FIELD
-        self.value = Time.now.strftime('%a, %d %b %Y %H:%M:%S %z')
-        self
+    def initialize(value = nil, charset = 'utf-8')
+      self.charset = charset
+      if value.blank?
+        value = Time.now.strftime('%a, %d %b %Y %H:%M:%S %z')
       else
-        value = strip_field(FIELD_NAME, args.last)
-        value = ::DateTime.parse(value.to_s).strftime('%a, %d %b %Y %H:%M:%S %z')
-        super(CAPITALIZED_FIELD, value)
+        value = strip_field(FIELD_NAME, value)
+        value.to_s.gsub!(/\(.*?\)/, '')
+        value = ::DateTime.parse(value.to_s.squeeze(" ")).strftime('%a, %d %b %Y %H:%M:%S %z')
       end
+      super(CAPITALIZED_FIELD, value, charset)
     end
     
     def encoded

data/lib/mail/fields/from_field.rb

@@ -36,11 +36,11 @@ module Mail
     FIELD_NAME = 'from'
     CAPITALIZED_FIELD = 'From'
     
-    def initialize(*args)
-      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, args.last))
+    def initialize(value = nil, charset = 'utf-8')
+      self.charset = charset
+      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
       self.parse
       self
-
     end
     
     def encoded

data/lib/mail/fields/in_reply_to_field.rb

@@ -36,8 +36,9 @@ module Mail
     FIELD_NAME = 'in-reply-to'
     CAPITALIZED_FIELD = 'In-Reply-To'
     
-    def initialize(*args)
-      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, args.last))
+    def initialize(value = nil, charset = 'utf-8')
+      self.charset = charset
+      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
       self.parse
       self
     end

data/lib/mail/fields/keywords_field.rb

@@ -7,8 +7,9 @@ module Mail
     FIELD_NAME = 'keywords'
     CAPITALIZED_FIELD = 'Keywords'
     
-    def initialize(*args)
-      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, args.last))
+    def initialize(value = nil, charset = 'utf-8')
+      self.charset = charset
+      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
       self.parse
       self
     end

data/lib/mail/fields/message_id_field.rb

@@ -38,13 +38,14 @@ module Mail
     FIELD_NAME = 'message-id'
     CAPITALIZED_FIELD = 'Message-ID'
     
-    def initialize(*args)
+    def initialize(value = nil, charset = 'utf-8')
+      self.charset = charset
       @uniq = 1
-      if args.last.blank?
+      if value.blank?
         self.name = CAPITALIZED_FIELD
         self.value = generate_message_id
       else
-        super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, args.last))
+        super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
       end
       self.parse
       self

data/lib/mail/fields/mime_version_field.rb

@@ -8,13 +8,12 @@ module Mail
     FIELD_NAME = 'mime-version'
     CAPITALIZED_FIELD = 'Mime-Version'
 
-    def initialize(*args)
-      if args.last.blank?
-        self.name = CAPITALIZED_FIELD
-        self.value = '1.0'
-      else
-        super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, args.last))
+    def initialize(value = nil, charset = 'utf-8')
+      self.charset = charset
+      if value.blank?
+        value = '1.0'
       end
+      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
       self.parse
       self
 

data/lib/mail/fields/received_field.rb

@@ -25,8 +25,9 @@ module Mail
     FIELD_NAME = 'received'
     CAPITALIZED_FIELD = 'Received'
     
-    def initialize(*args)
-      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, args.last))
+    def initialize(value = nil, charset = 'utf-8')
+      self.charset = charset
+      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
       self.parse
       self
 

data/lib/mail/fields/references_field.rb

@@ -36,11 +36,11 @@ module Mail
     FIELD_NAME = 'references'
     CAPITALIZED_FIELD = 'References'
     
-    def initialize(*args)
-      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, args.last))
+    def initialize(value = nil, charset = 'utf-8')
+      self.charset = charset
+      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
       self.parse
       self
-
     end
     
     def encoded

data/lib/mail/fields/reply_to_field.rb

@@ -36,11 +36,11 @@ module Mail
     FIELD_NAME = 'reply-to'
     CAPITALIZED_FIELD = 'Reply-To'
     
-    def initialize(*args)
-      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, args.last))
+    def initialize(value = nil, charset = 'utf-8')
+      self.charset = charset
+      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
       self.parse
       self
-
     end
     
     def encoded

data/lib/mail/fields/resent_bcc_field.rb

@@ -36,11 +36,11 @@ module Mail
     FIELD_NAME = 'resent-bcc'
     CAPITALIZED_FIELD = 'Resent-Bcc'
     
-    def initialize(*args)
-      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, args.last))
+    def initialize(value = nil, charset = 'utf-8')
+      self.charset = charset
+      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
       self.parse
       self
-
     end
     
     def encoded

data/lib/mail/fields/resent_cc_field.rb

@@ -36,11 +36,11 @@ module Mail
     FIELD_NAME = 'resent-cc'
     CAPITALIZED_FIELD = 'Resent-Cc'
     
-    def initialize(*args)
-      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, args.last))
+    def initialize(value = nil, charset = 'utf-8')
+      self.charset = charset
+      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
       self.parse
       self
-
     end
     
     def encoded

data/lib/mail/fields/resent_date_field.rb

@@ -11,16 +11,16 @@ module Mail
     FIELD_NAME = 'resent-date'
     CAPITALIZED_FIELD = 'Resent-Date'
     
-    def initialize(*args)
-      if args.last.blank?
-        self.name = CAPITALIZED_FIELD
-        self.value = Time.now.strftime('%a, %d %b %Y %H:%M:%S %z')
-        self
+    def initialize(value = nil, charset = 'utf-8')
+      self.charset = charset
+      if value.blank?
+        value = Time.now.strftime('%a, %d %b %Y %H:%M:%S %z')
       else
-        value = strip_field(FIELD_NAME, args.last)
+        value = strip_field(FIELD_NAME, value)
         value = ::DateTime.parse(value.to_s).strftime('%a, %d %b %Y %H:%M:%S %z')
-        super(CAPITALIZED_FIELD, value)
       end
+      super(CAPITALIZED_FIELD, value, charset)
+      self
     end
     
     def encoded