Merge branch 'am-sparkpost' into 'master'

Move to sparkpost

See merge request !106

.env

 OPENCPU_ENDPOINT_URL=https://opencpu.roqua-staging.nl/ocpu
 OPENCPU_PASSWORD=needed_for_opencpu_integration
 OPENCPU_USERNAME=deploy
+SPARKPOST_APIURL=https://api.eu.sparkpost.com/api/
+SPARKPOST_APIKEY=needed_to_send_email

Gemfile

@@ -30,8 +30,8 @@ gem 'react-rails', '~> 1.7.1'
 
 gem 'active_interaction', '~> 3.5'
 gem 'jsonb_accessor', '0.4.0.beta'
-gem 'mailgun_rails', '~> 0.9.0'
 gem 'opencpu', '~> 0.10.0'
+gem 'sparkpost_rails'
 gem 'valid_email', '~> 0.0'
 
 gem 'dotenv-rails', '~> 2.2.1'
@@ -53,7 +53,7 @@ group :development do
   gem 'web-console'
 
   gem 'guard', '~> 2.13.0'
-  gem 'guard-bundler'
+  gem 'guard-bundler', require: false
   gem 'guard-coffeelint'
   gem 'guard-livereload', '~> 2.4.0'
   gem 'guard-rspec', '~> 4.6.4'

Gemfile.lock

@@ -80,7 +80,7 @@ GEM
       capybara (>= 1.0, < 3)
       launchy
     cliver (0.3.2)
-    coderay (1.1.1)
+    coderay (1.1.2)
     coffee-rails (4.2.2)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0)
@@ -102,8 +102,6 @@ GEM
     database_cleaner (1.7.0)
     diff-lcs (1.3)
     docile (1.1.5)
-    domain_name (0.5.20170404)
-      unf (>= 0.0.5, < 1.0.0)
     dotenv (2.2.1)
     dotenv-rails (2.2.1)
       dotenv (= 2.2.1)
@@ -116,7 +114,7 @@ GEM
     eventmachine (1.2.3)
     execjs (2.7.0)
     fabrication (2.15.2)
-    ffi (1.9.25)
+    ffi (1.11.3)
     font-awesome-rails (4.7.0.2)
       railties (>= 3.2, < 5.2)
     formatador (0.2.5)
@@ -131,8 +129,8 @@ GEM
       pry (>= 0.9.12)
       shellany (~> 0.0)
       thor (>= 0.18.1)
-    guard-bundler (2.1.0)
-      bundler (~> 1.0)
+    guard-bundler (3.0.0)
+      bundler (>= 2.1, < 3)
       guard (~> 2.2)
       guard-compat (~> 1.1)
     guard-coffeelint (0.1.5)
@@ -170,8 +168,6 @@ GEM
       httparty (>= 0.7.3)
       mimemagic
       multipart-post
-    http-cookie (1.0.3)
-      domain_name (~> 0.5)
     http_parser.rb (0.6.0)
     httparty (0.14.0)
       multi_xml (>= 0.5.2)
@@ -190,10 +186,9 @@ GEM
     letter_opener (1.4.1)
       launchy (~> 2.2)
     libv8 (3.16.14.19)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
