mail 2.4.4 → 2.5.2

data/lib/mail/parsers/rfc2822.treetop

@@ -110,7 +110,7 @@ module Mail
     end
     
     rule local_dot_atom_text
-      ("."? domain_text)+
+      ("."* domain_text "."*)+
     end
     
     rule domain_text
@@ -218,7 +218,7 @@ module Mail
     end
     
     rule mailbox_list
-      (first_addr:mailbox other_addr:("," addr_value:mailbox)*) / obs_mbox_list
+      (first_addr:mailbox other_addr:(("," / ";") addr_value:mailbox)*) / obs_mbox_list
     end
   
     rule mailbox
@@ -265,7 +265,7 @@ module Mail
     end
   
     rule address_list
-      first_addr:address? other_addr:(FWS* "," FWS* addr_value:address?)*
+      first_addr:address? other_addr:(FWS* ("," / ";") FWS* addr_value:address?)*
     end
     
     rule date_time

data/lib/mail/patterns.rb

@@ -8,7 +8,6 @@ module Mail
     
     aspecial     = %Q|()<>[]:;@\\,."| # RFC5322
     tspecial     = %Q|()<>@,;:\\"/[]?=| # RFC2045
-    lwsp         = %Q| \t\r\n|
     sp           = %Q| |
     control      = %Q|\x00-\x1f\x7f-\xff|
     

data/lib/mail/version_specific/ruby_1_8.rb

@@ -3,6 +3,7 @@
 module Mail
   class Ruby18
     require 'base64'
+    require 'iconv'
 
     # Escapes any parenthesis in a string that are unescaped. This can't
     # use the Ruby 1.9.1 regexp feature of negative look behind so we have
@@ -65,6 +66,7 @@ module Mail
       if match
         encoding = match[1]
         str = Ruby18.decode_base64(match[2])
+        str = Iconv.conv('UTF-8//IGNORE', fix_encoding(encoding), str)
       end
       str
     end
@@ -80,7 +82,11 @@ module Mail
       match = str.match(/\=\?(.+)?\?[Qq]\?(.+)?\?\=/m)
       if match
         encoding = match[1]
-        str = Encodings::QuotedPrintable.decode(match[2].gsub(/_/, '=20'))
+        string = match[2].gsub(/_/, '=20')
+        # Remove trailing = if it exists in a Q encoding
+        string = string.sub(/\=$/, '')
+        str = Encodings::QuotedPrintable.decode(string)
+        str = Iconv.conv('UTF-8//IGNORE', fix_encoding(encoding), str)
       end
       str
     end
@@ -94,5 +100,16 @@ module Mail
       language = Configuration.instance.param_encode_language
       "#{encoding}'#{language}'#{URI.escape(str)}"
     end
+
+    private
+
+    def Ruby18.fix_encoding(encoding)
+      case encoding.upcase
+      when 'UTF8'
+        'UTF-8'
+      else
+        encoding
+      end
+    end
   end
 end

data/lib/mail/version_specific/ruby_1_9.rb

@@ -68,11 +68,16 @@ module Mail
       match = str.match(/\=\?(.+)?\?[Qq]\?(.+)?\?\=/m)
       if match
         encoding = match[1]
-        str = Encodings::QuotedPrintable.decode(match[2].gsub(/_/, '=20'))
+        string = match[2].gsub(/_/, '=20')
+        # Remove trailing = if it exists in a Q encoding
+        string = string.sub(/\=$/, '')
+        str = Encodings::QuotedPrintable.decode(string)
         str.force_encoding(fix_encoding(encoding))
       end
       decoded = str.encode("utf-8", :invalid => :replace, :replace => "")
       decoded.valid_encoding? ? decoded : decoded.encode("utf-16le", :invalid => :replace, :replace => "").encode("utf-8")
+    rescue Encoding::UndefinedConversionError
+      str.dup.force_encoding("utf-8")
     end
 
     def Ruby19.param_decode(str, encoding)
@@ -105,6 +110,7 @@ module Mail
         when /utf-?(\d{1,2})?(\w{1,2})/i then return "UTF-#{$1}#{$2}".gsub(/\A(UTF-(?:16|32))\z/, '\\1BE')
         # Windows-1252 and alike
         when /Windows-?(.*)/i then return "Windows-#{$1}"
+        when /^8bit$/ then return "ASCII-8BIT"
         #more aliases to be added if needed
         else return encoding
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mail
 version: !ruby/object:Gem::Version
-  version: 2.4.4
+  version: 2.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-14 00:00:00.000000000Z
+date: 2012-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &70305676450460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '1.16'
   type: :runtime
   prerelease: false
-  version_requirements: *70305676450460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: treetop
-  requirement: &70305676449980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: 1.4.8
   type: :runtime
   prerelease: false
-  version_requirements: *70305676449980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.8
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70305676449520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +53,12 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70305676449520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.0
 description: A really Ruby Mail handler.
 email: raasdnil@gmail.com
 executables: []
@@ -59,11 +74,12 @@ files:
 - CHANGELOG.rdoc
 - Dependencies.txt
 - Gemfile
-- Gemfile.lock
 - Rakefile
 - TODO.rdoc
+- lib/load_parsers.rb
 - lib/mail/attachments_list.rb
 - lib/mail/body.rb
+- lib/mail/check_delivery_params.rb
 - lib/mail/configuration.rb
 - lib/mail/core_extensions/nil.rb
 - lib/mail/core_extensions/object.rb
@@ -187,6 +203,7 @@ files:
 - lib/mail/parts_list.rb
 - lib/mail/patterns.rb
 - lib/mail/utilities.rb
+- lib/mail/values/unicode_tables.dat
 - lib/mail/version.rb
 - lib/mail/version_specific/ruby_1_8.rb
 - lib/mail/version_specific/ruby_1_9.rb
@@ -214,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Mail provides a nice Ruby DSL for making, sending and reading emails.

data/Gemfile.lock

@@ -1,36 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activesupport (3.0.6)
-    bouncy-castle-java (1.5.0146.1)
-    diff-lcs (1.1.3)
-    i18n (0.5.0)
-    jruby-openssl (0.7.4)
-      bouncy-castle-java
-    mime-types (1.16)
-    polyglot (0.3.3)
-    rake (0.9.2.2)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
-    treetop (1.4.10)
-      polyglot
-      polyglot (>= 0.3.1)
-
-PLATFORMS
-  java
-  ruby
-
-DEPENDENCIES
-  activesupport (>= 2.3.6)
-  i18n (>= 0.4.0)
-  jruby-openssl
-  mime-types (~> 1.16)
-  rake (> 0.8.7)
-  rspec (~> 2.8.0)
-  treetop (~> 1.4.10)