mail 2.6.3 → 2.6.4.rc2

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
     

data/lib/mail/fields/resent_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/resent_date_field.rb

@@ -13,7 +13,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/resent_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/resent_sender_field.rb

@@ -38,7 +38,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_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/return_path_field.rb

@@ -41,7 +41,6 @@ module Mail
       value = nil if value == '<>'
       self.charset = charset
       super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
-      self.parse
       self
     end
     

data/lib/mail/fields/sender_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/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/unstructured_field.rb

@@ -70,7 +70,7 @@ module Mail
     end
 
     def do_decode
-      value.blank? ? nil : Encodings.decode_encode(value, :decode)
+      Utilities.blank?(value) ? nil : Encodings.decode_encode(value, :decode)
     end
 
     # 2.2.3. Long Header Fields
@@ -143,7 +143,7 @@ module Mail
       while !words.empty?
         limit = 78 - prepend
         limit = limit - 7 - encoding.length if should_encode
-        line = ""
+        line = String.new
         first_word = true
         while !words.empty?
           break unless word = words.first.dup

data/lib/mail/header.rb

@@ -49,7 +49,7 @@ module Mail
     # me the example so we can fix it.
     def initialize(header_text = nil, charset = nil)
       @charset = charset
-      self.raw_source = header_text.to_crlf.lstrip
+      self.raw_source = ::Mail::Utilities.to_crlf(header_text).lstrip
       split_header if header_text
     end
 
@@ -136,7 +136,7 @@ module Mail
       case
       when selected.length > 1
         selected.map { |f| f }
-      when !selected.blank?
+      when !Utilities.blank?(selected)
         selected.first
       else
         nil
@@ -166,11 +166,11 @@ module Mail
       
       case
       # User wants to delete the field
-      when !selected.blank? && value == nil
+      when !Utilities.blank?(selected) && value == nil
         fields.delete_if { |f| selected.include?(f) }
         
       # User wants to change the field
-      when !selected.blank? && limited_field?(fn)
+      when !Utilities.blank?(selected) && limited_field?(fn)
         selected.first.update(fn, value)
         
       # User wants to create the field
@@ -204,7 +204,7 @@ module Mail
                            content-id content-disposition content-location]
 
     def encoded
-      buffer = ''
+      buffer = String.new
       buffer.force_encoding('us-ascii') if buffer.respond_to?(:force_encoding)
       fields.each do |field|
         buffer << field.encoded

data/lib/mail/matchers/attachment_matchers.rb

@@ -0,0 +1,28 @@
+module Mail
+  module Matchers
+    def any_attachment
+      AnyAttachmentMatcher.new
+    end
+
+    def an_attachment_with_filename(filename)
+      AttachmentFilenameMatcher.new(filename)
+    end
+
+    class AnyAttachmentMatcher
+      def ===(other)
+        other.attachment?
+      end
+    end
+
+    class AttachmentFilenameMatcher
+      attr_reader :filename
+      def initialize(filename)
+        @filename = filename
+      end
+
+      def ===(other)
+        other.attachment? && other.filename == filename
+      end
+    end
+  end
+end

data/lib/mail/matchers/has_sent_mail.rb

@@ -42,15 +42,25 @@ module Mail
 
       def bcc(recipient_or_list)
         @blind_copy_recipients ||= []
+        @blind_copy_recipients.concat(Array(recipient_or_list))
+        self
+      end
 
-        if recipient_or_list.kind_of?(Array)
-          @blind_copy_recipients += recipient_or_list
-        else
-          @blind_copy_recipients << recipient_or_list
-        end
+      def with_attachments(attachments)
+        @attachments ||= []
+        @attachments.concat(Array(attachments))
+        self
+      end
+
+      def with_no_attachments
+        @having_attachments = false
         self
       end
 
+      def with_any_attachments
+        @having_attachments = true
+        self
+      end
 
       def with_subject(subject)
         @subject = subject
@@ -95,8 +105,10 @@ module Mail
 
       def filter_matched_deliveries(deliveries)
         candidate_deliveries = deliveries
-
-        %w(sender recipients copy_recipients blind_copy_recipients subject subject_matcher body body_matcher).each do |modifier_name|
+        modifiers =
+          %w(sender recipients copy_recipients blind_copy_recipients subject
+          subject_matcher body body_matcher having_attachments attachments)
+        modifiers.each do |modifier_name|
           next unless instance_variable_defined?("@#{modifier_name}")
           candidate_deliveries = candidate_deliveries.select{|matching_delivery| self.send("matches_on_#{modifier_name}?", matching_delivery)}
         end
@@ -128,6 +140,17 @@ module Mail
         @subject_matcher.match delivery.subject
       end
 
