send_grid_mailer 1.2.1 → 2.0.0

data/spec/dummy/spec/mailers/test_mailer_spec.rb

@@ -94,7 +94,7 @@ describe TestMailer do
         end
       end
 
-      context "setting body" do
+      context "when setting body" do
         let(:deliver) { described_class.body_email.deliver_now! }
 
         it "sends mail with valid body" do
@@ -120,7 +120,7 @@ describe TestMailer do
         end
       end
 
-      context "setting body from params" do
+      context "when setting body from params" do
         let(:deliver) { described_class.body_params_email.deliver_now! }
 
         it "sends mail with valid body" do
@@ -146,7 +146,7 @@ describe TestMailer do
         end
       end
 
-      context "setting body from rails template" do
+      context "when setting body from rails template" do
         let(:deliver) { described_class.rails_tpl_email.deliver_now! }
 
         it "sends mail with valid body" do
@@ -172,7 +172,7 @@ describe TestMailer do
         end
       end
 
-      context "overriding default from" do
+      context "when overriding default from" do
         let(:request_body) do
           {
             "from" =>
@@ -193,7 +193,7 @@ describe TestMailer do
           }
         end
 
-        context "using params" do
+        context "when using params" do
           let(:deliver) { described_class.from_params_email.deliver_now! }
           let(:subject) { "From params email" }
 
@@ -202,7 +202,7 @@ describe TestMailer do
           end
         end
 
-        context "using methods" do
+        context "when using methods" do
           let(:deliver) { described_class.from_email.deliver_now! }
           let(:subject) { "From email" }
 
@@ -212,7 +212,7 @@ describe TestMailer do
         end
       end
 
-      context "setting recipients" do
+      context "with setting recipients" do
         let(:request_body) do
           {
             "from" =>
@@ -251,7 +251,7 @@ describe TestMailer do
           }
         end
 
-        context "using params" do
+        context "when using params" do
           let(:deliver) { described_class.recipients_params_email.deliver_now! }
           let(:subject) { "Recipients params email" }
 
@@ -260,7 +260,7 @@ describe TestMailer do
           end
         end
 
-        context "using methods" do
+        context "when using methods" do
           let(:deliver) { described_class.recipients_email.deliver_now! }
           let(:subject) { "Recipients email" }
 
@@ -270,7 +270,7 @@ describe TestMailer do
         end
       end
 
-      context "setting template id" do
+      context "when setting template id" do
         let(:request_body) do
           {
             "from" =>
@@ -286,7 +286,7 @@ describe TestMailer do
           }
         end
 
-        context "using params" do
+        context "when using params" do
           let(:deliver) { described_class.template_id_params_email.deliver_now! }
           let(:subject) { "Template id params email" }
 
@@ -295,7 +295,7 @@ describe TestMailer do
           end
         end
 
-        context "using methods" do
+        context "when using methods" do
           let(:deliver) { described_class.template_id_email.deliver_now! }
           let(:subject) { "Template id email" }
 
@@ -305,7 +305,7 @@ describe TestMailer do
         end
       end
 
-      context "setting subject" do
+      context "when setting subject" do
         let(:request_body) do
           {
             "from" =>
@@ -326,7 +326,7 @@ describe TestMailer do
           }
         end
 
-        context "using params" do
+        context "when using params" do
           let(:deliver) { described_class.subject_params_email.deliver_now! }
 
           it "sends mail with valid subject" do
@@ -334,7 +334,7 @@ describe TestMailer do
           end
         end
 
-        context "using methods" do
+        context "when using methods" do
           let(:deliver) { described_class.subject_email.deliver_now! }
 
           it "sends mail with valid subject" do
@@ -343,7 +343,7 @@ describe TestMailer do
         end
       end
 
-      context "setting headers" do
+      context "when setting headers" do
         let(:request_body) do
           {
             "from" =>
@@ -369,7 +369,7 @@ describe TestMailer do
           }
         end
 
-        context "using params" do
+        context "when using params" do
           let(:deliver) { described_class.headers_params_email.deliver_now! }
           let(:subject) { "Headers params email" }
 
@@ -378,7 +378,7 @@ describe TestMailer do
           end
         end
 
