actionmailer 3.0.0.beta2 → 3.0.0.beta3

data/CHANGELOG

@@ -1,3 +1,10 @@
+*Rails 3.0.0 [beta 3] (April 13th, 2010)*
+
+* Removed all quoting.rb type files from ActionMailer and put Mail 2.2.0 in instead [ML]
+
+* Lot of updates to various test cases that now work better with the new Mail and so have different expectations
+
+
 *Rails 3.0.0 [beta 2] (April 1st, 2010)*
 
 * Added interceptors and observers from Mail [ML]
@@ -5,6 +12,16 @@
     ActionMailer::Base.register_interceptor calls Mail.register_interceptor
     ActionMailer::Base.register_observer calls Mail.register_observer
 
+* Mail::Part now no longer has nil as a default charset, it is always set to something, and defaults to UTF-8
+
+* Added explict setting of charset in set_fields! method to make sure Mail has the user defined default
+
+* Removed quoting.rb and refactored for Mail to take responsibility of all quoting and auto encoding requirements for the header.
+
+* Fixed several tests which had incorrect encoding.
+
+* Changed all utf-8 to UTF-8 for consistency
+
 * Whole new API added with tests.  See base.rb for full details.  Old API is deprecated.
 
 

data/lib/action_mailer.rb

@@ -46,7 +46,6 @@ module ActionMailer
   autoload :DeprecatedApi
   autoload :MailHelper
   autoload :OldApi
-  autoload :Quoting
   autoload :TestCase
   autoload :TestHelper
 end

data/lib/action_mailer/base.rb

@@ -207,7 +207,7 @@ module ActionMailer #:nodoc:
   #   scores instead of hyphens, so <tt>Content-Transfer-Encoding:</tt>
   #   becomes <tt>:content_transfer_encoding</tt>. The defaults set by Action Mailer are:
   #   * <tt>:mime_version => "1.0"</tt>
-  #   * <tt>:charset      => "utf-8",</tt>
+  #   * <tt>:charset      => "UTF-8",</tt>
   #   * <tt>:content_type => "text/plain",</tt>
   #   * <tt>:parts_order  => [ "text/plain", "text/enriched", "text/html" ]</tt>
   #
@@ -264,7 +264,7 @@ module ActionMailer #:nodoc:
   #   (i.e. multiple parts are assembled from templates which specify the content type in their
   #   filenames) this variable controls how the parts are ordered.
   class Base < AbstractController::Base
-    include DeliveryMethods, Quoting
+    include DeliveryMethods
     abstract!
 
     include AbstractController::Logger
@@ -286,7 +286,7 @@ module ActionMailer #:nodoc:
     class_attribute :default_params
     self.default_params = {
       :mime_version => "1.0",
-      :charset      => "utf-8",
+      :charset      => "UTF-8",
       :content_type => "text/plain",
       :parts_order  => [ "text/plain", "text/enriched", "text/html" ]
     }.freeze
@@ -375,6 +375,11 @@ module ActionMailer #:nodoc:
       process(method_name, *args) if method_name
     end
 
+    def process(*args) #:nodoc:
+      lookup_context.skip_default_locale!
+      super
+    end
+
     # Allows you to pass random and unusual headers to the new +Mail::Message+ object
     # which will add them to itself.
     # 
@@ -525,19 +530,25 @@ module ActionMailer #:nodoc:
       content_type = headers[:content_type]
       parts_order  = headers[:parts_order]
 
-      # Merge defaults from class
+      # Handle defaults
       headers = headers.reverse_merge(self.class.default)
-      charset = headers.delete(:charset)
-
-      # Quote fields
       headers[:subject] ||= default_i18n_subject
-      quote_fields!(headers, charset)
+
+      # Apply charset at the beginning so all fields are properly quoted
+      m.charset = charset = headers[:charset]
+
+      # Set configure delivery behavior
+      wrap_delivery_behavior!(headers.delete(:delivery_method))
+
+      # Assign all headers except parts_order, content_type and body
+      assignable = headers.except(:parts_order, :content_type, :body)
+      assignable.each { |k, v| m[k] = v }
 
       # Render the templates and blocks
       responses, explicit_order = collect_responses_and_parts_order(headers, &block)