+      def matches_on_having_attachments?(delivery)
+        @having_attachments && delivery.attachments.any? ||
+          (!@having_attachments && delivery.attachments.none?)
+      end
+
+      def matches_on_attachments?(delivery)
+        @attachments.each_with_index.inject( true ) do |sent_attachments, (attachment, index)|
+          sent_attachments &&= (attachment === delivery.attachments[index])
+        end
+      end
+
       def matches_on_body?(delivery)
         delivery.body == @body
       end

data/lib/mail/message.rb

@@ -1415,7 +1415,7 @@ module Mail
     end
 
     def has_content_transfer_encoding?
-      header[:content_transfer_encoding] && header[:content_transfer_encoding].errors.blank?
+      header[:content_transfer_encoding] && Utilities.blank?(header[:content_transfer_encoding].errors)
     end
 
     def has_transfer_encoding? # :nodoc:
@@ -1669,6 +1669,8 @@ module Mail
     def html_part=(msg)
       # Assign the html part and set multipart/alternative if there's a text part.
       if msg
+        msg = Mail::Part.new(:body => msg) unless msg.kind_of?(Mail::Message)
+
         @html_part = msg
         @html_part.content_type = 'text/html' unless @html_part.has_content_type?
         add_multipart_alternate_header if text_part
@@ -1691,6 +1693,8 @@ module Mail
     def text_part=(msg)
       # Assign the text part and set multipart/alternative if there's an html part.
       if msg
+        msg = Mail::Part.new(:body => msg) unless msg.kind_of?(Mail::Message)
+
         @text_part = msg
         @text_part.content_type = 'text/plain' unless @text_part.has_content_type?
         add_multipart_alternate_header if html_part
@@ -1709,7 +1713,7 @@ module Mail
 
     # Adds a part to the parts list or creates the part list
     def add_part(part)
-      if !body.multipart? && !self.body.decoded.blank?
+      if !body.multipart? && !Utilities.blank?(self.body.decoded)
         @text_part = Mail::Part.new('Content-Type: text/plain;')
         @text_part.body = body.decoded
         self.body << @text_part
@@ -1765,14 +1769,17 @@ module Mail
     #
     # See also #attachments
     def add_file(values)
-      convert_to_multipart unless self.multipart? || self.body.decoded.blank?
+      convert_to_multipart unless self.multipart? || Utilities.blank?(self.body.decoded)
       add_multipart_mixed_header
       if values.is_a?(String)
         basename = File.basename(values)
         filedata = File.open(values, 'rb') { |f| f.read }
       else
         basename = values[:filename]
-        filedata = values[:content] || File.open(values[:filename], 'rb') { |f| f.read }
+        filedata = values
+        unless filedata[:content]
+          filedata = values.merge(:content=>File.open(values[:filename], 'rb') { |f| f.read })
+        end
       end
       self.attachments[basename] = filedata
     end
@@ -1857,7 +1864,7 @@ module Mail
         case
         when k == 'delivery_handler'
           begin
-            m.delivery_handler = Object.const_get(v) unless v.blank?
+            m.delivery_handler = Object.const_get(v) unless Utilities.blank?(v)
           rescue NameError
           end
         when k == 'transport_encoding'
@@ -1987,7 +1994,7 @@ module Mail
 
     def raw_source=(value)
       value = value.dup.force_encoding(Encoding::BINARY) if RUBY_VERSION >= "1.9.1"
-      @raw_source = value.to_crlf
+      @raw_source = ::Mail::Utilities.to_crlf(value)
     end
 
     # see comments to body=. We take data and process it lazily
@@ -2020,7 +2027,7 @@ module Mail
       raw_string = raw_source.to_s
       if match_data = raw_source.to_s.match(/\AFrom\s(#{TEXT}+)#{CRLF}/m)
         set_envelope(match_data[1])
-        self.raw_source = raw_string.sub(match_data[0], "") 
+        self.raw_source = raw_string.sub(match_data[0], "")
       end
     end
 
@@ -2046,7 +2053,7 @@ module Mail
       add_required_message_fields
       add_multipart_mixed_header    if body.multipart?
       add_content_type              unless has_content_type?
-      add_charset                   unless has_charset?
+      add_charset                   if text? && !has_charset?
       add_content_transfer_encoding unless has_content_transfer_encoding?
     end
 
@@ -2146,20 +2153,7 @@ module Mail
     end
 
     def decode_body_as_text
-      body_text = decode_body
-      if charset
-        if RUBY_VERSION < '1.9'
-          require 'iconv'
-          return Iconv.conv("UTF-8//TRANSLIT//IGNORE", charset, body_text)
-        else
-          if encoding = Encoding.find(charset) rescue nil
-            body_text.force_encoding(encoding)
-            return body_text.encode(Encoding::UTF_8, :undef => :replace, :invalid => :replace, :replace => '')
-          end
-        end
-      end
-      body_text
+      Encodings.transcode_charset decode_body, charset, 'UTF-8'
     end
-
   end
 end