-        context "using methods" do
+        context "when using methods" do
           let(:deliver) { described_class.headers_email.deliver_now! }
           let(:subject) { "Headers email" }
 
@@ -388,7 +388,7 @@ describe TestMailer do
         end
       end
 
-      context "adding attachments" do
+      context "when adding attachments" do
         let(:deliver) { described_class.add_attachments_email.deliver_now! }
 
         it "sends mail with valid body" do
@@ -426,7 +426,7 @@ describe TestMailer do
         end
       end
 
-      context "adding substitutions" do
+      context "when adding substitutions" do
         let(:deliver) { described_class.substitutions_email.deliver_now! }
 
         it "sends mail with valid body" do
@@ -457,7 +457,7 @@ describe TestMailer do
         end
       end
 
-      context "working with recipient interceptor" do
+      context "when working with recipient interceptor" do
         let(:interceptor) { double(:interceptor, class: "RecipientInterceptor") }
         let(:deliver) { described_class.recipients_email.deliver_now! }
         let(:request_body) do
@@ -517,9 +517,6 @@ describe TestMailer do
   end
 
   context "when setting delivery_method to :sendgrid_dev" do
-    let(:sub) { 'value' }
-    let(:deliver) { described_class.template_with_substitutions_email(sub).deliver_now! }
-
     before { allow(TestMailer).to receive(:delivery_method).and_return(:sendgrid_dev) }
 
     context "with valid API key" do
@@ -528,6 +525,9 @@ describe TestMailer do
       end
 
       context "with unsuccessful response" do
+        let(:sub) { 'value' }
+        let(:deliver) { described_class.template_with_substitutions_email(sub).deliver_now! }
+
         it "raises sendgrid mailer error" do
           errors = [
             {
@@ -583,30 +583,68 @@ describe TestMailer do
         end
 
         context 'when there are template versions' do
-          def active_template(sub = "%key%")
-            "<h1>Active version</h1>"\
-            "<span>This should be replaced: #{sub}</span>"\
-            "<span>This should not be replaced: %key2%</span>"
-          end
-  
-          let(:response) { {
-            versions: [
+          context "when using substitutions" do
+            let(:sub) { 'value' }
+            let(:deliver) { described_class.template_with_substitutions_email(sub).deliver_now! }
+            let(:response) do
               {
-                active: 1,
-                html_content: active_template
-              }, 
+                versions: [
+                  {
+                    active: 1,
+                    html_content: active_template
+                  },
+                  {
+                    active: 0,
+                    html_content: ''
+                  }
+                ]
+              }.to_json
+            end
+
+            def active_template(sub = "%key%")
+              "<h1>Active version</h1>"\
+              "<span>This should be replaced: #{sub}</span>"\
+              "<span>This should not be replaced: %key2%</span>"
+            end
+
+            it "gets templates from sendgrid api, applies substitutions to active one and "\
+               "uses LetterOpener to deliver it" do
+              expect_valid_sg_api_get_template_request(response)
+              expect(lo).to have_received(:deliver!) do |arg|
+                expect(arg.html_part.to_s).to include(active_template(sub))
+              end
+            end
+          end
+
+          context "when using dynamic templates" do
+            let(:data) { 'value' }
+            let(:deliver) { described_class.dynamic_template_email(data).deliver_now! }
+            let(:response) do
               {
-                active: 0,
-                html_content: ''
-              }, 
-            ]
-          }.to_json}
-  
-          it "gets templates form sendgrid api, applies substitutions to active one and "\
-             "uses LetterOpener to deliver it" do
-            expect_valid_sg_api_get_template_request(response)
-            expect(lo).to have_received(:deliver!) do |arg|
-              expect(arg.html_part.to_s).to include(active_template(sub))
+                versions: [
+                  {
+                    active: 1,
+                    html_content: active_dynamic_template
+                  },
+                  {
+                    active: 0,
+                    html_content: ''
+                  }
+                ]
+              }.to_json
+            end
+
+            def active_dynamic_template(data = "{{key}}")
+              "<h1>Active dynamic version</h1>"\
+              "<span>This should be replaced: #{data}</span>"
+            end
+
+            it "gets templates from sendgrid api, applies dynamic data to active one and "\
+               "uses LetterOpener to deliver it" do
+              expect_valid_sg_api_get_template_request(response)
+              expect(lo).to have_received(:deliver!) do |arg|
+                expect(arg.html_part.to_s).to include(active_dynamic_template(data))
+              end
             end
           end
         end

