mail 2.6.3 → 2.6.4.rc1

data/lib/mail/encodings/transfer_encoding.rb

@@ -23,30 +23,39 @@ module Mail
         raise "Unimplemented"
       end
 
+      def self.compatible_input?(str)
+        true
+      end
+
       def self.to_s
         self::NAME
       end
 
       def self.get_best_compatible(source_encoding, str)
-        if self.can_transport? source_encoding then
-            source_encoding 
+        if self.can_transport?(source_encoding) && self.compatible_input?(str)
+          source_encoding
         else
-            choices = []
-            Encodings.get_all.each do |enc|
-                choices << enc if self.can_transport? enc and enc.can_encode? source_encoding
-            end
-            best = nil 
-            best_cost = 100
-            choices.each do |enc|
-                this_cost = enc.cost str
-                if this_cost < best_cost then
-                    best_cost = this_cost
-                    best = enc
-                elsif this_cost == best_cost then 
-                    best = enc if enc::PRIORITY < best::PRIORITY
-                end
+          choices = Encodings.get_all.select do |enc|
+            self.can_transport?(enc) && enc.can_encode?(source_encoding)
+          end
+
+          best = nil
+          best_cost = nil
+
+          choices.each do |enc|
+            # If the current choice cannot be transported safely,
+            # give priority to other choices but allow it to be used as a fallback.
+            this_cost = enc.cost(str) if enc.compatible_input?(str)
+
+            if !best_cost || (this_cost && this_cost < best_cost)
+              best_cost = this_cost
+              best = enc
+            elsif this_cost == best_cost
+              best = enc if enc::PRIORITY < best::PRIORITY
             end
-            best
+          end
+
+          best
         end
       end
 

data/lib/mail/field.rb

@@ -114,11 +114,11 @@ module Mail
     def initialize(name, value = nil, charset = 'utf-8')
       case
       when name.index(COLON)            # Field.new("field-name: field data")
-        @charset = value.blank? ? charset : value
+        @charset = Utilities.blank?(value) ? charset : value
         @name = name[FIELD_PREFIX]
         @raw_value = name
         @value = nil
-      when value.blank?                 # Field.new("field-name")
+      when Utilities.blank?(value)   # Field.new("field-name")
         @name = name
         @value = nil
         @raw_value = nil
@@ -168,15 +168,19 @@ module Mail
     end
 
     def same( other )
+      return false unless other.kind_of?(self.class)
       match_to_s(other.name, self.name)
     end
 
+    def ==( other )
+      return false unless other.kind_of?(self.class)
+      match_to_s(other.name, self.name) && match_to_s(other.value, self.value)
+    end
+
     def responsible_for?( val )
       name.to_s.casecmp(val.to_s) == 0
     end
 
-    alias_method :==, :same
-
     def <=>( other )
       self.field_order_id <=> other.field_order_id
     end
@@ -189,6 +193,16 @@ module Mail
       field.send(name, *args, &block)
     end
 
