mail 2.2.15 → 2.3.0

data/lib/mail/version_specific/ruby_1_8.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 module Mail
   class Ruby18
     require 'base64'
@@ -14,13 +15,13 @@ module Mail
       re = /([\(\)])/          # Only match unescaped parens
       str.gsub(re) { |s| '\\' + s }
     end
-    
+
     def Ruby18.paren( str )
       str = $1 if str =~ /^\((.*)?\)$/
       str = escape_paren( str )
       '(' + str + ')'
     end
-    
+
     def Ruby18.escape_bracket( str )
       re = /\\\>/
       str = str.gsub(re) { |s| '>'}
@@ -29,36 +30,36 @@ module Mail
       re = /([\<\>])/          # Only match unescaped parens
       str.gsub(re) { |s| '\\' + s }
     end
-    
+
     def Ruby18.bracket( str )
       str = $1 if str =~ /^\<(.*)?\>$/
       str = escape_bracket( str )
       '<' + str + '>'
     end
-    
+
     def Ruby18.decode_base64(str)
       Base64.decode64(str) if str
     end
-    
+
     def Ruby18.encode_base64(str)
       Base64.encode64(str)
     end
-    
+
     def Ruby18.has_constant?(klass, string)
       klass.constants.include?( string )
     end
-    
+
     def Ruby18.get_constant(klass, string)
       klass.const_get( string )
     end
-    
+
     def Ruby18.b_value_encode(str, encoding)
       # Ruby 1.8 requires an encoding to work
       raise ArgumentError, "Must supply an encoding" if encoding.nil?
       encoding = encoding.to_s.upcase.gsub('_', '-')
       [Encodings::Base64.encode(str), encoding]
     end
-    
+
     def Ruby18.b_value_decode(str)
       match = str.match(/\=\?(.+)?\?[Bb]\?(.+)?\?\=/m)
       if match
@@ -67,14 +68,14 @@ module Mail
       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?
       encoding = encoding.to_s.upcase.gsub('_', '-')
       [Encodings::QuotedPrintable.encode(str), encoding]
     end
-    
+
     def Ruby18.q_value_decode(str)
       match = str.match(/\=\?(.+)?\?[Qq]\?(.+)?\?\=/m)
       if match
@@ -83,11 +84,11 @@ module Mail
       end
       str
     end
-    
+
     def Ruby18.param_decode(str, encoding)
       URI.unescape(str)
     end
-    
+
     def Ruby18.param_encode(str)
       encoding = $KCODE.to_s.downcase
       language = Configuration.instance.param_encode_language

data/lib/mail/version_specific/ruby_1_9.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 module Mail
   class Ruby19
 
@@ -14,7 +15,7 @@ module Mail
       str = escape_paren( str )
       '(' + str + ')'
     end
-    
+
     def Ruby19.escape_bracket( str )
       re = /(?<!\\)([\<\>])/          # Only match unescaped brackets
       str.gsub(re) { |s| '\\' + s }
@@ -27,26 +28,26 @@ module Mail
     end
 
     def Ruby19.decode_base64(str)
-      str.unpack( 'm' ).first.force_encoding(Encoding::BINARY)
+      str.unpack( 'm' ).first
     end
-    
+
     def Ruby19.encode_base64(str)
       [str].pack( 'm' )
     end
-    
+
     def Ruby19.has_constant?(klass, string)
-      klass.constants.include?( string.to_sym )
+      klass.const_defined?( string, false )
     end
-    
+
     def Ruby19.get_constant(klass, string)
-      klass.const_get( string.to_sym )
+      klass.const_get( string )
     end
-    
+
     def Ruby19.b_value_encode(str, encoding = nil)
       encoding = str.encoding.to_s
       [Ruby19.encode_base64(str), encoding]
     end
-    
+
     def Ruby19.b_value_decode(str)
       match = str.match(/\=\?(.+)?\?[Bb]\?(.+)?\?\=/m)
       if match
@@ -54,9 +55,10 @@ module Mail
         str = Ruby19.decode_base64(match[2])
         str.force_encoding(fix_encoding(encoding))
       end
-      str.encode("utf-8", :invalid => :replace, :replace => "") 
+      decoded = str.encode("utf-8", :invalid => :replace, :replace => "")
+      decoded.valid_encoding? ? decoded : decoded.encode("utf-16le", :invalid => :replace, :replace => "").encode("utf-8")
     end
-    
+
     def Ruby19.q_value_encode(str, encoding = nil)
       encoding = str.encoding.to_s
       [Encodings::QuotedPrintable.encode(str), encoding]
@@ -69,7 +71,8 @@ module Mail
         str = Encodings::QuotedPrintable.decode(match[2])
         str.force_encoding(fix_encoding(encoding))
       end
-      str.encode("utf-8", :invalid => :replace, :replace => "") 
+      decoded = str.encode("utf-8", :invalid => :replace, :replace => "")
+      decoded.valid_encoding? ? decoded : decoded.encode("utf-16le", :invalid => :replace, :replace => "").encode("utf-8")
     end
 
     def Ruby19.param_decode(str, encoding)
@@ -84,8 +87,8 @@ module Mail
       "#{encoding}'#{language}'#{URI.escape(str)}"
     end
 
-     # mails somtimes includes invalid encodings like iso885915 or utf8 so we transform them to iso885915 or utf8 
-     # TODO: add this as a test somewhere 
+     # mails somtimes includes invalid encodings like iso885915 or utf8 so we transform them to iso885915 or utf8
+     # TODO: add this as a test somewhere
      # Encoding.list.map{|e| [e.to_s.upcase==fix_encoding(e.to_s.downcase.gsub("-", "")), e.to_s] }.select {|a,b| !b}
      #  Encoding.list.map{|e| [e.to_s==fix_encoding(e.to_s), e.to_s] }.select {|a,b| !b}
     def Ruby19.fix_encoding(encoding)
@@ -94,8 +97,8 @@ module Mail
         when /iso-?(\d{4})-?(\w{1,2})/i then return "ISO-#{$1}-#{$2}"
         # "ISO-2022-JP-KDDI"  and alike
         when /iso-?(\d{4})-?(\w{1,2})-?(\w*)/i then return "ISO-#{$1}-#{$2}-#{$3}"
-        # utf-8 and alike
-        when /utf-?(.*)/i then return "UTF-#{$1}"
+        # UTF-8, UTF-32BE and alike
+        when /utf-?(\d{1,2})?(\w{1,2})/i then return "UTF-#{$1}#{$2}"
         # Windows-1252 and alike
         when /Windows-?(.*)/i then return "Windows-#{$1}"
         #more aliases to be added if needed

data/lib/mail.rb

@@ -4,12 +4,6 @@ module Mail # :doc:
   require 'date'
   require 'shellwords'
 
-  require 'active_support'
-  require 'active_support/core_ext/class/attribute_accessors'
-  require 'active_support/core_ext/hash/indifferent_access'
-  require 'active_support/core_ext/object/blank'
-  require 'active_support/core_ext/string'
-
   require 'uri'
   require 'net/smtp'
   require 'mime/types'
@@ -22,7 +16,7 @@ module Mail # :doc:
     end
   end
 
-  if RUBY_VERSION >= "1.9.1"
+  if RUBY_VERSION >= "1.9.0"
     require 'mail/version_specific/ruby_1_9'
     RubyVer = Ruby19
   else
@@ -33,9 +27,20 @@ module Mail # :doc:
   require 'mail/version'
 
   require 'mail/core_extensions/nil'
+  require 'mail/core_extensions/object'
   require 'mail/core_extensions/string'
   require 'mail/core_extensions/shellwords' unless String.new.respond_to?(:shellescape)
   require 'mail/core_extensions/smtp' if RUBY_VERSION < '1.9.3'
+  require 'mail/indifferent_hash'
+
+  # Only load our multibyte extensions if AS is not already loaded
+  if defined?(ActiveSupport)
+    require 'active_support/inflector'
+  else
+    require 'mail/core_extensions/string/access'
+    require 'mail/core_extensions/string/multibyte'
+    require 'mail/multibyte'
+  end
 
   require 'mail/patterns'
   require 'mail/utilities'

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mail
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 3
+  prerelease: 
   segments: 
   - 2
-  - 2
-  - 15
-  version: 2.2.15
+  - 3
+  - 0
+  version: 2.3.0
 platform: ruby
 authors: 
 - Mikel Lindsaar
@@ -14,68 +15,56 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-26 00:00:00 +11:00
+date: 2011-04-26 00:00:00 +10:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 3
-        - 6
-        version: 2.3.6
-  type: :runtime
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: mime-types
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 47
         segments: 
         - 1
         - 16
         version: "1.16"
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: treetop
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 4
         - 8
         version: 1.4.8
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: i18n
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 0
         - 4
         - 0
         version: 0.4.0
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id003
 description: A really Ruby Mail handler.
 email: raasdnil@gmail.com
 executables: []
@@ -88,14 +77,20 @@ extra_rdoc_files:
 - TODO.rdoc
 files: 
 - README.rdoc
+- CHANGELOG.rdoc
+- Dependencies.txt
+- Gemfile
 - Rakefile
 - TODO.rdoc
 - lib/mail/attachments_list.rb
 - lib/mail/body.rb
 - lib/mail/configuration.rb
 - lib/mail/core_extensions/nil.rb
+- lib/mail/core_extensions/object.rb
 - lib/mail/core_extensions/shellwords.rb
 - lib/mail/core_extensions/smtp.rb
+- lib/mail/core_extensions/string/access.rb
+- lib/mail/core_extensions/string/multibyte.rb
 - lib/mail/core_extensions/string.rb
 - lib/mail/elements/address.rb
 - lib/mail/elements/address_list.rb
@@ -160,11 +155,18 @@ files:
 - lib/mail/fields/unstructured_field.rb
 - lib/mail/fields.rb
 - lib/mail/header.rb
+- lib/mail/indifferent_hash.rb
 - lib/mail/mail.rb
 - lib/mail/message.rb
+- lib/mail/multibyte/chars.rb
+- lib/mail/multibyte/exceptions.rb
+- lib/mail/multibyte/unicode.rb
+- lib/mail/multibyte/utils.rb
+- lib/mail/multibyte.rb
 - lib/mail/network/delivery_methods/file_delivery.rb
 - lib/mail/network/delivery_methods/sendmail.rb
 - lib/mail/network/delivery_methods/smtp.rb
+- lib/mail/network/delivery_methods/smtp_connection.rb
 - lib/mail/network/delivery_methods/test_mailer.rb
 - lib/mail/network/retriever_methods/base.rb
 - lib/mail/network/retriever_methods/imap.rb
@@ -210,7 +212,6 @@ files:
 - lib/tasks/corpus.rake
 - lib/tasks/treetop.rake
 - lib/VERSION
-- CHANGELOG.rdoc
 has_rdoc: true
 homepage: http://github.com/mikel/mail
 licenses: []
@@ -225,6 +226,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -233,13 +235,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Mail provides a nice Ruby DSL for making, sending and reading emails.