hyrax 3.1.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea0970bcb0ea485337ce206cd398d9ca95ce9f5dbd22bda820b6112e089ed624
-  data.tar.gz: c58183be603ec7ac6af52523412034f3b28332b2b8d5aa788239e7dabbf4c521
+  metadata.gz: 4fa4543b3224a41244d522ea1eedff364bc5a611766952b7f75472c438b4fff1
+  data.tar.gz: 19c28428038b672908944c5ad30dd144eabc934e80ecfa5c1d080d6144e7df9d
 SHA512:
-  metadata.gz: af2b27f2c10d54ede9007a17f4a126bf408d92c163a924081658625212ff52edccb06bbc7edcf49fce1faa56c715bdf0454f687fbc284f93cfd8d30dbb26d46a
-  data.tar.gz: 85b38c0dc2628abbbb56dc8aed70461bb5fe6e9ce4444a2d61d6f972968efd1f9157881fc2a5f4443cb1bba85f0495b78e3bc2e7d0d7fe5ea9a8d4cb69d6946b
+  metadata.gz: 697a6d11f891fe1a0c42997fb80d49ab94810779745c7472670b9c32bd09d49283ceddb5736d1d5652efc9d5ac21e9dffb416fa2e75c300954c5cb529034a82c
+  data.tar.gz: efe3443f9e7e285713ff9c53661f5202748fc0613c9282dc07d834e8802c052a3551d617460d2b1975493b9ab065b0d9c66e9bfd0561fe1aef996821093f6526

data/.circleci/config.yml

@@ -33,10 +33,9 @@ jobs:
             fi
             [[ -z "$(git branch --all --list master */master)" ]]
 
-      - samvera/bundle_for_gem:
+      - samvera/bundle:
           ruby_version: << parameters.ruby_version >>
           bundler_version: << parameters.bundler_version >>
-          project: hyrax
 
       # Run rubocop in parallel with caching
       # This should get added to the orb once proven here
@@ -89,10 +88,9 @@ jobs:
           at: ~/
       - samvera/engine_cart_generate:
           cache_key: v1-internal-test-app-{{ checksum "hyrax.gemspec" }}-{{ checksum ".regen" }}-{{ checksum ".circleci/config.yml" }}-<< parameters.rails_version >>-<< parameters.ruby_version >>
-      - samvera/bundle_for_gem:
+      - samvera/bundle:
           ruby_version: << parameters.ruby_version >>
           bundler_version: << parameters.bundler_version >>
-          project: hyrax
       - persist_to_workspace:
           root: ~/
           paths:
@@ -128,10 +126,9 @@ jobs:
           solr_config_path: .internal_test_app/solr/conf
           core_name: hyrax-valkyrie-test
       # Rerun bundler in case this is a different ruby version than bundle and build steps
-      - samvera/bundle_for_gem:
+      - samvera/bundle:
           ruby_version: << parameters.ruby_version >>
           bundler_version: << parameters.bundler_version >>
-          project: hyrax
       - run:
           command: bundle exec rake app:db:migrate
       - samvera/parallel_rspec
@@ -189,21 +186,21 @@ workflows:
           hyrax_valkyrie: "true"
           requires:
             - build
-  ruby2-7-2:
+  ruby2-7-4:
     jobs:
       - bundle:
-          ruby_version: "2.7.2"
+          ruby_version: "2.7.4"
           rails_version: "5.2.6"
           bundler_version: "2.1.4"
       - build:
-          ruby_version: "2.7.2"
+          ruby_version: "2.7.4"
           rails_version: "5.2.6"
           bundler_version: "2.1.4"
           requires:
             - bundle
       - test:
-          name: "ruby2-7-2"
-          ruby_version: "2.7.2"
+          name: "ruby2-7-4"
+          ruby_version: "2.7.4"
           bundler_version: "2.1.4"
           requires:
             - build

data/.dassie/.env

@@ -1,4 +1,3 @@
 MEMCACHED_HOST=memcached
-HYRAX_ANALYTICS=1
 REDIS_PROVIDER=SIDEKIQ_REDIS_URL
-SIDEKIQ_REDIS_URL=redis://redis:6379/0
+SIDEKIQ_REDIS_URL=redis://redis:6379/0

