sendgrid-rails 2.0.1 → 2.0.2

data/lib/send_grid/api_header.rb

@@ -1,33 +1,32 @@
-class SendGrid::ApiHeader
-  attr_reader :data
-
-  def initialize
-    @data = Hash.new { |h,k| h[k] = Hash.new(&h.default_proc) }
-  end
-
-  def add_recipients(recipients)
-    @data[:to] = [] unless @data[:to].instance_of?(Array)
-    @data[:to] |= Array.wrap(recipients)
-  end
-
-  def substitute(var, val)
-    @data[:sub][var] = Array.wrap(val)
-  end
-
-  def uniq_args(val)
-    @data[:unique_args] = val if val.instance_of?(Hash)
-  end
-
-  def category(cat)
-    @data[:category] = cat
-  end
-
-  def add_filter_setting(fltr, setting, val)
-    @data[:filters][fltr][:settings][setting] = val
-  end
-
-  def to_json
-    @data.to_json
-  end
-end
-
+class SendGrid::ApiHeader
+  attr_reader :data
+
+  def initialize
+    @data = Hash.new { |h,k| h[k] = Hash.new(&h.default_proc) }
+  end
+
+  def add_recipients(recipients)
+    @data[:to] = [] unless @data[:to].instance_of?(Array)
+    @data[:to] |= Array.wrap(recipients)
+  end
+
+  def substitute(var, val)
+    @data[:sub][var] = Array.wrap(val)
+  end
+
+  def uniq_args(val)
+    @data[:unique_args] = val if val.instance_of?(Hash)
+  end
+
+  def category(cat)
+    @data[:category] = cat
+  end
+
+  def add_filter_setting(fltr, setting, val)
+    @data[:filters][fltr][:settings][setting] = val
+  end
+
+  def to_json
+    JSON.generate(@data, :array_nl => ' ')
+  end
+end

data/lib/send_grid/version.rb

@@ -1,4 +1,4 @@
-module SendGrid
-  VERSION = "2.0.1"
-end
-
+module SendGrid
+  VERSION = "2.0.2"
+end
+

data/spec/api_header_spec.rb

@@ -1,41 +1,41 @@
-require 'spec_helper'
-
-describe SendGrid::ApiHeader do
-  let(:header) { SendGrid::ApiHeader.new }
-  describe "#to_json" do
-    it "returns valid json if no data was set" do
-      header.to_json.should eql "{}"
-    end
-
-    it "contains 1 recipient (as array)" do
-      header.add_recipients 'email@email.com'
-      header.to_json.should eql '{"to":["email@email.com"]}'
-    end
-
-    it "contaions an array of recipients" do
-      header.add_recipients %w(email1@email.com email2@email.com)
-      header.to_json.should eql '{"to":["email1@email.com","email2@email.com"]}'
-    end
-
-    it "contains substitution" do
-      header.substitute :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"}}'
-    end
-
-    it "contains category" do
-      header.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"}}}}'
-    end
-  end
-end
-
+require 'spec_helper'
+
+describe SendGrid::ApiHeader do
+  let(:header) { SendGrid::ApiHeader.new }
+  describe "#to_json" do
+    it "returns valid json if no data was set" do
+      header.to_json.should eql "{}"
+    end
+
+    it "contains 1 recipient (as array)" do
+      header.add_recipients 'email@email.com'
+      header.to_json.should eql '{"to":[ "email@email.com" ]}'
+    end
+
+    it "contaions an array of recipients" do
+      header.add_recipients %w(email1@email.com email2@email.com)
+      header.to_json.should eql '{"to":[ "email1@email.com", "email2@email.com" ]}'
+    end
+
+    it "contains substitution" do
+      header.substitute :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"}}'
+    end
+
+    it "contains category" do
+      header.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"}}}}'
+    end
+  end
+end
+

data/spec/mailer_spec.rb

@@ -1,32 +1,42 @@
-require 'spec_helper'
-
-describe Mailer do
-  describe 'email with multiple recipients' do
-    it 'set correct recipients in X-SMTAPI header' do
-      Mailer.email_with_multiple_recipients(%w(em1@email.com em2@email.com)).deliver.header.to_s.
-        should include('X-SMTPAPI: {"to":["em1@email.com","em2@email.com"]}')
-    end
-
-    it 'removes original TO header part' do
-      Mailer.email_with_multiple_recipients(%w(em1@email.com em2@email.com)).deliver.header.to_s.
-        should_not include("To: em1@email.com")
-    end
-  end
-
-  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}}}')
-    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}}}')
-    end
-
-    it 'set correct open tracking nil X-SMTAPI header' do
-      Mailer.email_open_tracking(nil).deliver.header.to_s.
-        should_not include('"filters":{"opentrack')
-    end
-  end
-end
+require 'spec_helper'
+
+describe Mailer do
+  describe 'email with multiple recipients' do
+    it 'set correct recipients in X-SMTAPI header' do
+      Mailer.email_with_multiple_recipients(%w(em1@email.com em2@email.com)).deliver.header.to_s.
+        should include('X-SMTPAPI: {"to":[ "em1@email.com", "em2@email.com" ]}')
+    end
+
+    it 'removes original TO header part' do
+      Mailer.email_with_multiple_recipients(%w(em1@email.com em2@email.com)).deliver.header.to_s.
+        should_not include("To: em1@email.com")
+    end
+
+    it 'maintains recommended header line length' do
+      emails = 15.times.map{ |i| "email#{i}@example.com" }
+      header = Mailer.email_with_multiple_recipients(emails).deliver.header.to_s
+      header.lines.each do |line|
+        unless line.starts_with?('Message-ID:') # May be longer depending on your test machine
+          line.should have_at_most(72).characters
+        end
+      end
+    end
+  end
+
+  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}}}')
+    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}}}')
+    end
+
+    it 'set correct open tracking nil X-SMTAPI header' do
+      Mailer.email_open_tracking(nil).deliver.header.to_s.
+        should_not include('"filters":{"opentrack')
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sendgrid-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-13 00:00:00.000000000Z
+date: 2012-06-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70345080410260 !ruby/object:Gem::Requirement
+  requirement: &70215829558960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *70345080410260
+  version_requirements: *70215829558960
 - !ruby/object:Gem::Dependency
   name: actionmailer
-  requirement: &70345080409740 !ruby/object:Gem::Requirement
+  requirement: &70215829558460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70345080409740
+  version_requirements: *70215829558460
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70345080409280 !ruby/object:Gem::Requirement
+  requirement: &70215829558000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: 2.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70345080409280
+  version_requirements: *70215829558000
 description: Gem to extend ActionMailer with SendGrid API support
 email:
 - paveltyk@gmail.com