mail 2.2.5.1 → 2.2.5.2

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

@@ -140,7 +140,7 @@ module Mail
     end
   
     # Start a POP3 session and ensures that it will be closed in any case.
-    def start(config = Mail::Configuration.instance, &block)
+    def start(config = Configuration.instance, &block)
       raise ArgumentError.new("Mail::Retrievable#pop3_start takes a block") unless block_given?
     
       pop3 = Net::POP3.new(settings[:address], settings[:port], isapop = false)

data/lib/mail/part.rb

@@ -43,7 +43,7 @@ module Mail
     end
     
     def delivery_status_report_part?
-      main_type =~ /message/i && sub_type =~ /delivery-status/i
+      (main_type =~ /message/i && sub_type =~ /delivery-status/i) && body =~ /Status:/
     end
     
     def delivery_status_data

data/lib/mail/patterns.rb

@@ -11,6 +11,10 @@ module Mail
     lwsp         = %Q| \t\r\n|
     control      = %Q|\x00-\x1f\x7f-\xff|
     
+    if control.respond_to?(:force_encoding)
+      control = control.force_encoding(Encoding::BINARY)
+    end
+    
     CRLF          = /\r\n/
     WSP           = /[#{white_space}]/
     FWS           = /#{CRLF}#{WSP}*/

data/lib/mail/version.rb

@@ -2,14 +2,11 @@
 module Mail
   module VERSION
     
-    def self.version
-      version_hash = {}
-      File.read(File.join(File.dirname(__FILE__), '../', 'VERSION')).each_line do |line|
-        type, value = line.chomp.split(":")
-        next if type =~ /^\s+$/  || value =~ /^\s+$/
-        version_hash[type] = value
-      end
-      version_hash
+    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']
@@ -18,5 +15,10 @@ module Mail
     BUILD = version['build']
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
+    
+    def self.version
+      STRING
+    end
+    
   end
 end

data/lib/mail/version_specific/ruby_1_8.rb

@@ -90,7 +90,7 @@ module Mail
     
     def Ruby18.param_encode(str)
       encoding = $KCODE.to_s.downcase
-      language = Mail::Configuration.instance.param_encode_language
+      language = Configuration.instance.param_encode_language
       "#{encoding}'#{language}'#{URI.escape(str)}"
     end
   end

data/lib/mail/version_specific/ruby_1_9.rb

@@ -80,7 +80,7 @@ module Mail
 
     def Ruby19.param_encode(str)
       encoding = str.encoding.to_s.downcase
-      language = Mail::Configuration.instance.param_encode_language
+      language = Configuration.instance.param_encode_language
       "#{encoding}'#{language}'#{URI.escape(str)}"
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: mail
 version: !ruby/object:Gem::Version 
-  hash: 105
+  hash: 111
   prerelease: false
   segments: 
   - 2
   - 2
   - 5
-  - 1
-  version: 2.2.5.1
+  - 2
+  version: 2.2.5.2
 platform: ruby
 authors: 
 - Mikel Lindsaar
@@ -80,219 +80,120 @@ files:
 - Rakefile
 - TODO.rdoc
 - lib/mail/attachments_list.rb
-- lib/mail/attachments_list.rbc
 - lib/mail/body.rb
-- lib/mail/body.rbc
 - lib/mail/configuration.rb
-- lib/mail/configuration.rbc
 - lib/mail/core_extensions/nil.rb
-- lib/mail/core_extensions/nil.rbc
 - lib/mail/core_extensions/string.rb
-- lib/mail/core_extensions/string.rbc
 - lib/mail/elements/address.rb
-- lib/mail/elements/address.rbc
 - lib/mail/elements/address_list.rb
-- lib/mail/elements/address_list.rbc
 - lib/mail/elements/content_disposition_element.rb
-- lib/mail/elements/content_disposition_element.rbc
 - lib/mail/elements/content_location_element.rb
-- lib/mail/elements/content_location_element.rbc
 - lib/mail/elements/content_transfer_encoding_element.rb
-- lib/mail/elements/content_transfer_encoding_element.rbc
 - lib/mail/elements/content_type_element.rb
-- lib/mail/elements/content_type_element.rbc
 - lib/mail/elements/date_time_element.rb
-- lib/mail/elements/date_time_element.rbc
 - lib/mail/elements/envelope_from_element.rb
-- lib/mail/elements/envelope_from_element.rbc
 - lib/mail/elements/message_ids_element.rb
-- lib/mail/elements/message_ids_element.rbc
 - lib/mail/elements/mime_version_element.rb
-- lib/mail/elements/mime_version_element.rbc
 - lib/mail/elements/phrase_list.rb
-- lib/mail/elements/phrase_list.rbc
 - lib/mail/elements/received_element.rb
-- lib/mail/elements/received_element.rbc
 - lib/mail/elements.rb
-- lib/mail/elements.rbc
 - lib/mail/encodings/7bit.rb
-- lib/mail/encodings/7bit.rbc
 - lib/mail/encodings/8bit.rb
-- lib/mail/encodings/8bit.rbc
 - lib/mail/encodings/base64.rb
-- lib/mail/encodings/base64.rbc
 - lib/mail/encodings/binary.rb
-- lib/mail/encodings/binary.rbc
 - lib/mail/encodings/quoted_printable.rb
-- lib/mail/encodings/quoted_printable.rbc
 - lib/mail/encodings/transfer_encoding.rb
-- lib/mail/encodings/transfer_encoding.rbc
 - lib/mail/encodings.rb
-- lib/mail/encodings.rbc
 - lib/mail/envelope.rb
-- lib/mail/envelope.rbc
 - lib/mail/field.rb
-- lib/mail/field.rbc
 - lib/mail/field_list.rb
-- lib/mail/field_list.rbc
 - lib/mail/fields/bcc_field.rb
-- lib/mail/fields/bcc_field.rbc
 - lib/mail/fields/cc_field.rb
-- lib/mail/fields/cc_field.rbc
 - lib/mail/fields/comments_field.rb
-- lib/mail/fields/comments_field.rbc
 - lib/mail/fields/common/address_container.rb
-- lib/mail/fields/common/address_container.rbc
 - lib/mail/fields/common/common_address.rb
-- lib/mail/fields/common/common_address.rbc
 - lib/mail/fields/common/common_date.rb
-- lib/mail/fields/common/common_date.rbc
 - lib/mail/fields/common/common_field.rb
-- lib/mail/fields/common/common_field.rbc
 - lib/mail/fields/common/common_message_id.rb
-- lib/mail/fields/common/common_message_id.rbc
 - lib/mail/fields/common/parameter_hash.rb
-- lib/mail/fields/common/parameter_hash.rbc
 - lib/mail/fields/content_description_field.rb
-- lib/mail/fields/content_description_field.rbc
 - lib/mail/fields/content_disposition_field.rb
-- lib/mail/fields/content_disposition_field.rbc
 - lib/mail/fields/content_id_field.rb
-- lib/mail/fields/content_id_field.rbc
 - lib/mail/fields/content_location_field.rb
-- lib/mail/fields/content_location_field.rbc
 - lib/mail/fields/content_transfer_encoding_field.rb
-- lib/mail/fields/content_transfer_encoding_field.rbc
 - lib/mail/fields/content_type_field.rb
-- lib/mail/fields/content_type_field.rbc
 - lib/mail/fields/date_field.rb
-- lib/mail/fields/date_field.rbc
 - lib/mail/fields/from_field.rb
-- lib/mail/fields/from_field.rbc
 - lib/mail/fields/in_reply_to_field.rb
-- lib/mail/fields/in_reply_to_field.rbc
 - lib/mail/fields/keywords_field.rb
-- lib/mail/fields/keywords_field.rbc
 - lib/mail/fields/message_id_field.rb
-- lib/mail/fields/message_id_field.rbc
 - lib/mail/fields/mime_version_field.rb
-- lib/mail/fields/mime_version_field.rbc
 - lib/mail/fields/optional_field.rb
-- lib/mail/fields/optional_field.rbc
 - lib/mail/fields/received_field.rb
-- lib/mail/fields/received_field.rbc
 - lib/mail/fields/references_field.rb
-- lib/mail/fields/references_field.rbc
 - lib/mail/fields/reply_to_field.rb
-- lib/mail/fields/reply_to_field.rbc
 - lib/mail/fields/resent_bcc_field.rb
-- lib/mail/fields/resent_bcc_field.rbc
 - lib/mail/fields/resent_cc_field.rb
-- lib/mail/fields/resent_cc_field.rbc
 - lib/mail/fields/resent_date_field.rb
-- lib/mail/fields/resent_date_field.rbc
 - lib/mail/fields/resent_from_field.rb
-- lib/mail/fields/resent_from_field.rbc
 - lib/mail/fields/resent_message_id_field.rb
-- lib/mail/fields/resent_message_id_field.rbc
 - lib/mail/fields/resent_sender_field.rb
-- lib/mail/fields/resent_sender_field.rbc
 - lib/mail/fields/resent_to_field.rb
-- lib/mail/fields/resent_to_field.rbc
 - lib/mail/fields/return_path_field.rb
-- lib/mail/fields/return_path_field.rbc
 - lib/mail/fields/sender_field.rb
-- lib/mail/fields/sender_field.rbc
 - lib/mail/fields/structured_field.rb
-- lib/mail/fields/structured_field.rbc
 - lib/mail/fields/subject_field.rb
-- lib/mail/fields/subject_field.rbc
 - lib/mail/fields/to_field.rb
-- lib/mail/fields/to_field.rbc
 - lib/mail/fields/unstructured_field.rb
-- lib/mail/fields/unstructured_field.rbc
 - lib/mail/fields.rb
-- lib/mail/fields.rbc
 - lib/mail/header.rb
-- lib/mail/header.rbc
 - lib/mail/mail.rb
-- lib/mail/mail.rbc
 - lib/mail/message.rb
-- lib/mail/message.rbc
 - lib/mail/network/delivery_methods/file_delivery.rb
-- lib/mail/network/delivery_methods/file_delivery.rbc
 - lib/mail/network/delivery_methods/sendmail.rb
-- lib/mail/network/delivery_methods/sendmail.rbc
 - lib/mail/network/delivery_methods/smtp.rb
-- lib/mail/network/delivery_methods/smtp.rbc
 - lib/mail/network/delivery_methods/test_mailer.rb
-- lib/mail/network/delivery_methods/test_mailer.rbc
 - lib/mail/network/retriever_methods/imap.rb
 - lib/mail/network/retriever_methods/pop3.rb
-- lib/mail/network/retriever_methods/pop3.rbc
 - lib/mail/network.rb
-- lib/mail/network.rbc
 - lib/mail/parsers/address_lists.rb
-- lib/mail/parsers/address_lists.rbc
 - lib/mail/parsers/address_lists.treetop
 - lib/mail/parsers/content_disposition.rb
-- lib/mail/parsers/content_disposition.rbc
 - lib/mail/parsers/content_disposition.treetop
 - lib/mail/parsers/content_location.rb
-- lib/mail/parsers/content_location.rbc
 - lib/mail/parsers/content_location.treetop
 - lib/mail/parsers/content_transfer_encoding.rb
-- lib/mail/parsers/content_transfer_encoding.rbc
 - lib/mail/parsers/content_transfer_encoding.treetop
 - lib/mail/parsers/content_type.rb
-- lib/mail/parsers/content_type.rbc
 - lib/mail/parsers/content_type.treetop
 - lib/mail/parsers/date_time.rb
-- lib/mail/parsers/date_time.rbc
 - lib/mail/parsers/date_time.treetop
 - lib/mail/parsers/envelope_from.rb
-- lib/mail/parsers/envelope_from.rbc
 - lib/mail/parsers/envelope_from.treetop
 - lib/mail/parsers/message_ids.rb
-- lib/mail/parsers/message_ids.rbc
 - lib/mail/parsers/message_ids.treetop
 - lib/mail/parsers/mime_version.rb
-- lib/mail/parsers/mime_version.rbc
 - lib/mail/parsers/mime_version.treetop
 - lib/mail/parsers/phrase_lists.rb
-- lib/mail/parsers/phrase_lists.rbc
 - lib/mail/parsers/phrase_lists.treetop
 - lib/mail/parsers/received.rb
-- lib/mail/parsers/received.rbc
 - lib/mail/parsers/received.treetop
 - lib/mail/parsers/rfc2045.rb
-- lib/mail/parsers/rfc2045.rbc
 - lib/mail/parsers/rfc2045.treetop
 - lib/mail/parsers/rfc2822.rb
-- lib/mail/parsers/rfc2822.rbc
 - lib/mail/parsers/rfc2822.treetop
 - lib/mail/parsers/rfc2822_obsolete.rb
-- lib/mail/parsers/rfc2822_obsolete.rbc
 - lib/mail/parsers/rfc2822_obsolete.treetop
 - lib/mail/part.rb
-- lib/mail/part.rbc
 - lib/mail/parts_list.rb
-- lib/mail/parts_list.rbc
 - lib/mail/patterns.rb
-- lib/mail/patterns.rbc
 - lib/mail/utilities.rb
-- lib/mail/utilities.rbc
 - lib/mail/version.rb
-- lib/mail/version.rbc
 - lib/mail/version_specific/ruby_1_8.rb
-- lib/mail/version_specific/ruby_1_8.rbc
 - lib/mail/version_specific/ruby_1_9.rb
 - lib/mail.rb
-- lib/mail.rbc
 - lib/tasks/corpus.rake
-- lib/tasks/corpus.rake.compiled.rbc
 - lib/tasks/treetop.rake
-- lib/tasks/treetop.rake.compiled.rbc
 - lib/VERSION
 - CHANGELOG.rdoc
 has_rdoc: true

data/lib/mail.rbc

@@ -1,1151 +0,0 @@
-!RBIX
-0
-x
-M
-1
-n
-n
-x
-10
-__script__
-i
-28
-99
-7
-0
-65
-49
-1
-2
-13
-99
-12
-7
-2
-12
-7
-3
-12
-65
-12
-49
-4
-4
-15
-49
-2
-0
-15
-2
-11
-I
-6
-I
-0
-I
-0
-I
-0
-n
-p
-5
-x
-4
-Mail
-x
-11
-open_module
-x
-15
-__module_init__
-M
-1
-n
-n
-x
-4
-Mail
-i
-442
-5
-66
-5
-7
-0
-64
-47
-49
-1
-1
-15
-5
-7
-2
-64
-47
-49
-1
-1
-15
-5
-7
-3
-64
-47
-49
-1
-1
-15
-5
-7
-4
-64
-47
-49
-1
-1
-15
-5
-7
-5
-64
-47
-49
-1
-1
-15
-5
-7
-6
-64
-47
-49
-1
-1
-15
-5
-7
-7
-64
-47
-49
-1
-1
-15
-5
-7
-8
-64
-47
-49
-1
-1
-15
-45
-9
-10
-7
-11
-64
-49
-12
-1
-9
-142
-26
-93
-0
-15
-29
-103
-0
-5
-7
-13
-64
-47
-49
-1
-1
-30
-8
-137
-26
-93
-1
-15
-24
-13
-45
-14
-15
-12
-49
-16
-1
-10
-120
-8
-132
-15
-5
-7
-17
-64
-47
-49
-18
-1
-25
-8
-137
-15
-92
-1
-27
-34
-92
-0
-27
-8
-143
-1
-15
-45
-9
-19
-7
-20
-64
-49
-21
-1
-9
-177
-5
-7
-22
-64
-47
-49
-1
-1
-15
-65
-7
-23
-45
-24
-25
-43
-26
-49
-27
-2
-8
-197
-5
-7
-28
-64
-47
-49
-1
-1
-15
-65
-7
-23
-45
-24
-29
-43
-30
-49
-27
-2
-15
-5
-7
-31
-64
-47
-49
-1
-1
-15
-5
-7
-32
-64
-47
-49
-1
-1
-15
-5
-7
-33
-64
-47
-49
-1
-1
-15
-5
-7
-34
-64
-47
-49
-1
-1
-15
-5
-7
-35
-64
-47
-49
-1
-1
-15
-5
-7
-36
-64
-47
-49
-1
-1
-15
-5
-7
-37
-64
-47
-49
-1
-1
-15
-5
-7
-38
-64
-47
-49
-1
-1
-15
-5
-7
-39
-64
-47
-49
-1
-1
-15
-5
-7
-40
-64
-47
-49
-1
-1
-15
-5
-7
-41
-64
-47
-49
-1
-1
-15
-5
-7
-42
-64
-47
-49
-1
-1
-15
-5
-7
-43
-64
-47
-49
-1
-1
-15
-5
-7
-44
-64
-47
-49
-1
-1
-15
-5
-7
-45
-64
-47
-49
-1
-1
-15
-5
-7
-46
-64
-47
-49
-1
-1
-15
-7
-47
-64
-7
-48
-64
-7
-49
-64
-7
-50
-64
-7
-51
-64
-7
-52
-64
-7
-53
-64
-7
-54
-64
-7
-55
-64
-7
-56
-64
-7
-57
-64
-7
-58
-64
-7
-59
-64
-7
-60
-64
-35
-14
-19
-0
-15
-20
-0
-56
-61
-50
-62
-0
-15
-5
-7
-63
-64
-47
-49
-1
-1
-15
-5
-7
-64
-64
-47
-49
-1
-1
-15
-5
-7
-65
-64
-47
-49
-1
-1
-15
-5
-7
-66
-64
-47
-49
-1
-1
-15
-5
-7
-67
-64
-47
-49
-1
-1
-11
-I
-11
-I
-1
-I
-0
-I
-0
-n
-p
-68
-s
-4
-date
-x
-7
-require
-s
-14
-active_support
-s
-47
-active_support/core_ext/hash/indifferent_access
-s
-36
-active_support/core_ext/object/blank
-s
-30
-active_support/core_ext/string
-s
-3
-uri
-s
-8
-net/smtp
-s
-10
-mime/types
-x
-12
-RUBY_VERSION
-n
-s
-5
-1.8.6
-x
-2
-<=
-s
-7
-tlsmail
-x
-9
-LoadError
-n
-x
-3
-===
-s
-58
-You need to install tlsmail if you are using ruby <= 1.8.6
-x
-5
-raise
-n
-s
-5
-1.9.1
-x
-2
->=
-s
-30
-mail/version_specific/ruby_1_9
-x
-7
-RubyVer
-x
-4
-Mail
-n
-x
-6
-Ruby19
-x
-9
-const_set
-s
-30
-mail/version_specific/ruby_1_8
-n
-x
-6
-Ruby18
-s
-12
-mail/version
-s
-24
-mail/core_extensions/nil
-s
-27
-mail/core_extensions/string
-s
-13
-mail/patterns
-s
-14
-mail/utilities
-s
-18
-mail/configuration
-s
-12
-mail/network
-s
-12
-mail/message
-s
-9
-mail/part
-s
-11
-mail/header
-s
-15
-mail/parts_list
-s
-21
-mail/attachments_list
-s
-9
-mail/body
-s
-10
-mail/field
-s
-15
-mail/field_list
-s
-13
-mail/envelope
-s
-16
-rfc2822_obsolete
-s
-7
-rfc2822
-s
-13
-address_lists
-s
-12
-phrase_lists
-s
-9
-date_time
-s
-8
-received
-s
-11
-message_ids
-s
-13
-envelope_from
-s
-7
-rfc2045
-s
-12
-mime_version
-s
-12
-content_type
-s
-19
-content_disposition
-s
-25
-content_transfer_encoding
-s
-16
-content_location
-M
-1
-p
-2
-x
-9
-for_block
-t
-n
-x
-4
-Mail
-i
-120
-57
-19
-0
-15
-26
-93
-0
-15
-29
-38
-0
-5
-7
-0
-64
-47
-49
-1
-1
-15
-5
-7
-2
-20
-0
-47
-49
-3
-0
-63
-2
-47
-49
-1
-1
-30
-8
-116
-26
-93
-1
-15
-24
-13
-45
-4
-5
-12
-49
-6
-1
-10
-55
-8
-111
-15
-5
-7
-0
-64
-47
-49
-1
-1
-15
-5
-7
-7
-64
-47
-49
-1
-1
-15
-45
-8
-9
-45
-10
-11
-45
-10
-12
-65
-49
-13
-0
-49
-14
-1
-49
-15
-1
-7
-16
-20
-0
-47
-49
-3
-0
-63
-2
-81
-17
-49
-18
-1
-25
-8
-116
-15
-92
-1
-27
-34
-92
-0
-27
-11
-I
-8
-I
-1
-I
-1
-I
-1
-n
-p
-19
-s
-15
-treetop/runtime
-x
-7
-require
-s
-13
-mail/parsers/
-x
-4
-to_s
-x
-9
-LoadError
-n
-x
-3
-===
-s
-16
-treetop/compiler
-x
-7
-Treetop
-n
-x
-4
-File
-n
-n
-x
-11
-active_path
-x
-7
-dirname
-x
-4
-join
-s
-14
-/mail/parsers/
-x
-1
-+
-x
-4
-load
-p
-15
-I
-0
-I
-3b
-I
-4
-I
-3e
-I
-14
-I
-3f
-I
-2b
-I
-40
-I
-38
-I
-42
-I
-41
-I
-43
-I
-4a
-I
-44
-I
-78
-x
-43
-/Users/mikel/ruby_programs/mail/lib/mail.rb
-p
-1
-x
-6
-parser
-x
-4
-each
-s
-13
-mail/elements
-s
-14
-mail/encodings
-s
-21
-mail/encodings/base64
-s
-31
-mail/encodings/quoted_printable
-s
-9
-mail/mail
-p
-89
-I
-2
-I
-4
-I
-b
-I
-6
-I
-14
-I
-7
-I
-1d
-I
-8
-I
-26
-I
-9
-I
-2f
-I
-b
-I
-38
-I
-c
-I
-41
-I
-d
-I
-4a
-I
-f
-I
-55
-I
-11
-I
-6c
-I
-12
-I
-79
-I
-13
-I
-8e
-I
-f
-I
-90
-I
-17
-I
-9b
-I
-18
-I
-a4
-I
-19
-I
-b1
-I
-1b
-I
-ba
-I
-1c
-I
-c6
-I
-1f
-I
-cf
-I
-21
-I
-d8
-I
-22
-I
-e1
-I
-24
-I
-ea
-I
-25
-I
-f3
-I
-26
-I
-fc
-I
-29
-I
-105
-I
-2b
-I
-10e
-I
-2c
-I
-117
-I
-2d
-I
-120
-I
-2e
-I
-129
-I
-2f
-I
-132
-I
-30
-I
-13b
-I
-31
-I
-144
-I
-32
-I
-14d
-I
-34
-I
-156
-I
-36
-I
-162
-I
-37
-I
-171
-I
-38
-I
-17a
-I
-39
-I
-185
-I
-3b
-I
-18d
-I
-49
-I
-196
-I
-4a
-I
-19f
-I
-4b
-I
-1a8
-I
-4c
-I
-1b1
-I
-4f
-I
-1ba
-x
-43
-/Users/mikel/ruby_programs/mail/lib/mail.rb
-p
-1
-x
-7
-parsers
-x
-13
-attach_method
-p
-3
-I
-0
-I
-2
-I
-1c
-x
-43
-/Users/mikel/ruby_programs/mail/lib/mail.rb
-p
-0