mail 2.5.2 → 2.6.0

data/lib/mail/fields/resent_cc_field.rb

@@ -6,7 +6,7 @@
 # field in the email.
 # 
 # Sending resent_cc to a mail message will instantiate a Mail::Field object that
-# has a ResentCcField as it's field type.  This includes all Mail::CommonAddress
+# has a ResentCcField as its field type.  This includes all Mail::CommonAddress
 # module instance metods.
 # 
 # Only one Resent-Cc field can appear in a header, though it can have multiple
@@ -16,7 +16,7 @@
 # 
 #  mail = Mail.new
 #  mail.resent_cc = 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
-#  mail.resent_cc    #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
+#  mail.resent_cc    #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
 #  mail[:resent_cc]  #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentCcField:0x180e1c4
 #  mail['resent-cc'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentCcField:0x180e1c4
 #  mail['Resent-Cc'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentCcField:0x180e1c4

data/lib/mail/fields/resent_from_field.rb

@@ -6,7 +6,7 @@
 # field in the email.
 # 
 # Sending resent_from to a mail message will instantiate a Mail::Field object that
-# has a ResentFromField as it's field type.  This includes all Mail::CommonAddress
+# has a ResentFromField as its field type.  This includes all Mail::CommonAddress
 # module instance metods.
 # 
 # Only one Resent-From field can appear in a header, though it can have multiple
@@ -16,7 +16,7 @@
 #
 #  mail = Mail.new
 #  mail.resent_from = 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
-#  mail.resent_from    #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
+#  mail.resent_from    #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
 #  mail[:resent_from]  #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentFromField:0x180e1c4
 #  mail['resent-from'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentFromField:0x180e1c4
 #  mail['Resent-From'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentFromField:0x180e1c4

data/lib/mail/fields/resent_sender_field.rb

@@ -6,7 +6,7 @@
 # field in the email.
 # 
 # Sending resent_sender to a mail message will instantiate a Mail::Field object that
-# has a ResentSenderField as it's field type.  This includes all Mail::CommonAddress
+# has a ResentSenderField as its field type.  This includes all Mail::CommonAddress
 # module instance metods.
 # 
 # Only one Resent-Sender field can appear in a header, though it can have multiple
@@ -16,7 +16,7 @@
 # 
 #  mail = Mail.new
 #  mail.resent_sender = 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
-#  mail.resent_sender    #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentSenderField:0x180e1c4
+#  mail.resent_sender    #=> ['mikel@test.lindsaar.net']
 #  mail[:resent_sender]  #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentSenderField:0x180e1c4
 #  mail['resent-sender'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentSenderField:0x180e1c4
 #  mail['Resent-Sender'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentSenderField:0x180e1c4
@@ -47,7 +47,7 @@ module Mail
     end
 
     def address
-      tree.addresses.first
+      address_list.addresses.first
     end
     
     def encoded

data/lib/mail/fields/resent_to_field.rb

@@ -6,7 +6,7 @@
 # field in the email.
 # 
 # Sending resent_to to a mail message will instantiate a Mail::Field object that
-# has a ResentToField as it's field type.  This includes all Mail::CommonAddress
+# has a ResentToField as its field type.  This includes all Mail::CommonAddress
 # module instance metods.
 # 
 # Only one Resent-To field can appear in a header, though it can have multiple
@@ -16,7 +16,7 @@
 # 
 #  mail = Mail.new
 #  mail.resent_to = 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
-#  mail.resent_to    #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
+#  mail.resent_to    #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
 #  mail[:resent_to]  #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentToField:0x180e1c4
 #  mail['resent-to'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentToField:0x180e1c4
 #  mail['Resent-To'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ResentToField:0x180e1c4

data/lib/mail/fields/sender_field.rb

@@ -6,7 +6,7 @@
 # field in the email.
 # 
 # Sending sender to a mail message will instantiate a Mail::Field object that
-# has a SenderField as it's field type.  This includes all Mail::CommonAddress
+# has a SenderField as its field type.  This includes all Mail::CommonAddress
 # module instance metods.
 # 
 # Only one Sender field can appear in a header, though it can have multiple
@@ -15,16 +15,16 @@
 # == Examples:
 # 
 #  mail = Mail.new
-#  mail.sender = 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
-#  mail.sender    #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
+#  mail.sender = 'Mikel Lindsaar <mikel@test.lindsaar.net>'
+#  mail.sender    #=> 'mikel@test.lindsaar.net'
 #  mail[:sender]  #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::SenderField:0x180e1c4
 #  mail['sender'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::SenderField:0x180e1c4
 #  mail['Sender'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::SenderField:0x180e1c4
 # 
