sendgrid-actionmailer 2.2.0 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d0cf44faa71a46698dd397f001b0ed5c07f00edc
-  data.tar.gz: 1feedab0fd41d4d9dbff84441f272bab024bf08d
+SHA256:
+  metadata.gz: 94259db52788333029d0c8fc9160c054a0e0bef5fc40b0ff4a2f825c9a337e54
+  data.tar.gz: eee118a0ebb96bf3c098f6c5ec7a28ec832c2b116b4060d7ef25df18ef36d063
 SHA512:
-  metadata.gz: 603221943d0dd4cc9446e68f3c77441930efa6f90545e7255e4af56eed0ab7fcf81e66d94ba6fbc72c9f8347db0922f54558ecb9ec6ea1f39ddb0a042520af51
-  data.tar.gz: 2976d343386bb783ed92088d6a3417175ed61441562661d71dac703298bf093e6122b84f6509f2bb010b07cbee4a474067e35e8cb19691cb0cff29e4beb2b602
+  metadata.gz: 1cb7d6f1972707fa631f27512ab36cc219373ca36725b666d05dab7ea128d270f8454cb30d45b0bc4b7d2f0460ca1ae380a2af3410c585d919461b0994d51cf1
+  data.tar.gz: f2852025eecc5f5087a7e8b41df7cae42f93b4978acf3fb4c8a613f2a3f30eefa83b300affc72234b3f398505bab759a977473ee71a4cc8766c4eb27a3762263

data/.gitignore

@@ -20,3 +20,4 @@ tmp
 *.o
 *.a
 mkmf.log
+.DS_Store

data/.travis.yml

@@ -1,12 +1,12 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.5.1
-  - 2.4.4
-  - 2.3.4
-  - 2.3.7
-  - 2.2.10
+  - 2.6.5
+  - 2.5.7
+  - 2.4.9
+  - 2.3.8
 before_install:
+  - gem update --system
   - gem install bundler
 gemfile:
   - gemfiles/mail_2.5.gemfile

data/CHANGELOG.md

@@ -1,5 +1,36 @@
 # Change Log
 
+## 2.4.0 - 2019-07-9
+
+### Changed
+
+- Compatibility with `sendgrid-ruby` v6.0.
+
+## 2.3.0 - 2019-4-10
+
+### Fixes
+
+- No asm substitutions if template_id present
+
+## 2.2.1 - 2019-1-4
+
+### Fixes
+
+- Fix Travis
+
+## 2.2.0 - 2018-11-23
+
+### Fixes
+
+- Update Readme
+
+## 2.1.0 - 2018-11-20
+
+### Fixes
+
+- Substiutions and dynamic_template_data should be compatible.
+
+
 ## 2.0.0 - 2018-08-15
 
 ### Changed

data/README.md

