mail 2.6.4 → 2.6.5.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f91f133d2e44832ecef1cb4bfe9cc57391aedf84
-  data.tar.gz: 23d0cdbc09cdbaafee76b01d7c3820a6c0dfb6d1
+  metadata.gz: 355466608fdb0199f2abf66e17375703660da89d
+  data.tar.gz: a084636cc65742d9549eaa2fc69a5f5fe90e3d39
 SHA512:
-  metadata.gz: c788407da309561bee6a59ec746efeea7c0cc8633206eb2085f08ad6b161df92475109a988de748e554248d2ca47e6cd31c3fd0394d0eddac5950e7bb28783a8
-  data.tar.gz: 55b70f9d539420d254373c7abfccf6bc85228f34c38696086be363a36fb4f966415238aaa8e9ec9e6eed02207af2a3940b9f85c5f3076e735cd19e095764abc2
+  metadata.gz: b1e02764ba8ddb7f3232f210393866eb6de53cbedef8876ae5b17e6371a385bcc9a1097b87197bf0560cb7b0acb1e62cbbe2949561aab9e70fc045909cbf78b7
+  data.tar.gz: 8416a9f1d38d2c3753641b1eb026c3043fe0fd353f2f5ec47f0dac83a233217c43f9f49b30be3edbd6c7eeef60dcf89980c6917140662e591ed11e156b398ee9

data/CHANGELOG.rdoc

@@ -1,4 +1,12 @@
-== HEAD
+== Version 2.6.5 - Unreleased
+
+Features:
+* #1053 - Ruby 2.4.0 compatibility. Fixnum+Bignum unified as Integer. (peterkovacs)
+
+Bugs:
+* #605 - Fix Mail::Address#name for nil addresses (peterkovacs)
+* #1003 - Fix decoding some b encoded headers on specific rubies that don't account for lack of base64 padding (kjg)
+* #1023 - Fix double-quoting in display names. (garethrees)
 
 == Version 2.6.4 - Wed Mar 23 08:16 -0700 2016 Jeremy Daer <jeremydaer@gmail.com>
 

data/Gemfile

@@ -1,11 +1,14 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 gemspec
 
-gem "tlsmail", "~> 0.0.1" if RUBY_VERSION <= "1.8.6"
-gem "jruby-openssl", :platforms => :jruby
+gem 'tlsmail', '~> 0.0.1' if RUBY_VERSION <= '1.8.6'
+gem 'jruby-openssl', :platforms => :jruby
+gem 'rake', '< 11.0', :platforms => :ruby_18
+gem 'rdoc', '< 4.3', :platforms => [ :ruby_18, :ruby_19 ]
+gem 'mime-types', '< 2.0', :platforms => [ :ruby_18, :ruby_19 ]
 
 # For gems not required to run tests
 group :local_development, :test do