+    if RUBY_VERSION >= '1.9.2'
+      def respond_to_missing?(method_name, include_private)
+        field.respond_to?(method_name, include_private) || super
+      end
+    else
+      def respond_to?(method_name, include_private = false)
+        field.respond_to?(method_name, include_private) || super
+      end
+    end
+
     FIELD_ORDER = %w[ return-path received
                       resent-date resent-from resent-sender resent-to
                       resent-cc resent-bcc resent-message-id

data/lib/mail/fields/bcc_field.rb

@@ -39,13 +39,24 @@ module Mail
     def initialize(value = '', charset = 'utf-8')
       @charset = charset
       super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
-      self.parse
       self
     end
     
-    # Bcc field should never be :encoded
+    def include_in_headers=(include_in_headers)
+      @include_in_headers = include_in_headers
+    end
+
+    def include_in_headers
+      defined?(@include_in_headers) ? @include_in_headers : self.include_in_headers = false
+    end
+
+    # Bcc field should not be :encoded by default
     def encoded
-      ''
+      if include_in_headers
+        do_encode(CAPITALIZED_FIELD)
+      else
+        ''
+      end
     end
     
     def decoded

data/lib/mail/fields/cc_field.rb

@@ -39,7 +39,6 @@ module Mail
     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/common/common_address.rb

@@ -5,7 +5,7 @@ module Mail
   module CommonAddress # :nodoc:
       
     def parse(val = value)
-      unless val.blank?
+      unless Utilities.blank?(val)
         @address_list = AddressList.new(encode_if_needed(val))
       else
         nil
@@ -84,10 +84,10 @@ module Mail
       case
       when val.nil?
         raise ArgumentError, "Need to pass an address to <<"
-      when val.blank?
+      when Utilities.blank?(val)
         parse(encoded)
       else
-        self.value = [self.value, val].reject {|a| a.blank? }.join(", ")
+        self.value = [self.value, val].reject {|a| Utilities.blank?(a) }.join(", ")
       end
     end
 
@@ -99,22 +99,22 @@ module Mail
     private
   
     def do_encode(field_name)
-      return '' if value.blank?
+      return '' if Utilities.blank?(value)
       address_array = address_list.addresses.reject { |a| encoded_group_addresses.include?(a.encoded) }.compact.map { |a| a.encoded }
       address_text  = address_array.join(", \r\n\s")
       group_array = groups.map { |k,v| "#{k}: #{v.map { |a| a.encoded }.join(", \r\n\s")};" }
       group_text  = group_array.join(" \r\n\s")
-      return_array = [address_text, group_text].reject { |a| a.blank? }
+      return_array = [address_text, group_text].reject { |a| Utilities.blank?(a) }
       "#{field_name}: #{return_array.join(", \r\n\s")}\r\n"
     end
 
     def do_decode
-      return nil if value.blank?
+      return nil if Utilities.blank?(value)
       address_array = address_list.addresses.reject { |a| decoded_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 = [address_text, group_text].reject { |a| Utilities.blank?(a) }
       return_array.join(", ")
     end
 

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

@@ -11,7 +11,7 @@ module Mail
     end
     
     def parse(val = value)
-      unless val.blank?
+      unless Utilities.blank?(val)
         @element = Mail::DateTimeElement.new(val)
       else
         nil

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

@@ -44,7 +44,7 @@ module Mail
       if value.is_a?(Array)
         value
       else
-        value.to_s.sub(/#{field_name}:\s+/i, EMPTY)
+        value.to_s.sub(/\A#{field_name}:\s+/i, EMPTY)
       end
     end
 

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

@@ -2,11 +2,11 @@
 module Mail
   module CommonMessageId # :nodoc:
     def element
-      @element ||= Mail::MessageIdsElement.new(value) unless value.blank?
+      @element ||= Mail::MessageIdsElement.new(value) unless Utilities.blank?(value)
     end
 
     def parse(val = value)
-      unless val.blank?
+      unless Utilities.blank?(val)
         @element = Mail::MessageIdsElement.new(val)
       else
         nil

data/lib/mail/fields/content_disposition_field.rb

@@ -3,10 +3,10 @@ require 'mail/fields/common/parameter_hash'
 
 module Mail
   class ContentDispositionField < StructuredField
-    
+
     FIELD_NAME = 'content-disposition'
     CAPITALIZED_FIELD = 'Content-Disposition'
-    
+
     def initialize(value = nil, charset = 'utf-8')
       self.charset = charset
       ensure_filename_quoted(value)
@@ -14,13 +14,13 @@ module Mail
       self.parse
       self
     end
-    
+
     def parse(val = value)
-      unless val.blank?
+      unless Utilities.blank?(val)
         @element = Mail::ContentDispositionElement.new(val)
       end
     end
-    
+
     def element
       @element ||= Mail::ContentDispositionElement.new(value)
     end
@@ -28,20 +28,20 @@ module Mail
     def disposition_type
       element.disposition_type
     end
-    
+
     def parameters
       @parameters = ParameterHash.new
-      element.parameters.each { |p| @parameters.merge!(p) }
+      element.parameters.each { |p| @parameters.merge!(p) } unless element.parameters.nil?
       @parameters
     end
 
     def filename
       case
-      when !parameters['filename'].blank?
+      when !Utilities.blank?(parameters['filename'])
         @filename = parameters['filename']
-      when !parameters['name'].blank?
+      when !Utilities.blank?(parameters['name'])
         @filename = parameters['name']
-      else 
+      else
         @filename = nil
       end
       @filename
@@ -56,7 +56,7 @@ module Mail
       end
       "#{CAPITALIZED_FIELD}: #{disposition_type}" + p
     end
-    
+
     def decoded
       if parameters.length > 0
         p = "; #{parameters.decoded}"

data/lib/mail/fields/content_id_field.rb

@@ -11,7 +11,7 @@ module Mail
     def initialize(value = nil, charset = 'utf-8')
       self.charset = charset
       @uniq = 1
-      if value.blank?
+      if Utilities.blank?(value)
         value = generate_content_id
       else
         value = strip_field(FIELD_NAME, value)
@@ -22,7 +22,7 @@ module Mail
     end
     
     def parse(val = value)
-      unless val.blank?
+      unless Utilities.blank?(val)
         @element = Mail::MessageIdsElement.new(val)
       end
     end

data/lib/mail/fields/content_location_field.rb

@@ -16,7 +16,7 @@ module Mail
     end
     
     def parse(val = value)
-      unless val.blank?
+      unless Utilities.blank?(val)
         @element = Mail::ContentLocationElement.new(val)
       end
     end

data/lib/mail/fields/content_transfer_encoding_field.rb

@@ -18,7 +18,7 @@ module Mail
     end
     
     def parse(val = value)
-      unless val.blank?
+      unless Utilities.blank?(val)
         @element = Mail::ContentTransferEncodingElement.new(val)
       end
     end

data/lib/mail/fields/content_type_field.rb

@@ -26,7 +26,7 @@ module Mail
     end
 
     def parse(val = value)
-      unless val.blank?
+      unless Utilities.blank?(val)
         self.value = val
         @element = nil
         element

data/lib/mail/fields/date_field.rb

@@ -33,7 +33,7 @@ module Mail
 
     def initialize(value = nil, charset = 'utf-8')
       self.charset = charset
-      if value.blank?
+      if Utilities.blank?(value)
         value = ::DateTime.now.strftime('%a, %d %b %Y %H:%M:%S %z')
       else
         value = strip_field(FIELD_NAME, value)

data/lib/mail/fields/from_field.rb

@@ -39,7 +39,6 @@ module Mail
     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

@@ -10,12 +10,11 @@ module Mail
     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)
-      unless val.blank?
+      unless Utilities.blank?(val)
         @phrase_list ||= PhraseList.new(value)
       end
     end

data/lib/mail/fields/message_id_field.rb

@@ -41,7 +41,7 @@ module Mail
     def initialize(value = nil, charset = 'utf-8')
       self.charset = charset
       @uniq = 1
-      if value.blank?
+      if Utilities.blank?(value)
         self.name = CAPITALIZED_FIELD
         self.value = generate_message_id
       else

data/lib/mail/fields/mime_version_field.rb

@@ -10,7 +10,7 @@ module Mail
 
     def initialize(value = nil, charset = 'utf-8')
       self.charset = charset
-      if value.blank?
+      if Utilities.blank?(value)
         value = '1.0'
       end
       super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
@@ -20,7 +20,7 @@ module Mail
     end
     
     def parse(val = value)
-      unless val.blank?
+      unless Utilities.blank?(val)
         @element = Mail::MimeVersionElement.new(val)
       end
     end

data/lib/mail/fields/received_field.rb

@@ -34,7 +34,7 @@ module Mail
     end
     
     def parse(val = value)
-      unless val.blank?
+      unless Utilities.blank?(val)
         @element = Mail::ReceivedElement.new(val)
       end
     end
@@ -56,7 +56,7 @@ module Mail
     end
  
     def encoded
-      if value.blank?
+      if Utilities.blank?(value)
         "#{CAPITALIZED_FIELD}: \r\n"
       else
         "#{CAPITALIZED_FIELD}: #{info}; #{formatted_date}\r\n"
@@ -64,7 +64,7 @@ module Mail
     end
     
     def decoded
-      if value.blank?
+      if Utilities.blank?(value)
         ""
       else
         "#{info}; #{formatted_date}" 

data/lib/mail/fields/reply_to_field.rb

@@ -39,7 +39,6 @@ module Mail
     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/resent_bcc_field.rb

@@ -39,7 +39,6 @@ module Mail
     def initialize(value = nil, charset = 'utf-8')
       self.charset = charset
       super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
-      self.parse
       self
     end