-      create_parts_from_responses(m, responses, charset)
+      create_parts_from_responses(m, responses)
 
-      # Finally setup content type and parts order
+      # Setup content type, reapply charset and handle parts order
       m.content_type = set_content_type(m, content_type, headers[:content_type])
       m.charset      = charset
 
@@ -547,12 +558,6 @@ module ActionMailer #:nodoc:
         m.body.sort_parts!
       end
 
-      # Set configure delivery behavior
-      wrap_delivery_behavior!(headers.delete(:delivery_method))
-
-      # Remove any missing configuration header and assign all others
-      headers.except!(:parts_order, :content_type)
-      headers.each { |k, v| m[k] = v }
       m
     end
 
@@ -577,17 +582,6 @@ module ActionMailer #:nodoc:
       I18n.t(:subject, :scope => [:actionmailer, mailer_scope, action_name], :default => action_name.humanize)
     end
 
-    # TODO: Move this into Mail
-    def quote_fields!(headers, charset) #:nodoc:
-      m = @_message
-      m.subject  ||= quote_if_necessary(headers.delete(:subject), charset)          if headers[:subject]
-      m.to       ||= quote_address_if_necessary(headers.delete(:to), charset)       if headers[:to]
-      m.from     ||= quote_address_if_necessary(headers.delete(:from), charset)     if headers[:from]
-      m.cc       ||= quote_address_if_necessary(headers.delete(:cc), charset)       if headers[:cc]
-      m.bcc      ||= quote_address_if_necessary(headers.delete(:bcc), charset)      if headers[:bcc]
-      m.reply_to ||= quote_address_if_necessary(headers.delete(:reply_to), charset) if headers[:reply_to]
-    end
-
     def collect_responses_and_parts_order(headers) #:nodoc:
       responses, parts_order = [], nil
 
@@ -630,16 +624,16 @@ module ActionMailer #:nodoc:
       end
     end
 
-    def create_parts_from_responses(m, responses, charset) #:nodoc:
+    def create_parts_from_responses(m, responses) #:nodoc:
       if responses.size == 1 && !m.has_attachments?
         responses[0].each { |k,v| m[k] = v }
       elsif responses.size > 1 && m.has_attachments?
         container = Mail::Part.new
         container.content_type = "multipart/alternative"
-        responses.each { |r| insert_part(container, r, charset) }
+        responses.each { |r| insert_part(container, r, m.charset) }
         m.add_part(container)
       else
-        responses.each { |r| insert_part(m, r, charset) }
+        responses.each { |r| insert_part(m, r, m.charset) }
       end
     end
 

data/lib/action_mailer/old_api.rb

@@ -143,12 +143,12 @@ module ActionMailer
       { :content_type => content_type,
         :content_disposition => content_disposition }.merge(params)
     end
-    
+
     def create_mail 
       m = @_message
 
-      quote_fields!({:subject => subject, :to => recipients, :from => from,
-                    :bcc => bcc, :cc => cc, :reply_to => reply_to}, charset)
+      set_fields!({:subject => subject, :to => recipients, :from => from,
+                   :bcc => bcc, :cc => cc, :reply_to => reply_to}, charset)
 
       m.mime_version = mime_version    unless mime_version.nil?
       m.date         = sent_on.to_time rescue sent_on if sent_on
@@ -230,6 +230,17 @@ module ActionMailer
       )
     end
 
+    def set_fields!(headers, charset) #:nodoc:
+      m = @_message
+      m.charset = charset
+      m.subject  ||= headers.delete(:subject)  if headers[:subject]
+      m.to       ||= headers.delete(:to)       if headers[:to]
+      m.from     ||= headers.delete(:from)     if headers[:from]
+      m.cc       ||= headers.delete(:cc)       if headers[:cc]
+      m.bcc      ||= headers.delete(:bcc)      if headers[:bcc]
+      m.reply_to ||= headers.delete(:reply_to) if headers[:reply_to]
+    end
+
     def split_content_type(ct) 
       ct.to_s.split("/")
     end

data/lib/action_mailer/test_case.rb

@@ -8,7 +8,7 @@ module ActionMailer
   end
 
   class TestCase < ActiveSupport::TestCase
-    include Quoting, TestHelper
+    include TestHelper
 
     setup :initialize_test_deliveries
     setup :set_expected_mail