data/.dassie/Gemfile

@@ -8,7 +8,7 @@ else
 end
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '2.7.2'
+ruby '2.7.4'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 5.2.4', '>= 5.2.4.4'
@@ -52,11 +52,15 @@ gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
 gemspec name: 'hyrax', path: ENV.fetch('HYRAX_ENGINE_PATH', '..')
 
-gem 'rsolr', '>= 1.0', '< 3'
 gem 'bootstrap-sass', '~> 3.0'
-gem 'twitter-typeahead-rails', '0.11.1.pre.corejavascript'
-gem 'jquery-rails'
 gem 'devise'
 gem 'devise-guests', '~> 0.6'
+gem 'jquery-rails'
+gem 'pry-byebug'
+gem 'pry-doc'
+gem 'pry-rails'
+gem 'pry-rescue'
 gem 'riiif', '~> 2.1'
+gem 'rsolr', '>= 1.0', '< 3'
 gem 'sidekiq', '~> 6.0'
+gem 'twitter-typeahead-rails', '0.11.1.pre.corejavascript'

data/.dassie/app/controllers/catalog_controller.rb

@@ -5,6 +5,8 @@ class CatalogController < ApplicationController
 
   # This filter applies the hydra access controls
   before_action :enforce_show_permissions, only: :show
+  # Allow all search options when in read-only mode
+  skip_before_action :check_read_only
 
   def self.uploaded_field
     "system_create_dtsi"
@@ -28,6 +30,10 @@ class CatalogController < ApplicationController
     config.view.gallery.partials = [:index_header, :index]
     config.view.slideshow.partials = [:index]
 
