From 09bfb690a4ce43c0fbe1f41e07d654e3b2b1d2c8 Mon Sep 17 00:00:00 2001
From: Martin Fenner <martin.fenner@datacite.org>
Date: Wed, 24 Jun 2020 08:21:52 +0200
Subject: [PATCH] use latest bolognese gem

---
 Gemfile               |  9 ++++-----
 Gemfile.lock          | 31 ++++++++++++++-----------------
 config/application.rb |  3 ---
 3 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/Gemfile b/Gemfile
index ff0f8ed..5cd2a7c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,17 +7,16 @@ gem "oj_mimic_json", "~> 1.0", ">= 1.0.1"
 gem "equivalent-xml", "~> 0.6.0"
 gem "nokogiri", ">= 1.10.8"
 gem "iso8601", "~> 0.9.0"
-gem "maremma", "~> 4.6"
-gem "faraday", "~> 1.0", ">= 1.0.1"
-gem "bolognese", "~> 1.0", ">= 1.6.5"
+gem "maremma", "4.6.1"
+gem "faraday", "0.17.0"
+gem "bolognese", "~> 1.0", ">= 1.6.6"
 gem "dalli", "~> 2.7.6"
 gem "lograge", "~> 0.11.2"
 gem "logstash-event", "~> 1.2", ">= 1.2.02"
 gem "logstash-logger", "~> 0.26.1"
-gem 'sentry-raven', '~> 3.0'
+gem "sentry-raven", "~> 2.9"
 gem "gender_detector", "~> 0.1.2"
 gem "rack-cors", "~> 1.0", require: "rack/cors"
-gem "rack-utf8_sanitizer", "~> 1.6"
 gem "git", "~> 1.5"
 gem "sprockets", "~> 3.7", ">= 3.7.2"
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 7956f50..f4a6d52 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -55,7 +55,7 @@ GEM
       latex-decode (~> 0.0)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
-    bolognese (1.6.6)
+    bolognese (1.6.7)
       activesupport (>= 4.2.5)
       benchmark_methods (~> 0.7)
       bibtex-ruby (>= 5.1.0)
@@ -65,7 +65,7 @@ GEM
       concurrent-ruby (~> 1.1, >= 1.1.5)
       csl-styles (~> 1.0, >= 1.0.1.8)
       edtf (~> 3.0, >= 3.0.4)
-      faraday (~> 1.0, >= 1.0.1)
+      faraday (= 0.17.0)
       gender_detector (~> 0.1.2)
       iso8601 (~> 0.9.1)
       json-ld (~> 3.1, >= 3.1.4)
@@ -118,12 +118,12 @@ GEM
       nokogiri (>= 1.4.3)
     erubi (1.9.0)
     excon (0.71.1)
-    faraday (1.0.1)
+    faraday (0.17.0)
       multipart-post (>= 1.2, < 3)
     faraday-encoding (0.0.5)
       faraday
-    faraday_middleware (1.0.0)
-      faraday (~> 1.0)
+    faraday_middleware (0.13.1)
+      faraday (>= 0.7.4, < 1.0)
     ffi (1.13.1)
     gender_detector (0.1.2)
       unicode_utils (>= 1.3.0)
@@ -174,14 +174,14 @@ GEM
       mini_mime (>= 0.1.1)
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
-    maremma (4.8)
+    maremma (4.6.1)
       activesupport (>= 4.2.5)
       addressable (>= 2.3.6)
       builder (~> 3.2, >= 3.2.2)
       excon (~> 0.71.0)
-      faraday (~> 1.0, >= 1.0.1)
+      faraday (= 0.17.0)
       faraday-encoding (~> 0.0.4)
-      faraday_middleware (~> 1.0)
+      faraday_middleware (~> 0.13.1)
       nokogiri (~> 1.10.4)
       oj (>= 2.8.3)
       oj_mimic_json (~> 1.0, >= 1.0.1)
@@ -212,8 +212,6 @@ GEM
       rack (>= 2.0.0)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rack-utf8_sanitizer (1.7.0)
-      rack (>= 1.0, < 3.0)
     rails (5.2.4.3)
       actioncable (= 5.2.4.3)
       actionmailer (= 5.2.4.3)
@@ -303,8 +301,8 @@ GEM
       rubocop (>= 0.72.0)
     ruby-progressbar (1.10.1)
     safe_yaml (1.0.5)
-    sentry-raven (3.0.0)
-      faraday (>= 1.0)
+    sentry-raven (2.13.0)
+      faraday (>= 0.7.6, < 1.0)
     simplecov (0.17.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
@@ -348,12 +346,12 @@ PLATFORMS
 DEPENDENCIES
   better_errors
   binding_of_caller
-  bolognese (~> 1.0, >= 1.6.5)
+  bolognese (~> 1.0, >= 1.6.6)
   capybara
   dalli (~> 2.7.6)
   dotenv
   equivalent-xml (~> 0.6.0)
-  faraday (~> 1.0, >= 1.0.1)
+  faraday (= 0.17.0)
   gender_detector (~> 0.1.2)
   git (~> 1.5)
   iso8601 (~> 0.9.0)
@@ -361,18 +359,17 @@ DEPENDENCIES
   lograge (~> 0.11.2)
   logstash-event (~> 1.2, >= 1.2.02)
   logstash-logger (~> 0.26.1)
-  maremma (~> 4.6)
+  maremma (= 4.6.1)
   nokogiri (>= 1.10.8)
   oj (>= 3.1.0)
   oj_mimic_json (~> 1.0, >= 1.0.1)
   rack-cors (~> 1.0)
-  rack-utf8_sanitizer (~> 1.6)
   rails (~> 5.2)
   rspec-rails (~> 3.5, >= 3.5.2)
   rubocop (~> 0.77.0)
   rubocop-performance (~> 1.5, >= 1.5.1)
   rubocop-rails (~> 2.4)
-  sentry-raven (~> 3.0)
+  sentry-raven (~> 2.9)
   simplecov (~> 0.17.1)
   spring
   spring-watcher-listen (~> 2.0.0)
diff --git a/config/application.rb b/config/application.rb
index 18ab55f..92e4522 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -60,9 +60,6 @@ class Application < Rails::Application
     # Configure SSL options to enable HSTS with subdomains. Previous versions had false.
     config.ssl_options = { hsts: { subdomains: true } }
 
-    # make sure all input is UTF-8
-    config.middleware.insert 0, Rack::UTF8Sanitizer, additional_content_types: ['application/vnd.api+json', 'application/xml']
-
     # compress responses with deflate or gzip
     config.middleware.use Rack::Deflater