@@ -45,7 +45,7 @@ The Mail functionality is extended to include additional attributes provided by
 [Sendgrid v3 API Documentation](https://sendgrid.com/docs/API_Reference/api_v3.html)
 
 ### template_id (string)
-The id of a template that you would like to use. If you use a template that contains a subject and content (either text or html), you do not need to specify those at the personalizations nor message level.
+The id of a template that you would like to use. If you use a template that contains a subject, you do not need to specify a subject at the personalizations nor message level. However, because of the way ActionMailer works, a body is required, even if the template contains one. If all your emails use templates with a body, you can add `default body: "not used"` to the top of your mailer.
 
 ```mail(to: 'example@email.com', subject: 'email subject', body: 'email body', template_id: 'template_1')```
 
@@ -217,7 +217,7 @@ The name of the campaign.
 
 ### dynamic_template_data (json)
 
-Data to provide for feeding the new dynamic templates in Sendgrid with valueable data. This also disables the following Unsubscribe links because of deprecation of substitutions in the new template implementaiton.
+Data to provide for feeding the new dynamic templates in Sendgrid with valueable data. This also disables the following Unsubscribe links because of deprecation of substitutions in the new template implementaiton.  Variables are available within templates using [{{handlebar syntax}}](https://sendgrid.com/docs/for-developers/sending-email/using-handlebars).
 
 ```mail(to: 'example@email.com', subject: 'email subject', body: 'email body',  dynamic_template_data:{ variable_1: 'foo', variable_2: 'bar'})```
 
@@ -229,4 +229,4 @@ Sendgrid unfortunately uses <% %> for their default substitution syntax, which m
  * `<a href="%asm_global_unsubscribe_raw_url%">Unsubscribe from List</a>`
  * `<a href="%asm_preferences_raw_url%">Manage Email Preferences</a>`
 
-Note: This feature, and substitutions in general, do not work in combination with dynamic templates.
+Note: This feature, and substitutions in general, do not work in combination with dynamic templates.

data/gemfiles/mail_2.5.gemfile

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "mail", "2.5.4"
+gem "mail", "2.5.5"
 
 gemspec :path => "../"

data/gemfiles/mail_2.6.gemfile

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "mail", "2.6.4"
+gem "mail", "2.6.6"
 
 gemspec :path => "../"

data/gemfiles/mail_2.7.gemfile

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "mail", "2.7.0"
+gem "mail", "2.7.1"
 
 gemspec :path => "../"

data/lib/sendgrid_actionmailer.rb

@@ -83,7 +83,7 @@ module SendGridActionMailer
 
         if mail['dynamic_template_data']
           p.add_dynamic_template_data(json_parse(mail['dynamic_template_data'].value))
-        else
+        elsif mail['template_id'].nil?
           p.add_substitution(Substitution.new(key: "%asm_group_unsubscribe_raw_url%", value: "<%asm_group_unsubscribe_raw_url%>"))
           p.add_substitution(Substitution.new(key: "%asm_global_unsubscribe_raw_url%", value: "<%asm_global_unsubscribe_raw_url%>"))
           p.add_substitution(Substitution.new(key: "%asm_preferences_raw_url%", value: "<%asm_preferences_raw_url%>"))
@@ -136,7 +136,7 @@ module SendGridActionMailer
     end
 
     def json_parse(text, symbolize=true)
-      JSON.parse(text.gsub(/:*\"*([\%a-zA-Z0-9_-]*)\"*(( *)=>\ *)/) { "\"#{$1}\":" }, symbolize_names: symbolize)
+      JSON.parse(text.empty? ? '{}' : text.gsub(/:*\"*([\%a-zA-Z0-9_-]*)\"*(( *)=>\ *)/) { "\"#{$1}\":" }, symbolize_names: symbolize)
     end
 
     def add_send_options(sendgrid_mail, mail)
@@ -163,9 +163,11 @@ module SendGridActionMailer
           sendgrid_mail.add_custom_arg(CustomArg.new(key: key, value: value))
         end
       end
-      if mail['send_at'] && mail['batch_id']
+      if mail['send_at']
         sendgrid_mail.send_at = mail['send_at'].value.to_i
-        sendgrid_mail.batch_id= mail['batch_id'].to_s
+      end
+      if mail['batch_id']
+        sendgrid_mail.batch_id = mail['batch_id'].to_s
       end
       if mail['asm']
         asm = json_parse(mail['asm'].value)
@@ -226,7 +228,7 @@ module SendGridActionMailer
       result = client.mail._('send').post(request_body: email.to_json) # ლ(ಠ益ಠლ) that API
 
       if result.status_code && result.status_code.start_with?('4')
-        message = JSON.parse(result.body).fetch('errors').pop.fetch('message')
+        message = !!(result.body) ? JSON.parse(result.body).fetch('errors').pop.fetch('message') : 'Sendgrid API Error'
         full_message = "Sendgrid delivery failed with #{result.status_code} #{message}"
 
         settings[:raise_delivery_errors] ? raise(SendgridDeliveryError, full_message) : warn(full_message)

data/lib/sendgrid_actionmailer/version.rb

@@ -1,3 +1,3 @@
 module SendGridActionMailer
-  VERSION = '2.2.0'.freeze
+  VERSION = '2.4.2'.freeze
 end

data/sendgrid-actionmailer.gemspec

@@ -20,10 +20,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'mail', '~> 2.5'
-  spec.add_dependency 'sendgrid-ruby', '~> 5.3.0'
+  spec.add_dependency 'sendgrid-ruby', '~> 6.0'
 
   spec.add_development_dependency 'appraisal', '~> 2.1.0'
-  spec.add_development_dependency 'bundler', '~> 1.6'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 3.2'
   spec.add_development_dependency 'webmock'

data/spec/lib/sendgrid_actionmailer_spec.rb

@@ -393,6 +393,18 @@ module SendGridActionMailer
             expect(client.sent_mail['personalizations'].first['dynamic_template_data']).to eq(template_data)
           end
         end
+
+        it 'sets dynamic template data and sandbox_mode' do
+          mail['mail_settings'] = '{}'
+          mailer.deliver!(mail)
+          expect(client.sent_mail['mail_settings']).to eq(nil)
+        end
+
+        it 'sets dynamic template data and sandbox_mode' do
+          mail['mail_settings'] = {}
+          mailer.deliver!(mail)
+          expect(client.sent_mail['mail_settings']).to eq(nil)
+        end
       end
 
       context 'multipart/alternative' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sendgrid-actionmailer
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.4.2
 platform: ruby
 authors:
 - Eddie Zaneski
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-23 00:00:00.000000000 Z
+date: 2020-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -32,14 +32,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.3.0
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.3.0
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -58,16 +58,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -157,8 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: SendGrid support for ActionMailer.