sendgrid-rails 2.0.2 → 2.0.3

data/.gitignore

@@ -3,3 +3,4 @@
 .rvmrc
 Gemfile.lock
 pkg/*
+nbproject/

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - 1.9.2
+  - 1.9.3
+  - rbx-19mode
+script: bundle exec rspec spec

data/README.rdoc

@@ -1,4 +1,4 @@
-= SendGrid gem for Rails
+= SendGrid gem for Rails 3 {<img src="https://secure.travis-ci.org/PavelTyk/sendgrid-rails.png" />}[http://travis-ci.org/PavelTyk/sendgrid-rails]
 
 SendGrid gem provides ActionMailer::Base extensions to use SendGrid API features in you emails.
 It extends ActionMailer with next methods:
@@ -15,7 +15,7 @@ In your Gemfile:
 
     gem 'sendgrid-rails', '~> 2.0'
 
-In your config/environment.rb:
+In config/initializers/mail.rb:
 
     ActionMailer::Base.register_interceptor(SendGrid::MailInterceptor)
     
@@ -28,6 +28,17 @@ In your config/environment.rb:
       :password => 'your password'
     }
 
+=== 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'
+
+In config/initializers/mail.rb:
+
+    SendGrid.configure do |config|
+      config.dummy_recipient = 'noreply@example.com'
+    end
+
 == Usage examples
 
 === Adding multiple recipients:
@@ -58,17 +69,17 @@ Mailer class definition:
 
 === Adding category
 
-    Mailer class definition:
+Mailer class definition:
 
-        class Mailer < ActionMailer::Base
-          default :from => 'no-reply@example.com',
-                  :subject => 'An email sent via SendGrid with substitutions'
+    class Mailer < ActionMailer::Base
+      default :from => 'no-reply@example.com',
+              :subject => 'An email sent via SendGrid with substitutions'
 
-          def email_with_category
-            category 'SendGridRocks'
-            mail :to => 'email1@email.com'
-          end
-        end
+      def email_with_category
+        category 'SendGridRocks'
+        mail :to => 'email1@email.com'
+      end
+    end
 
 == Apps (formerly called Filters)
 
@@ -90,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.2*
+
+* ApiHeader#to_json wraps array items with spaces
+
+*v2.0.1*
+
+* Standard SMTP To attribute set to 'dummy@email.com' after recipients added to X-SMTPAPI header
+
 *v2.0*
 
 * Using mail interceptor

data/lib/send_grid.rb

@@ -2,6 +2,7 @@ module SendGrid
   autoload :ApiHeader, 'send_grid/api_header'
   autoload :MailInterceptor, 'send_grid/mail_interceptor'
   autoload :VERSION, 'send_grid/version'
+  autoload :Config, 'send_grid/config'
 
   def self.included(base)
     base.class_eval do
@@ -27,4 +28,17 @@ module SendGrid
       add_filter_setting(:opentrack, :enabled, enabled ? 1 : 0) unless enabled.nil?
     end
   end
+
+  class << self
+    attr_writer :config
+
+    def config
+      @config ||= SendGrid::Config.new
+    end
+
+    # Sendgrid.config will be default if block is not passed
+    def configure
+      yield(self.config) if block_given?
+    end
+  end
 end

data/lib/send_grid/config.rb

@@ -0,0 +1,7 @@
+class SendGrid::Config
+  attr_accessor :dummy_recipient
+
+  def initialize
+    @dummy_recipient = "dummy@email.com"
+  end
+end

data/lib/send_grid/mail_interceptor.rb

@@ -4,7 +4,7 @@ module SendGrid
       sendgrid_header = mail.instance_variable_get(:@sendgrid_header)
       sendgrid_header.add_recipients(mail.to)
       mail.header['X-SMTPAPI'] = sendgrid_header.to_json if sendgrid_header.data.present?
-      mail.header['to'] = 'dummy@email.com'
+      mail.header['to'] = SendGrid.config.dummy_recipient
     end
   end
 end

data/lib/send_grid/version.rb

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

data/lib/sendgrid-rails.rb

@@ -1,6 +1,6 @@
 require 'send_grid'
 require 'active_support'
 require 'active_support/core_ext'
-autoload :ActionMailer, 'action_mailer'
+require 'action_mailer'
 
 ActionMailer::Base.send :include, SendGrid

data/spec/mailer_spec.rb

@@ -1,42 +1,62 @@
-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
+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
+
+  describe 'dummy_recipient used in TO is taken from config' do
+    it 'should be used in TO default dummy_recipient' do
+      # by defaut dummy_recipient's email is dummy@email.com
+
+      Mailer.email_with_multiple_recipients(%w(em1@email.com em2@email.com)).deliver.header.to_s.
+        should include('To: dummy@email.com')
+    end
+
+    it 'should be used in To defined in config dummy_recipient' do
+      # dummy_recipient can be redefined config/initializers
+
+      SendGrid.configure do |config|
+        config.dummy_recipient = 'noreply@example.com'
+      end
+
+      Mailer.email_with_multiple_recipients(%w(em1@email.com em2@email.com)).deliver.header.to_s.
+        should include('To: noreply@example.com')
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sendgrid-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-28 00:00:00.000000000Z
+date: 2013-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70215829558960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *70215829558960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: actionmailer
-  requirement: &70215829558460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70215829558460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70215829558000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +53,12 @@ dependencies:
         version: 2.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70215829558000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 description: Gem to extend ActionMailer with SendGrid API support
 email:
 - paveltyk@gmail.com
@@ -53,11 +68,13 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - README.rdoc
 - Rakefile
 - lib/send_grid.rb
 - lib/send_grid/api_header.rb
+- lib/send_grid/config.rb
 - lib/send_grid/mail_interceptor.rb
 - lib/send_grid/version.rb
 - lib/sendgrid-rails.rb
@@ -87,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: sendgrid-rails
-rubygems_version: 1.8.10
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: SendGrid gem fo Rails 3