+    # Because too many times on Samvera tech people raise a problem regarding a failed query to SOLR.
+    # Often, it's because they inadvertently exceeded the character limit of a GET request.
+    config.http_method = :post
+
     ## Default parameters to send to solr for all search-like requests. See also SolrHelper#solr_search_params
     config.default_solr_params = {
       qt: "search",

data/.dassie/app/models/user.rb

@@ -5,8 +5,6 @@ class User < ApplicationRecord
   include Hyrax::User
   include Hyrax::UserUsageStats
 
-
-
   if Blacklight::Utils.needs_attr_accessible?
     attr_accessible :email, :password, :password_confirmation
   end

data/.dassie/config/analytics.yml

@@ -1,6 +1,13 @@
 analytics:
-  app_name: My App Name
-  app_version: 0.0.1
-  privkey_path: /tmp/privkey.p12
-  privkey_secret: s00pers3kr1t
-  client_email: oauth@example.org
+  google:
+    analytics_id: <%= ENV['GOOGLE_ANALYTICS_ID'] %>
+    app_name: <%= ENV['GOOGLE_OAUTH_APP_NAME'] %>
+    app_version: <%= ENV['GOOGLE_OAUTH_APP_VERSION'] %>
+    privkey_path: <%= ENV['GOOGLE_OAUTH_PRIVATE_KEY_PATH'] %>
+    privkey_secret: <%= ENV['GOOGLE_OAUTH_PRIVATE_KEY_SECRET'] %>
+    client_email: <%= ENV['GOOGLE_OAUTH_CLIENT_EMAIL'] %>
+  matomo: 
+    base_url: <%= ENV['MATOMO_BASE_URL'] %>
+    site_id: <%= ENV['MATOMO_SITE_ID'] %>
+    auth_token: <%= ENV['MATOMO_AUTH_TOKEN'] %>
+    

data/.dassie/config/environments/development.rb

@@ -29,6 +29,8 @@ Rails.application.configure do
     config.cache_store = :null_store
   end
 
+  config.web_console.whitelisted_ips = ['172.18.0.0/16', '172.27.0.0/16', '0.0.0.0/0']
+
   # Store uploaded files on the local file system (see config/storage.yml for options)
   config.active_storage.service = :local
 

data/.dassie/config/initializers/hyrax.rb

@@ -5,6 +5,8 @@ Hyrax.config do |config|
   # Defaults to false.  See README for more info
   config.arkivo_api = true
 
+  config.analytics = ActiveModel::Type::Boolean.new.cast(ENV.fetch('HYRAX_ANALYTICS', 'false'))
+  config.analytics_provider = ENV.fetch('HYRAX_ANALYTICS_PROVIDER', 'google')
   # Injected via `rails g hyrax:work GenericWork`
   config.register_curation_concern :generic_work
   # Injected via `rails g hyrax:work NamespacedWorks::NestedWork`
@@ -13,6 +15,8 @@ Hyrax.config do |config|
   config.register_curation_concern :monograph
 
   config.iiif_image_server = true
+  config.work_requires_files = false
+  config.citations = true
 
   # Returns a URL that resolves to an image provided by a IIIF image server
   config.iiif_image_url_builder = lambda do |file_id, base_url, size, format|
@@ -36,14 +40,22 @@ Hyrax.config do |config|
     config.browse_everything = nil
   end
 
+  # config.geonames_username = ''
+
   ##
   # Set the system-wide virus scanner
   config.virus_scanner = Hyrax::VirusScanner
 
   ##
-  # To index to the Valkyrie core, uncomment the following two lines.
+  # To index to the Valkyrie core, uncomment the following lines.
   # config.query_index_from_valkyrie = true
   # config.index_adapter = :solr_index
+
+  ##
+  # NOTE: To Valkyrie works, use Monograph which is_a Hyrax::Work is_a Valkyrie::Resource
+  # To use Valkyrie models, uncomment the following lines.
+  # config.collection_model = 'Hyrax::PcdmCollection'
+  # config.admin_set_model = 'Hyrax::AdministrativeSet'
 end
 
 Date::DATE_FORMATS[:standard] = "%m/%d/%Y"

data/.dassie/db/migrate/20210921150120_enable_uuid_extension.valkyrie_engine.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+# This migration comes from valkyrie_engine (originally 20160111215816)
+class EnableUuidExtension < ActiveRecord::Migration[5.0]
+  def change
+    enable_extension 'uuid-ossp'
+  end
+end

data/.dassie/db/migrate/20210921150121_create_orm_resources.valkyrie_engine.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+# This migration comes from valkyrie_engine (originally 20161007101725)
+class CreateOrmResources < ActiveRecord::Migration[5.0]
+  def options
+    if ENV["VALKYRIE_ID_TYPE"] == "string"
+      { id: :text, default: -> { '(uuid_generate_v4())::text' } }
+    else
+      { id: :uuid }
+    end
+  end
+
+  def change
+    create_table :orm_resources, **options do |t|
+      t.jsonb :metadata, null: false, default: {}
+      t.timestamps
+    end
+    add_index :orm_resources, :metadata, using: :gin
+  end
+end

data/.dassie/db/migrate/20210921150122_add_model_type_to_orm_resources.valkyrie_engine.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+# This migration comes from valkyrie_engine (originally 20170124135846)
+class AddModelTypeToOrmResources < ActiveRecord::Migration[5.0]
+  def change
+    add_column :orm_resources, :resource_type, :string
+  end
+end

data/.dassie/db/migrate/20210921150123_change_model_type_to_internal_model.valkyrie_engine.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+# This migration comes from valkyrie_engine (originally 20170531004548)
+class ChangeModelTypeToInternalModel < ActiveRecord::Migration[5.1]
+  def change
+    rename_column :orm_resources, :resource_type, :internal_resource
+  end
+end

data/.dassie/db/migrate/20210921150124_create_path_gin_index.valkyrie_engine.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+# This migration comes from valkyrie_engine (originally 20171011224121)
+class CreatePathGinIndex < ActiveRecord::Migration[5.1]
+  def change
+    add_index :orm_resources, 'metadata jsonb_path_ops', using: :gin
+  end
+end

data/.dassie/db/migrate/20210921150125_create_internal_resource_index.valkyrie_engine.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+# This migration comes from valkyrie_engine (originally 20171204224121)
+class CreateInternalResourceIndex < ActiveRecord::Migration[5.1]
+  def change
+    add_index :orm_resources, :internal_resource
+  end
+end

data/.dassie/db/migrate/20210921150126_create_updated_at_index.valkyrie_engine.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+# This migration comes from valkyrie_engine (originally 20180212092225)
+class CreateUpdatedAtIndex < ActiveRecord::Migration[5.1]
+  def change
+    add_index :orm_resources, :updated_at
+  end
+end

data/.dassie/db/migrate/20210921150127_add_optimistic_locking_to_orm_resources.valkyrie_engine.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+# This migration comes from valkyrie_engine (originally 20180802220739)
+class AddOptimisticLockingToOrmResources < ActiveRecord::Migration[5.1]
+  def change
+    add_column :orm_resources, :lock_version, :integer
+  end
+end

data/.dassie/db/migrate/20211130181150_create_default_administrative_set.rb

@@ -0,0 +1,8 @@
+class CreateDefaultAdministrativeSet < ActiveRecord::Migration[5.2]
+  def change
+    create_table :hyrax_default_administrative_set do |t|
+      t.string :default_admin_set_id, null: false
+      t.timestamps null: false
+    end
+  end
+end

data/.dassie/db/schema.rb

@@ -10,10 +10,11 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2020_08_21_212903) do
+ActiveRecord::Schema.define(version: 2021_11_30_181150) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
+  enable_extension "uuid-ossp"
 
   create_table "bookmarks", id: :serial, force: :cascade do |t|
     t.integer "user_id", null: false
