mail 2.6.1 → 2.6.3

data/lib/mail/utilities.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 module Mail
   module Utilities
-    include Patterns
+    include Constants
 
     # Returns true if the string supplied is free from characters not allowed as an ATOM
     def atom_safe?( str )
@@ -177,7 +177,7 @@ module Mail
     #  string = :resent_from_field
     #  dasherize ( string ) #=> 'resent_from_field'
     def dasherize( str )
-      str.to_s.gsub('_', '-')
+      str.to_s.tr(UNDERSCORE, HYPHEN)
     end
 
     # Swaps out all hyphens (-) for underscores (_) good for stringing to symbols
@@ -188,7 +188,7 @@ module Mail
     #  string = :resent_from_field
     #  underscoreize ( string ) #=> 'resent_from_field'
     def underscoreize( str )
-      str.to_s.downcase.gsub('-', '_')
+      str.to_s.downcase.tr(HYPHEN, UNDERSCORE)
     end
 
     if RUBY_VERSION <= '1.8.6'

data/lib/mail/version.rb

@@ -1,24 +1,16 @@
-# encoding: utf-8
 module Mail
   module VERSION
-    
-    version = {}
-    File.read(File.join(File.dirname(__FILE__), '../', '../', 'VERSION')).each_line do |line|
-      type, value = line.chomp.split(":")
-      next if type =~ /^\s+$/  || value =~ /^\s+$/
-      version[type] = value
-    end
-    
-    MAJOR = version['major']
-    MINOR = version['minor']
-    PATCH = version['patch']
-    BUILD = version['build']
+
+    MAJOR = 2
+    MINOR = 6
+    PATCH = 3
+    BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
-    
+
     def self.version
       STRING
     end
-    
+
   end
 end

data/lib/mail/version_specific/ruby_1_8.rb

@@ -62,7 +62,7 @@ module Mail
     end
 
     def Ruby18.b_value_decode(str)
-      match = str.match(/\=\?(.+)?\?[Bb]\?(.+)?\?\=/m)
+      match = str.match(/\=\?(.+)?\?[Bb]\?(.*)\?\=/m)
       if match
         encoding = match[1]
         str = Ruby18.decode_base64(match[2])
@@ -79,7 +79,7 @@ module Mail
     end
 
     def Ruby18.q_value_decode(str)
-      match = str.match(/\=\?(.+)?\?[Qq]\?(.+)?\?\=/m)
+      match = str.match(/\=\?(.+)?\?[Qq]\?(.*)\?\=/m)
       if match
         encoding = match[1]
         string = match[2].gsub(/_/, '=20')

data/lib/mail/version_specific/ruby_1_9.rb

@@ -2,6 +2,36 @@
 
 module Mail
   class Ruby19
+    class StrictCharsetEncoder
+      def encode(string, charset)
+        string.force_encoding(Mail::Ruby19.pick_encoding(charset))
+      end
+    end
+
+    class BestEffortCharsetEncoder
+      def encode(string, charset)
+        string.force_encoding(pick_encoding(charset))
+      end
+
+      private
+
+      def pick_encoding(charset)
+        charset = case charset
+        when /ansi_x3.110-1983/
+          'ISO-8859-1'
+        when /Windows-?1258/i # Windows-1258 is similar to 1252
+          "Windows-1252"
+        else
+          charset
+        end
+        Mail::Ruby19.pick_encoding(charset)
+      end
+    end
+
+    class << self
+      attr_accessor :charset_encoder
+    end
+    self.charset_encoder = StrictCharsetEncoder.new
 
     # Escapes any parenthesis in a string that are unescaped this uses
     # a Ruby 1.9.1 regexp feature of negative look behind
@@ -49,14 +79,17 @@ module Mail
     end
 
     def Ruby19.b_value_decode(str)
