mail 1.1.0 → 1.2.1

data/lib/mail/header.rb

@@ -160,7 +160,7 @@ module Mail
     def encoded
       buffer = ''
       fields.each do |field|
-        buffer << field.encoded.to_s
+        buffer << field.encoded
       end
       buffer
     end
@@ -221,7 +221,7 @@ module Mail
     end
     
     def limited_field?(name)
-      LIMITED_FIELDS.include?(name.downcase)      
+      LIMITED_FIELDS.include?(name.to_s.downcase)
     end
     
   end

data/lib/mail/message.rb

@@ -200,6 +200,20 @@ module Mail
       value ? self.from = value : header[:from]
     end
     
+    # Returns the list of addresses this message should be sent to by
+    # collecting the addresses off the to, cc and bcc fields.
+    # 
+    # Example:
+    # 
+    #  mail.to = 'mikel@test.lindsaar.net'
+    #  mail.cc = 'sam@test.lindsaar.net'
+    #  mail.bcc = 'bob@test.lindsaar.net'
+    #  mail.destinations.length #=> 3
+    #  mail.destinations.first #=> 'mikel@test.lindsaar.net'
+    def destinations
+      [to, cc, bcc].map { |f| f.addresses if f }.compact.flatten
+    end
+    
     # Sets the subject field in the message header.
     # 
     # Example:
@@ -559,23 +573,21 @@ module Mail
 
     # Encodes the message, calls encode on all it's parts, gets an email message
     # ready to send
-    def encode!
-      parts.each { |part| part.encode! }
+    def ready_to_send!
+      parts.each { |part| part.ready_to_send! }
       add_required_fields
     end
-
-    # Decodes the message, calls decode on all it's parts, gets an email message
-    # ready to send
-    def decode!
-      parts.each { |part| part.decode! }
-      add_required_fields
+    
+    def encode!
+      STDERR.puts("Deprecated in 1.1.0 in favour of :ready_to_send! as it is less confusing with encoding and decoding.")
+      ready_to_send!
     end
     
     # Outputs an encoded string representation of the mail message including
     # all headers, attachments, etc.  This is an encoded email in US-ASCII,
     # so it is able to be directly sent to an email server.
     def encoded
-      encode!
+      ready_to_send!
       buffer = header.encoded
       buffer << "\r\n"
       buffer << body.encoded
@@ -584,6 +596,10 @@ module Mail
     
     alias :to_s :encoded
     
+    def decoded
+      raise NoMethodError, 'Can not decode an entire message, try calling #decoded on the various fields and body or parts if it is a multipart message.'
+    end
+    
     private
 
     #  2.1. General Description

data/lib/mail/utilities.rb

@@ -24,7 +24,13 @@ module Mail
       # If the string supplied has PHRASE unsafe characters in it, will return the string quoted 
       # in double quotes, otherwise returns the string unmodified
       def quote_phrase( str )
-        (PHRASE_UNSAFE === str) ? dquote(str) : str
+        if RUBY_VERSION >= '1.9'
+          string = str.dup
+          string.force_encoding('ASCII-8BIT')
+          (PHRASE_UNSAFE === string) ? dquote(str) : str
+        else
+          (PHRASE_UNSAFE === str) ? dquote(str) : str
+        end
       end
 
       # Returns true if the string supplied is free from characters not allowed as a TOKEN

data/lib/mail/version.rb

@@ -2,8 +2,8 @@
 module Mail
   module VERSION
     MAJOR = 1
-    MINOR = 1
-    TINY  = 0
+    MINOR = 2
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/mail/version_specific/ruby_1_8.rb

@@ -36,29 +36,49 @@ module Mail
     def Ruby18.get_constant(klass, string)
       klass.const_get( string )
     end
-
-    def Ruby18.b_encode(str, encoding)
+    
+    def Ruby18.b_value_encode(str, encoding)
       # Ruby 1.8 requires an encoding to work
       raise ArgumentError, "Must supply an encoding" if encoding.nil?
-      return str if str.ascii_only?
       encoding = encoding.to_s.upcase.gsub('_', '-')
-      string = Encodings::Base64.encode(str)
-      "=?#{encoding}?B?#{string.chomp}?="
+      [Encodings::Base64.encode(str), encoding]
     end
-
-    def Ruby18.q_encode(str, encoding)
+    
+    def Ruby18.b_value_decode(str)
+      match = str.match(/\=\?(.+)?\?B\?(.+)?\?\=/)
+      if match
+        encoding = match[1]
+        str = Ruby18.decode_base64(match[2])
+      end
+      str
+    end
+    
+    def Ruby18.q_value_encode(str, encoding)
       # Ruby 1.8 requires an encoding to work
       raise ArgumentError, "Must supply an encoding" if encoding.nil?
-      return str if str.ascii_only?
       encoding = encoding.to_s.upcase.gsub('_', '-')
-      string = Encodings::QuotedPrintable.encode(str)
-      "=?#{encoding}?Q?#{string.chomp}?="
+      [Encodings::QuotedPrintable.encode(str), encoding]
+    end
+    
+    def Ruby18.q_value_decode(str)
+      match = str.match(/\=\?(.+)?\?Q\?(.+)?\?\=/)
+      if match
+        encoding = match[1]
+        str = Encodings::QuotedPrintable.decode(match[2])
+      end
+      str
     end
     
     def Ruby18.param_decode(str, encoding)
       URI.unescape(str)
     end
     
+    def Ruby18.param_encode(str)
+      encoding = $KCODE.to_s.downcase
+      language = Mail::Configuration.instance.param_encode_language
+      "#{encoding}'#{language}'#{URI.escape(str)}"
+    end
+    
   end
   
 end

data/lib/mail/version_specific/ruby_1_9.rb

@@ -31,18 +31,34 @@ module Mail
       klass.const_get( string.to_sym )
     end
     
-    def Ruby19.b_encode(str, encoding = nil)
-      return str if str.ascii_only?
+    def Ruby19.b_value_encode(str, encoding = nil)
       encoding = str.encoding.to_s
-      string = Encodings::Base64.encode(str)
-      "=?#{encoding}?B?#{string.chomp}?="
+      [Ruby19.encode_base64(str), encoding]
     end
     
-    def Ruby19.q_encode(str, encoding = nil)
-      return str if str.ascii_only?
+    def Ruby19.b_value_decode(str)
+      match = str.match(/\=\?(.+)?\?B\?(.+)?\?\=/)
+      if match
+        encoding = match[1]
+        str = Ruby19.decode_base64(match[2])
+        str.force_encoding(encoding)
+      end
+      str
+    end
+    
+    def Ruby19.q_value_encode(str, encoding = nil)
       encoding = str.encoding.to_s
-      string = Encodings::QuotedPrintable.encode(str)
-      "=?#{encoding}?Q?#{string.chomp}?="
+      [Encodings::QuotedPrintable.encode(str), encoding]
+    end
+
+    def Ruby19.q_value_decode(str)
+      match = str.match(/\=\?(.+)?\?Q\?(.+)?\?\=/)
+      if match
+        encoding = match[1]
+        str = Encodings::QuotedPrintable.decode(match[2])
+        str.force_encoding(encoding)
+      end
+      str
     end
 
     def Ruby19.param_decode(str, encoding)
@@ -51,5 +67,11 @@ module Mail
       string
     end
 
+    def Ruby19.param_encode(str)
+      encoding = str.encoding.to_s.downcase
+      language = Mail::Configuration.instance.param_encode_language
+      "#{encoding}'#{language}'#{URI.escape(str)}"
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mail
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.2.1
 platform: ruby
 authors: 
 - Mikel Lindsaar