@@ -139,6 +140,12 @@ ActiveRecord::Schema.define(version: 2020_08_21_212903) do
     t.index ["machine_id"], name: "index_hyrax_collection_types_on_machine_id", unique: true
   end
 
+  create_table "hyrax_default_administrative_set", force: :cascade do |t|
+    t.string "default_admin_set_id", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
   create_table "hyrax_features", force: :cascade do |t|
     t.string "key", null: false
     t.boolean "enabled", default: false, null: false
@@ -225,6 +232,18 @@ ActiveRecord::Schema.define(version: 2020_08_21_212903) do
     t.index ["namespace"], name: "index_minter_states_on_namespace", unique: true
   end
 
+  create_table "orm_resources", id: :uuid, default: -> { "uuid_generate_v4()" }, force: :cascade do |t|
+    t.jsonb "metadata", default: {}, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.string "internal_resource"
+    t.integer "lock_version"
+    t.index ["internal_resource"], name: "index_orm_resources_on_internal_resource"
+    t.index ["metadata"], name: "index_orm_resources_on_metadata", using: :gin
+    t.index ["metadata"], name: "index_orm_resources_on_metadata_jsonb_path_ops", opclass: :jsonb_path_ops, using: :gin
+    t.index ["updated_at"], name: "index_orm_resources_on_updated_at"
+  end
+
   create_table "permission_template_accesses", force: :cascade do |t|
     t.bigint "permission_template_id"
     t.string "agent_type"

data/.env

@@ -1,14 +1,17 @@
+ANALYTICS_START_DATE=2021-08-21
 CHROME_HEADLESS_MODE=false
 DATABASE_CLEANER_ALLOW_REMOTE_DATABASE_URL=true
 DATABASE_TEST_URL=postgresql://hyrax_user:hyrax_password@postgres/hyrax_test?pool=5
 DATABASE_URL=postgresql://hyrax_user:hyrax_password@postgres/hyrax?pool=5
-DB_PORT=5432
 DB_HOST=postgres
-FCREPO_PORT=8080
+DB_PORT=5432
 FCREPO_HOST=fcrepo
+FCREPO_PORT=8080
 FCREPO_REST_PATH=rest
 FCREPO_TEST_BASE_PATH=/test
 HUB_URL=http://chrome:4444/wd/hub
+HYRAX_ANALYTICS=false
+HYRAX_ANALYTICS_PROVIDER=google
 HYRAX_DERIVATIVES_PATH=/app/samvera/hyrax-webapp/derivatives/
 HYRAX_ENGINE_PATH=/app/samvera/hyrax-engine
 HYRAX_UPLOAD_PATH=/app/samvera/hyrax-webapp/uploads/
@@ -17,9 +20,9 @@ RACK_ENV=development
 RAILS_ENV=development
 RAILS_ROOT=.dassie
 REDIS_HOST=redis
-SOLR_PORT=8983
 SOLR_HOST=solr
