govuk_notify_rails 1.0.0 → 2.0.0

data/spec/dummy/public/robots.txt

@@ -0,0 +1,5 @@
+# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file
+#
+# To ban all spiders from the entire site uncomment the next two lines:
+# User-agent: *
+# Disallow: /

data/spec/govuk_notify_delivery/delivery_spec.rb

@@ -3,36 +3,54 @@ require 'govuk_notify_rails/delivery'
 
 describe GovukNotifyRails::Delivery do
   describe '#deliver!' do
-    let(:service_id) { 'service-123' }
-    let(:secret_key) { 'secret' }
+    let(:api_key) { 'api-key' }
     let(:notify_client) { double('NotifyClient') }
 
     let(:personalisation) { { name: 'John' } }
+    let(:reference) { 'my_reference' }
 
     let(:message) do
-      instance_double(Mail::Message,
-                      to: ['email@example.com'],
-                      govuk_notify_template: 'template-123',
-                      govuk_notify_personalisation: personalisation)
+      instance_double(
+        Mail::Message,
+        to: ['email@example.com'],
+        govuk_notify_template: 'template-123',
+        govuk_notify_reference: reference,
+        govuk_notify_personalisation: personalisation
+      )
     end
 
-    subject { described_class.new(service_id: service_id, secret_key: secret_key) }
+    subject { described_class.new(api_key: api_key) }
 
     before(:each) do
-      allow(notify_client).to receive(:new).with(service_id, secret_key).and_return(notify_client)
+      allow(notify_client).to receive(:new).with(api_key).and_return(notify_client)
       allow(subject).to receive(:notify_client).and_return(notify_client)
     end
 
     it 'should deliver the message payload' do
-      expect(notify_client).to receive(:send_email).with({to: 'email@example.com', template: 'template-123', personalisation: {name: 'John'}})
+      expect(notify_client).to receive(:send_email).with(
+        {email_address: 'email@example.com', template_id: 'template-123', reference: reference, personalisation: personalisation}
+      )
       subject.deliver!(message)
     end
 
     context 'no personalisation set' do
       let(:personalisation) { nil }
 
-      it 'supports message without personalisation' do
-        expect(notify_client).to receive(:send_email).with({to: 'email@example.com', template: 'template-123'})
+      it 'supports messages without personalisation' do
+        expect(notify_client).to receive(:send_email).with(
+          {email_address: 'email@example.com', template_id: 'template-123', reference: reference}
+        )
+        subject.deliver!(message)
+      end
+    end
+
+    context 'no reference set' do
+      let(:reference) { nil }
+
+      it 'supports messages without a reference' do
+        expect(notify_client).to receive(:send_email).with(
+          {email_address: 'email@example.com', template_id: 'template-123', personalisation: personalisation}
+        )
         subject.deliver!(message)
       end
     end

data/spec/mailers/notify_mailer_spec.rb

@@ -4,6 +4,7 @@ require 'govuk_notify_rails/mailer'
 RSpec.describe NotifyMailer, type: :mailer do
   describe 'new_message_test_email' do
     let(:template) { '9661d08a-486d-4c67-865e-ad976f17871d' }
+    let(:reference) { 'my_reference' }
     let(:user) { double('User', name: 'Test Name', email: 'test@example.com') }
     let(:mail) { described_class.test_email(user) }
 
@@ -23,6 +24,10 @@ RSpec.describe NotifyMailer, type: :mailer do
       expect(mail.govuk_notify_template).to eq(template)
     end
 
+    it 'sets the reference' do
+      expect(mail.govuk_notify_reference).to eq(reference)
+    end
+
     it 'sets the personalisation' do
       expect(mail.govuk_notify_personalisation.keys).to eq([:full_name])
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_notify_rails
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Jesus Laiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-31 00:00:00.000000000 Z
+date: 2017-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -17,9 +17,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,23 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: notifications-ruby-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -78,14 +72,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
+- !ruby/object:Gem::Dependency
+  name: listen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.0.5
 description: 
 email:
 - zheileman@users.noreply.github.com
@@ -99,18 +107,27 @@ files:
 - lib/govuk_notify_rails/mail_ext.rb
 - lib/govuk_notify_rails/mailer.rb
 - lib/govuk_notify_rails/version.rb
-- spec/dummy/README.rdoc
+- spec/dummy/README.md
 - spec/dummy/Rakefile
+- spec/dummy/app/assets/config/manifest.js
 - spec/dummy/app/assets/javascripts/application.js
+- spec/dummy/app/assets/javascripts/cable.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/jobs/application_job.rb
+- spec/dummy/app/mailers/application_mailer.rb
 - spec/dummy/app/mailers/notify_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/bin/bundle
 - spec/dummy/bin/rails
 - spec/dummy/bin/rake
 - spec/dummy/bin/setup
+- spec/dummy/bin/spring
+- spec/dummy/bin/update
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
@@ -118,6 +135,7 @@ files:
 - 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/cookies_serializer.rb
@@ -125,17 +143,22 @@ files:
 - spec/dummy/config/initializers/govuk_notify_rails.rb
 - spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
+- spec/dummy/config/initializers/new_framework_defaults.rb
 - spec/dummy/config/initializers/session_store.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/config/spring.rb
 - spec/dummy/log/development.log
-- spec/dummy/log/test.log
 - 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/public/robots.txt
 - spec/govuk_notify_delivery/delivery_spec.rb
 - spec/mailers/notify_mailer_spec.rb
 - spec/spec_helper.rb
@@ -165,22 +188,32 @@ specification_version: 4
 summary: Custom ActionMailer delivery method for sending emails via GOV.UK Notify
   API
 test_files:
+- spec/dummy/app/assets/config/manifest.js
 - spec/dummy/app/assets/javascripts/application.js
+- spec/dummy/app/assets/javascripts/cable.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/jobs/application_job.rb
+- spec/dummy/app/mailers/application_mailer.rb
 - spec/dummy/app/mailers/notify_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/bin/bundle
 - spec/dummy/bin/rails
 - spec/dummy/bin/rake
 - spec/dummy/bin/setup
+- spec/dummy/bin/spring
+- spec/dummy/bin/update
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
 - 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/cookies_serializer.rb
@@ -188,20 +221,25 @@ test_files:
 - spec/dummy/config/initializers/govuk_notify_rails.rb
 - spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
+- spec/dummy/config/initializers/new_framework_defaults.rb
 - spec/dummy/config/initializers/session_store.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/config/spring.rb
 - spec/dummy/config.ru
 - spec/dummy/log/development.log
-- spec/dummy/log/test.log
 - 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/public/robots.txt
 - spec/dummy/Rakefile
-- spec/dummy/README.rdoc
+- spec/dummy/README.md
 - spec/govuk_notify_delivery/delivery_spec.rb
 - spec/mailers/notify_mailer_spec.rb
 - spec/spec_helper.rb

data/spec/dummy/log/test.log

@@ -1,6 +0,0 @@
------------------------------------
-GovukNotifyRailsTest: test_truth
------------------------------------
------------------------------------
-GovukNotifyRailsTest: test_truth
------------------------------------