diff --git a/Gemfile b/Gemfile index 6cb0ea8..939e2d8 100644 --- a/Gemfile +++ b/Gemfile @@ -62,12 +62,15 @@ gem 'devise' gem 'devise-guests' gem 'config' gem 'mods_display', '0.3.4' +gem 'stanford-mods', '1.1.5' + gem 'coderay' gem 'blacklight_range_limit' gem 'mysql2' gem 'honeybadger' +gem 'annotot' group :deployment do gem 'dlss-capistrano' diff --git a/Gemfile.lock b/Gemfile.lock index 51b6af6..509a7c4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,75 +1,79 @@ GEM remote: https://rubygems.org/ specs: - actioncable (5.0.6) - actionpack (= 5.0.6) - nio4r (>= 1.2, < 3.0) + actioncable (5.1.5) + actionpack (= 5.1.5) + nio4r (~> 2.0) websocket-driver (~> 0.6.1) - actionmailer (5.0.6) - actionpack (= 5.0.6) - actionview (= 5.0.6) - activejob (= 5.0.6) + actionmailer (5.1.5) + actionpack (= 5.1.5) + actionview (= 5.1.5) + activejob (= 5.1.5) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.0.6) - actionview (= 5.0.6) - activesupport (= 5.0.6) + actionpack (5.1.5) + actionview (= 5.1.5) + activesupport (= 5.1.5) rack (~> 2.0) - rack-test (~> 0.6.3) + rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.0.6) - activesupport (= 5.0.6) + actionview (5.1.5) + activesupport (= 5.1.5) builder (~> 3.1) - erubis (~> 2.7.0) + erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.0.6) - activesupport (= 5.0.6) + activejob (5.1.5) + activesupport (= 5.1.5) globalid (>= 0.3.6) - activemodel (5.0.6) - activesupport (= 5.0.6) - activerecord (5.0.6) - activemodel (= 5.0.6) - activesupport (= 5.0.6) - arel (~> 7.0) - activesupport (5.0.6) + activemodel (5.1.5) + activesupport (= 5.1.5) + activerecord (5.1.5) + activemodel (= 5.1.5) + activesupport (= 5.1.5) + arel (~> 8.0) + activesupport (5.1.5) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (~> 0.7) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.5.0) - public_suffix (~> 2.0, >= 2.0.2) - airbrussh (1.1.2) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) + airbrussh (1.3.0) sshkit (>= 1.6.1, != 1.7.0) - archive-zip (0.7.0) + annotot (0.3.0) + rails (~> 5.1.4) + archive-zip (0.11.0) io-like (~> 0.3.0) - arel (7.1.4) - autoprefixer-rails (6.7.3) + arel (8.0.0) + autoprefixer-rails (8.0.0) execjs bcrypt (3.1.11) - blacklight (6.7.3) + bindex (0.5.0) + blacklight (6.14.1) bootstrap-sass (~> 3.2) deprecation globalid + jbuilder kaminari (>= 0.15) nokogiri (~> 1.6) rails (>= 4.2, < 6) rsolr (>= 1.0.6, < 3) twitter-typeahead-rails (= 0.11.1.pre.corejavascript) - blacklight_range_limit (6.1.0) - blacklight (~> 6.0) + blacklight_range_limit (6.3.2) + blacklight (>= 6.0.2) jquery-rails rails (>= 3.0) bootstrap-sass (3.3.7) autoprefixer-rails (>= 5.2.1) sass (>= 3.3.4) builder (3.2.3) - bundler-audit (0.5.0) + bundler-audit (0.6.0) bundler (~> 1.2) thor (~> 0.18) - byebug (8.2.0) - capistrano (3.8.0) + byebug (10.0.0) + capistrano (3.10.1) airbrussh (>= 1.0.0) i18n rake (>= 10.0.0) @@ -77,68 +81,67 @@ GEM capistrano-bundle_audit (0.2.1) bundler-audit (~> 0.5) capistrano (~> 3.0) - capistrano-bundler (1.1.4) + capistrano-bundler (1.3.0) capistrano (~> 3.1) sshkit (~> 1.2) capistrano-one_time_key (0.0.1) capistrano (~> 3.0) capistrano-passenger (0.2.0) capistrano (~> 3.0) - capistrano-rails (1.1.5) + capistrano-rails (1.3.1) capistrano (~> 3.1) capistrano-bundler (~> 1.1) capistrano-rvm (0.1.2) capistrano (~> 3.0) sshkit (~> 1.2) - capistrano-shared_configs (0.1.2) - capybara (2.12.1) + capistrano-shared_configs (0.2.2) + capybara (2.18.0) addressable - mime-types (>= 1.16) + mini_mime (>= 0.1.3) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) - xpath (~> 2.0) + xpath (>= 2.0, < 4.0) capybara-selenium (0.0.6) capybara selenium-webdriver childprocess (0.8.0) ffi (~> 1.0, >= 1.0.11) - chromedriver-helper (1.1.0) - archive-zip (~> 0.7.0) - nokogiri (~> 1.6) - coderay (1.1.0) - coffee-rails (4.2.1) + chromedriver-helper (1.2.0) + archive-zip (~> 0.10) + nokogiri (~> 1.8) + coderay (1.1.2) + coffee-rails (4.2.2) coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.2.x) + railties (>= 4.0.0) coffee-script (2.4.1) coffee-script-source execjs coffee-script-source (1.12.2) concurrent-ruby (1.0.5) - config (1.4.0) + config (1.7.0) activesupport (>= 3.0) - deep_merge (~> 1.1.1) - coveralls (0.8.9) - json (~> 1.8) - rest-client (>= 1.6.8, < 2) - simplecov (~> 0.10.0) + deep_merge (~> 1.2.1) + dry-validation (>= 0.10.4) + coveralls (0.8.21) + json (>= 1.8, < 3) + simplecov (~> 0.14.1) term-ansicolor (~> 1.3) - thor (~> 0.19.1) - tins (~> 1.6.0) + thor (~> 0.19.4) + tins (~> 1.6) crack (0.4.3) safe_yaml (~> 1.0.0) crass (1.0.3) - debug_inspector (0.0.2) - deep_merge (1.1.1) + deep_merge (1.2.1) deprecation (1.0.0) activesupport - devise (4.2.0) + devise (4.4.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 4.1.0, < 5.1) + railties (>= 4.1.0, < 5.2) responders warden (~> 1.2.3) - devise-guests (0.3.3) + devise-guests (0.6.0) devise diff-lcs (1.3) dlss-capistrano (3.4.1) @@ -147,47 +150,71 @@ GEM capistrano-one_time_key capistrano-shared_configs docile (1.1.5) - domain_name (0.5.25) - unf (>= 0.0.5, < 1.0.0) - erubis (2.7.0) + dry-configurable (0.7.0) + concurrent-ruby (~> 1.0) + dry-container (0.6.0) + concurrent-ruby (~> 1.0) + dry-configurable (~> 0.1, >= 0.1.3) + dry-core (0.4.4) + concurrent-ruby (~> 1.0) + dry-equalizer (0.2.0) + dry-logic (0.4.2) + dry-container (~> 0.2, >= 0.2.6) + dry-core (~> 0.2) + dry-equalizer (~> 0.2) + dry-types (0.12.2) + concurrent-ruby (~> 1.0) + dry-configurable (~> 0.1) + dry-container (~> 0.3) + dry-core (~> 0.2, >= 0.2.1) + dry-equalizer (~> 0.2) + dry-logic (~> 0.4, >= 0.4.2) + inflecto (~> 0.0.0, >= 0.0.2) + dry-validation (0.11.1) + concurrent-ruby (~> 1.0) + dry-configurable (~> 0.1, >= 0.1.3) + dry-core (~> 0.2, >= 0.2.1) + dry-equalizer (~> 0.2) + dry-logic (~> 0.4, >= 0.4.0) + dry-types (~> 0.12.0) + erubi (1.7.0) execjs (2.7.0) faraday (0.14.0) multipart-post (>= 1.2, < 3) - ffi (1.9.18) + ffi (1.9.21) font-awesome-rails (4.7.0.3) railties (>= 3.2, < 5.2) globalid (0.4.1) activesupport (>= 4.2.0) - hashdiff (0.3.2) - honeybadger (3.1.2) - http-cookie (1.0.2) - domain_name (~> 0.5) - i18n (0.9.3) + hashdiff (0.3.7) + honeybadger (3.3.0) + i18n (0.9.5) concurrent-ruby (~> 1.0) + inflecto (0.0.2) io-like (0.3.0) - iso-639 (0.2.5) - jbuilder (2.6.2) - activesupport (>= 3.0.0, < 5.1) - multi_json (~> 1.2) + iso-639 (0.2.8) + jbuilder (2.7.0) + activesupport (>= 4.2.0) + multi_json (>= 1.2) jquery-rails (4.3.1) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (1.8.6) - kaminari (1.0.1) + json (2.1.0) + kaminari (1.1.1) activesupport (>= 4.1.0) - kaminari-actionview (= 1.0.1) - kaminari-activerecord (= 1.0.1) - kaminari-core (= 1.0.1) - kaminari-actionview (1.0.1) + kaminari-actionview (= 1.1.1) + kaminari-activerecord (= 1.1.1) + kaminari-core (= 1.1.1) + kaminari-actionview (1.1.1) actionview - kaminari-core (= 1.0.1) - kaminari-activerecord (1.0.1) + kaminari-core (= 1.1.1) + kaminari-activerecord (1.1.1) activerecord - kaminari-core (= 1.0.1) - kaminari-core (1.0.1) + kaminari-core (= 1.1.1) + kaminari-core (1.1.1) libv8 (3.16.14.19) - loofah (2.1.1) + loofah (2.2.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.0) @@ -195,7 +222,6 @@ GEM material_icons (2.2.1) railties (>= 3.2) method_source (0.9.0) - mime-types (2.99.3) mini_mime (1.0.0) mini_portile2 (2.3.0) minitest (5.11.3) @@ -212,13 +238,12 @@ GEM mods_display (0.3.4) i18n stanford-mods - multi_json (1.12.1) + multi_json (1.13.1) multipart-post (2.0.0) - mysql2 (0.4.5) + mysql2 (0.4.10) net-scp (1.2.1) net-ssh (>= 2.6.5) - net-ssh (4.1.0) - netrc (0.11.0) + net-ssh (4.2.0) nio4r (2.2.0) nokogiri (1.8.2) mini_portile2 (~> 2.3.0) @@ -229,95 +254,99 @@ GEM openseadragon (0.4.0) rails (> 3.2.0) orm_adapter (0.5.0) - public_suffix (2.0.5) - puma (3.7.0) + public_suffix (3.0.2) + puma (3.11.2) rack (2.0.4) - rack-test (0.6.3) - rack (>= 1.0) - rails (5.0.6) - actioncable (= 5.0.6) - actionmailer (= 5.0.6) - actionpack (= 5.0.6) - actionview (= 5.0.6) - activejob (= 5.0.6) - activemodel (= 5.0.6) - activerecord (= 5.0.6) - activesupport (= 5.0.6) + rack-test (0.8.3) + rack (>= 1.0, < 3) + rails (5.1.5) + actioncable (= 5.1.5) + actionmailer (= 5.1.5) + actionpack (= 5.1.5) + actionview (= 5.1.5) + activejob (= 5.1.5) + activemodel (= 5.1.5) + activerecord (= 5.1.5) + activesupport (= 5.1.5) bundler (>= 1.3.0) - railties (= 5.0.6) + railties (= 5.1.5) sprockets-rails (>= 2.0.0) - rails-controller-testing (1.0.1) - actionpack (~> 5.x) - actionview (~> 5.x) + rails-controller-testing (1.0.2) + actionpack (~> 5.x, >= 5.0.1) + actionview (~> 5.x, >= 5.0.1) activesupport (~> 5.x) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.0.3) loofah (~> 2.0) - railties (5.0.6) - actionpack (= 5.0.6) - activesupport (= 5.0.6) + railties (5.1.5) + actionpack (= 5.1.5) + activesupport (= 5.1.5) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (12.3.0) - rdoc (4.3.0) + rb-fsevent (0.10.2) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + rdoc (6.0.1) ref (2.0.0) - responders (2.3.0) - railties (>= 4.2.0, < 5.1) - rest-client (1.8.0) - http-cookie (>= 1.0.2, < 2.0) - mime-types (>= 1.16, < 3.0) - netrc (~> 0.7) + responders (2.4.0) + actionpack (>= 4.2.0, < 5.3) + railties (>= 4.2.0, < 5.3) retriable (3.1.1) rsolr (2.1.0) builder (>= 2.1.2) faraday (>= 0.9.0) - rspec-core (3.5.4) - rspec-support (~> 3.5.0) - rspec-expectations (3.5.0) + rspec-core (3.7.1) + rspec-support (~> 3.7.0) + rspec-expectations (3.7.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-mocks (3.5.0) + rspec-support (~> 3.7.0) + rspec-mocks (3.7.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-rails (3.5.2) + rspec-support (~> 3.7.0) + rspec-rails (3.7.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-support (~> 3.5.0) - rspec-support (3.5.0) + rspec-core (~> 3.7.0) + rspec-expectations (~> 3.7.0) + rspec-mocks (~> 3.7.0) + rspec-support (~> 3.7.0) + rspec-support (3.7.1) ruby-progressbar (1.9.0) rubyzip (1.2.1) safe_yaml (1.0.4) - sass (3.4.23) - sass-rails (5.0.6) + sass (3.5.5) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + sass-rails (5.0.7) railties (>= 4.0.0, < 6) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - sdoc (0.4.1) - json (~> 1.7, >= 1.7.7) - rdoc (~> 4.0) - selenium-webdriver (3.8.0) + sdoc (1.0.0) + rdoc (>= 5.0) + selenium-webdriver (3.9.0) childprocess (~> 0.5) - rubyzip (~> 1.0) - simplecov (0.10.0) + rubyzip (~> 1.2) + simplecov (0.14.1) docile (~> 1.1.0) - json (~> 1.8) + json (>= 1.8, < 3) simplecov-html (~> 0.10.0) - simplecov-html (0.10.0) + simplecov-html (0.10.2) solr_wrapper (1.2.0) faraday retriable ruby-progressbar rubyzip - spring (1.4.3) + spring (2.0.2) + activesupport (>= 4.2) sprockets (3.7.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) @@ -325,21 +354,21 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sqlite3 (1.3.11) - sshkit (1.13.1) + sqlite3 (1.3.13) + sshkit (1.16.0) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) stanford-mods (1.1.5) mods (~> 2.0.2) - term-ansicolor (1.3.2) + term-ansicolor (1.6.0) tins (~> 1.0) therubyracer (0.12.3) libv8 (~> 3.16.14.15) ref thor (0.19.4) thread_safe (0.3.6) - tilt (2.0.6) - tins (1.6.0) + tilt (2.0.8) + tins (1.16.3) tinymce-rails (4.7.6) railties (>= 3.1.1) twitter-typeahead-rails (0.11.1.pre.corejavascript) @@ -348,32 +377,30 @@ GEM railties (>= 3.1) tzinfo (1.2.5) thread_safe (~> 0.1) - uglifier (3.2.0) + uglifier (4.1.6) execjs (>= 0.3.0, < 3) - unf (0.1.4) - unf_ext - unf_ext (0.0.7.1) warden (1.2.7) rack (>= 1.0) - web-console (3.4.0) + web-console (3.5.1) actionview (>= 5.0) activemodel (>= 5.0) - debug_inspector + bindex (>= 0.4.0) railties (>= 5.0) - webmock (2.3.2) + webmock (3.3.0) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.3) - xpath (2.0.0) - nokogiri (~> 1.3) + xpath (3.0.0) + nokogiri (~> 1.8) PLATFORMS ruby DEPENDENCIES + annotot blacklight (~> 6.0) blacklight_range_limit byebug @@ -409,6 +436,7 @@ DEPENDENCIES solr_wrapper spring sqlite3 + stanford-mods (= 1.1.5) therubyracer tzinfo-data uglifier diff --git a/app/views/catalog/_refine_facets.html.erb b/app/views/catalog/_refine_facets.html.erb index d7e09f1..ce1bd45 100644 --- a/app/views/catalog/_refine_facets.html.erb +++ b/app/views/catalog/_refine_facets.html.erb @@ -6,7 +6,7 @@