From d5cadfc1108728635055d476eff7b34c975705d6 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Wed, 13 Apr 2005 04:44:58 +0000
Subject: Address parsing failed when the "to" (or "cc", or whatever) was an
 array. It was also too restrictive in the formats of the addresses #1097
 [Jamis]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1149 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 actionmailer/lib/action_mailer/base.rb        |  4 +++-
 actionmailer/test/mail_service_test.rb        | 18 +++++++++++++++++-
 activerecord/lib/active_record/validations.rb |  8 ++++----
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index a20197c754..27a0c8e19c 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -166,7 +166,9 @@ module ActionMailer #:nodoc:
       # it needs to be. This allows extended characters to be used in the
       # "to", "from", "cc", and "bcc" headers.
       def quote_address_if_necessary(address, charset)
-        if address =~ /^([^<>\s]+) (<.*>)$/
+        if Array === address
+          address.map { |a| quote_address_if_necessary(a, charset) }
+        elsif address =~ /^(\S.+)\s+(<.*>)$/
           address = $2
           phrase = quote_if_necessary($1, charset)
           "#{phrase} #{address}"
diff --git a/actionmailer/test/mail_service_test.rb b/actionmailer/test/mail_service_test.rb
index bebbdba473..d5d24b2640 100755
--- a/actionmailer/test/mail_service_test.rb
+++ b/actionmailer/test/mail_service_test.rb
@@ -289,7 +289,23 @@ EOF
 
     created = TestMailer.create_utf8_body @recipient
     assert_match(/안녕하세요!/, created.encoded)
-   end
+  end
+
+  def test_multiple_utf8_recipients
+    @recipient = ["김치통 <kimchi@example.net.kr>", "\"Example Recipient\" <me@example.com>"]
+    expected = new_mail "utf-8"
+    expected.to      = TestMailer.quote_address_if_necessary @recipient, "utf-8"
+    expected.subject = "testing utf-8 body"
+    expected.body    = "안녕하세요!"
+    expected.from    = TestMailer.quote_address_if_necessary @recipient.first, "utf-8"
+    expected.cc      = TestMailer.quote_address_if_necessary @recipient, "utf-8"
+    expected.bcc     = TestMailer.quote_address_if_necessary @recipient, "utf-8"
+    expected.date    = Time.local 2004, 12, 12
+
+    created = TestMailer.create_utf8_body @recipient
+    assert_match(/\nFrom: =\?.*?\?= <kimchi@example.net.kr>\r/, created.encoded)
+    assert_match(/\nTo: =\?.*?\?= <kimchi.*?>, Example Recipient <me/, created.encoded)
+  end
 
 end
 
diff --git a/activerecord/lib/active_record/validations.rb b/activerecord/lib/active_record/validations.rb
index 9364a2501c..850d012e4d 100755
--- a/activerecord/lib/active_record/validations.rb
+++ b/activerecord/lib/active_record/validations.rb
@@ -369,27 +369,27 @@ module ActiveRecord
         # Declare different validations per option.
         case range_options.first
         when :within, :in
-          raise ArgumentError, ':within must be a Range' unless option_value.is_a?(Range)
+          raise ArgumentError, ':within must be a Range' unless option_value.is_a?(Range) # '
           validates_each(attrs, options) do |record, attr|
             next if record.send(attr).nil? and options[:allow_nil]
             record.errors.add_on_boundary_breaking(attr, option_value, options[:too_long], options[:too_short])
           end
         when :is
-          raise ArgumentError, ':is must be a nonnegative Integer' unless option_value.is_a?(Integer) and option_value >= 0
+          raise ArgumentError, ':is must be a nonnegative Integer' unless option_value.is_a?(Integer) and option_value >= 0 # '
           message = options[:message] || options[:wrong_length]
           message = (message % option_value) rescue message
           validates_each(attrs, options) do |record, attr, value|
             record.errors.add(attr, message) if value.nil? or value.size != option_value
           end
         when :minimum
-          raise ArgumentError, ':minimum must be a nonnegative Integer' unless option_value.is_a?(Integer) and option_value >= 0
+          raise ArgumentError, ':minimum must be a nonnegative Integer' unless option_value.is_a?(Integer) and option_value >= 0 # '
           message = options[:message] || options[:too_short]
           message = (message % option_value) rescue message
           validates_each(attrs, options) do |record, attr, value|
             record.errors.add(attr, message) if value.nil? or value.size < option_value
           end
         when :maximum
-          raise ArgumentError, ':maximum must be a nonnegative Integer' unless option_value.is_a?(Integer) and option_value >= 0
+          raise ArgumentError, ':maximum must be a nonnegative Integer' unless option_value.is_a?(Integer) and option_value >= 0 # '
           message = options[:message] || options[:too_long]
           message = (message % option_value) rescue message
           validates_each(attrs, options) do |record, attr, value|
-- 
cgit v1.2.3