Skip to content

Handle downcased params #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
josh-works wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Handle downcased params #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4af25f6
Update README with example params submission
josh-works Jun 8, 2019
8e6afb3
failing test for downcased params
josh-works Jun 28, 2019
e9729fa
downcasing all params, as well as references to the new downcased keys
josh-works Jun 28, 2019
eea3bc0
removing duplicate key from default_params hash
josh-works Jun 28, 2019
7b10c8c
resolve hound issues
josh-works Jun 28, 2019
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
12 changes: 6 additions & 6 deletions lib/griddler/mailgun/adapter.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class Adapter
attr_reader :params

def initialize(params)
@params = params
@params = params.transform_keys(&:downcase)
end

def self.normalize_params(params)
Expand All @@ -16,7 +16,7 @@ def normalize_params
{
to: to_recipients,
cc: cc_recipients,
bcc: Array.wrap(param_or_header(:Bcc)),
bcc: Array.wrap(param_or_header(:bcc)),
from: determine_sender,
subject: params[:subject],
text: params['body-plain'],
Expand All @@ -34,23 +34,23 @@ def normalize_params
private

def determine_sender
sender = param_or_header(:From)
sender = param_or_header(:from)
sender ||= params[:sender]
end

def to_recipients
to_emails = param_or_header(:To)
to_emails = param_or_header(:to)
to_emails ||= params[:recipient]
to_emails.split(',').map(&:strip)
end

def cc_recipients
cc = param_or_header(:Cc) || ''
cc = param_or_header(:cc) || ""
cc.split(',').map(&:strip)
end

def headers
@headers ||= extract_headers
@headers ||= extract_headers.transform_keys(&:downcase)
end

def extract_headers
Expand Down
9 changes: 8 additions & 1 deletion spec/griddler/mailgun/adapter_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,14 @@
expect(normalized_params[:to]).to eq ['johndoe@example.com']
end

it "handles downcased params" do
downcased = {
to: "John Doe <johndoe@example.com>"
}
normalized_params = Griddler::Mailgun::Adapter.normalize_params(downcased)
expect(normalized_params[:to]).to eq ["John Doe <johndoe@example.com>"]
end

it 'handles message-headers' do
params = default_params.merge(
'message-headers' => '[["NotCc", "emily@example.mailgun.org"], ["Reply-To", "mail2@example.mailgun.org"]]'
Expand Down Expand Up @@ -174,7 +182,6 @@ def default_params
"To"=>"John Doe <johndoe@example.com>, Jane Doe <janedoe@example.com>",
"body-html"=>"<div dir=\"ltr\">And attachments. Two of them. An image and a text file.</div>\r\n",
"body-plain"=>"And attachments. Two of them. An image and a text file.\r\n",
"from"=>"Jon Snow <jon@example.com>",
"recipient"=>"johndoe@example.com",
"sender"=>"jon@example.com",
"stripped-html"=>"<div dir=\"ltr\">And attachments. Two of them. An image and a text file.</div>\r\n",
Expand Down