sendgrid-actionmailer 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0cf44faa71a46698dd397f001b0ed5c07f00edc
-  data.tar.gz: 1feedab0fd41d4d9dbff84441f272bab024bf08d
+  metadata.gz: ff377937e071ce7e6dc1b86856cead94d05227e7
+  data.tar.gz: 75b9942067f8f1595a95492e77de8054de538a60
 SHA512:
-  metadata.gz: 603221943d0dd4cc9446e68f3c77441930efa6f90545e7255e4af56eed0ab7fcf81e66d94ba6fbc72c9f8347db0922f54558ecb9ec6ea1f39ddb0a042520af51
-  data.tar.gz: 2976d343386bb783ed92088d6a3417175ed61441562661d71dac703298bf093e6122b84f6509f2bb010b07cbee4a474067e35e8cb19691cb0cff29e4beb2b602
+  metadata.gz: f1f7897cee79c83ff6f8a437a42423fa1ed37f9ba2e95fb5d03fd56fe8b53f1e9dd6f89bf32cefef9285b8fd045e6805db52e75329dc2bff8719ea48ef4c4f4f
+  data.tar.gz: 83e7ff0e02f48d625e0cee94950e9bad79846a4bc85a16846df7298f37214823a937f3ff0075f889e4d58b4b7b87e906bdf1480cdd73acd580a3c18f930f0f0c

data/.travis.yml

@@ -5,8 +5,8 @@ rvm:
   - 2.4.4
   - 2.3.4
   - 2.3.7
-  - 2.2.10
 before_install:
+  - gem update --system
   - gem install bundler
 gemfile:
   - gemfiles/mail_2.5.gemfile

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')```
 
@@ -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/lib/sendgrid_actionmailer/version.rb

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

data/lib/sendgrid_actionmailer.rb

@@ -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)

data/sendgrid-actionmailer.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'sendgrid-ruby', '~> 5.3.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.2.1
 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: 2019-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -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