actionmailer 1.0.1 → 1.1.1

data/lib/action_mailer/part_container.rb

@@ -1,5 +1,22 @@
 module ActionMailer
-  module PartContainer #:nodoc:
+  # Accessors and helpers that ActionMailer::Base and ActionMailer::Part have
+  # in common. Using these helpers you can easily add subparts or attachments
+  # to your message:
+  #
+  #   def my_mail_message(...)
+  #     ...
+  #     part "text/plain" do |p|
+  #       p.body "hello, world"
+  #       p.transfer_encoding "base64"
+  #     end
+  #
+  #     attachment "image/jpg" do |a|
+  #       a.body = File.read("hello.jpg")
+  #       a.filename = "hello.jpg"
+  #     end
+  #   end
+  module PartContainer
+    # The list of subparts of this container
     attr_reader :parts
 
     # Add a part to a multipart message, with the given content-type. The

data/lib/action_mailer/quoting.rb

@@ -3,57 +3,17 @@ module ActionMailer
     # 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 ) { "=%02x" % $&[0] }.gsub( / /, "_" )
+      text = text.gsub( /[^a-z ]/i ) { quoted_printable_encode($&) }.
+                  gsub( / /, "_" )
       "=?#{charset}?Q?#{text}?="
     end
 
-    # A quick-and-dirty regexp for determining whether a string contains any
-    # characters that need escaping.
-    CHARS_NEEDING_QUOTING = /[\000-\011\013\014\016-\037\177-\377]/
-
-    # Quote the given text if it contains any "illegal" characters
-    def quote_if_necessary(text, charset)
-      (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", and "bcc" headers.
-    def quote_address_if_necessary(address, charset)
-      if Array === address
-        address.map { |a| quote_address_if_necessary(a, charset) }
-      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
-
-module ActionMailer
-  module Quoting #:nodoc:
-    # 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 ) { "=%02x" % $&[0] }.gsub( / /, "_" )
-      "=?#{charset}?Q?#{text}?="
+    # 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

data/lib/action_mailer/vendor/text/format.rb

@@ -47,20 +47,39 @@
 #++
 
 module Text #:nodoc:
-    # = Introduction
-    #
-    # Text::Format provides the ability to nicely format fixed-width text with
-    # knowledge of the writeable space (number of columns), margins, and
-    # indentation settings.
-    #
-    # Copyright::   Copyright (c) 2002 - 2003 by Austin Ziegler
-    # Version::     0.63
-    # Based On::    Perl
-    #               Text::Format[http://search.cpan.org/author/GABOR/Text-Format0.52/lib/Text/Format.pm],
-    #               Copyright (c) 1998 G�bor Egressy
-    # Licence::     Ruby's, Perl Artistic, or GPL version 2 (or later)
-    #
-  class Format
+   # Text::Format for Ruby is copyright 2002 - 2005 by Austin Ziegler. It
+   # is available under Ruby's licence, the Perl Artistic licence, or the
+   # GNU GPL version 2 (or at your option, any later version). As a
+   # special exception, for use with official Rails (provided by the
+   # rubyonrails.org development team) and any project created with
+   # official Rails, the following alternative MIT-style licence may be
+   # used:
+   #
+   # == Text::Format Licence for Rails and Rails Applications
+   # Permission is hereby granted, free of charge, to any person
+   # obtaining a copy of this software and associated documentation files
+   # (the "Software"), to deal in the Software without restriction,
+   # including without limitation the rights to use, copy, modify, merge,
+   # publish, distribute, sublicense, and/or sell copies of the Software,
+   # and to permit persons to whom the Software is furnished to do so,
+   # subject to the following conditions:
+   #
+   # * The names of its contributors may not be used to endorse or
+   #   promote products derived from this software without specific prior
+   #   written permission.
+   #
+   # The above copyright notice and this permission notice shall be
+   # included in all copies or substantial portions of the Software.
+   #
+   # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+   # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+   # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+   # NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+   # BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+   # ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+   # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+   # SOFTWARE.  
+   class Format
     VERSION = '0.63'
 
       # Local abbreviations. More can be added with Text::Format.abbreviations

data/lib/action_mailer/vendor/tmail/address.rb

@@ -1,12 +1,31 @@
 #
 # address.rb
 #
+#--
 # Copyright (c) 1998-2003 Minero Aoki <aamine@loveruby.net>
 #
-# This program is free software.
-# You can distribute/modify this program under the terms of
-# the GNU Lesser General Public License version 2 or later.
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
 #
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Note: Originally licensed under LGPL v2+. Using MIT license for Rails
+# with permission of Minero Aoki.
+#++
 
 require 'tmail/encode'
 require 'tmail/parser'

data/lib/action_mailer/vendor/tmail/attachments.rb

@@ -15,7 +15,9 @@ module TMail
         parts.collect { |part| 
           if part.header["content-type"].main_type != "text"
             content   = part.body # unquoted automatically by TMail#body
-            file_name = part.sub_header("content-type", "name") ||
+            file_name = (part['content-location'] &&
+                          part['content-location'].body) ||
+                        part.sub_header("content-type", "name") ||
                         part.sub_header("content-disposition", "filename")
             
             next if file_name.blank? || content.blank?

data/lib/action_mailer/vendor/tmail/base64.rb

@@ -1,12 +1,31 @@
 #
 # base64.rb
 #
+#--
 # Copyright (c) 1998-2003 Minero Aoki <aamine@loveruby.net>
 #
-# This program is free software.
-# You can distribute/modify this program under the terms of
-# the GNU Lesser General Public License version 2 or later.
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
 #
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Note: Originally licensed under LGPL v2+. Using MIT license for Rails
+# with permission of Minero Aoki.
+#++
 
 module TMail
 

data/lib/action_mailer/vendor/tmail/config.rb

@@ -1,12 +1,31 @@
 #
 # config.rb
 #
+#--
 # Copyright (c) 1998-2003 Minero Aoki <aamine@loveruby.net>
 #
-# This program is free software.
-# You can distribute/modify this program under the terms of
-# the GNU Lesser General Public License version 2 or later.
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
 #
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Note: Originally licensed under LGPL v2+. Using MIT license for Rails
+# with permission of Minero Aoki.
+#++
 
 module TMail
 

data/lib/action_mailer/vendor/tmail/encode.rb

@@ -1,12 +1,31 @@
 #
 # encode.rb
 #
+#--
 # Copyright (c) 1998-2003 Minero Aoki <aamine@loveruby.net>
 #
-# This program is free software.
-# You can distribute/modify this program under the terms of
-# the GNU Lesser General Public License version 2 or later.
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
 #
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Note: Originally licensed under LGPL v2+. Using MIT license for Rails
+# with permission of Minero Aoki.
+#++
 
 require 'nkf'
 require 'tmail/base64.rb'

data/lib/action_mailer/vendor/tmail/facade.rb

@@ -1,12 +1,31 @@
 #
 # facade.rb
 #
+#--
 # Copyright (c) 1998-2003 Minero Aoki <aamine@loveruby.net>
 #
-# This program is free software.
-# You can distribute/modify this program under the terms of
-# the GNU Lesser General Public License version 2 or later.
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
 #
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Note: Originally licensed under LGPL v2+. Using MIT license for Rails
+# with permission of Minero Aoki.
+#++
 
 require 'tmail/utils'
 

data/lib/action_mailer/vendor/tmail/header.rb

@@ -1,12 +1,31 @@
 #
 # header.rb
 #
+#--
 # Copyright (c) 1998-2003 Minero Aoki <aamine@loveruby.net>
 #
-# This program is free software.
-# You can distribute/modify this program under the terms of
-# the GNU Lesser General Public License version 2 or later.
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
 #
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Note: Originally licensed under LGPL v2+. Using MIT license for Rails
+# with permission of Minero Aoki.
+#++
 
 require 'tmail/encode'
 require 'tmail/address'
@@ -754,9 +773,11 @@ module TMail
         strategy.meta @main
       end
       @params.each do |k,v|
-        strategy.meta ';'
-        strategy.space
-        strategy.kv_pair k, v
+        if v
+          strategy.meta ';'
+          strategy.space
+          strategy.kv_pair k, v
+        end
       end
     end
 

data/lib/action_mailer/vendor/tmail/info.rb

@@ -1,12 +1,31 @@
 #
 # info.rb
 #
+#--
 # Copyright (c) 1998-2003 Minero Aoki <aamine@loveruby.net>
 #
-# This program is free software.
-# You can distribute/modify this program under the terms of
-# the GNU Lesser General Public License version 2 or later.
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
 #
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Note: Originally licensed under LGPL v2+. Using MIT license for Rails
+# with permission of Minero Aoki.
+#++
 
 module TMail
 

data/lib/action_mailer/vendor/tmail/mail.rb

@@ -1,12 +1,31 @@
 #
 # mail.rb
 #
+#--
 # Copyright (c) 1998-2003 Minero Aoki <aamine@loveruby.net>
 #
-# This program is free software.
-# You can distribute/modify this program under the terms of
-# the GNU Lesser General Public License version 2 or later.
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
 #
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Note: Originally licensed under LGPL v2+. Using MIT license for Rails
+# with permission of Minero Aoki.
+#++
 
 require 'tmail/facade'
 require 'tmail/encode'