actionmailer 2.0.5 → 2.1.0

data/lib/action_mailer/vendor/{tmail-1.2.1 → tmail-1.2.3}/tmail/attachments.rb

@@ -1,6 +1,6 @@
 =begin rdoc
 
-= Attachment handling class
+= Attachment handling file
 
 =end
 
@@ -17,8 +17,7 @@ module TMail
     end
 
     def attachment?(part)
-      (part['content-disposition'] && part['content-disposition'].disposition == "attachment") ||
-      part.header['content-type'].main_type != "text"
+      part.disposition_is_attachment? || part.content_type_is_text?
     end
 
     def attachments

data/lib/action_mailer/vendor/{tmail-1.2.1 → tmail-1.2.3}/tmail/base64.rb

@@ -1,9 +1,4 @@
-# = TITLE:
-#
-#   Base64
-#
-# = COPYRIGHT:
-#
+#--
 #   Copyright (c) 1998-2003 Minero Aoki <aamine@loveruby.net>
 #
 #   Permission is hereby granted, free of charge, to any person obtaining
@@ -27,10 +22,9 @@
 #
 #   Note: Originally licensed under LGPL v2+. Using MIT license for Rails
 #   with permission of Minero Aoki.
-
-#
+#++
+#:stopdoc:
 module TMail
-
   module Base64
 
     module_function
@@ -48,5 +42,5 @@ module TMail
     end
 
   end
-
 end
+#:startdoc:

data/lib/action_mailer/vendor/{tmail-1.2.1 → tmail-1.2.3}/tmail/compat.rb

@@ -1,17 +1,18 @@
-unless Enumerable.method_defined?(:map)
-  module Enumerable
+#:stopdoc:
+unless Enumerable.method_defined?(:map) 
+  module Enumerable #:nodoc:
     alias map collect
   end
 end
 
 unless Enumerable.method_defined?(:select)
-  module Enumerable
+  module Enumerable #:nodoc:
     alias select find_all
   end
 end
 
 unless Enumerable.method_defined?(:reject)
-  module Enumerable
+  module Enumerable #:nodoc:
     def reject
       result = []
       each do |i|
@@ -23,7 +24,7 @@ unless Enumerable.method_defined?(:reject)
 end
 
 unless Enumerable.method_defined?(:sort_by)
-  module Enumerable
+  module Enumerable #:nodoc:
     def sort_by
       map {|i| [yield(i), i] }.sort.map {|val, i| i }
     end
@@ -31,9 +32,10 @@ unless Enumerable.method_defined?(:sort_by)
 end
 
 unless File.respond_to?(:read)
-  def File.read(fname)
+  def File.read(fname) #:nodoc:
     File.open(fname) {|f|
       return f.read
     }
   end
 end
+#:startdoc:

data/lib/action_mailer/vendor/{tmail-1.2.1 → tmail-1.2.3}/tmail/config.rb

@@ -1,8 +1,3 @@
-=begin rdoc
-
-= Configuration Class
-
-=end
 #--
 # Copyright (c) 1998-2003 Minero Aoki <aamine@loveruby.net>
 #
@@ -28,7 +23,7 @@
 # Note: Originally licensed under LGPL v2+. Using MIT license for Rails
 # with permission of Minero Aoki.
 #++
-
+#:stopdoc:
 module TMail
 
   class Config
@@ -69,3 +64,4 @@ module TMail
   end
 
 end
+#:startdoc:

data/lib/action_mailer/vendor/{tmail-1.2.1 → tmail-1.2.3}/tmail/core_extensions.rb

@@ -1,14 +1,9 @@
-=begin rdoc
-
-= Ruby on Rails Core Extensions
-
-provides .blank?
-
-=end
-unless Object.respond_to?(:blank?) #:nodoc:
-  # Check first to see if we are in a Rails environment, no need to 
-  # define these methods if we are
+#:stopdoc:
+unless Object.respond_to?(:blank?)
   class Object