@@ -48,11 +48,11 @@ module ActionMailer
 
     private
       def charset
-        "utf-8"
+        "UTF-8"
       end
 
       def encode(subject)
-        quoted_printable(subject, charset)
+        Mail::Encodings.q_value_encode(subject, charset)
       end
 
       def read_fixture(action)

data/lib/action_mailer/version.rb

@@ -3,7 +3,7 @@ module ActionMailer
     MAJOR = 3
     MINOR = 0
     TINY  = 0
-    BUILD = "beta2"
+    BUILD = "beta3"
 
     STRING = [MAJOR, MINOR, TINY, BUILD].join('.')
   end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 3
   - 0
   - 0
-  - beta2
-  version: 3.0.0.beta2
+  - beta3
+  version: 3.0.0.beta3
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-01 00:00:00 -07:00
+date: 2010-04-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,8 +29,8 @@ dependencies:
         - 3
         - 0
         - 0
-        - beta2
-        version: 3.0.0.beta2
+        - beta3
+        version: 3.0.0.beta3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -42,10 +42,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 2
-        - 1
-        - 5
-        - 3
-        version: 2.1.5.3
+        - 2
+        - 0
+        version: 2.2.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -81,7 +80,6 @@ files:
 - lib/action_mailer/deprecated_api.rb
 - lib/action_mailer/mail_helper.rb
 - lib/action_mailer/old_api.rb
-- lib/action_mailer/quoting.rb
 - lib/action_mailer/railtie.rb
 - lib/action_mailer/railties/log_subscriber.rb
 - lib/action_mailer/test_case.rb

data/lib/action_mailer/quoting.rb

@@ -1,64 +0,0 @@
-module ActionMailer
-  module Quoting #:nodoc:
-    # TODO extract this into Mail itself.
-    # 
-    # 
-    # Convert the given text into quoted printable format, with an instruction
-    # that the text be eventually interpreted in the given charset.
-    def quoted_printable(text, charset)
-      text = text.gsub( /[^a-z ]/i ) { quoted_printable_encode($&) }.
-                  gsub( / /, "_" )
-      "=?#{charset}?Q?#{text}?="
-    end
-
-    # Convert the given character to quoted printable format, taking into
-    # account multi-byte characters (if executing with $KCODE="u", for instance)
-    def quoted_printable_encode(character)
-      result = ""
-      character.each_byte { |b| result << "=%02X" % b }
-      result
-    end
-
-    # A quick-and-dirty regexp for determining whether a string contains any
-    # characters that need escaping.
-    if !defined?(CHARS_NEEDING_QUOTING)
-      CHARS_NEEDING_QUOTING = Regexp.new('[\000-\011\013\014\016-\037\177-\377]', nil, 'n')
-    end
-
-    # Quote the given text if it contains any "illegal" characters
-    def quote_if_necessary(text, charset)
-      text = text.dup.force_encoding(Encoding::ASCII_8BIT) if text.respond_to?(:force_encoding)
-
-      (text =~ CHARS_NEEDING_QUOTING) ?
-        quoted_printable(text, charset) :
-        text
-    end
-
-    # Quote any of the given strings if they contain any "illegal" characters
-    def quote_any_if_necessary(charset, *args)
-      args.map { |v| quote_if_necessary(v, charset) }
-    end
-
-    # Quote the given address if it needs to be. The address may be a
-    # regular email address, or it can be a phrase followed by an address in
-    # brackets. The phrase is the only part that will be quoted, and only if
-    # it needs to be. This allows extended characters to be used in the
-    # "to", "from", "cc", "bcc" and "reply-to" headers.
-    def quote_address_if_necessary(address, charset)
-      if Array === address
-        address.map { |a| quote_address_if_necessary(a, charset) }.join(", ")
-      elsif address =~ /^(\S.*)\s+(<.*>)$/
-        address = $2
-        phrase = quote_if_necessary($1.gsub(/^['"](.*)['"]$/, '\1'), charset)
-        "\"#{phrase}\" #{address}"
-      else
-        address
-      end
-    end
-
-    # Quote any of the given addresses, if they need to be.
-    def quote_any_address_if_necessary(charset, *args)
-      args.map { |v| quote_address_if_necessary(v, charset) }
-    end
-  end
-end