adds solr service config file, solr config file, and assorted referen…

…ces to activefedora have been replaced with direct solr service or activemodel
NEU-DSG · Mar 30, 2023 · 2ca4c85 · 2ca4c85
1 parent ff33617
commit 2ca4c85
Show file tree

Hide file tree

Showing 63 changed files with 1,341 additions and 5,405 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,9 +4,10 @@
 # or operating system, you probably want to add a global ignore instead:
 #   git config --global core.excludesfile '~/.gitignore_global'
 
+.idea
 bundlelist-03282023.txt
 gemlist-03282023.txt
-
+mysql-init
 saxon-js-compilation.md
 .env
 # Ruby Mine stuff

diff --git a/Gemfile b/Gemfile
@@ -12,24 +12,21 @@ gem 'passenger', '6.0.4'
 # Use mysql2 for the staging environment
 gem 'mysql2', '0.5.3'
 
-# gem 'minitest', '4.7.5'
-
-# Use SCSS for stylesheets
 # gem 'sass-rails', '~> 4.0.2'
 gem 'bootstrap-sass', '3.3.4.1'
 
 # Use Uglifier as compressor for JavaScript assets
 gem 'uglifier', '>= 1.3.0'
 
-# Use CoffeeScript for .js.coffee assets and views
-gem 'coffee-rails', '~> 5.0.0'
-
 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
 gem 'therubyracer', platforms: :ruby
 
 # Use jquery as the JavaScript library
 gem 'jquery-rails'
 gem 'jquery-ui-rails'
+gem 'dotenv-rails', groups: [:development, :test]
+# loads environment variables from .env into ENV in development
+# https://github.com/bkeepers/dotenv/
 
 # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
 gem 'turbolinks'
@@ -50,8 +47,6 @@ gem 'resque', :require => 'resque/server'
 # Use Nest because some inherited config uses Nest
 gem 'nest'
 
-gem 'aws-sdk-s3', require: false
-
 gem 'discard', '~> 1.2'
 
 # Use thor for command line tasks
@@ -63,12 +58,6 @@ gem 'discard', '~> 1.2'
 # Use Namae to try to parse arbitrary names
 gem 'namae'
 
-# Bootstrap WYSIWYG Editor
-# gem 'bootsy' NO LONGER MAINTAINED
-
-# Forem gem for Forums
-# gem 'forem', git: "https://github.com/radar/forem.git", :branch => "rails4"
-
 # Configure email alerts on exception
 gem 'exception_notification'
 
@@ -113,8 +102,6 @@ group :development, :test do
   gem "pry"
   gem "rspec-rails", "~> 3"
   gem "rspec-its"
-  gem "sunspot_solr"
-  gem "jettywrapper"
   gem "factory_bot_rails"
 end
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -31,27 +31,6 @@ GEM
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    active-fedora (11.5.2)
-      active-triples (>= 0.11.0, < 2.0.0)
-      activemodel (>= 4.2, < 6)
-      activesupport (>= 4.2.4, < 6)
-      deprecation
-      faraday (~> 0.12.1)
-      faraday-encoding (= 0.0.4)
-      ldp (~> 0.7.0)
-      rsolr (>= 1.1.2, < 3)
-      ruby-progressbar (~> 1.0)
-      solrizer (>= 3.4, < 5)
-    active-triples (1.1.0)
-      activemodel (>= 3.0.0)
-      activesupport (>= 3.0.0)
-      rdf (>= 2.0.2, < 4.0)
-      rdf-vocab (>= 2.0, < 4.0)
-    active_fedora-datastreams (0.2.0)
-      active-fedora (>= 11.0.0.pre, < 13)
-      nom-xml (>= 0.5.1)
-      om (~> 3.1)
-      rdf-rdfxml (~> 2.0)
     activejob (5.2.6)
       activesupport (= 5.2.6)
       globalid (>= 0.3.6)
@@ -75,22 +54,6 @@ GEM
     arel (9.0.0)
     autoprefixer-rails (9.7.6)
       execjs
