mail 2.5.5 → 2.6.0

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

@@ -6,7 +6,7 @@ module Mail
       
     def parse(val = value)
       unless val.blank?
-        @tree = AddressList.new(encode_if_needed(val))
+        @address_list = AddressList.new(encode_if_needed(val))
       else
         nil
       end
@@ -20,44 +20,40 @@ module Mail
       Encodings.address_encode(val, charset)
     end
     
-    # Allows you to iterate through each address object in the syntax tree
+    # Allows you to iterate through each address object in the address_list
     def each
-      tree.addresses.each do |address|
+      address_list.addresses.each do |address|
         yield(address)
       end
     end
 
     # Returns the address string of all the addresses in the address list
     def addresses
-      list = tree.addresses.map { |a| a.address }
+      list = address_list.addresses.map { |a| a.address }
       Mail::AddressContainer.new(self, list)
     end
 
     # Returns the formatted string of all the addresses in the address list
     def formatted
-      list = tree.addresses.map { |a| a.format }
+      list = address_list.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 }
+      list = address_list.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
+      list = address_list.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.to_str] = get_group_addresses(group.group_list)
-      end
-      @groups
+      address_list.addresses_grouped_by_group
     end
   
     # Returns the addresses that are part of groups
@@ -77,7 +73,7 @@ module Mail
 
     # Returns the name of all the groups in a string
     def group_names # :nodoc:
-      tree.group_names
+      address_list.group_names
     end
   
     def default
@@ -104,7 +100,7 @@ module Mail
   
     def do_encode(field_name)
       return '' if value.blank?
-      address_array = tree.addresses.reject { |a| encoded_group_addresses.include?(a.encoded) }.compact.map { |a| a.encoded }
+      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")
@@ -114,7 +110,7 @@ module Mail
 
     def do_decode
       return nil if value.blank?
-      address_array = tree.addresses.reject { |a| decoded_group_addresses.include?(a.decoded) }.map { |a| a.decoded }
+      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(" ")
@@ -122,15 +118,14 @@ module Mail
       return_array.join(", ")
     end
 
-    # Returns the syntax tree of the Addresses
-    def tree # :nodoc:
-      @tree ||= AddressList.new(value)
+    def address_list # :nodoc:
+      @address_list ||= 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)
+        group_list.addresses.map do |address|
+          Mail::Address.new(address)
         end
       else
         []

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

@@ -13,7 +13,6 @@ module Mail
     def parse(val = value)
       unless val.blank?
         @element = Mail::DateTimeElement.new(val)
-        @tree = @element.tree
       else
         nil
       end
@@ -32,11 +31,5 @@ module Mail
     def element
       @element ||= Mail::DateTimeElement.new(value)
     end
-    
-    # Returns the syntax tree of the Date
-    def tree
-      @tree ||= element.tree
-    end
-    
   end
 end

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

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

data/lib/mail/fields/content_transfer_encoding_field.rb

@@ -23,12 +23,6 @@ module Mail
       end
     end
     
-    def tree
-      STDERR.puts("tree is deprecated.  Please use encoding to get parse result\n#{caller}")
-      @element ||= Mail::ContentTransferEncodingElement.new(value)
-      @tree ||= @element.tree
-    end
-    
     def element
       @element ||= Mail::ContentTransferEncodingElement.new(value)
     end

data/lib/mail/fields/resent_sender_field.rb

@@ -47,7 +47,7 @@ module Mail
     end
 
     def address
-      tree.addresses.first
+      address_list.addresses.first
     end
     
     def encoded

data/lib/mail/fields/sender_field.rb

@@ -48,7 +48,7 @@ module Mail
     end
 
     def address
-      tree.addresses.first
+      address_list.addresses.first
     end
     
     def encoded

data/lib/mail/fields/unstructured_field.rb

@@ -144,6 +144,7 @@ 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 charset && word.respond_to?(:encode!)
@@ -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.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
@@ -177,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
     
@@ -246,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')

data/lib/mail/message.rb

@@ -240,7 +240,7 @@ module Mail
     # This method bypasses checking perform_deliveries and raise_delivery_errors,
     # so use with caution.
     #
-    # It still however fires off the intercepters and calls the observers callbacks if they are defined.
+    # It still however fires off the interceptors and calls the observers callbacks if they are defined.
     #
     # Returns self
     def deliver!
@@ -353,17 +353,23 @@ module Mail
       return false unless other.respond_to?(:encoded)
 
       if self.message_id && other.message_id
-        result = (self.encoded == other.encoded)
+        self.encoded == other.encoded
       else
         self_message_id, other_message_id = self.message_id, other.message_id
-        self.message_id, other.message_id = '<temp@test>', '<temp@test>'
-        result = self.encoded == other.encoded
-        self.message_id = "<#{self_message_id}>" if self_message_id
-        other.message_id = "<#{other_message_id}>" if other_message_id
-        result
+        begin
+          self.message_id, other.message_id = '<temp@test>', '<temp@test>'
+          self.encoded == other.encoded
+        ensure
+          self.message_id, other.message_id = self_message_id, other_message_id
+        end
       end
     end
 
+    def initialize_copy(original)
+      super
+      @header = @header.dup
+    end
+
     # Provides access to the raw source of the message as it was when it
     # was instantiated. This is set at initialization and so is untouched
     # by the parsers or decoder / encoders
@@ -1388,7 +1394,7 @@ module Mail
       header.has_date?
     end
 
-    # Returns true if the message has a Date field, the field may or may
+    # Returns true if the message has a Mime-Version field, the field may or may
     # not have a value, but the field exists or not.
     def has_mime_version?
       header.has_mime_version?
@@ -1594,7 +1600,7 @@ module Mail
     end
 
     # Returns an AttachmentsList object, which holds all of the attachments in
-    # the receiver object (either the entier email or a part within) and all
+    # the receiver object (either the entire email or a part within) and all
     # of its descendants.
     #
     # It also allows you to add attachments to the mail object directly, like so:
@@ -1974,8 +1980,9 @@ module Mail
     end
 
     def raw_source=(value)
-      value.force_encoding("binary") if RUBY_VERSION >= "1.9.1"
       @raw_source = value.to_crlf
+      @raw_source.force_encoding("binary") if RUBY_VERSION >= "1.9.1"
+      @raw_source
     end
 
     # see comments to body=. We take data and process it lazily
@@ -2128,7 +2135,7 @@ module Mail
         if perform_deliveries
           delivery_method.deliver!(self)
         end
-      rescue Exception => e # Net::SMTP errors or sendmail pipe errors
+      rescue => e # Net::SMTP errors or sendmail pipe errors
         raise e if raise_delivery_errors
       end
     end

data/lib/mail/multibyte/unicode.rb

@@ -341,7 +341,7 @@ module Mail
         def load
           begin
             @codepoints, @composition_exclusion, @composition_map, @boundary, @cp1252 = File.open(self.class.filename, 'rb') { |f| Marshal.load f.read }
-          rescue Exception => e
+          rescue => e
               raise IOError.new("Couldn't load the Unicode tables for UTF8Handler (#{e.message}), Mail::Multibyte is unusable")
           end
 

data/lib/mail/network/delivery_methods/exim.rb

@@ -36,13 +36,17 @@ module Mail
   #
   #   mail.deliver!
   class Exim < Sendmail
-    DEFAULTS = {
-      :location   => '/usr/sbin/exim',
-      :arguments  => '-i -t'
-    }
+    def initialize(values)
+      self.settings = { :location       => '/usr/sbin/exim',
+                        :arguments      => '-i -t' }.merge(values)
+    end
 
-    def self.call(path, arguments, destinations, encoded_message)
-      super path, arguments, nil, encoded_message
+    def self.call(path, arguments, destinations, mail)
+      popen "#{path} #{arguments}" do |io|
+        io.puts mail.encoded.to_lf
+        io.flush
+      end
     end
+
   end
 end