+    # Check first to see if we are in a Rails environment, no need to 
+    # define these methods if we are
+
     # An object is blank if it's nil, empty, or a whitespace string.
     # For example, "", "   ", nil, [], and {} are blank.
     #
@@ -27,41 +22,42 @@ unless Object.respond_to?(:blank?) #:nodoc:
     end
   end
 
-  class NilClass #:nodoc:
+  class NilClass
     def blank?
       true
     end
   end
 
-  class FalseClass #:nodoc:
+  class FalseClass
     def blank?
       true
     end
   end
 
-  class TrueClass #:nodoc:
+  class TrueClass
     def blank?
       false
     end
   end
 
-  class Array #:nodoc:
+  class Array
     alias_method :blank?, :empty?
   end
 
-  class Hash #:nodoc:
+  class Hash
     alias_method :blank?, :empty?
   end
 
-  class String #:nodoc:
+  class String
     def blank?
       empty? || strip.empty?
     end
   end
 
-  class Numeric #:nodoc:
+  class Numeric
     def blank?
       false
     end
   end
-end
+end
+#:startdoc:

data/lib/action_mailer/vendor/{tmail-1.2.1 → tmail-1.2.3}/tmail/encode.rb

@@ -1,7 +1,4 @@
-# = TITLE:
-#
-#   Text Encoding class
-#
+#--
 # = COPYRIGHT:
 #
 #   Copyright (c) 1998-2003 Minero Aoki <aamine@loveruby.net>
@@ -27,14 +24,22 @@
 #
 #   Note: Originally licensed under LGPL v2+. Using MIT license for Rails
 #   with permission of Minero Aoki.
-
+#++
+#:stopdoc:
 require 'nkf'
 require 'tmail/base64'
 require 'tmail/stringio'
 require 'tmail/utils'
+#:startdoc:
 
 
 module TMail
+  
+  #:stopdoc:
+  class << self
+    attr_accessor :KCODE
+  end
+  self.KCODE = 'NONE'
 
   module StrategyInterface
 
@@ -52,10 +57,34 @@ module TMail
     end
     module_function :create_dest
 
+    #:startdoc:
+    # Returns the TMail object encoded and ready to be sent via SMTP etc.
+    # You should call this before you are packaging up your  email to
+    # correctly escape all the values that need escaping in the email, line
+    # wrap the email etc.
+    # 
+    # It is also a good idea to call this before you marshal or serialize
+    # a TMail object.
+    # 
+    # For Example:
+    # 
+    #  email = TMail::Load(my_email_file)
+    #  email_to_send = email.encoded
     def encoded( eol = "\r\n", charset = 'j', dest = nil )
       accept_strategy Encoder, eol, charset, dest
     end
 
+    # Returns the TMail object decoded and ready to be used by you, your
+    # program etc.
+    # 
+    # You should call this before you are packaging up your  email to
+    # correctly escape all the values that need escaping in the email, line
+    # wrap the email etc.
+    # 
+    # For Example:
+    # 
+    #  email = TMail::Load(my_email_file)
+    #  email_to_send = email.encoded
     def decoded( eol = "\n", charset = 'e', dest = nil )
       # Turn the E-Mail into a string and return it with all
       # encoded characters decoded.  alias for to_s
@@ -64,7 +93,7 @@ module TMail
 
     alias to_s decoded
 
-    def accept_strategy( klass, eol, charset, dest = nil )
+    def accept_strategy( klass, eol, charset, dest = nil ) #:nodoc:
       dest ||= ''
       accept klass.new( create_dest(dest), charset, eol )
       dest
@@ -72,6 +101,7 @@ module TMail
 
   end
 
+  #:stopdoc:
 
   ###
   ### MIME B encoding decoder
@@ -90,8 +120,8 @@ module TMail
     }
 
     def self.decode( str, encoding = nil )
