mail-notify 1.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f36508ecc59051156b2be68986f684048edc3fd7dc658cde126b9c473efe730
-  data.tar.gz: 3c7f8e5e9eb5eaff953156826be0889b84bd2518a3034327e50eceb3c7f3efe5
+  metadata.gz: '0871ca5095f5674b08513169aa9361160fa5d55126f471d5ad313101ed854714'
+  data.tar.gz: 67bb0c0ff21658d7ecab145d047318f9822b8256ce9d296df6845a98375ecd2e
 SHA512:
-  metadata.gz: 99c1f607b2fac7a132186ee9a9e81a5a497f61639ccdc3a0ebd87ae19f946d115b3e0b182df532d77b7e5db7ab48bcc4dd4d4b29b3cea727857ddc43fa47ab61
-  data.tar.gz: 485548b456350634e2cafca421c0547c6854ac739b2d702e46f0bde938d3bf74eaac5a2a4f9d9322a74d54ade47b29907f0514b03ec1dbc95bc9586cb8013c89
+  metadata.gz: f989326003aeede1438e09100a01ffb05368a2be7099a2c2bdf86bd4991e6d31ac6c9e25b5e11f442393eb4640002859f2deafc750a7a6269716e02c554b3492
+  data.tar.gz: 1960f73ec4244ef53ba5a9f96eb0a4b0a32ffcb233d8c3acb787310fa01d7e94b2c2ba24abedee62441e6729af92316ab91226159816afa415f94bc26b3fcd3a

data/CHANGELOG.md

@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog]
 
 ## [Unreleased]
 
+## [1.0.1] - 2020-03-06
+
+- Support additional Notify services
+
 ## [1.0] - 2019-10-22
 
 - Bump Notify gem to 5.1
@@ -40,6 +44,7 @@ The format is based on [Keep a Changelog]
 
 [unreleased]:
   https://github.com/DFE-Digital/dfe-teachers-payment-service/compare/1.0...HEAD
+[1.0.1]: https://github.com/dxw/mail-notify/compare/1.0...1.0.1
 [1.0]: https://github.com/dxw/mail-notify/compare/0.2.1...1.0
 [0.2.1]: https://github.com/dxw/mail-notify/compare/0.2.0...0.2.1
 [0.2.0]: https://github.com/dxw/mail-notify/compare/0.1.0...0.2.0

data/Gemfile

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in mail-notify.gemspec
 gemspec

data/README.md

