Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions lib/uri/mailto.rb
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,7 @@ class MailTo < Generic
HEADER_REGEXP = /\A(?<hfield>(?:%\h\h|[!$'-.0-;@-Z_a-z~])*=(?:%\h\h|[!$'-.0-;@-Z_a-z~])*)(?:&\g<hfield>)*\z/
# practical regexp for email address
# https://html.spec.whatwg.org/multipage/input.html#valid-e-mail-address
EMAIL_REGEXP = %r[\A#{
atext = %q[(?:[a-zA-Z0-9!\#$%&'*+\/=?^_`{|}~-]+)]
}(?:\.#{atext})*@#{
label = %q[(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)]
}(?:\.#{label})*\z]
EMAIL_REGEXP = /\A[a-zA-Z0-9.!\#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*\z/
# :startdoc:

#
Expand Down
26 changes: 10 additions & 16 deletions test/uri/test_mailto.rb
Original file line number Diff line number Diff line change
Expand Up @@ -145,29 +145,23 @@ def test_check_to
u.to = '[email protected]'
assert_equal(u.to, '[email protected]')

# Invalid emails
assert_raise(URI::InvalidComponentError) do
u.to = '#[email protected]'
end
# Intentionally allowed violations of RFC 5322
u.to = '[email protected]'
assert_equal(u.to, '[email protected]')

assert_raise(URI::InvalidComponentError) do
u.to = '@invalid.email'
end
u.to = '[email protected]'
assert_equal(u.to, '[email protected]')

assert_raise(URI::InvalidComponentError) do
u.to = '[email protected]'
end

assert_raise(URI::InvalidComponentError) do
u.to = '[email protected]'
end
u.to = '[email protected]'
assert_equal(u.to, '[email protected]')

# Invalid emails
assert_raise(URI::InvalidComponentError) do
u.to = '[email protected]'
u.to = '#[email protected]'
end

assert_raise(URI::InvalidComponentError) do
u.to = 'n..t@invalid.email'
u.to = '@invalid.email'
end

# Invalid host emails
Expand Down