+    listen (3.2.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
     lograge (0.9.0)
       actionpack (>= 4)
       activesupport (>= 4)
@@ -202,14 +197,10 @@ GEM
     loofah (2.2.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    lumberjack (1.0.11)
+    lumberjack (1.1.1)
     mail (2.6.6)
       mime-types (>= 1.16, < 4)
-    mailgun_rails (0.9.0)
-      actionmailer (>= 3.2.13)
-      json (>= 1.7.7)
-      rest-client (>= 1.6.7)
-    method_source (0.8.2)
+    method_source (0.9.2)
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2019.0331)
@@ -224,11 +215,10 @@ GEM
       bourbon (>= 4.0)
       sass (>= 3.3)
     nenv (0.3.0)
-    netrc (0.11.0)
     nio4r (2.3.1)
     nokogiri (1.10.5)
       mini_portile2 (~> 2.4.0)
-    notiffany (0.1.1)
+    notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
     olive_branch (1.2.3)
@@ -260,10 +250,9 @@ GEM
       ttfunk (~> 1.5)
     prawn-table (0.2.2)
       prawn (>= 1.3.0, < 3.0.0)
-    pry (0.10.4)
+    pry (0.12.2)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
+      method_source (~> 0.9.0)
     public_suffix (3.0.3)
     rack (2.0.7)
     rack-test (1.1.0)
@@ -297,9 +286,9 @@ GEM
       thor (>= 0.18.1, < 2.0)
     rainbow (3.0.0)
     rake (12.3.2)
-    rb-fsevent (0.9.8)
-    rb-inotify (0.9.8)
-      ffi (>= 0.5.0)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
     react-rails (1.7.2)
       babel-transpiler (>= 0.7.0)
       coffee-script-source (~> 1.8)
@@ -313,10 +302,6 @@ GEM
     responders (2.4.0)
       actionpack (>= 4.2.0, < 5.3)
       railties (>= 4.2.0, < 5.3)
-    rest-client (2.0.2)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 4.0)
-      netrc (~> 0.8)
     roqua-support (0.1.33)
       active_interaction (~> 3.0)
       activesupport (>= 3.2, < 6)
@@ -356,7 +341,6 @@ GEM
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.9.0)
     ruby-rc4 (0.1.5)
-    ruby_dep (1.5.0)
     ruby_parser (3.13.1)
       sexp_processor (~> 4.9)
     safe_yaml (1.0.5)
@@ -374,7 +358,8 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    slop (3.6.0)
+    sparkpost_rails (1.5.2)
+      rails (>= 4.0, < 6.1)
     spring (2.0.1)
       activesupport (>= 4.2)
       concurrent-ruby (~> 1.0)
@@ -402,9 +387,6 @@ GEM
       thread_safe (~> 0.1)
     uglifier (3.2.0)
       execjs (>= 0.3.0, < 3)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.4)
     unicode-display_width (1.3.0)
     valid_email (0.0.13)
       activemodel
@@ -458,7 +440,6 @@ DEPENDENCIES
   jsonb_accessor (= 0.4.0.beta)
   letter_opener
   lograge
-  mailgun_rails (~> 0.9.0)
   neat (~> 1.7.3)
   olive_branch
   opencpu (~> 0.10.0)
@@ -479,6 +460,7 @@ DEPENDENCIES
   rspec-repeat
   sass-rails (~> 5.0)
   simplecov
+  sparkpost_rails
   spring
   sprockets-rails (~> 3.2.0)
   therubyracer
@@ -490,4 +472,4 @@ DEPENDENCIES
   webmock (~> 3.2)
 
 BUNDLED WITH
-   2.1.2
+   2.1.4

config/environments/production.rb

@@ -22,11 +22,7 @@ Rails.application.configure do
 
   config.log_formatter = ::Logger::Formatter.new
 
-  config.action_mailer.delivery_method = :mailgun
-  config.action_mailer.mailgun_settings = {
-    api_key: ENV['MAILGUN_APIKEY'],
-    domain: ENV['MAILGUN_DOMAIN']
-  }
+  config.action_mailer.delivery_method = :sparkpost
 
   roqua_server_app_path = "https://#{ENV['SCREENSMART_URL']}" if ENV['SCREENSMART_URL']
   heroku_app_path = "https://#{ENV['HEROKU_APP_NAME']}.herokuapp.com" if ENV['HEROKU_APP_NAME']

config/initializers/sparkpost_rails.rb

+SparkPostRails.configure do |c|
+  c.api_endpoint = ENV["SPARKPOST_APIURL"]
+  c.api_key = ENV["SPARKPOST_APIKEY"]
+end