data/spec/rails_helper.rb

@@ -30,19 +30,17 @@ ActiveRecord::Migration.maintain_test_schema!
 
 Dir[::Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
 
+FactoryBot.definition_file_paths = ["#{::Rails.root}/spec/factories"]
+FactoryBot.find_definitions
+
 RSpec.configure do |config|
   config.fixture_path = "#{::Rails.root}/spec/assets"
-  config.use_transactional_fixtures = true
   config.infer_spec_type_from_file_location!
   config.filter_rails_from_backtrace!
 
   config.filter_run :focus
   config.run_all_when_everything_filtered = true
 
-  FactoryBot.definition_file_paths = ["#{::Rails.root}/spec/factories"]
-  FactoryBot.find_definitions
-
   config.include FactoryBot::Syntax::Methods
   config.include ActionDispatch::TestProcess
-  config.include TestHelpers
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: send_grid_mailer
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Platanus
@@ -9,8 +9,36 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-16 00:00:00.000000000 Z
+date: 2021-06-25 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: handlebars
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+- !ruby/object:Gem::Dependency
+  name: letter_opener
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -31,34 +59,62 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.4
+        version: 5.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.4
+        version: 5.3.0
 - !ruby/object:Gem::Dependency
-  name: letter_opener
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: factory_bot_rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
-  type: :runtime
+        version: '4.7'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: '4.7'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -88,49 +144,49 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.13
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.13
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: 0.65.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: 0.65.0
 - !ruby/object:Gem::Dependency
-  name: factory_bot_rails
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -144,19 +200,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
 description: Is an Action Mailer adapter for using SendGrid in a Rails application
 email:
 - rubygems@platan.us
@@ -165,13 +221,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
+- ".circleci/setup-rubygems.sh"
 - ".coveralls.yml"
 - ".gitignore"
-- ".hound.yml"
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-version"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Guardfile
@@ -194,49 +250,57 @@ files:
 - send_grid_mailer.gemspec
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
-- spec/dummy/app/assets/javascripts/application.js
+- spec/dummy/app/assets/config/manifest.js
 - spec/dummy/app/assets/stylesheets/application.css
+- spec/dummy/app/channels/application_cable/channel.rb
+- spec/dummy/app/channels/application_cable/connection.rb
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/javascript/packs/application.js
+- spec/dummy/app/jobs/application_job.rb
 - spec/dummy/app/mailers/application_mailer.rb
 - spec/dummy/app/mailers/test_mailer.rb
+- spec/dummy/app/models/application_record.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/views/layouts/mailer.html.erb
 - spec/dummy/app/views/layouts/mailer.text.erb
 - spec/dummy/app/views/test_mailer/rails_tpl_email.html.erb
-- spec/dummy/bin/bundle
 - spec/dummy/bin/rails
 - spec/dummy/bin/rake
 - spec/dummy/bin/setup
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
+- spec/dummy/config/cable.yml
 - spec/dummy/config/database.yml
 - spec/dummy/config/environment.rb
 - spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
+- spec/dummy/config/initializers/application_controller_renderer.rb
 - spec/dummy/config/initializers/assets.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
+- spec/dummy/config/initializers/content_security_policy.rb
 - spec/dummy/config/initializers/cookies_serializer.rb
 - spec/dummy/config/initializers/filter_parameter_logging.rb
 - spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/session_store.rb
+- spec/dummy/config/initializers/permissions_policy.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
+- spec/dummy/config/puma.rb
 - spec/dummy/config/routes.rb
-- spec/dummy/config/secrets.yml
-- spec/dummy/db/schema.rb
+- spec/dummy/config/storage.yml
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
+- spec/dummy/public/apple-touch-icon-precomposed.png
+- spec/dummy/public/apple-touch-icon.png
 - spec/dummy/public/favicon.ico
 - spec/dummy/spec/assets/image.png
 - spec/dummy/spec/assets/video.mp4
 - spec/dummy/spec/lib/send_grid_mailer/definition_spec.rb
 - spec/dummy/spec/mailers/test_mailer_spec.rb
-- spec/dummy/spec/support/test_helpers.rb
 - spec/rails_helper.rb
 - spec/spec_helper.rb
 homepage: https://github.com/platanus/send_grid_mailer
@@ -258,56 +322,63 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Action Mailer adapter for using SendGrid
 test_files:
-- spec/spec_helper.rb
 - spec/dummy/README.rdoc
+- spec/dummy/Rakefile
+- spec/dummy/app/assets/config/manifest.js
+- spec/dummy/app/assets/stylesheets/application.css
+- spec/dummy/app/channels/application_cable/channel.rb
+- spec/dummy/app/channels/application_cable/connection.rb
+- spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/javascript/packs/application.js
+- spec/dummy/app/jobs/application_job.rb
 - spec/dummy/app/mailers/application_mailer.rb
 - spec/dummy/app/mailers/test_mailer.rb
-- spec/dummy/app/views/test_mailer/rails_tpl_email.html.erb
+- spec/dummy/app/models/application_record.rb
 - spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/app/views/layouts/mailer.text.erb
 - spec/dummy/app/views/layouts/mailer.html.erb
-- spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/assets/stylesheets/application.css
-- spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/Rakefile
-- spec/dummy/bin/rake
-- spec/dummy/bin/bundle
+- spec/dummy/app/views/layouts/mailer.text.erb
+- spec/dummy/app/views/test_mailer/rails_tpl_email.html.erb
 - spec/dummy/bin/rails
+- spec/dummy/bin/rake
 - spec/dummy/bin/setup
-- spec/dummy/spec/mailers/test_mailer_spec.rb
-- spec/dummy/spec/lib/send_grid_mailer/definition_spec.rb
-- spec/dummy/spec/support/test_helpers.rb
-- spec/dummy/spec/assets/image.png
-- spec/dummy/spec/assets/video.mp4
-- spec/dummy/public/404.html
-- spec/dummy/public/500.html
-- spec/dummy/public/422.html
-- spec/dummy/public/favicon.ico
 - spec/dummy/config.ru
-- spec/dummy/db/schema.rb
-- spec/dummy/config/routes.rb
-- spec/dummy/config/environment.rb
-- spec/dummy/config/secrets.yml
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
-- spec/dummy/config/environments/test.rb
+- spec/dummy/config/cable.yml
+- spec/dummy/config/database.yml
+- spec/dummy/config/environment.rb
 - spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/production.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/filter_parameter_logging.rb
+- spec/dummy/config/environments/test.rb
+- spec/dummy/config/initializers/application_controller_renderer.rb
 - spec/dummy/config/initializers/assets.rb
-- spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/cookies_serializer.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/database.yml
+- spec/dummy/config/initializers/content_security_policy.rb
+- spec/dummy/config/initializers/cookies_serializer.rb
+- spec/dummy/config/initializers/filter_parameter_logging.rb
+- spec/dummy/config/initializers/inflections.rb
+- spec/dummy/config/initializers/mime_types.rb
+- spec/dummy/config/initializers/permissions_policy.rb
+- spec/dummy/config/initializers/wrap_parameters.rb
+- spec/dummy/config/locales/en.yml
+- spec/dummy/config/puma.rb
+- spec/dummy/config/routes.rb
+- spec/dummy/config/storage.yml
+- spec/dummy/public/404.html
+- spec/dummy/public/422.html
+- spec/dummy/public/500.html
+- spec/dummy/public/apple-touch-icon-precomposed.png
+- spec/dummy/public/apple-touch-icon.png
+- spec/dummy/public/favicon.ico
+- spec/dummy/spec/assets/image.png
+- spec/dummy/spec/assets/video.mp4
+- spec/dummy/spec/lib/send_grid_mailer/definition_spec.rb
+- spec/dummy/spec/mailers/test_mailer_spec.rb
 - spec/rails_helper.rb
+- spec/spec_helper.rb