Skip to content

Split SMTP API JSON into lines under 1000 chars #4

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
XurdeFdez wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Split SMTP API JSON into lines under 1000 chars #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0917c0f
Split JSON into several lines: By RFC 821 no line can be longer than …
XurdeFdez Sep 23, 2013
4d2f7f1
Split JSON into several lines: By RFC 821 no line can be longer than …
XurdeFdez Sep 23, 2013
c90a0a5
Fix specs
XurdeFdez Sep 24, 2013
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
2 changes: 1 addition & 1 deletion lib/send_grid/api_header.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def add_filter_setting(fltr, setting, val)
end

def to_json
@data.to_json
JSON.generate(@data, {:indent => " ", :space => "", :space_before => "", :object_nl => "", :array_nl => ""})
end

def standard_smtp(enabled = false)
Expand Down
12 changes: 6 additions & 6 deletions spec/api_header_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,32 +9,32 @@

it "contains 1 recipient (as array)" do
header.add_recipients '[email protected]'
header.to_json.should eql '{"to":["[email protected]"]}'
header.to_json.should eql '{ "to":[ "[email protected]"]}'
end

it "contaions an array of recipients" do
header.add_recipients %w([email protected] [email protected])
header.to_json.should eql '{"to":["[email protected]","[email protected]"]}'
header.to_json.should eql '{ "to":[ "[email protected]", "[email protected]"]}'
end

it "contains substitution" do
header.substitute :var1, 'Hello'
header.to_json.should eql '{"sub":{"var1":["Hello"]}}'
header.to_json.should eql '{ "sub":{ "var1":[ "Hello"]}}'
end

it "contains uniq args" do
header.uniq_args :arg1 => 'val1'
header.to_json.should eql '{"unique_args":{"arg1":"val1"}}'
header.to_json.should eql '{ "unique_args":{ "arg1":"val1"}}'
end

it "contains category" do
header.category 'category_name'
header.to_json.should eql '{"category":"category_name"}'
header.to_json.should eql '{ "category":"category_name"}'
end

it "contains filter settings" do
header.add_filter_setting :filter1, :setting1, 'val1'
header.to_json.should eql '{"filters":{"filter1":{"settings":{"setting1":"val1"}}}}'
header.to_json.should eql '{ "filters":{ "filter1":{ "settings":{ "setting1":"val1"}}}}'
end
end
end
6 changes: 3 additions & 3 deletions spec/mailer_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
describe 'email with multiple recipients' do
it 'set correct recipients in X-SMTAPI header' do
Mailer.email_with_multiple_recipients(%w([email protected] [email protected])).deliver.header.to_s.
should include('X-SMTPAPI: {"to":["[email protected]","[email protected]"]}')
should include('X-SMTPAPI: { "to":[ "[email protected]", "[email protected]"]}')
end

it 'removes original TO header part' do
Expand All @@ -16,12 +16,12 @@
describe '#open_tracking' do
it 'set correct open tracking enabled X-SMTAPI header' do
Mailer.email_open_tracking.deliver.header.to_s.
should include('"filters":{"opentrack":{"settings":{"enabled":1}}}')
should include(' "filters":{ "opentrack":{ "settings":{ "enabled":1}}}')
end

it 'set correct open tracking disabled X-SMTAPI header' do
Mailer.email_open_tracking(false).deliver.header.to_s.
should include('"filters":{"opentrack":{"settings":{"enabled":0}}}')
should include(' "filters":{ "opentrack":{ "settings":{ "enabled":0}}}')
end

it 'set correct open tracking nil X-SMTAPI header' do
Expand Down