+SOLR_PORT=8983
 SOLR_TEST_URL=http://solr:8983/solr/hyrax_test
 SOLR_URL=http://solr:8983/solr/hyrax
-VALKYRIE_SOLR_PORT=8983
 VALKYRIE_SOLR_HOST=solr
+VALKYRIE_SOLR_PORT=8983

data/.github/workflows/main.yml

@@ -0,0 +1,17 @@
+name: Trigger Nurax build
+on:
+  workflow_dispatch:
+  push:
+
+jobs:
+  trigger:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: peter-evans/repository-dispatch@v1
+      with:
+         token: ${{ secrets.NURAX_ACCESS_TOKEN }}
+         event-type: push
+         repository: curationexperts/nurax
+         client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'
+
+

data/.github/workflows/release.yml

@@ -0,0 +1,17 @@
+name: Trigger Nurax build
+on:
+  workflow_dispatch:
+  release:
+
+jobs:
+  trigger:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: peter-evans/repository-dispatch@v1
+      with:
+         token: ${{ secrets.NURAX_ACCESS_TOKEN }}
+         event-type: release
+         repository: curationexperts/nurax
+         client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'
+
+

data/.gitignore

@@ -49,6 +49,8 @@ coverage
 rdoc
 /.bundle
 tmp
+/.idea
+
 
 *.log
 *~
@@ -71,6 +73,7 @@ db/schema.rb
 
 .*_app
 .byebug_history
+.tool-versions
 
 ## Carried over from hyrax-models (RIP)
 *.gem
@@ -82,3 +85,4 @@ lib/bundler/man
 spec/reports
 /spec/examples.txt
 node_modules
+.env.*

data/.regen

@@ -1 +1 @@
-36
+41

data/.rubocop_fixme.yml

@@ -63,6 +63,7 @@ RSpec/ExampleLength:
     - 'spec/jobs/content_restored_version_event_job_spec.rb'
     - 'spec/jobs/content_new_version_event_job_spec.rb'
     - 'spec/jobs/content_depositor_change_event_job_spec.rb'
+    - 'spec/jobs/change_depositor_event_job_spec.rb'
     - 'spec/jobs/content_deposit_event_job_spec.rb'
     - 'spec/jobs/content_delete_event_job_spec.rb'
     - 'spec/jobs/ingest_file_job_spec.rb'
@@ -100,7 +101,6 @@ RSpec/SubjectStub:
     - 'spec/models/hyrax/operation_spec.rb'
     - 'spec/controllers/hyrax/accepts_batches_controller_spec.rb'
     - 'spec/indexers/hyrax/repository_reindexer_spec.rb'
-    - 'spec/jobs/content_depositor_change_event_job_spec.rb'
     - 'spec/lib/hyrax/analytics_spec.rb'
     - 'spec/models/job_io_wrapper_spec.rb'
     - 'spec/search_builders/hyrax/abstract_type_relation_spec.rb'
@@ -114,6 +114,8 @@ RSpec/AnyInstance:
     - 'spec/controllers/hyrax/batch_edits_controller_spec.rb'
     - 'spec/controllers/hyrax/stats_controller_spec.rb'
     - 'spec/controllers/hyrax/users_controller_spec.rb'
+    - 'spec/hyrax/transactions/steps/delete_access_control_spec.rb'
+    - 'spec/hyrax/transactions/steps/save_access_control_spec.rb'
     - 'spec/jobs/content_restored_version_event_job_spec.rb'
     - 'spec/jobs/file_set_attached_event_job_spec.rb'
     - 'spec/jobs/hyrax/grant_edit_to_members_job_spec.rb'

data/CONTAINERS.md

@@ -1,15 +1,12 @@
 Hyrax-in-a-Container
 ====================
 