-      encoding ||= (OUTPUT_ENCODING[$KCODE] || 'j')
-      opt = '-m' + encoding
+      encoding ||= (OUTPUT_ENCODING[TMail.KCODE] || 'j')
+      opt = '-mS' + encoding
       str.gsub(ENCODED_WORDS) {|s| NKF.nkf(opt, s) }
     end
 
@@ -193,8 +223,9 @@ module TMail
 
     def initialize( dest = nil, encoding = nil, eol = "\r\n", limit = nil )
       @f = StrategyInterface.create_dest(dest)
-      @opt = OPTIONS[$KCODE]
+      @opt = OPTIONS[TMail.KCODE]
       @eol = eol
+      @folded = false
       @preserve_quotes = true
       reset
     end
@@ -308,22 +339,36 @@ module TMail
     def scanadd( str, force = false )
       types = ''
       strs = []
-
+      if str.respond_to?(:encoding)
+        enc = str.encoding 
+        str.force_encoding(Encoding::ASCII_8BIT)
+      end
       until str.empty?
         if m = /\A[^\e\t\r\n ]+/.match(str)
           types << (force ? 'j' : 'a')
-          strs.push m[0]
-
+          if str.respond_to?(:encoding)
+            strs.push m[0].force_encoding(enc)
+          else
+            strs.push m[0]
+          end
         elsif m = /\A[\t\r\n ]+/.match(str)
           types << 's'
-          strs.push m[0]
+          if str.respond_to?(:encoding)
+            strs.push m[0].force_encoding(enc)
+          else
+            strs.push m[0]
+          end
 
         elsif m = /\A\e../.match(str)
           esc = m[0]
           str = m.post_match
           if esc != "\e(B" and m = /\A[^\e]+/.match(str)
             types << 'j'
-            strs.push m[0]
+            if str.respond_to?(:encoding)
+              strs.push m[0].force_encoding(enc)
+            else
+              strs.push m[0]
+            end
           end
 
         else
@@ -367,11 +412,16 @@ module TMail
     end
 
     def concat_A_S( types, strs )
+      if RUBY_VERSION < '1.9'
+        a = ?a; s = ?s
+      else
+        a = 'a'.ord; s = 's'.ord
+      end
       i = 0
       types.each_byte do |t|
         case t
-        when ?a then add_text strs[i]
-        when ?s then add_lwsp strs[i]
+        when a then add_text strs[i]
+        when s then add_lwsp strs[i]
         else
           raise "TMail FATAL: unknown flag: #{t.chr}"
         end
@@ -417,7 +467,13 @@ module TMail
       size = max_bytes(chunksize, str.size) - 6
       size = (size % 2 == 0) ? (size) : (size - 1)
       return nil if size <= 0
-      "\e$B#{str.slice!(0, size)}\e(B"
+      if str.respond_to?(:encoding)
+        enc = str.encoding
+        str.force_encoding(Encoding::ASCII_8BIT)
+        "\e$B#{str.slice!(0, size)}\e(B".force_encoding(enc)
+      else
+        "\e$B#{str.slice!(0, size)}\e(B"
+      end
     end
 
     def extract_A( chunksize, str )
@@ -490,7 +546,7 @@ module TMail
 
       # Check the text to see if there is whitespace, or if not
       @wrapped_text = []
-      until @text == ''
+      until @text.blank?
         fold_the_string
       end
       @text = @wrapped_text.join("#{@eol}#{SPACER}")
@@ -501,10 +557,12 @@ module TMail
       # Is the location of the whitespace shorter than the RCF_2822_MAX_LENGTH?
       # if there is no whitespace in the string, then this
       unless mazsize(whitespace_location) <= 0
+        @text.strip!
         @wrapped_text << @text.slice!(0...whitespace_location)
       # If it is not less, we have to wrap it destructively
       else
         slice_point = RFC_2822_MAX_LENGTH - @curlen - @lwsp.length
+        @text.strip!
         @wrapped_text << @text.slice!(0...slice_point)
       end
     end
@@ -519,5 +577,5 @@ module TMail
     end
 
   end