-    aws-eventstream (1.1.0)
-    aws-partitions (1.341.0)
-    aws-sdk-core (3.103.0)
-      aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.239.0)
-      aws-sigv4 (~> 1.1)
-      jmespath (~> 1.0)
-    aws-sdk-kms (1.36.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.74.0)
-      aws-sdk-core (~> 3, >= 3.102.1)
-      aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.2.1)
-      aws-eventstream (~> 1, >= 1.0.2)
     bcrypt (3.1.13)
     blacklight (6.23.0)
       bootstrap-sass (~> 3.2)
@@ -137,21 +100,12 @@ GEM
       activemodel (>= 4.0.0)
       activesupport (>= 4.0.0)
       mime-types (>= 1.16)
-    childprocess (3.0.0)
     coderay (1.1.2)
-    coffee-rails (5.0.0)
-      coffee-script (>= 2.2.0)
-      railties (>= 5.2.0)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.12.2)
     concurrent-ruby (1.2.2)
     config (2.2.1)
       deep_merge (~> 1.2, >= 1.2.1)
       dry-validation (~> 1.0, >= 1.0.0)
     crass (1.0.6)
-    daemons (1.3.1)
     date (3.3.3)
     deep_merge (1.2.1)
     deprecation (1.0.0)
@@ -173,6 +127,10 @@ GEM
     docile (1.3.2)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
+    dotenv (2.8.1)
+    dotenv-rails (2.8.1)
+      dotenv (= 2.8.1)
+      railties (>= 3.2)
     dry-configurable (0.11.5)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.4, >= 0.4.7)
@@ -211,9 +169,6 @@ GEM
       dry-equalizer (~> 0.2)
       dry-initializer (~> 3.0)
       dry-schema (~> 1.5)
-    ebnf (1.2.0)
-      rdf (~> 3.1)
-      sxp (~> 1.1)
     edtf (3.0.5)
       activesupport (>= 3.0, < 7.0)
     erubi (1.12.0)
@@ -231,8 +186,6 @@ GEM
       railties (>= 4.2.0)
     faraday (0.12.2)
       multipart-post (>= 1.2, < 3)
-    faraday-encoding (0.0.4)
-      faraday
     ffi (1.12.2)
     figaro (1.1.1)
       thor (~> 0.14)
@@ -254,46 +207,27 @@ GEM
       haml (>= 4.0.6, < 6.0)
       html2haml (>= 1.0.1)
       railties (>= 5.1)
-    hamster (3.0.0)
-      concurrent-ruby (~> 1.0)
     hiredis (0.6.3)
     html2haml (2.2.0)
       erubis (~> 2.7.0)
       haml (>= 4.0, < 6)
       nokogiri (>= 1.6.0)
       ruby_parser (~> 3.5)
