Merge pull request #1232 from sul-dlss/update-spotlight

update spotlight to v2.2.0

CHANGELOG.md

@@ -13,6 +13,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Fixed
 ### Security
 
+## [v1.21.0] - 2018-08-16
+
+### Removed
+- Some locale files from upstream Spotlight removed #1228
+### Fixed
+- Long versioned pages cannot be saved now fixed #1225
+### Security
+- Updates dependencies #1232 
+
 ## [v1.20.0] - 2018-08-09
 
 ### Added

Gemfile.lock

@@ -55,7 +55,7 @@ GEM
       io-like (~> 0.3.0)
     arel (9.0.0)
     ast (2.4.0)
-    autoprefixer-rails (9.1.0)
+    autoprefixer-rails (9.1.1)
       execjs
     babel-source (5.8.35)
     babel-transpiler (0.7.0)
@@ -85,7 +85,7 @@ GEM
       bootstrap-sass (~> 3.0)
       rails
       ruby-oembed
-    blacklight-spotlight (2.1.0)
+    blacklight-spotlight (2.2.0)
       acts-as-taggable-on (>= 5.0, < 7)
       almond-rails (~> 0.1)
       autoprefixer-rails
@@ -102,6 +102,7 @@ GEM
       faraday_middleware
       friendly_id (~> 5.2)
       github-markup
+      i18n (< 1.1)
       i18n-active_record
       iiif-presentation
       iiif_manifest
@@ -225,7 +226,7 @@ GEM
     deep_merge (1.2.1)
     deprecation (1.0.0)
       activesupport
-    devise (4.4.3)
+    devise (4.5.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0, < 6.0)
@@ -285,7 +286,7 @@ GEM
     factory_bot_rails (4.10.0)
       factory_bot (~> 4.10.0)
       railties (>= 3.0.0)
-    faraday (0.15.2)
+    faraday (0.12.2)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
@@ -316,7 +317,6 @@ GEM
     hashdiff (0.3.7)
     hashie (3.5.7)
     honeybadger (3.3.1)
-    httpauth (0.2.1)
     httpclient (2.8.3)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
@@ -342,7 +342,7 @@ GEM
     jsonpath (0.9.3)
       multi_json
       to_regexp (~> 0.2.1)
-    jwt (2.1.0)
+    jwt (1.5.6)
     kaminari (1.1.1)
       activesupport (>= 4.1.0)
       kaminari-actionview (= 1.1.1)
@@ -384,12 +384,12 @@ GEM
     material_icons (2.2.1)
       railties (>= 3.2)
     method_source (0.9.0)
-    mime-types (3.1)
+    mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
+    mime-types-data (3.2018.0812)
     mimemagic (0.3.2)
     mini_magick (4.8.0)
-    mini_mime (1.0.0)
+    mini_mime (1.0.1)
     mini_portile2 (2.3.0)
     minitest (5.11.3)
     mirador_rails (0.8.0)
@@ -408,6 +408,7 @@ GEM
       stanford-mods (~> 2.1)
     msgpack (1.2.4)
     multi_json (1.13.1)
+    multi_xml (0.6.0)
     multipart-post (2.0.0)
     mysql2 (0.5.2)
     namae (1.0.1)
@@ -423,10 +424,12 @@ GEM
       activesupport (>= 3.2.18)
       i18n
       nokogiri
-    oauth2 (0.6.1)
-      faraday (~> 0.7)
-      httpauth (~> 0.1)
+    oauth2 (1.4.0)
+      faraday (>= 0.8, < 0.13)
+      jwt (~> 1.0)
       multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 3)
     okcomputer (1.17.2)
     openseadragon (0.5.0)
       rails (> 3.2.0)
@@ -441,7 +444,7 @@ GEM
       ast (~> 2.4.0)
     parslet (1.8.2)
     powerpack (0.1.2)
-    public_suffix (3.0.2)
+    public_suffix (3.0.3)
     puma (3.12.0)
     rack (2.0.5)
     rack-accept (0.4.5)

db/migrate/20180814221815_change_paper_trail_versions_object_column_to_medium_text.rb

@@ -0,0 +1,11 @@
+##
+# A migration that updates the object column size on PaperTrail's version table
+# This is in a generator template because our migrations run before PaperTrail is installed
+class ChangePaperTrailVersionsObjectColumnToMediumText < ActiveRecord::Migration[5.1]
+  # See https://github.com/paper-trail-gem/paper_trail/blob/6c34a3dd5a5f8c1b042f458b7727c9d3bbf81a50/lib/generators/paper_trail/install/templates/create_versions.rb.erb#L5-L17
+  # for rationale of the 1,073,741,823 byte limit
+
+  def change
+    change_column :versions, :object, :text, limit: 1_073_741_823
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2018_05_31_002412) do
+ActiveRecord::Schema.define(version: 2018_08_14_221815) do
 
   create_table "bibliography_services", force: :cascade do |t|
     t.string "header"
@@ -428,7 +428,7 @@
     t.integer "item_id", null: false
     t.string "event", null: false
     t.string "whodunnit"
-    t.text "object"
+    t.text "object", limit: 1073741823
     t.datetime "created_at"
     t.index ["item_type", "item_id"], name: "index_versions_on_item_type_and_item_id"
   end