-
+  #:startdoc:
 end    # module TMail

data/lib/action_mailer/vendor/{tmail-1.2.1 → tmail-1.2.3}/tmail/header.rb

@@ -1,11 +1,3 @@
-=begin rdoc
-
-= Header handling class
-
-=end
-# RFC #822 ftp://ftp.isi.edu/in-notes/rfc822.txt
-# 
-#
 #--
 # Copyright (c) 1998-2003 Minero Aoki <aamine@loveruby.net>
 #
@@ -38,9 +30,10 @@ require 'tmail/parser'
 require 'tmail/config'
 require 'tmail/utils'
 
-
+#:startdoc:
 module TMail
 
+  # Provides methods to handle and manipulate headers in the email
   class HeaderField
 
     include TextUtils
@@ -214,7 +207,11 @@ module TMail
 
     def comments
       ensure_parsed
-      @comments
+      if @comments[0]
+        [Decoder.decode(@comments[0])]
+      else
+        @comments
+      end
     end
 
     private

data/lib/action_mailer/vendor/tmail-1.2.3/tmail/index.rb

@@ -0,0 +1,9 @@
+#:stopdoc:
+# This is here for Rolls. 
+# Rolls uses this instead of lib/tmail.rb.
+
+require 'tmail/version'
+require 'tmail/mail'
+require 'tmail/mailbox'
+require 'tmail/core_extensions'
+#:startdoc:

data/lib/action_mailer/vendor/{tmail-1.2.1 → tmail-1.2.3}/tmail/interface.rb

@@ -591,12 +591,17 @@ module TMail
     end
 
     # Destructively sets the message ID of the mail object instance to the passed in string
+    # 
+    # Invalid message IDs are ignored (silently, unless configured otherwise) and result in 
+    # a nil message ID.  Left and right angle brackets are required.
     #
     # Example:
     # 
     #  mail = TMail::Mail.new
+    #  mail.message_id = "<348F04F142D69C21-291E56D292BC@xxxx.net>"
+    #  mail.message_id #=> "<348F04F142D69C21-291E56D292BC@xxxx.net>"
     #  mail.message_id = "this_is_my_badly_formatted_message_id"
-    #  mail.message_id #=> "this_is_my_badly_formatted_message_id"
+    #  mail.message_id #=> nil
     def message_id=( str )
       set_string_attr 'Message-Id', str
     end
@@ -966,31 +971,33 @@ module TMail
       end
     end
 
-    # Destructively convert the Mail object's body into a Base64 encoded email
+    # Convert the Mail object's body into a Base64 encoded email
     # returning the modified Mail object
     def base64_encode!
       store 'Content-Transfer-Encoding', 'Base64'
-      self.body = Base64.folding_encode(self.body)
+      self.body = base64_encode
     end
 
-    # ==Depreciation warning
-    # base64_encode will return the body encoded, not modify the message body in 
-    # future versions of TMail
-    alias :base64_encode :base64_encode!
+    # Return the result of encoding the TMail::Mail object body
+    # without altering the current body
+    def base64_encode
+      Base64.folding_encode(self.body)
+    end
 
-    # Destructively convert the Mail object's body into a Base64 decoded email
+    # Convert the Mail object's body into a Base64 decoded email
     # returning the modified Mail object
     def base64_decode!
       if /base64/i === self.transfer_encoding('')
         store 'Content-Transfer-Encoding', '8bit'
-        self.body = Base64.decode(self.body, @config.strict_base64decode?)
+        self.body = base64_decode
       end
     end
 
-    # ==Depreciation warning
-    # base64_decode will return the body decoded, not modify the message body in 
-    # future versions of TMail
-    alias :base64_decode :base64_decode!
+    # Returns the result of decoding the TMail::Mail object body
+    # without altering the current body
+    def base64_decode
+      Base64.decode(self.body, @config.strict_base64decode?)
+    end
 
     # Returns an array of each destination in the email message including to: cc: or bcc:
     #