-    htmlentities (4.3.4)
     http-accept (1.7.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    http_logger (0.6.0)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     iso-639 (0.3.5)
     jbuilder (2.10.0)
       activesupport (>= 5.0.0)
-    jettywrapper (2.0.3)
-      activesupport (>= 3.0.0)
-      childprocess
-      i18n
-      logger
-      rubyzip
-    jmespath (1.4.0)
     jquery-rails (4.4.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (6.0.1)
       railties (>= 3.2.16)
     json (2.3.0)
-    json-canonicalization (0.2.0)
-    json-ld (3.1.4)
-      htmlentities (~> 4.3)
-      json-canonicalization (~> 0.2)
-      link_header (~> 0.0, >= 0.0.8)
-      multi_json (~> 1.14)
-      rack (~> 2.0)
-      rdf (~> 3.1)
     kaminari (1.2.0)
       activesupport (>= 4.1.0)
       kaminari-actionview (= 1.2.0)
@@ -306,19 +240,7 @@ GEM
       activerecord
       kaminari-core (= 1.2.0)
     kaminari-core (1.2.0)
-    ldp (0.7.2)
-      deprecation
-      faraday
-      http_logger
-      json-ld
-      rdf (>= 1.1)
-      rdf-isomorphic
-      rdf-turtle
-      rdf-vocab (>= 0.8)
-      slop
     libv8 (3.16.14.19)
-    link_header (0.0.8)
-    logger (1.4.2)
     loofah (2.19.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -373,11 +295,6 @@ GEM
       activesupport (>= 3.2.18)
       i18n
       nokogiri
-    om (3.2.0)
-      activemodel (>= 5.1, < 7)
-      activesupport
-      nokogiri (>= 1.4.2)
-      solrizer (~> 3.3)
     openseadragon (0.5.0)
       rails (> 3.2.0)
     orm_adapter (0.5.0)
@@ -426,31 +343,6 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rchardet (1.8.0)
-    rdf (3.1.1)
-      hamster (~> 3.0)
-      link_header (~> 0.0, >= 0.0.8)
-    rdf-aggregate-repo (3.1.0)
-      rdf (~> 3.1)
-    rdf-isomorphic (3.1.0)
-      rdf (~> 3.1)
-    rdf-rdfa (3.1.0)
-      haml (~> 5.1)
-      htmlentities (~> 4.3)
-      rdf (~> 3.1)
-      rdf-aggregate-repo (~> 3.1)
-      rdf-xsd (~> 3.1)
-    rdf-rdfxml (2.2.1)
-      htmlentities (~> 4.3)
-      rdf (>= 2.2, < 4.0)
-      rdf-rdfa (>= 2.2, < 4.0)
-      rdf-xsd (>= 2.2, < 4.0)
-    rdf-turtle (3.1.0)
-      ebnf (~> 1.2)
-      rdf (~> 3.1)
-    rdf-vocab (3.1.4)
-      rdf (~> 3.1)
-    rdf-xsd (3.1.0)
-      rdf (~> 3.1)
     rdoc (6.2.1)
     redic (1.5.3)
       hiredis
@@ -500,7 +392,6 @@ GEM
       rspec-mocks (~> 3.9.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.3)
-    ruby-progressbar (1.10.1)
     ruby2_keywords (0.0.2)
     ruby_parser (3.14.2)
       sexp_processor (~> 4.9)
@@ -532,13 +423,6 @@ GEM
       rack (~> 2.0)
       rack-protection (= 2.0.8.1)
       tilt (~> 2.0)
-    slop (4.8.1)
-    solrizer (3.4.1)
-      activesupport
-      daemons
-      nokogiri
-      stomp
-      xml-simple
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -552,10 +436,6 @@ GEM
     stanford-mods (2.6.1)
       activesupport
       mods (~> 2.2)
-    stomp (1.4.9)
-    sunspot_solr (2.5.0)
-    sxp (1.1.0)
-      rdf (~> 3.1)
     temple (0.8.2)
     therubyracer (0.12.3)
       libv8 (~> 3.16.14.15)
@@ -585,14 +465,11 @@ GEM
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    xml-simple (1.1.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  active_fedora-datastreams
-  aws-sdk-s3
   blacklight
   blacklight-gallery
   bootstrap-sass (= 3.3.4.1)
@@ -604,19 +481,18 @@ DEPENDENCIES
   capistrano-resque (~> 0.2.2)
   capistrano-rvm
   carrierwave (~> 1.3.1)
-  coffee-rails (~> 5.0.0)
   devise
   devise-guests (~> 0.3)
   devise_invitable (~> 2.0.0)
   discard (~> 1.2)
+  dotenv-rails
   exception_notification
   factory_bot_rails
   figaro
   friendly_id (~> 5.2.4)
   git
   haml-rails (~> 2.0)
   jbuilder (= 2.10)
-  jettywrapper
   jquery-rails
   jquery-ui-rails
   json (~> 2.3)
@@ -642,7 +518,6 @@ DEPENDENCIES
   simplecov-json
   simplecov-rcov
   sprockets (~> 3.7.2)
-  sunspot_solr
   therubyracer
   turbolinks
   uglifier (>= 1.3.0)

diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb
@@ -2,7 +2,7 @@
 
 class CatalogController < ApplicationController
   include Blacklight::Catalog
-  include Hydra::Controller::ControllerBehavior
+  # include Hydra::Controller::ControllerBehavior
   # include Rails.application.routes.url_helpers
   # These before_actions apply the hydra access controls
   # before_action :enforce_show_permissions, :only=>:show

diff --git a/app/controllers/downloads_controller.rb b/app/controllers/downloads_controller.rb
@@ -1,5 +1,5 @@
 class DownloadsController < ApplicationController
-  include Hydra::Controller::DownloadBehavior
+  # include Hydra::Controller::DownloadBehavior
 
   skip_before_action :authorize_download!
 end