From f1047173e8d2ccc3a65ed434445bd2807df86614 Mon Sep 17 00:00:00 2001
From: Michael Koziarski <michael@koziarski.com>
Date: Sun, 2 Dec 2007 20:31:39 +0000
Subject: Remove old tests which relied on @ being an ATOM to work around old
Mail.app bugs. Closes #10317 [mikel]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8257 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
.../vendor/tmail-1.1.0/tmail/base64.rb | 79 ++++++++--------------
1 file changed, 29 insertions(+), 50 deletions(-)
(limited to 'actionmailer/lib')
diff --git a/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/base64.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/base64.rb
index 41189f8c34..e99b6b0ba2 100755
--- a/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/base64.rb
+++ b/actionmailer/lib/action_mailer/vendor/tmail-1.1.0/tmail/base64.rb
@@ -1,73 +1,52 @@
-=begin rdoc
-
-= Base64 handling class
-
-=end
-#--
-# Copyright (c) 1998-2003 Minero Aoki <aamine@loveruby.net>
+# = TITLE:
+#
+# Base64
+#
+# = COPYRIGHT:
#
-# 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:
+# Copyright (c) 1998-2003 Minero Aoki <aamine@loveruby.net>
#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
+# 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 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.
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
#
-# Note: Originally licensed under LGPL v2+. Using MIT license for Rails
-# with permission of Minero Aoki.
-#++
+# 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
module Base64
module_function
- def rb_folding_encode( str, eol = "\n", limit = 60 )
+ def folding_encode( str, eol = "\n", limit = 60 )
[str].pack('m')
end
- def rb_encode( str )
+ def encode( str )
[str].pack('m').tr( "\r\n", '' )
end
- def rb_decode( str, strict = false )
+ def decode( str, strict = false )
str.unpack('m').first
end
- begin
- require 'tmail/base64.so'
- alias folding_encode c_folding_encode
- alias encode c_encode
- alias decode c_decode
- class << self
- alias folding_encode c_folding_encode
- alias encode c_encode
- alias decode c_decode
- end
- rescue LoadError
- alias folding_encode rb_folding_encode
- alias encode rb_encode
- alias decode rb_decode
- class << self
- alias folding_encode rb_folding_encode
- alias encode rb_encode
- alias decode rb_decode
- end
- end
-
end
end
--
cgit v1.2.3