sendgrid-rails 2.0.3 → 2.0.4

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YmUyZWE1MDNiMWY3NzBjMWUyMmJiOGFhYzdkMmViMjAxMGMzYTFlYg==
+  data.tar.gz: !binary |-
+    NjY1MTFkMWEwODkzODViMWQxODNiZTJhN2YxN2Y5ODE3ZTQxOGM1MQ==
+SHA512:
+  metadata.gz: !binary |-
+    NWI4MTg5MjRiYTFiNGE5ODAxNGU5N2JmZDE5NDlmMGU4NmZiNDYzZWY4NThm
+    Mzk5YWFhMjhhMDc0ZmYxMmY0M2JmNzg5NDg5MTUwMjA5YWExYWFhZmNmZGQ1
+    MmZlMDRjZThlNmVhYjhlOTEyZTI3ZjY1MTljOTZmZjhmZWM4Y2M=
+  data.tar.gz: !binary |-
+    NTQ4MmIwMWQyNzFlNjhjZDBhMzJiZjRkY2RmNGYxYTI0ZjY0YTFmYjNiZmQy
+    ZDEyNzNlZmJkOTc1YzM4MDAzMjI1YzMyNzFjMzY4ZTFjN2I3NGM3MTM3NmI2
+    MDQ2ZmQ5N2YwYWIyNGNlZDI0YWFiYzU4ZTRlODI3MmFlNmIyMzY=

data/README.rdoc

@@ -31,7 +31,7 @@ In config/initializers/mail.rb:
 === Overriding default recipient in standard SMTP header
 
 Dummy recipient email used in sent email's "To" header and seen in received email's Received header.
-By deefault set to 'dummy@email.com'
+By default set to 'dummy@email.com'
 
 In config/initializers/mail.rb:
 
@@ -101,6 +101,14 @@ Add an invisible image at the end of the email to track e-mail opens. If the ema
 
 == Change log
 
+*v2.0.4*
+
+* CC and BCC are copied to SendGrid XSMTP-API header
+
+*v2.0.3*
+
+* Ability to change "dummy_recipient" in config
+
 *v2.0.2*
 
 * ApiHeader#to_json wraps array items with spaces

data/lib/send_grid/api_header.rb

@@ -1,32 +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
-    JSON.generate(@data, :array_nl => ' ')
-  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/mail_interceptor.rb

@@ -3,6 +3,8 @@ module SendGrid
     def self.delivering_email(mail)
       sendgrid_header = mail.instance_variable_get(:@sendgrid_header)
       sendgrid_header.add_recipients(mail.to)
+      sendgrid_header.add_recipients(mail.cc)
+      sendgrid_header.add_recipients(mail.bcc)
       mail.header['X-SMTPAPI'] = sendgrid_header.to_json if sendgrid_header.data.present?
       mail.header['to'] = SendGrid.config.dummy_recipient
     end

data/lib/send_grid/version.rb

@@ -1,4 +1,4 @@
-module SendGrid
-  VERSION = "2.0.3"
-end
-
+module SendGrid
+  VERSION = "2.0.4"
+end
+

data/send_grid.gemspec

@@ -9,6 +9,7 @@ Gem::Specification.new do |s|
   s.authors     = ["PavelTyk"]
   s.email       = ["paveltyk@gmail.com"]
   s.homepage    = "https://github.com/PavelTyk/sendgrid-rails"
+  s.license     = "MIT"
   s.summary     = %q{SendGrid gem fo Rails 3}
   s.description = %q{Gem to extend ActionMailer with SendGrid API support}
 

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/fixtures/mailers/mailer.rb

@@ -6,6 +6,10 @@ class Mailer < ActionMailer::Base
     mail :to => recipients, :body => "Hello!"
   end
 
+  def email_with_cc_recipients(recipients, cc, bcc)
+    mail :to => recipients, :body => "Hello!", :cc => cc, :bcc => bcc
+  end
+
   def email_open_tracking(opentrack_enabled = true)
     open_tracking opentrack_enabled
     mail :to => 'email@email.com', :body => 'Hello!'

data/spec/mailer_spec.rb

@@ -5,6 +5,9 @@ describe Mailer 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" ]}')
+
+      Mailer.email_with_cc_recipients(%w(em1@email.com), %w(cc@email.com), %w(bcc@email.com)).deliver.header.to_s.
+        should include('X-SMTPAPI: {"to":[ "em1@email.com", "cc@email.com", "bcc@email.com" ]}')
     end
 
     it 'removes original TO header part' do

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: sendgrid-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.3
-  prerelease: 
+  version: 2.0.4
 platform: ruby
 authors:
 - PavelTyk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-13 00:00:00.000000000 Z
+date: 2014-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -85,28 +78,28 @@ files:
 - spec/spec_helper.rb
 - spec/version_spec.rb
 homepage: https://github.com/PavelTyk/sendgrid-rails
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: sendgrid-rails
-rubygems_version: 1.8.25
+rubygems_version: 2.1.10
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: SendGrid gem fo Rails 3
 test_files:
 - spec/api_header_spec.rb