-#  mail[:sender].encoded   #=> 'Sender: Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net\r\n'
-#  mail[:sender].decoded   #=> 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
-#  mail[:sender].addresses #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
-#  mail[:sender].formatted #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
+#  mail[:sender].encoded   #=> "Sender: Mikel Lindsaar <mikel@test.lindsaar.net>\r\n"
+#  mail[:sender].decoded   #=> 'Mikel Lindsaar <mikel@test.lindsaar.net>'
+#  mail[:sender].addresses #=> ['mikel@test.lindsaar.net']
+#  mail[:sender].formatted #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>']
 # 
 require 'mail/fields/common/common_address'
 
@@ -48,7 +48,7 @@ module Mail
     end
 
     def address
-      tree.addresses.first
+      address_list.addresses.first
     end
     
     def encoded

data/lib/mail/fields/to_field.rb

@@ -6,7 +6,7 @@
 # field in the email.
 # 
 # Sending to to a mail message will instantiate a Mail::Field object that
-# has a ToField as it's field type.  This includes all Mail::CommonAddress
+# has a ToField as its field type.  This includes all Mail::CommonAddress
 # module instance metods.
 # 
 # Only one To field can appear in a header, though it can have multiple
@@ -16,7 +16,7 @@
 # 
 #  mail = Mail.new
 #  mail.to = 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
-#  mail.to    #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
+#  mail.to    #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
 #  mail[:to]  #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ToField:0x180e1c4
 #  mail['to'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ToField:0x180e1c4
 #  mail['To'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::ToField:0x180e1c4

data/lib/mail/fields/unstructured_field.rb

@@ -144,9 +144,10 @@ module Mail
         limit = 78 - prepend
         limit = limit - 7 - encoding.length if should_encode
         line = ""
+        first_word = true
         while !words.empty?
           break unless word = words.first.dup
-          word.encode!(charset) if defined?(Encoding) && charset
+          word.encode!(charset) if charset && word.respond_to?(:encode!)
           word = encode(word) if should_encode
           word = encode_crlf(word)
           # Skip to next line if we're going to go past the limit
@@ -158,7 +159,12 @@ module Mail
           # Remove the word from the queue ...
           words.shift
           # Add word separator
-          line << " " unless (line.empty? || should_encode)
+          if first_word
+            first_word = false
+          else
+            line << " " if !should_encode
+          end
+
           # ... add it in encoded form to the current line
           line << word
         end

data/lib/mail/header.rb

@@ -48,11 +48,15 @@ module Mail
     # these cases, please make a patch and send it in, or at the least, send
     # me the example so we can fix it.
     def initialize(header_text = nil, charset = nil)
-      @errors = []
       @charset = charset
-      self.raw_source = header_text.to_crlf
+      self.raw_source = header_text.to_crlf.lstrip
       split_header if header_text
     end
+
+    def initialize_copy(original)
+      super
+      @fields = @fields.dup
+    end
     
     # The preserved raw source of the header as you passed it in, untouched
     # for your Regexing glory.
@@ -91,7 +95,6 @@ module Mail
       unfolded_fields[0..(self.class.maximum_amount-1)].each do |field|
 
         field = Field.new(field, nil, charset)
-        field.errors.each { |error| self.errors << error }
         if limited_field?(field.name) && (selected = select_field_for(field.name)) && selected.any? 
           selected.first.update(field.name, field.value)
         else
@@ -102,7 +105,7 @@ module Mail
     end
     
     def errors
-      @errors
+      @fields.map(&:errors).flatten(1)
     end
     
     #  3.6. Field definitions
@@ -154,6 +157,9 @@ module Mail
     #  h['X-Mail-SPAM'] # => nil
     def []=(name, value)
       name = dasherize(name)
+      if name.include?(':')
+        raise ArgumentError, "Header names may not contain a colon: #{name.inspect}"
+      end
       fn = name.downcase
       selected = select_field_for(fn)
       
@@ -174,7 +180,7 @@ module Mail
       if dasherize(fn) == "content-type"
         # Update charset if specified in Content-Type
         params = self[:content_type].parameters rescue nil
-        @charset = params && params[:charset]
+        @charset = params[:charset] if params && params[:charset]
       end
     end
     