-  gem "appraisal", "~> 1.0" unless RUBY_VERSION <= "1.8.7"
+  gem 'appraisal', '~> 1.0' unless RUBY_VERSION < '1.9'
 end

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009-2016 Mikel Lindsaar
+Copyright (c) 2009-2017 Mikel Lindsaar
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -48,9 +48,12 @@ Every Mail commit is tested by Travis on the [following platforms](https://githu
 * ruby-1.9.2 [ x86_64 ]
 * ruby-1.9.3 [ x86_64 ]
 * ruby-2.0.0 [ x86_64 ]
-* ruby-2.1.2 [ x86_64 ]
+* ruby-2.1.10 [ x86_64 ]
+* ruby-2.2.6 [ x86_64 ]
+* ruby-2.3.3 [ x86_64 ]
 * ruby-head [ x86_64 ]
 * jruby [ x86_64 ]
+* jruby-9.1.6.0 [ x86_64 ]
 * jruby-head [ x86_64 ]
 * rbx-2 [ x86_64 ]
 
@@ -697,7 +700,7 @@ License
 
 (The MIT License)
 
-Copyright (c) 2009-2016 Mikel Lindsaar
+Copyright (c) 2009-2017 Mikel Lindsaar
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/mail/attachments_list.rb

@@ -30,7 +30,7 @@ module Mail
     # mail.attachments['test.png'].filename #=> 'test.png'
     # mail.attachments[1].filename          #=> 'test.jpg'
     def [](index_value)
-      if index_value.is_a?(Fixnum)
+      if index_value.is_a?(Integer)
         self.fetch(index_value)
       else
         self.select { |a| a.filename == index_value }.first

data/lib/mail/elements/address.rb

@@ -93,7 +93,7 @@ module Mail
     #  a.display_name = 'Mikel Lindsaar'
     #  a.format #=> 'Mikel Lindsaar <mikel@test.lindsaar.net>'
     def display_name=( str )
-      @display_name = str.dup # in case frozen
+      @display_name = str.nil? ? nil : str.dup # in case frozen
     end
 
     # Returns the local part (the left hand side of the @ sign in the email address) of
@@ -123,7 +123,12 @@ module Mail
     #  a.comments #=> ['My email address']
     def comments
       parse unless @parsed
-      get_comments.map { |c| c.squeeze(SPACE) } unless get_comments.empty?
+      comments = get_comments
+      if comments.nil? || comments.none?
+        nil
+      else
+        comments.map { |c| c.squeeze(SPACE) }
+      end
     end
 
     # Sometimes an address will not have a display name, but might have the name
@@ -205,9 +210,9 @@ module Mail
     end
 
     def get_display_name
-      if @data.display_name
+      if @data && @data.display_name
         str = strip_all_comments(@data.display_name.to_s)
-      elsif @data.comments && @data.domain
+      elsif @data && @data.comments && @data.domain
         str = strip_domain_comments(format_comments)
       end
       str unless Utilities.blank?(str)

data/lib/mail/elements/address_list.rb

@@ -20,7 +20,7 @@ module Mail
     #  a.group_names  #=> ["My Group"]
     def initialize(string)
       @addresses_grouped_by_group = nil
-      @address_list = Parsers::AddressListsParser.new.parse(string)
+      @address_list = Mail::Parsers::AddressListsParser.new.parse(string)
     end
     
     # Returns a list of address objects from the parsed line

data/lib/mail/fields/common/address_container.rb

@@ -8,10 +8,10 @@ module Mail
       super(list)
     end
 
-    def << (address)
+    def <<(address)
       @field << address
     end
 
   end
   
-end
+end

data/lib/mail/multibyte/chars.rb

@@ -269,12 +269,12 @@ module Mail #:nodoc:
           @wrapped_string[*args] = replace_by
         else
           result = Unicode.u_unpack(@wrapped_string)
-          if args[0].is_a?(Fixnum)
+          if args[0].is_a?(Integer)
             raise IndexError, "index #{args[0]} out of string" if args[0] >= result.length
             min = args[0]
             max = args[1].nil? ? min : (min + args[1] - 1)
             range = Range.new(min, max)
-            replace_by = [replace_by].pack('U') if replace_by.is_a?(Fixnum)
+            replace_by = [replace_by].pack('U') if replace_by.is_a?(Integer)
           elsif args.first.is_a?(Range)
             raise RangeError, "#{args[0]} out of range" if args[0].min >= result.length
             range = args[0]

data/lib/mail/network/retriever_methods/test_retriever.rb

@@ -25,7 +25,7 @@ module Mail
       emails_index.reverse! if options[:what] == :last
       emails_index = case count = options[:count]
         when :all then emails_index
-        when Fixnum then emails_index[0, count]
+        when Integer then emails_index[0, count]
         else
           raise 'Invalid count option value: ' + count.inspect
       end

data/lib/mail/parsers/address_lists_parser.rb

@@ -92,7 +92,7 @@ module Mail::Parsers
         # version.
         when :angle_addr_s
           if qstr
-            address.display_name = qstr
+            address.display_name = Mail::Utilities.unescape(qstr)
             qstr = nil
           elsif phrase_e
             address.display_name = s[phrase_s..phrase_e].strip

data/lib/mail/utilities.rb

@@ -72,12 +72,26 @@ module Mail
     #  unqoute(string) #=> 'This is "a string"'
     def unquote( str )
       if str =~ /^"(.*?)"$/
-        $1.gsub(/\\(.)/, '\1')
+        unescape($1)
       else
         str
       end
     end
 
+    # Removes any \-escaping.
+    #
+    # Example:
+    #
+    #  string = 'This is \"a string\"'
+    #  unescape(string) #=> 'This is "a string"'
+    #
+    #  string = '"This is \"a string\""'
+    #  unescape(string) #=> '"This is "a string""'
+    def unescape( str )
+      str.gsub(/\\(.)/, '\1')
+    end
+    module_function :unescape
+
     # Wraps a string in parenthesis and escapes any that are in the string itself.
     #
     # Example:

data/lib/mail/version.rb

@@ -4,8 +4,8 @@ module Mail
 
     MAJOR = 2
     MINOR = 6
-    PATCH = 4
-    BUILD = nil
+    PATCH = 5
+    BUILD = 'rc1'
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
 

data/lib/mail/version_specific/ruby_1_9.rb

@@ -59,6 +59,9 @@ module Mail
     end
 
     def Ruby19.decode_base64(str)
+      if !str.end_with?("=") && str.length % 4 != 0
+        str = str.ljust((str.length + 3) & ~3, "=")
+      end
       str.unpack( 'm' ).first
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mail
 version: !ruby/object:Gem::Version
-  version: 2.6.4
+  version: 2.6.5.rc1
 platform: ruby
 authors:
 - Mikel Lindsaar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-23 00:00:00.000000000 Z
+date: 2017-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -264,12 +264,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Mail provides a nice Ruby DSL for making, sending and reading emails.