-      match = str.match(/\=\?(.+)?\?[Bb]\?(.+)?\?\=/m)
+      match = str.match(/\=\?(.+)?\?[Bb]\?(.*)\?\=/m)
       if match
         charset = match[1]
         str = Ruby19.decode_base64(match[2])
-        str.force_encoding(pick_encoding(charset))
+        str = charset_encoder.encode(str, charset)
       end
-      decoded = str.encode("utf-8", :invalid => :replace, :replace => "")
-      decoded.valid_encoding? ? decoded : decoded.encode("utf-16le", :invalid => :replace, :replace => "").encode("utf-8")
+      decoded = str.encode(Encoding::UTF_8, :invalid => :replace, :replace => "")
+      decoded.valid_encoding? ? decoded : decoded.encode(Encoding::UTF_16LE, :invalid => :replace, :replace => "").encode(Encoding::UTF_8)
+    rescue Encoding::UndefinedConversionError, ArgumentError, Encoding::ConverterNotFoundError
+      warn "Encoding conversion failed #{$!}"
+      str.dup.force_encoding(Encoding::UTF_8)
     end
 
     def Ruby19.q_value_encode(str, encoding = nil)
@@ -65,28 +98,29 @@ module Mail
     end
 
     def Ruby19.q_value_decode(str)
-      match = str.match(/\=\?(.+)?\?[Qq]\?(.+)?\?\=/m)
+      match = str.match(/\=\?(.+)?\?[Qq]\?(.*)\?\=/m)
       if match
         charset = match[1]
         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(pick_encoding(charset))
+        str = charset_encoder.encode(str, charset)
         # We assume that binary strings hold utf-8 directly to work around
         # jruby/jruby#829 which subtly changes String#encode semantics.
-        str.force_encoding('utf-8') if str.encoding == Encoding::ASCII_8BIT
+        str.force_encoding(Encoding::UTF_8) if str.encoding == Encoding::ASCII_8BIT
       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")
+      decoded = str.encode(Encoding::UTF_8, :invalid => :replace, :replace => "")
+      decoded.valid_encoding? ? decoded : decoded.encode(Encoding::UTF_16LE, :invalid => :replace, :replace => "").encode(Encoding::UTF_8)
+    rescue Encoding::UndefinedConversionError, ArgumentError, Encoding::ConverterNotFoundError
+      warn "Encoding conversion failed #{$!}"
+      str.dup.force_encoding(Encoding::UTF_8)
     end
 
     def Ruby19.param_decode(str, encoding)
-      string = uri_parser.unescape(str)
-      string.force_encoding(encoding) if encoding
-      string
+      str = uri_parser.unescape(str)
+      str = charset_encoder.encode(str, encoding) if encoding
+      str
     end
 
     def Ruby19.param_encode(str)

metadata

@@ -1,89 +1,89 @@
 --- !ruby/object:Gem::Specification
 name: mail
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.6.3
 platform: ruby
 authors:
 - Mikel Lindsaar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-08 00:00:00.000000000 Z
+date: 2014-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 0.8.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: 0.8.7
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A really Ruby Mail handler.
@@ -96,25 +96,27 @@ extra_rdoc_files:
 - CHANGELOG.rdoc
 - TODO.rdoc
 files:
-- README.md
-- VERSION
-- MIT-LICENSE
-- CONTRIBUTING.md
 - CHANGELOG.rdoc
+- CONTRIBUTING.md
 - Dependencies.txt
 - Gemfile
+- MIT-LICENSE
+- README.md
 - Rakefile
 - TODO.rdoc
+- lib/mail.rb
 - lib/mail/attachments_list.rb
 - lib/mail/body.rb
 - lib/mail/check_delivery_params.rb
 - lib/mail/configuration.rb
+- lib/mail/constants.rb
 - lib/mail/core_extensions/nil.rb
 - lib/mail/core_extensions/object.rb
 - lib/mail/core_extensions/smtp.rb
+- lib/mail/core_extensions/string.rb
 - lib/mail/core_extensions/string/access.rb
 - lib/mail/core_extensions/string/multibyte.rb