@@ -198,6 +204,7 @@ module Mail
 
     def encoded
       buffer = ''
+      buffer.force_encoding('us-ascii') if buffer.respond_to?(:force_encoding)
       fields.each do |field|
         buffer << field.encoded
       end
@@ -242,27 +249,10 @@ module Mail
       @raw_source = val
     end
     
-    # 2.2.3. Long Header Fields
-    # 
-    #  The process of moving from this folded multiple-line representation
-    #  of a header field to its single line representation is called
-    #  "unfolding". Unfolding is accomplished by simply removing any CRLF
-    #  that is immediately followed by WSP.  Each header field should be
-    #  treated in its unfolded form for further syntactic and semantic
-    #  evaluation.
-    def unfold(string)
-      string.gsub(/#{CRLF}#{WSP}+/, ' ').gsub(/#{WSP}+/, ' ')
-    end
-    
-    # Returns the header with all the folds removed
-    def unfolded_header
-      @unfolded_header ||= unfold(raw_source)
-    end
-    
     # Splits an unfolded and line break cleaned header into individual field
     # strings.
     def split_header
-      self.fields = unfolded_header.split(CRLF)
+      self.fields = raw_source.split(HEADER_SPLIT)
     end
     
     def select_field_for(name)

data/lib/mail/mail.rb

@@ -206,6 +206,12 @@ module Mail
     end
   end
 
+  # Unregister the given observer, allowing mail to resume operations
+  # without it.
+  def self.unregister_observer(observer)
+    @@delivery_notification_observers.delete(observer)
+  end
+
   # You can register an object to be given every mail object that will be sent,
   # before it is sent.  So if you want to add special headers or modify any
   # email that gets sent through the Mail library, you can do so.
@@ -219,6 +225,12 @@ module Mail
     end
   end
 
+  # Unregister the given interceptor, allowing mail to resume operations
+  # without it.
+  def self.unregister_interceptor(interceptor)
+    @@delivery_interceptors.delete(interceptor)
+  end
+
   def self.inform_observers(mail)
     @@delivery_notification_observers.each do |observer|
       observer.delivered_email(mail)

data/lib/mail/matchers/has_sent_mail.rb

@@ -29,6 +29,29 @@ module Mail
         self
       end
 
+      def cc(recipient_or_list)
+        @copy_recipients ||= []
+
+        if recipient_or_list.kind_of?(Array)
+          @copy_recipients += recipient_or_list
+        else
+          @copy_recipients << recipient_or_list
+        end
+        self
+      end
+
+      def bcc(recipient_or_list)
+        @blind_copy_recipients ||= []
+
+        if recipient_or_list.kind_of?(Array)
+          @blind_copy_recipients += recipient_or_list
+        else
+          @blind_copy_recipients << recipient_or_list
+        end
+        self
+      end
+
+
       def with_subject(subject)
         @subject = subject
         self
@@ -73,7 +96,7 @@ module Mail
       def filter_matched_deliveries(deliveries)
         candidate_deliveries = deliveries
 
-        %w(sender recipients subject subject_matcher body body_matcher).each do |modifier_name|
+        %w(sender recipients copy_recipients blind_copy_recipients subject subject_matcher body body_matcher).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
@@ -89,6 +112,14 @@ module Mail
         @recipients.all? {|recipient| delivery.to.include?(recipient) }
       end
 
+      def matches_on_copy_recipients?(delivery)
+        @copy_recipients.all? {|recipient| delivery.cc.include?(recipient) }
+      end
+
+      def matches_on_blind_copy_recipients?(delivery)
+        @blind_copy_recipients.all? {|recipient| delivery.bcc.include?(recipient) }
+      end
+
       def matches_on_subject?(delivery)
         delivery.subject == @subject
       end
@@ -109,6 +140,8 @@ module Mail
         result = ''
         result += "from #{@sender} " if instance_variable_defined?('@sender')
         result += "to #{@recipients.inspect} " if instance_variable_defined?('@recipients')
+        result += "cc #{@copy_recipients.inspect} " if instance_variable_defined?('@copy_recipients')
+        result += "bcc #{@blind_copy_recipients.inspect} " if instance_variable_defined?('@blind_copy_recipients')
         result += "with subject \"#{@subject}\" " if instance_variable_defined?('@subject')
         result += "with subject matching \"#{@subject_matcher}\" " if instance_variable_defined?('@subject_matcher')
         result += "with body \"#{@body}\" " if instance_variable_defined?('@body')