-Our goal is to provide a practical, reusable "reference environment for applications.  The first step is providing
-on on-ramp for Hyrax engine development.  Then providing help with Hyrax-based application development.  Finally,
-providing better guidance around deployment.
-
-Where are we at?  It's complicated.  What we have below is experimental support, but one that we want to push
-towards.  We need your help to keep pushing in this direction.  So dig in and prepare to get your hands dirty.
+Our goal is to provide a practical, reusable reference environment for applications.  The first step is providing an on-ramp for Hyrax engine development. Then providing help with Hyrax-based application development. Finally, providing better guidance around deployment.
 
 The [Hyrax Engine Development](#hyrax-engine-development) is further along than the [Docker Image for Hyrax-based Applications](#docker-image-for-hyrax-based-applications) which is further along than [Deploying to Production](#deploying-to-production).
 
+See the [Troubleshooting](#troubleshooting) section if you encounter any issues.
+
 <!-- NOTE: This title is referenced in the top-level README.md. Keep that in mind if you change it. -->
 ## Hyrax Engine Development
 
@@ -42,8 +39,6 @@ To stop the containers for the Hyrax-based application, type <kbd>Ctrl</kbd>+<kb
 
 _**Note:** Starting and stopping Docker in this way will preserve your data between restarts._
 
-_**Note:** I (Jeremy) encountered a problem using `docker-compose build`. I ran `bundle update` in `./hyrax` as well as within `./hyrax/.dassie`. That appeared to clear up the problem of a failure to build a gem._
-
 ### Code Changes and Testing
 
 With `docker-compose up` running, any changes you make to your cloned Hyrax code-base should show up in `http://localhost:3000`; There may be cases where you need to restart your test application (e.g. stop the containers and start them up again).
@@ -99,7 +94,7 @@ In the two examples, note the difference in the `-w` switch. In the first case,
 
 ### Debugging
 
-I (Jeremy) find myself wanting to debug the application.  This requires a somewhat different approach than running Hyrax bare-metal.  You need to use `docker attach` to debug the running docker instance.
+If you are interested in running Hyrax in debug mode, this requires a somewhat different approach than running Hyrax bare-metal.  You need to use `docker attach` to debug the running docker instance.
 
 1. With `docker-compose up` running open a new Terminal session.
 2. In that new Terminal session, using `docker container ls` find the "CONTAINER ID" for the `hyrax-engine-dev`.
@@ -127,6 +122,14 @@ cp: cannot create directory '/var/solr/data/hyrax_test': Permission denied
 
 The solution that appears to work is to `docker-compose down --volumes`; This will tear down the docker instance, and remove the volumes.  You can then run `docker-compose up` to get back to work.  _**Note:** the `--volumes` switch will remove all custom data._
 
+#### Errors building the Docker image
+
+If you encounter errors running `docker-compose build`, try running `bundle update` in `./hyrax` as well as within `./hyrax/.dassie`. That can help clear up the problem of a failure to build a particular gem.
+
+#### Containers do not all start
+
+If any of the services fail to start on `docker-compose up`, try clearing out any `Gemfile.lock` files that might exist in `./hyrax` or `./hyrax/.dassie` and run `docker-compose build` again, then `docker-compose up` again.
+
 <!-- NOTE: This title is referenced in the top-level documentation/developing-your-hyrax-based-app.md. Keep that in mind if you change it. -->
 ## Docker Image for Hyrax-based Applications
 
@@ -177,4 +180,4 @@ helm dependency update chart/hyrax
 helm install -n hyrax --set image.tag=(git rev-parse HEAD) dassie chart/hyrax
 ```
 
-[dockerhub-samveralabs]: https://hub.docker.com/r/samveralabs
+[dockerhub-samveralabs]: https://hub.docker.com/r/samveralabs

data/Dockerfile

@@ -1,6 +1,5 @@
-ARG RUBY_VERSION=2.7.2
-# lock at alpine3.12 because 3.13 has dns resolver problems
-FROM ruby:$RUBY_VERSION-alpine3.12 as hyrax-base
+ARG RUBY_VERSION=2.7.4
+FROM ruby:$RUBY_VERSION-alpine3.14 as hyrax-base
 
 ARG DATABASE_APK_PACKAGE="postgresql-dev"
 ARG EXTRA_APK_PACKAGES="git"
@@ -8,6 +7,7 @@ ARG EXTRA_APK_PACKAGES="git"
 RUN apk --no-cache upgrade && \
   apk --no-cache add build-base \
   curl \
+  gcompat \
   imagemagick \
   tzdata \
   nodejs \
@@ -58,7 +58,7 @@ USER app
 
 RUN mkdir -p /app/fits && \
     cd /app/fits && \
-    wget https://github.com/harvard-lts/fits/releases/download/1.5.0/fits-1.5.0.zip -O fits.zip && \
+    wget https://github.com/harvard-lts/fits/releases/download/1.5.1/fits-1.5.1.zip -O fits.zip && \
     unzip fits.zip && \
     rm fits.zip && \
     chmod a+x /app/fits/fits.sh

data/README.md

@@ -77,6 +77,43 @@ This is where you work on the code-base that will be used by yours and other Hyr
     <p>By moving to Docker, we are encoding the documentation steps for standing up a Hyrax-engine development environment.</p>
 </aside>
 
+### Installing Analytics
+
+Hyrax supports your choice of either Google Analytics or Matomo.  To enable analytics tracking and reporting features, follow the directions below.
+
+Enable Analytics Features
+
+Analytics can be enabled and configured using environment variables. Set HYRAX_ANALYTICS to true, set either 'google' or 'matomo' for  HYRAX_ANALYTICS_PROVIDER, and set the date you would like reporting to start (ANALYTICS_START_DATE).
+
+```
+HYRAX_ANALYTICS=true
+HYRAX_ANALYTICS_PROVIDER=google
+ANALYTICS_START_DATE=2021-08-21
+```
+
+If using google, you'll also need the following ENV variables:
+
+```
+GOOGLE_ANALYTICS_ID=UA-111111-1  # Universal ID (Currently Hyrax Analytics only works with Univeral (UA) accounts)
+GOOGLE_OAUTH_APP_NAME=
+GOOGLE_OAUTHAPP_VERSION=
+GOOGLE_OAUTH_PRIVATE_KEY_PATH= # store the .p12 file in the root of your application
+GOOGLE_OAUTH_PRIVATE_KEY_SECRET=
+GOOGLE_OAUTH_CLIENT_EMAIL=
+```
+
+Add these ENV variables if using Matomo:
+
+```
+MATOMO_SITE_ID=
+MATOMO_BASE_URL=
+MATOMO_AUTH_TOKEN=
+```
+
+#### Analytics Features
+
+Once analytics is enabled, Hyrax will automatically install the JS tracking code.  Page views and downloads of a file set are recorded and sent to the selected analytics provider.  Admin users will have access to an expanded dashboard with details about how many vistors viewed a page, and how many visitors downloaded a file.  Easily find the top works by views, and most popular file downloads!
+
 #### Contributing
 
 We'd love to accept your contributions.  Please see our guide to [contributing to Hyrax](./.github/CONTRIBUTING.md).

data/app/actors/hyrax/actors/base_actor.rb

@@ -37,7 +37,7 @@ module Hyrax
       # @return [Boolean] true if destroy was successful
       def destroy(env)
         env.curation_concern.in_collection_ids.each do |id|
-          destination_collection = ::Collection.find(id)
+          destination_collection = Hyrax.config.collection_class.find(id)
           destination_collection.members.delete(env.curation_concern)
           destination_collection.update_index
         end

data/app/actors/hyrax/actors/collections_membership_actor.rb

@@ -69,7 +69,7 @@ module Hyrax
       # Adds the item to the ordered members so that it displays in the items
       # along side the FileSets on the show page
       def add(env, id)
-        collection = ::Collection.find(id)
+        collection = Hyrax.config.collection_class.find(id)
         collection.reindex_extent = Hyrax::Adapters::NestingIndexAdapter::LIMITED_REINDEX
 
         return unless env.current_ability.can?(:deposit, collection)
@@ -78,7 +78,7 @@ module Hyrax
 
       # Remove the object from the members set and the ordered members list
       def remove(curation_concern, id)
-        collection = ::Collection.find(id)
+        collection = Hyrax.config.collection_class.find(id)
         curation_concern.member_of_collections.delete(collection)
       end
 
@@ -107,7 +107,7 @@ module Hyrax
         collection_id = attributes_collection.first.second['id']
 
         # Do not apply permissions to work if collection type is configured not to
-        collection = ::Collection.find(collection_id)
+        collection = Hyrax.config.collection_class.find(collection_id)
         return unless collection.share_applies_to_new_works?
 
         # Save the collection id in env for use in apply_permission_template_actor