2021.3

CHANGELOG.md

@@ -1,5 +1,21 @@
 # changelog
 
+## [2021.3] - 2021-02-05
+
+### enhancements 🔧 
+- adds a locale for custom language labels (`"iso_639_1.<2 letter code>"`) (#693)
+- creates a `Spot::WorksControllerBehavior` mixin for common mixins/behavior (#694)
+  - adds .csv handling to `Hyrax::ImagesController`, which was causing a bunch of honeybadger reports
+- add "Center for the Integration of Teaching, Learning, and Scholarship" academic department option (#695)
+
+### dependencies 👩‍👩‍👧‍👧 
+- capistrano to 3.15.0 (#687)
+- nokogiri locked at `~> "1.10.10"` until we can upgrade ruby (#688)
+- okcomputer to 1.18.2 (#685)
+- rails to 5.2.4.4 (#686)
+- rspec-rails to 4.0.1 (#684)
+
+
 ## [2021.2] - 2021-01-21
 
 ### bug fixes 🐞 
@@ -560,6 +576,7 @@ fixes:
 
 Initial pre-release (live on ldr.stage.lafayette.edu)
 
+[2021.3]: https://github.com/LafayetteCollegeLibraries/spot/releases/tag/2021.3
 [2021.2]: https://github.com/LafayetteCollegeLibraries/spot/releases/tag/2021.2
 [2021.1]: https://github.com/LafayetteCollegeLibraries/spot/releases/tag/2021.1
 [2020.13]: https://github.com/LafayetteCollegeLibraries/spot/releases/tag/2020.13

Gemfile

@@ -79,7 +79,7 @@ gem 'iso-639', '0.3.5'
 gem 'jquery-rails', '4.4.0'
 
 # system monitoring
-gem 'okcomputer', '1.18.1'
+gem 'okcomputer', '1.18.2'
 
 # we're using postgres as our database within rails
 gem 'pg', '1.2.3'
@@ -125,12 +125,13 @@ gem 'mini_magick', '4.10.1'
 # manually add this gem to enable questioning_authority to parse linked-data results
 gem 'linkeddata', '~> 3.0'
 
-# hydra-role-management requires bootstrap_form without declaring a version,
-# bootstrap_form >=4.5.0 requires a ruby version >= 2.5 (we're stuck on 2.4.3
-# until we migrate to aws).
 #
-# @todo remove this restriction after aws migration
+# these are gems that we need to lock until we can upgrade ruby to >= 2.5
+# (on-prem is locked at 2.4.3).
+#
+# @todo remove these restriction after aws migration
 gem 'bootstrap_form', '~> 4.4.0'
+gem 'nokogiri', '~> 1.10.10'
 
 # development dependencies (not as necessary to
 # lock down versions here)
@@ -143,7 +144,7 @@ group :development do
   gem 'spring-watcher-listen', '~> 2.0.0'
 
   # Use Capistrano for deployment
-  gem 'capistrano', '~> 3.14', require: false
+  gem 'capistrano', '~> 3.15', require: false
   gem 'capistrano-bundler', '~> 1.3'
   gem 'capistrano-ext', '~> 1.2.1'
   gem 'capistrano-passenger', '~> 0.2.0'
@@ -166,7 +167,7 @@ group :development, :test do
   gem 'rails-controller-testing', '~> 1.0.5'
   gem 'rspec', '~> 3.8'
   gem 'rspec-its', '~> 1.1'
-  gem 'rspec-rails', '~> 3.6'
+  gem 'rspec-rails', '~> 4.0'
   gem 'rspec_junit_formatter', '~> 0.4.1'
   gem 'rubocop', '~> 0.63'
   gem 'rubocop-rspec', '~> 1.3'

Gemfile.lock

@@ -1,25 +1,25 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.4.3)
-      actionpack (= 5.2.4.3)
+    actioncable (5.2.4.4)
+      actionpack (= 5.2.4.4)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.4.3)
-      actionpack (= 5.2.4.3)
-      actionview (= 5.2.4.3)
-      activejob (= 5.2.4.3)
+    actionmailer (5.2.4.4)
+      actionpack (= 5.2.4.4)
+      actionview (= 5.2.4.4)
+      activejob (= 5.2.4.4)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.4.3)
-      actionview (= 5.2.4.3)
-      activesupport (= 5.2.4.3)
+    actionpack (5.2.4.4)
+      actionview (= 5.2.4.4)
+      activesupport (= 5.2.4.4)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.4.3)
-      activesupport (= 5.2.4.3)
+    actionview (5.2.4.4)
+      activesupport (= 5.2.4.4)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -43,26 +43,26 @@ GEM
     active_encode (0.7.0)
       rails
       sprockets (< 4)
-    activejob (5.2.4.3)
-      activesupport (= 5.2.4.3)
+    activejob (5.2.4.4)
+      activesupport (= 5.2.4.4)
       globalid (>= 0.3.6)
-    activemodel (5.2.4.3)
-      activesupport (= 5.2.4.3)
+    activemodel (5.2.4.4)
+      activesupport (= 5.2.4.4)
     activemodel-serializers-xml (1.0.2)
       activemodel (> 5.x)
       activesupport (> 5.x)
       builder (~> 3.1)
-    activerecord (5.2.4.3)
-      activemodel (= 5.2.4.3)
-      activesupport (= 5.2.4.3)
+    activerecord (5.2.4.4)
+      activemodel (= 5.2.4.4)
+      activesupport (= 5.2.4.4)
       arel (>= 9.0)
     activerecord-import (1.0.5)
       activerecord (>= 3.2)
-    activestorage (5.2.4.3)
-      actionpack (= 5.2.4.3)
-      activerecord (= 5.2.4.3)
+    activestorage (5.2.4.4)
+      actionpack (= 5.2.4.4)
+      activerecord (= 5.2.4.4)
       marcel (~> 0.3.1)
-    activesupport (5.2.4.3)
+    activesupport (5.2.4.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -165,7 +165,7 @@ GEM
     builder (3.2.4)
     byebug (11.1.1)
     cancancan (1.17.0)
-    capistrano (3.14.1)
+    capistrano (3.15.0)
       airbrussh (>= 1.0.0)
       i18n
       rake (>= 10.0.0)
@@ -206,7 +206,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.8)
     connection_pool (2.2.3)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
@@ -229,7 +229,7 @@ GEM
     devise_cas_authenticatable (1.10.4)
       devise (>= 1.2.0)
       rubycas-client (>= 2.2.1)
-    diff-lcs (1.3)
+    diff-lcs (1.4.4)
     docile (1.3.2)
     docopt (0.5.0)
     dotenv (2.7.5)
@@ -479,7 +479,7 @@ GEM
       tinymce-rails (~> 4.1)
     hyrax-spec (0.3.2)
       rspec (~> 3.6)
-    i18n (1.8.5)
+    i18n (1.8.7)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     iiif_manifest (0.5.0)
@@ -579,7 +579,7 @@ GEM
     listen (3.2.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.8.0)
+    loofah (2.9.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -598,7 +598,7 @@ GEM
     mini_magick (4.10.1)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.14.2)
+    minitest (5.14.3)
     msgpack (1.3.3)
     multi_json (1.15.0)
     multi_xml (0.6.0)
@@ -630,7 +630,7 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    okcomputer (1.18.1)
+    okcomputer (1.18.2)
     openseadragon (0.5.0)
       rails (> 3.2.0)
     orm_adapter (0.5.0)
@@ -659,18 +659,18 @@ GEM
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.4.3)
-      actioncable (= 5.2.4.3)
-      actionmailer (= 5.2.4.3)
-      actionpack (= 5.2.4.3)
-      actionview (= 5.2.4.3)
-      activejob (= 5.2.4.3)
-      activemodel (= 5.2.4.3)
-      activerecord (= 5.2.4.3)
-      activestorage (= 5.2.4.3)
-      activesupport (= 5.2.4.3)
+    rails (5.2.4.4)
+      actioncable (= 5.2.4.4)
+      actionmailer (= 5.2.4.4)
+      actionpack (= 5.2.4.4)
+      actionview (= 5.2.4.4)
+      activejob (= 5.2.4.4)
+      activemodel (= 5.2.4.4)
+      activerecord (= 5.2.4.4)
+      activestorage (= 5.2.4.4)
+      activesupport (= 5.2.4.4)
       bundler (>= 1.3.0)
-      railties (= 5.2.4.3)
+      railties (= 5.2.4.4)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
@@ -683,9 +683,9 @@ GEM
       loofah (~> 2.3)
     rails_autolink (1.1.6)
       rails (> 3.1)
-    railties (5.2.4.3)
-      actionpack (= 5.2.4.3)
-      activesupport (= 5.2.4.3)
+    railties (5.2.4.4)
+      actionpack (= 5.2.4.4)
+      activesupport (= 5.2.4.4)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
@@ -774,26 +774,26 @@ GEM
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-expectations (3.9.0)
+    rspec-core (3.9.3)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-rails (3.9.0)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.0)
+    rspec-rails (4.0.1)
+      actionpack (>= 4.2)
+      activesupport (>= 4.2)
+      railties (>= 4.2)
+      rspec-core (~> 3.9)
+      rspec-expectations (~> 3.9)
+      rspec-mocks (~> 3.9)
+      rspec-support (~> 3.9)
+    rspec-support (3.9.4)
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
     rubocop (0.63.1)
@@ -911,7 +911,7 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sshkit (1.21.1)
+    sshkit (1.21.2)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
     stub_env (1.0.4)
@@ -975,7 +975,7 @@ DEPENDENCIES
   bootsnap (= 1.4.7)
   bootstrap_form (~> 4.4.0)
   byebug
-  capistrano (~> 3.14)
+  capistrano (~> 3.15)
   capistrano-bundler (~> 1.3)
   capistrano-ext (~> 1.2.1)
   capistrano-passenger (~> 0.2.0)
@@ -1007,7 +1007,8 @@ DEPENDENCIES
   linkeddata (~> 3.0)
   listen (>= 3.0.5, < 3.3)
   mini_magick (= 4.10.1)
-  okcomputer (= 1.18.1)
+  nokogiri (~> 1.10.10)
+  okcomputer (= 1.18.2)
   pg (= 1.2.3)
   puma (= 3.12.6)
   rails (~> 5.2)
@@ -1016,7 +1017,7 @@ DEPENDENCIES
   rsolr (= 2.3.0)
   rspec (~> 3.8)
   rspec-its (~> 1.1)
-  rspec-rails (~> 3.6)
+  rspec-rails (~> 4.0)
   rspec_junit_formatter (~> 0.4.1)
   rubocop (~> 0.63)
   rubocop-rspec (~> 1.3)

app/authorities/qa/authorities/language.rb

@@ -11,7 +11,7 @@ class Language < Qa::Authorities::Base
     #
     # @return [Array<Hash<Symbol => String>>]
     def all
-      Spot::ISO6391.all.map { |key, val| wrap(id: key, label: val) }
+      Spot::ISO6391.all.map { |key, val| wrap(id: key, label: val) }.compact
     end
 
     # @param [String] id
@@ -38,7 +38,7 @@ def search(query)
       # @param [String] label
       # @return [Hash<Symbol => String>]
       def wrap(id:, label:)
-        return if id.nil? || label.nil?
+        return if id == label
 
         { id: id, label: label, value: id }
       end