mail 2.5.2 → 2.6.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +7 -0
- data/CHANGELOG.rdoc +124 -0
- data/CONTRIBUTING.md +21 -6
- data/Dependencies.txt +0 -1
- data/Gemfile +7 -22
- data/MIT-LICENSE +20 -0
- data/README.md +86 -31
- data/Rakefile +11 -22
- data/lib/mail/attachments_list.rb +4 -2
- data/lib/mail/body.rb +36 -11
- data/lib/mail/check_delivery_params.rb +13 -22
- data/lib/mail/configuration.rb +1 -0
- data/lib/mail/{patterns.rb → constants.rb} +29 -6
- data/lib/mail/core_extensions/smtp.rb +13 -13
- data/lib/mail/core_extensions/string/access.rb +1 -0
- data/lib/mail/core_extensions/string/multibyte.rb +1 -0
- data/lib/mail/core_extensions/string.rb +5 -17
- data/lib/mail/elements/address.rb +86 -145
- data/lib/mail/elements/address_list.rb +10 -42
- data/lib/mail/elements/content_disposition_element.rb +4 -7
- data/lib/mail/elements/content_location_element.rb +8 -11
- data/lib/mail/elements/content_transfer_encoding_element.rb +4 -10
- data/lib/mail/elements/content_type_element.rb +5 -8
- data/lib/mail/elements/date_time_element.rb +4 -7
- data/lib/mail/elements/envelope_from_element.rb +19 -13
- data/lib/mail/elements/message_ids_element.rb +8 -11
- data/lib/mail/elements/mime_version_element.rb +4 -7
- data/lib/mail/elements/phrase_list.rb +3 -7
- data/lib/mail/elements/received_element.rb +4 -7
- data/lib/mail/elements.rb +1 -0
- data/lib/mail/encodings/7bit.rb +1 -0
- data/lib/mail/encodings/8bit.rb +8 -2
- data/lib/mail/encodings/base64.rb +7 -1
- data/lib/mail/encodings/binary.rb +1 -0
- data/lib/mail/encodings/quoted_printable.rb +11 -4
- data/lib/mail/encodings/transfer_encoding.rb +27 -17
- data/lib/mail/encodings/unix_to_unix.rb +18 -0
- data/lib/mail/encodings.rb +54 -39
- data/lib/mail/envelope.rb +1 -5
- data/lib/mail/field.rb +81 -31
- data/lib/mail/field_list.rb +19 -18
- data/lib/mail/fields/bcc_field.rb +17 -5
- data/lib/mail/fields/cc_field.rb +3 -3
- data/lib/mail/fields/comments_field.rb +2 -1
- data/lib/mail/fields/common/address_container.rb +1 -0
- data/lib/mail/fields/common/common_address.rb +34 -28
- data/lib/mail/fields/common/common_date.rb +2 -8
- data/lib/mail/fields/common/common_field.rb +9 -5
- data/lib/mail/fields/common/common_message_id.rb +3 -2
- data/lib/mail/fields/common/parameter_hash.rb +4 -3
- data/lib/mail/fields/content_description_field.rb +1 -0
- data/lib/mail/fields/content_disposition_field.rb +13 -12
- data/lib/mail/fields/content_id_field.rb +4 -4
- data/lib/mail/fields/content_location_field.rb +2 -1
- data/lib/mail/fields/content_transfer_encoding_field.rb +4 -9
- data/lib/mail/fields/content_type_field.rb +4 -3
- data/lib/mail/fields/date_field.rb +16 -15
- data/lib/mail/fields/from_field.rb +3 -3
- data/lib/mail/fields/in_reply_to_field.rb +3 -1
- data/lib/mail/fields/keywords_field.rb +2 -2
- data/lib/mail/fields/message_id_field.rb +4 -4
- data/lib/mail/fields/mime_version_field.rb +3 -2
- data/lib/mail/fields/optional_field.rb +1 -0
- data/lib/mail/fields/received_field.rb +4 -3
- data/lib/mail/fields/references_field.rb +3 -1
- data/lib/mail/fields/reply_to_field.rb +3 -3
- data/lib/mail/fields/resent_bcc_field.rb +3 -3
- data/lib/mail/fields/resent_cc_field.rb +3 -3
- data/lib/mail/fields/resent_date_field.rb +2 -1
- data/lib/mail/fields/resent_from_field.rb +3 -3
- data/lib/mail/fields/resent_message_id_field.rb +1 -0
- data/lib/mail/fields/resent_sender_field.rb +4 -4
- data/lib/mail/fields/resent_to_field.rb +3 -3
- data/lib/mail/fields/return_path_field.rb +1 -1
- data/lib/mail/fields/sender_field.rb +9 -9
- data/lib/mail/fields/structured_field.rb +1 -0
- data/lib/mail/fields/subject_field.rb +1 -0
- data/lib/mail/fields/to_field.rb +3 -3
- data/lib/mail/fields/unstructured_field.rb +15 -8
- data/lib/mail/fields.rb +1 -0
- data/lib/mail/header.rb +21 -29
- data/lib/mail/indifferent_hash.rb +1 -0
- data/lib/mail/mail.rb +16 -1
- data/lib/mail/matchers/attachment_matchers.rb +29 -0
- data/lib/mail/matchers/has_sent_mail.rb +61 -4
- data/lib/mail/message.rb +175 -72
- data/lib/mail/multibyte/chars.rb +3 -2
- data/lib/mail/multibyte/exceptions.rb +1 -0
- data/lib/mail/multibyte/unicode.rb +22 -15
- data/lib/mail/multibyte/utils.rb +1 -0
- data/lib/mail/multibyte.rb +1 -0
- data/lib/mail/network/delivery_methods/exim.rb +3 -7
- data/lib/mail/network/delivery_methods/file_delivery.rb +2 -1
- data/lib/mail/network/delivery_methods/sendmail.rb +33 -10
- data/lib/mail/network/delivery_methods/smtp.rb +32 -34
- data/lib/mail/network/delivery_methods/smtp_connection.rb +7 -6
- data/lib/mail/network/delivery_methods/test_mailer.rb +3 -2
- data/lib/mail/network/retriever_methods/base.rb +1 -0
- data/lib/mail/network/retriever_methods/imap.rb +19 -13
- data/lib/mail/network/retriever_methods/pop3.rb +1 -0
- data/lib/mail/network/retriever_methods/test_retriever.rb +1 -0
- data/lib/mail/network.rb +1 -0
- data/lib/mail/parsers/address_lists_parser.rb +133 -0
- data/lib/mail/parsers/content_disposition_parser.rb +68 -0
- data/lib/mail/parsers/content_location_parser.rb +36 -0
- data/lib/mail/parsers/content_transfer_encoding_parser.rb +34 -0
- data/lib/mail/parsers/content_type_parser.rb +67 -0
- data/lib/mail/parsers/date_time_parser.rb +39 -0
- data/lib/mail/parsers/envelope_from_parser.rb +46 -0
- data/lib/mail/parsers/message_ids_parser.rb +40 -0
- data/lib/mail/parsers/mime_version_parser.rb +42 -0
- data/lib/mail/parsers/phrase_lists_parser.rb +36 -0
- data/lib/mail/parsers/ragel/common.rl +185 -0
- data/lib/mail/parsers/ragel/date_time.rl +30 -0
- data/lib/mail/parsers/ragel/parser_info.rb +61 -0
- data/lib/mail/parsers/ragel/ruby/machines/address_lists_machine.rb +14864 -0
- data/lib/mail/parsers/ragel/ruby/machines/address_lists_machine.rb.rl +37 -0
- data/lib/mail/parsers/ragel/ruby/machines/content_disposition_machine.rb +751 -0
- data/lib/mail/parsers/ragel/ruby/machines/content_disposition_machine.rb.rl +37 -0
- data/lib/mail/parsers/ragel/ruby/machines/content_location_machine.rb +614 -0
- data/lib/mail/parsers/ragel/ruby/machines/content_location_machine.rb.rl +37 -0
- data/lib/mail/parsers/ragel/ruby/machines/content_transfer_encoding_machine.rb +447 -0
- data/lib/mail/parsers/ragel/ruby/machines/content_transfer_encoding_machine.rb.rl +37 -0
- data/lib/mail/parsers/ragel/ruby/machines/content_type_machine.rb +825 -0
- data/lib/mail/parsers/ragel/ruby/machines/content_type_machine.rb.rl +37 -0
- data/lib/mail/parsers/ragel/ruby/machines/date_time_machine.rb +817 -0
- data/lib/mail/parsers/ragel/ruby/machines/date_time_machine.rb.rl +37 -0
- data/lib/mail/parsers/ragel/ruby/machines/envelope_from_machine.rb +2149 -0
- data/lib/mail/parsers/ragel/ruby/machines/envelope_from_machine.rb.rl +37 -0
- data/lib/mail/parsers/ragel/ruby/machines/message_ids_machine.rb +1570 -0
- data/lib/mail/parsers/ragel/ruby/machines/message_ids_machine.rb.rl +37 -0
- data/lib/mail/parsers/ragel/ruby/machines/mime_version_machine.rb +440 -0
- data/lib/mail/parsers/ragel/ruby/machines/mime_version_machine.rb.rl +37 -0
- data/lib/mail/parsers/ragel/ruby/machines/phrase_lists_machine.rb +564 -0
- data/lib/mail/parsers/ragel/ruby/machines/phrase_lists_machine.rb.rl +37 -0
- data/lib/mail/parsers/ragel/ruby/machines/rb_actions.rl +51 -0
- data/lib/mail/parsers/ragel/ruby/machines/received_machine.rb +5144 -0
- data/lib/mail/parsers/ragel/ruby/machines/received_machine.rb.rl +37 -0
- data/lib/mail/parsers/ragel/ruby/parser.rb.rl.erb +37 -0
- data/lib/mail/parsers/ragel/ruby.rb +40 -0
- data/lib/mail/parsers/ragel.rb +18 -0
- data/lib/mail/parsers/received_parser.rb +49 -0
- data/lib/mail/parsers.rb +27 -0
- data/lib/mail/part.rb +11 -4
- data/lib/mail/parts_list.rb +30 -10
- data/lib/mail/utilities.rb +127 -63
- data/lib/mail/values/unicode_tables.dat +0 -0
- data/lib/mail/version.rb +8 -15
- data/lib/mail/version_specific/ruby_1_8.rb +18 -7
- data/lib/mail/version_specific/ruby_1_9.rb +136 -32
- data/lib/mail.rb +12 -6
- metadata +115 -77
- data/lib/VERSION +0 -4
- data/lib/load_parsers.rb +0 -41
- data/lib/mail/core_extensions/nil.rb +0 -19
- data/lib/mail/core_extensions/object.rb +0 -13
- data/lib/mail/core_extensions/shell_escape.rb +0 -56
- data/lib/mail/parsers/address_lists.rb +0 -64
- data/lib/mail/parsers/address_lists.treetop +0 -19
- data/lib/mail/parsers/content_disposition.rb +0 -535
- data/lib/mail/parsers/content_disposition.treetop +0 -46
- data/lib/mail/parsers/content_location.rb +0 -139
- data/lib/mail/parsers/content_location.treetop +0 -20
- data/lib/mail/parsers/content_transfer_encoding.rb +0 -162
- data/lib/mail/parsers/content_transfer_encoding.treetop +0 -20
- data/lib/mail/parsers/content_type.rb +0 -967
- data/lib/mail/parsers/content_type.treetop +0 -68
- data/lib/mail/parsers/date_time.rb +0 -114
- data/lib/mail/parsers/date_time.treetop +0 -11
- data/lib/mail/parsers/envelope_from.rb +0 -194
- data/lib/mail/parsers/envelope_from.treetop +0 -32
- data/lib/mail/parsers/message_ids.rb +0 -45
- data/lib/mail/parsers/message_ids.treetop +0 -15
- data/lib/mail/parsers/mime_version.rb +0 -144
- data/lib/mail/parsers/mime_version.treetop +0 -19
- data/lib/mail/parsers/phrase_lists.rb +0 -45
- data/lib/mail/parsers/phrase_lists.treetop +0 -15
- data/lib/mail/parsers/received.rb +0 -71
- data/lib/mail/parsers/received.treetop +0 -11
- data/lib/mail/parsers/rfc2045.rb +0 -464
- data/lib/mail/parsers/rfc2045.treetop +0 -36
- data/lib/mail/parsers/rfc2822.rb +0 -5397
- data/lib/mail/parsers/rfc2822.treetop +0 -410
- data/lib/mail/parsers/rfc2822_obsolete.rb +0 -3768
- data/lib/mail/parsers/rfc2822_obsolete.treetop +0 -241
- data/lib/tasks/corpus.rake +0 -125
- data/lib/tasks/treetop.rake +0 -10
data/lib/load_parsers.rb
DELETED
|
@@ -1,41 +0,0 @@
|
|
|
1
|
-
# encoding: utf-8
|
|
2
|
-
# This file loads up the parsers for mail to use. It also will attempt to compile parsers
|
|
3
|
-
# if they don't exist.
|
|
4
|
-
#
|
|
5
|
-
# It also only uses the compiler if we are running the SPEC suite
|
|
6
|
-
module Mail # :doc:
|
|
7
|
-
require 'treetop/runtime'
|
|
8
|
-
|
|
9
|
-
def self.compile_parser(parser)
|
|
10
|
-
require 'treetop/compiler'
|
|
11
|
-
STDOUT.puts "Compiling parser #{parser} from treetop source"
|
|
12
|
-
Treetop.load(File.join(File.dirname(__FILE__)) + "/mail/parsers/#{parser}")
|
|
13
|
-
end
|
|
14
|
-
|
|
15
|
-
parsers = %w[ rfc2822_obsolete rfc2822 address_lists phrase_lists
|
|
16
|
-
date_time received message_ids envelope_from rfc2045
|
|
17
|
-
mime_version content_type content_disposition
|
|
18
|
-
content_transfer_encoding content_location ]
|
|
19
|
-
|
|
20
|
-
if defined?(MAIL_SPEC_SUITE_RUNNING)
|
|
21
|
-
STDOUT.puts "Compiling all parsers from treetop source"
|
|
22
|
-
|
|
23
|
-
parsers.each do |parser|
|
|
24
|
-
compile_parser(parser)
|
|
25
|
-
end
|
|
26
|
-
|
|
27
|
-
else
|
|
28
|
-
STDOUT.puts "Loading precompiled parsers from ruby source"
|
|
29
|
-
|
|
30
|
-
parsers.each do |parser|
|
|
31
|
-
begin
|
|
32
|
-
require "mail/parsers/#{parser}"
|
|
33
|
-
rescue LoadError
|
|
34
|
-
STDOUT.puts "Couldn't load parser #{parser} from ruby source"
|
|
35
|
-
compile_parser(parser)
|
|
36
|
-
end
|
|
37
|
-
end
|
|
38
|
-
|
|
39
|
-
end
|
|
40
|
-
|
|
41
|
-
end
|
|
@@ -1,56 +0,0 @@
|
|
|
1
|
-
# encoding: utf-8
|
|
2
|
-
|
|
3
|
-
# The following is an adaptation of ruby 1.9.2's shellwords.rb file,
|
|
4
|
-
# it is modified to include '+' in the allowed list to allow for
|
|
5
|
-
# sendmail to accept email addresses as the sender with a + in them
|
|
6
|
-
#
|
|
7
|
-
module Mail
|
|
8
|
-
module ShellEscape
|
|
9
|
-
# Escapes a string so that it can be safely used in a Bourne shell
|
|
10
|
-
# command line.
|
|
11
|
-
#
|
|
12
|
-
# Note that a resulted string should be used unquoted and is not
|
|
13
|
-
# intended for use in double quotes nor in single quotes.
|
|
14
|
-
#
|
|
15
|
-
# open("| grep #{Shellwords.escape(pattern)} file") { |pipe|
|
|
16
|
-
# # ...
|
|
17
|
-
# }
|
|
18
|
-
#
|
|
19
|
-
# +String#shellescape+ is a shorthand for this function.
|
|
20
|
-
#
|
|
21
|
-
# open("| grep #{pattern.shellescape} file") { |pipe|
|
|
22
|
-
# # ...
|
|
23
|
-
# }
|
|
24
|
-
#
|
|
25
|
-
def escape_for_shell(str)
|
|
26
|
-
# An empty argument will be skipped, so return empty quotes.
|
|
27
|
-
return "''" if str.empty?
|
|
28
|
-
|
|
29
|
-
str = str.dup
|
|
30
|
-
|
|
31
|
-
# Process as a single byte sequence because not all shell
|
|
32
|
-
# implementations are multibyte aware.
|
|
33
|
-
str.gsub!(/([^A-Za-z0-9_\s\+\-.,:\/@])/n, "\\\\\\1")
|
|
34
|
-
|
|
35
|
-
# A LF cannot be escaped with a backslash because a backslash + LF
|
|
36
|
-
# combo is regarded as line continuation and simply ignored.
|
|
37
|
-
str.gsub!(/\n/, "'\n'")
|
|
38
|
-
|
|
39
|
-
return str
|
|
40
|
-
end
|
|
41
|
-
|
|
42
|
-
module_function :escape_for_shell
|
|
43
|
-
end
|
|
44
|
-
end
|
|
45
|
-
|
|
46
|
-
class String
|
|
47
|
-
# call-seq:
|
|
48
|
-
# str.shellescape => string
|
|
49
|
-
#
|
|
50
|
-
# Escapes +str+ so that it can be safely used in a Bourne shell
|
|
51
|
-
# command line. See +Shellwords::shellescape+ for details.
|
|
52
|
-
#
|
|
53
|
-
def escape_for_shell
|
|
54
|
-
Mail::ShellEscape.escape_for_shell(self)
|
|
55
|
-
end
|
|
56
|
-
end
|
|
@@ -1,64 +0,0 @@
|
|
|
1
|
-
# Autogenerated from a Treetop grammar. Edits may be lost.
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
module Mail
|
|
5
|
-
module AddressLists
|
|
6
|
-
include Treetop::Runtime
|
|
7
|
-
|
|
8
|
-
def root
|
|
9
|
-
@root ||= :primary_address
|
|
10
|
-
end
|
|
11
|
-
|
|
12
|
-
include RFC2822
|
|
13
|
-
|
|
14
|
-
module PrimaryAddress0
|
|
15
|
-
def addresses
|
|
16
|
-
([first_addr] + other_addr.elements.map { |o| o.addr_value }).reject { |e| e.empty? }
|
|
17
|
-
end
|
|
18
|
-
end
|
|
19
|
-
|
|
20
|
-
module PrimaryAddress1
|
|
21
|
-
def addresses
|
|
22
|
-
[first_addr] + other_addr.elements.map { |o| o.addr_value }
|
|
23
|
-
end
|
|
24
|
-
end
|
|
25
|
-
|
|
26
|
-
def _nt_primary_address
|
|
27
|
-
start_index = index
|
|
28
|
-
if node_cache[:primary_address].has_key?(index)
|
|
29
|
-
cached = node_cache[:primary_address][index]
|
|
30
|
-
if cached
|
|
31
|
-
cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
|
|
32
|
-
@index = cached.interval.end
|
|
33
|
-
end
|
|
34
|
-
return cached
|
|
35
|
-
end
|
|
36
|
-
|
|
37
|
-
i0 = index
|
|
38
|
-
r1 = _nt_address_list
|
|
39
|
-
r1.extend(PrimaryAddress0)
|
|
40
|
-
if r1
|
|
41
|
-
r0 = r1
|
|
42
|
-
else
|
|
43
|
-
r2 = _nt_obs_addr_list
|
|
44
|
-
r2.extend(PrimaryAddress1)
|
|
45
|
-
if r2
|
|
46
|
-
r0 = r2
|
|
47
|
-
else
|
|
48
|
-
@index = i0
|
|
49
|
-
r0 = nil
|
|
50
|
-
end
|
|
51
|
-
end
|
|
52
|
-
|
|
53
|
-
node_cache[:primary_address][start_index] = r0
|
|
54
|
-
|
|
55
|
-
r0
|
|
56
|
-
end
|
|
57
|
-
|
|
58
|
-
end
|
|
59
|
-
|
|
60
|
-
class AddressListsParser < Treetop::Runtime::CompiledParser
|
|
61
|
-
include AddressLists
|
|
62
|
-
end
|
|
63
|
-
|
|
64
|
-
end
|
|
@@ -1,19 +0,0 @@
|
|
|
1
|
-
module Mail
|
|
2
|
-
grammar AddressLists
|
|
3
|
-
|
|
4
|
-
include RFC2822
|
|
5
|
-
|
|
6
|
-
rule primary_address
|
|
7
|
-
address_list {
|
|
8
|
-
def addresses
|
|
9
|
-
([first_addr] + other_addr.elements.map { |o| o.addr_value }).reject { |e| e.empty? }
|
|
10
|
-
end
|
|
11
|
-
} / obs_addr_list {
|
|
12
|
-
def addresses
|
|
13
|
-
[first_addr] + other_addr.elements.map { |o| o.addr_value }
|
|
14
|
-
end
|
|
15
|
-
}
|
|
16
|
-
end
|
|
17
|
-
|
|
18
|
-
end
|
|
19
|
-
end
|