From fddf97bea2b81010c93260cbf1120dceb6479ffe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Pokorn=C3=BD?= Date: Wed, 13 Jan 2021 12:02:31 +0100 Subject: [PATCH 1/3] properly e-mail is mandatory --- lib/sendgrid/helpers/mail/email.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/sendgrid/helpers/mail/email.rb b/lib/sendgrid/helpers/mail/email.rb index 6d1e30a9..b0d5a05b 100644 --- a/lib/sendgrid/helpers/mail/email.rb +++ b/lib/sendgrid/helpers/mail/email.rb @@ -4,7 +4,9 @@ module SendGrid class Email attr_accessor :email, :name - def initialize(email: nil, name: nil) + # @param [String] email required e-mail address + # @param [String] name optionally personification + def initialize(email:, name: nil) if name @email = email @name = name @@ -15,6 +17,8 @@ def initialize(email: nil, name: nil) def split_email(email) split = /(?:(?
.+)\s)?.+@[^>]+)>?/.match(email) + raise ArgumentError, "email (#{email}) is invalid" unless split + [split[:email], split[:address]] end From 9802165dd053a18dc32d695dd50e4d1ad6b66dcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Pokorn=C3=BD?= Date: Wed, 13 Jan 2021 14:27:33 +0100 Subject: [PATCH 2/3] add test for missing or invalid email --- test/sendgrid/helpers/mail/test_email.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/test/sendgrid/helpers/mail/test_email.rb b/test/sendgrid/helpers/mail/test_email.rb index 28f5c2ce..46ec72f9 100644 --- a/test/sendgrid/helpers/mail/test_email.rb +++ b/test/sendgrid/helpers/mail/test_email.rb @@ -29,4 +29,14 @@ def test_split_email_name_and_email } assert_equal @email.to_json, expected_json end + + def test_mandatory_email_missing + assert_raises(ArgumentError) { Email.new(email: nil) } + assert_raises(ArgumentError) { Email.new(email: "") } + end + + def test_invalid_email + assert_raises(ArgumentError) { Email.new(email: "some-invalid-string") } + end + end From 7a7b5d7deb5aca9994750dfd3a347bcba3de4a18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Pokorn=C3=BD?= Date: Wed, 13 Jan 2021 14:37:21 +0100 Subject: [PATCH 3/3] remove rubocop whitespace --- test/sendgrid/helpers/mail/test_email.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/test/sendgrid/helpers/mail/test_email.rb b/test/sendgrid/helpers/mail/test_email.rb index 46ec72f9..9ab1a477 100644 --- a/test/sendgrid/helpers/mail/test_email.rb +++ b/test/sendgrid/helpers/mail/test_email.rb @@ -38,5 +38,4 @@ def test_mandatory_email_missing def test_invalid_email assert_raises(ArgumentError) { Email.new(email: "some-invalid-string") } end - end