@@ -32,6 +32,16 @@ config.action_mailer.notify_settings = {
 }
 ```
 
+If you're using a different Notify service to GOV.UK Notify (for example [GOV.CA Notify](https://notification.alpha.canada.ca/)), you can also specify the Base URL in your setup:
+
+```ruby
+config.action_mailer.delivery_method = :notify
+config.action_mailer.notify_settings = {
+  api_key: YOUR_NOTIFY_API_KEY,
+  base_url: 'https://api.notification.alpha.canada.ca'
+}
+```
+
 ### Mailers
 
 There are two options for using `Mail::Notify`, either templating in Rails with a view, or templating in Notify. Whichever way you choose, you'll need your mailers to inherit from `Mail::Notify::Mailer` like so:

data/Rakefile

@@ -1,13 +1,12 @@
 # frozen_string_literal: true
 
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
-require 'rubocop/rake_task'
-require 'coveralls/rake/task'
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+require "standard/rake"
+require "coveralls/rake/task"
 
 Coveralls::RakeTask.new
-RuboCop::RakeTask.new
 
 RSpec::Core::RakeTask.new(:spec)
 
-task default: %i[rubocop spec coveralls:push]
+task default: %i[standard spec coveralls:push]

data/lib/mail/notify.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-require 'notifications/client'
+require "notifications/client"
 
-require 'mail/notify/version'
-require 'mail/notify/railtie' if defined? Rails
-require 'mail/notify/delivery_method'
-require 'mail/notify/personalisation'
-require 'mail/notify/mailer'
-require 'mail/notify/message'
-require 'mail/notify/mailers_controller'
+require "mail/notify/version"
+require "mail/notify/railtie" if defined? Rails
+require "mail/notify/delivery_method"
+require "mail/notify/personalisation"
+require "mail/notify/mailer"
+require "mail/notify/message"
+require "mail/notify/mailers_controller"
 
 Mail::Message.include Mail::Notify::Message
 

data/lib/mail/notify/delivery_method.rb

@@ -6,7 +6,7 @@ module Mail
       attr_accessor :settings, :response
 
       def initialize(settings)
-        raise ArgumentError, 'You must specify an API key' if settings[:api_key].blank?
+        raise ArgumentError, "You must specify an API key" if settings[:api_key].blank?
 
         @settings = settings
       end
@@ -26,7 +26,7 @@ module Mail
       private
 
       def client
-        @client ||= Notifications::Client.new(@settings[:api_key])
+        @client ||= Notifications::Client.new(@settings[:api_key], @settings[:base_url])
       end
 
       def email_params

data/lib/mail/notify/mailer.rb

@@ -4,15 +4,15 @@ module Mail
   module Notify
     class Mailer < ActionMailer::Base
       def view_mail(template_id, headers)
-        raise ArgumentError, 'You must specify a template ID' if template_id.blank?
+        raise ArgumentError, "You must specify a template ID" if template_id.blank?
 
         mail(headers.merge(template_id: template_id))
       end
 
       def template_mail(template_id, headers)
-        raise ArgumentError, 'You must specify a template ID' if template_id.blank?
+        raise ArgumentError, "You must specify a template ID" if template_id.blank?
 
-        mail(headers.merge(body: '', subject: '', template_id: template_id))
+        mail(headers.merge(body: "", subject: "", template_id: template_id))
       end
     end
   end

data/lib/mail/notify/mailers_controller.rb

@@ -23,13 +23,13 @@ module Mail
         # the `govuk_notify_layout` layout
         append_view_path(__dir__)
 
-        response.content_type = 'text/html'
-        render html: @email.preview.html.html_safe, layout: 'govuk_notify_layout'
+        response.content_type = "text/html"
+        render html: @email.preview.html.html_safe, layout: "govuk_notify_layout"
       end
 
       def render_preview_wrapper
         @part = @email
-        render action: 'email', layout: false, formats: %i[html]
+        render action: "email", layout: false, formats: %i[html]
       end
 
       def notify?

data/lib/mail/notify/railtie.rb

@@ -3,11 +3,11 @@
 module Mail
   module Notify
     class Railtie < Rails::Railtie
-      initializer 'mail-notify.add_delivery_method', before: 'action_mailer.set_configs' do
+      initializer "mail-notify.add_delivery_method", before: "action_mailer.set_configs" do
         ActionMailer::Base.add_delivery_method(:notify, Mail::Notify::DeliveryMethod)
       end
 
-      initializer 'mail-notify.action_controller' do
+      initializer "mail-notify.action_controller" do
         ActiveSupport.on_load(:action_controller, run_once: true) do
           Rails::MailersController.prepend(Mail::Notify::MailersController)
         end

data/lib/mail/notify/version.rb

@@ -2,6 +2,6 @@
 
 module Mail
   module Notify
-    VERSION = '1.0'
+    VERSION = "1.0.1"
   end
 end

data/mail-notify.gemspec

@@ -1,37 +1,38 @@
 # frozen_string_literal: true
 
-lib = File.expand_path('lib', __dir__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'mail/notify/version'
+require "mail/notify/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'mail-notify'
-  spec.version       = Mail::Notify::VERSION
-  spec.authors       = ['Stuart Harrison']
-  spec.email         = ['pezholio@gmail.com']
+  spec.name = "mail-notify"
+  spec.version = Mail::Notify::VERSION
+  spec.authors = ["Stuart Harrison"]
+  spec.email = ["pezholio@gmail.com"]
 
-  spec.summary       = 'ActionMailer support for the GOV.UK Notify API'
-  spec.homepage      = 'https://github.com/dxw/mail-notify'
-  spec.license       = 'MIT'
+  spec.summary = "ActionMailer support for the GOV.UK Notify API"
+  spec.homepage = "https://github.com/dxw/mail-notify"
+  spec.license = "MIT"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path(__dir__)) do
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.bindir        = 'exe'
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
 
-  spec.add_development_dependency 'bundler', '~> 2.0'
-  spec.add_development_dependency 'coveralls', '~> 0.8.22'
-  spec.add_development_dependency 'pry', '~> 0.12.0'
-  spec.add_development_dependency 'rails', '~> 6.0'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec-rails', '~> 3.8'
-  spec.add_development_dependency 'rubocop', '~> 0.63'
-  spec.add_development_dependency 'sqlite3', '~> 1.4.1'
+  spec.add_development_dependency "bundler", "~> 2.0"
+  spec.add_development_dependency "coveralls", "~> 0.8.22"
+  spec.add_development_dependency "pry", "~> 0.12.0"
+  spec.add_development_dependency "rails", "~> 6.0"
+  spec.add_development_dependency "rake", "~> 12.3.3"
+  spec.add_development_dependency "rspec-rails", "~> 3.8"
+  spec.add_development_dependency "standard", "~> 0.2"
+  spec.add_development_dependency "sqlite3", "~> 1.4.1"
+  spec.add_development_dependency "webmock", "~> 3.7.6"
 
-  spec.add_dependency 'actionmailer', '>= 5.0', '< 6.1'
-  spec.add_dependency 'notifications-ruby-client', '~> 5.1'
+  spec.add_dependency "actionmailer", ">= 5.0", "< 6.1"
+  spec.add_dependency "notifications-ruby-client", "~> 5.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mail-notify
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: 1.0.1
 platform: ruby
 authors:
 - Stuart Harrison
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-17 00:00:00.000000000 Z
+date: 2020-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -95,19 +95,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.8'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: standard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.63'
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.63'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.1
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.7.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.7.6
 - !ruby/object:Gem::Dependency
   name: actionmailer
   requirement: !ruby/object:Gem::Requirement