-- lib/mail/core_extensions/string.rb
+- lib/mail/elements.rb
 - lib/mail/elements/address.rb
 - lib/mail/elements/address_list.rb
 - lib/mail/elements/content_disposition_element.rb
@@ -127,17 +129,18 @@ files:
 - lib/mail/elements/mime_version_element.rb
 - lib/mail/elements/phrase_list.rb
 - lib/mail/elements/received_element.rb
-- lib/mail/elements.rb
+- lib/mail/encodings.rb
 - lib/mail/encodings/7bit.rb
 - lib/mail/encodings/8bit.rb
 - lib/mail/encodings/base64.rb
 - lib/mail/encodings/binary.rb
 - lib/mail/encodings/quoted_printable.rb
 - lib/mail/encodings/transfer_encoding.rb
-- lib/mail/encodings.rb
+- lib/mail/encodings/unix_to_unix.rb
 - lib/mail/envelope.rb
 - lib/mail/field.rb
 - lib/mail/field_list.rb
+- lib/mail/fields.rb
 - lib/mail/fields/bcc_field.rb
 - lib/mail/fields/cc_field.rb
 - lib/mail/fields/comments_field.rb
@@ -176,17 +179,17 @@ files:
 - lib/mail/fields/subject_field.rb
 - lib/mail/fields/to_field.rb
 - 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/matchers/has_sent_mail.rb
 - lib/mail/message.rb
+- lib/mail/multibyte.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.rb
 - lib/mail/network/delivery_methods/exim.rb
 - lib/mail/network/delivery_methods/file_delivery.rb
 - lib/mail/network/delivery_methods/sendmail.rb
@@ -197,7 +200,7 @@ files:
 - lib/mail/network/retriever_methods/imap.rb
 - lib/mail/network/retriever_methods/pop3.rb
 - lib/mail/network/retriever_methods/test_retriever.rb
-- lib/mail/network.rb
+- lib/mail/parsers.rb
 - lib/mail/parsers/address_lists_parser.rb
 - lib/mail/parsers/content_disposition_parser.rb
 - lib/mail/parsers/content_location_parser.rb
@@ -208,9 +211,11 @@ files:
 - lib/mail/parsers/message_ids_parser.rb
 - lib/mail/parsers/mime_version_parser.rb
 - lib/mail/parsers/phrase_lists_parser.rb
+- lib/mail/parsers/ragel.rb
 - lib/mail/parsers/ragel/common.rl
 - lib/mail/parsers/ragel/date_time.rl
 - lib/mail/parsers/ragel/parser_info.rb
+- lib/mail/parsers/ragel/ruby.rb
 - lib/mail/parsers/ragel/ruby/machines/address_lists_machine.rb
 - lib/mail/parsers/ragel/ruby/machines/address_lists_machine.rb.rl
 - lib/mail/parsers/ragel/ruby/machines/content_disposition_machine.rb
@@ -235,42 +240,37 @@ files:
 - lib/mail/parsers/ragel/ruby/machines/received_machine.rb
 - lib/mail/parsers/ragel/ruby/machines/received_machine.rb.rl
 - lib/mail/parsers/ragel/ruby/parser.rb.rl.erb
-- lib/mail/parsers/ragel/ruby.rb
-- lib/mail/parsers/ragel.rb
 - lib/mail/parsers/received_parser.rb
-- lib/mail/parsers.rb
 - lib/mail/part.rb
 - 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
-- lib/mail.rb
-homepage: http://github.com/mikel/mail
+homepage: https://github.com/mikel/mail
 licenses:
 - MIT
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --exclude
+- "--exclude"
 - lib/mail/values/unicode_tables.dat
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Mail provides a nice Ruby DSL for making, sending and reading emails.

data/VERSION

@@ -1,4 +0,0 @@
-major:2
-minor:6
-patch:1
-build: