mail 2.4.4 → 2.6.3

data/lib/mail/header.rb

@@ -17,10 +17,24 @@ module Mail
   #   2.2.3.  All field bodies MUST conform to the syntax described in
   #   sections 3 and 4 of this standard.
   class Header
-    include Patterns
+    include Constants
     include Utilities
     include Enumerable
     
+    @@maximum_amount = 1000
+
+    # Large amount of headers in Email might create extra high CPU load
+    # Use this parameter to limit number of headers that will be parsed by 
+    # mail library.
+    # Default: 1000
+    def self.maximum_amount
+      @@maximum_amount
+    end
+
+    def self.maximum_amount=(value)
+      @@maximum_amount = value
+    end
+
     # Creates a new header object.
     # 
     # Accepts raw text or nothing.  If given raw text will attempt to parse
@@ -34,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.
@@ -73,14 +91,11 @@ module Mail
     #  h.fields = ['From: mikel@me.com', 'To: bob@you.com']
     def fields=(unfolded_fields)
       @fields = Mail::FieldList.new
-      warn "Warning: more than 1000 header fields only using the first 1000" if unfolded_fields.length > 1000
-      unfolded_fields[0..1000].each do |field|
+      warn "Warning: more than #{self.class.maximum_amount} header fields only using the first #{self.class.maximum_amount}" if unfolded_fields.length > self.class.maximum_amount
+      unfolded_fields[0..(self.class.maximum_amount-1)].each do |field|
 
         field = Field.new(field, nil, charset)
-        field.errors.each { |error| self.errors << error }
-        selected = select_field_for(field.name)
-
-        if selected.any? && limited_field?(field.name)
+        if limited_field?(field.name) && (selected = select_field_for(field.name)) && selected.any? 
           selected.first.update(field.name, field.value)
         else
           @fields << field
@@ -90,7 +105,7 @@ module Mail
     end
     
     def errors
-      @errors
+      @fields.map(&:errors).flatten(1)
     end
     
     #  3.6. Field definitions
@@ -115,7 +130,8 @@ module Mail
     #  h['To']          #=> 'mikel@me.com'
     #  h['X-Mail-SPAM'] #=> ['15', '20']
     def [](name)
-      name = dasherize(name).downcase
+      name = dasherize(name)
+      name.downcase!
       selected = select_field_for(name)
       case
       when selected.length > 1
@@ -142,6 +158,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)
       
@@ -159,15 +178,15 @@ module Mail
         # Need to insert in correct order for trace fields
         self.fields << Field.new(name.to_s, value, charset)
       end
+      if dasherize(fn) == "content-type"
+        # Update charset if specified in Content-Type
+        params = self[:content_type].parameters rescue nil
+        @charset = params[:charset] if params && params[:charset]
+      end
     end
     
     def charset
-      params = self[:content_type].parameters rescue nil
-      if params
-        params[:charset]
-      else
-        @charset
-      end
+      @charset
     end
     
     def charset=(val)
@@ -186,6 +205,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
@@ -230,36 +250,26 @@ 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)
-      fields.select { |f| f.responsible_for?(name.to_s) }
+      fields.select { |f| f.responsible_for?(name) }
     end
     
     def limited_field?(name)
       LIMITED_FIELDS.include?(name.to_s.downcase)
     end
-    
+
+    # Enumerable support; yield each field in order to the block if there is one,
+    # or return an Enumerator for them if there isn't.
+    def each( &block )
+      return self.fields.each( &block ) if block
+      self.fields.each
+    end
+
   end
 end

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)
@@ -233,9 +245,11 @@ module Mail
 
   protected
 
+  RANDOM_TAG='%x%x_%x%x%d%x'
+
   def self.random_tag
     t = Time.now
-    sprintf('%x%x_%x%x%d%x',
+    sprintf(RANDOM_TAG,
             t.to_i, t.tv_usec,
             $$, Thread.current.object_id.abs, self.uniq, rand(255))
   end

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
@@ -61,7 +84,7 @@ module Mail
         result
       end
 
-      def negative_failure_message
+      def failure_message_when_negated
         result = "Expected no email to be sent "
         result += explain_expectations
         result += dump_deliveries
@@ -69,11 +92,11 @@ module Mail
       end
 
       protected
-      
+
       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')