hyrax 2.8.0 → 3.0.0.pre.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 140c7caa34751f7a525eda269abcee6331a9e7d200863e2cbee29d315966de65
-  data.tar.gz: 7085c394edd0aa1e90baef7d13f90245d8fb0fb65659e54549cedda0487445e9
+  metadata.gz: 5c9d46930e13b120e6e81277af6e070ea5f0b66c2f2f893413e66a37d2a7e617
+  data.tar.gz: ecfa59ac809495a3c5b3bb64fc70896c5333ac95c703872fd541f6c20a49cd81
 SHA512:
-  metadata.gz: 691b84f363281552cbd84f85b767bb5b460ba749e0449aed0498594143767a6cd4dae187a5dd9c88bf3b7bd06a568375da70367b3b8faa674a59f39deaf4df06
-  data.tar.gz: e19605afaa51b569ea79e7e99d65fd0576b172cd6dfeb38f815c4dd3a7ac18678bb6b3ff4ac4a5af2b6358bf55c459baba0c4a98b393d20f7d64388f576c894f
+  metadata.gz: e97ef9f92570796c35d77c448e61e1ff5e3953feabc6f89b54e90a73e27c0672695367720ee73f454a79d82238e31b8ba0a4b01be9332e40e91c495f39b270c4
+  data.tar.gz: 68849eac966a278f56747d6ea1b390ba2a973eae160d2aaf8ab72020dc6367fe6bf9e13fee4e8888b7b1aa1b75c79fa5b39670e8554fec915ef5988c00b85fd6

data/.circleci/config.yml

@@ -12,7 +12,7 @@ jobs:
         default: 1.17.3
       rails_version:
         type: string
-        default: '5.2.4.3'
+        default: '5.2.2'
     executor:
       name: 'samvera/ruby'
       ruby_version: << parameters.ruby_version >>
@@ -25,28 +25,34 @@ jobs:
       - samvera/bundle_for_gem:
           ruby_version: << parameters.ruby_version >>
           bundler_version: << parameters.bundler_version >>
-          cache_version: '{{ checksum ".regen" }}'
           project: hyrax
+
+      # Run rubocop in parallel with caching
+      # This should get added to the orb once proven here
+
+      - restore_cache:
+          name: Restore rubocop cache
+          keys:
+            - v1-ruby<< parameters.ruby_version >>-bundle{{ checksum "Gemfile.lock" }}
+            - v1-ruby<< parameters.ruby_version >>
+            - v1
+
+      - run:
+          name: Run rubocop in parallel
+          command: bundle exec rubocop --parallel
+
+      - save_cache:
+          name: Save rubocop cache
+          key: v1-ruby<< parameters.ruby_version >>-bundle{{ checksum "Gemfile.lock" }}
+          paths:
+            - ~/.cache
+
       - persist_to_workspace:
           root: ~/
           paths:
           - project/*
           - project/**/*
 
-  lint:
-    parameters:
-      ruby_version:
-        type: string
-        default: 2.5.5
-    executor:
-      name: 'samvera/ruby'
-      ruby_version: << parameters.ruby_version >>
-    resource_class: medium+
-    steps:
-      - attach_workspace:
-          at: ~/
-      - samvera/rubocop
-
   build:
     parameters:
       ruby_version:
@@ -57,24 +63,24 @@ jobs:
         default: 1.17.3
       rails_version:
         type: string
-        default: '5.2.4.3'
+        default: '5.2.2'
     executor:
-      name: 'samvera/ruby'
+      name: 'samvera/ruby_fcrepo_solr_redis_postgres'
       ruby_version: << parameters.ruby_version >>
     resource_class: medium+
     environment:
       RAILS_VERSION: << parameters.rails_version >>
       NOKOGIRI_USE_SYSTEM_LIBRARIES: true
-      ENGINE_CART_RAILS_OPTIONS: --skip-git --skip-bundle --skip-listen --skip-spring --skip-yarn --skip-keeps --skip-action-cable --skip-coffee --skip-puma --skip-test
+      ENGINE_CART_RAILS_OPTIONS: --database=postgresql --skip-git --skip-bundle --skip-listen --skip-spring --skip-keeps --skip-test --skip-bootsnap
+      DATABASE_URL: postgresql://postgres@127.0.0.1/circle_test # Hard-coded with data from CircleCI orb, related to https://github.com/samvera-labs/samvera-circleci-orb/issues/42
     steps:
       - attach_workspace:
           at: ~/
       - samvera/engine_cart_generate:
-          cache_key: v1-2.x-internal-test-app-{{ checksum "hyrax.gemspec" }}-{{ checksum ".regen" }}-<< parameters.rails_version >>-<< parameters.ruby_version >>
+          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:
           ruby_version: << parameters.ruby_version >>
           bundler_version: << parameters.bundler_version >>
-          cache_version: '{{ checksum ".regen" }}'
           project: hyrax
       - persist_to_workspace:
           root: ~/
@@ -90,49 +96,38 @@ jobs:
       bundler_version:
         type: string
         default: 1.17.3
+      hyrax_valkyrie:
+        type: string
+        default: "false"
     executor:
-      name: 'samvera/ruby_fcrepo_solr_redis'
+      name: 'samvera/ruby_fcrepo_solr_redis_postgres'
       ruby_version: << parameters.ruby_version >>
     resource_class: medium+
     parallelism: 10
     environment:
-      COVERALLS_PARALLEL: true
+      HYRAX_VALKYRIE: << parameters.hyrax_valkyrie >>
+      VALKYRIE_SOLR_PORT: 8985
+      DATABASE_URL: postgresql://postgres@127.0.0.1/circle_test # Hard-coded with data from CircleCI orb, related to https://github.com/samvera-labs/samvera-circleci-orb/issues/42
     steps:
       - attach_workspace:
           at: ~/
       - samvera/install_solr_core:
-          solr_config_path: .internal_test_app/solr/config
+          solr_config_path: .internal_test_app/solr/conf
+      - samvera/install_solr_core:
+          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:
           ruby_version: << parameters.ruby_version >>
           bundler_version: << parameters.bundler_version >>
-          cache_version: '{{ checksum ".regen" }}'
           project: hyrax
+      - run:
+          command: bundle exec rake app:db:migrate
       - samvera/parallel_rspec
 
 workflows:
   version: 2
-  ruby2-5rails5-1:
-    jobs:
-      - bundle:
-          ruby_version: "2.5.8"
-          rails_version: "5.1.7"
-      - lint:
-          ruby_version: "2.5.8"
-          requires:
-            - bundle
-      - build:
-          ruby_version: "2.5.8"
-          rails_version: "5.1.7"
-          requires:
-            - bundle
-      - test:
-          name: "rails5-1"
-          ruby_version: "2.5.8"
-          requires:
-            - build
-            - lint
-  ruby2-5rails5-2:
+  ruby2-5-8:
     jobs:
       - bundle:
           ruby_version: "2.5.8"
@@ -147,7 +142,7 @@ workflows:
           ruby_version: "2.5.8"
           requires:
             - build
-  ruby2-6rails5-2:
+  ruby2-6-6:
     jobs:
       - bundle:
           ruby_version: "2.6.6"
@@ -162,21 +157,27 @@ workflows:
           ruby_version: "2.6.6"
           requires:
             - build
-  ruby2-7rails5-2:
+      - test:
+          name: "ruby2-6-6-valkyrie"
+          ruby_version: "2.6.6"
+          hyrax_valkyrie: "true"
+          requires:
+            - build
+  ruby2-7-1:
     jobs:
       - bundle:
           ruby_version: "2.7.1"
           rails_version: "5.2.4.3"
-          bundler_version: "2.1.2"
+          bundler_version: "2.1.4"
       - build:
           ruby_version: "2.7.1"
           rails_version: "5.2.4.3"
-          bundler_version: "2.1.2"
+          bundler_version: "2.1.4"
           requires:
             - bundle
       - test:
           name: "ruby2-7-1"
           ruby_version: "2.7.1"
-          bundler_version: "2.1.2"
+          bundler_version: "2.1.4"
           requires:
             - build

data/.engine_cart.yml

@@ -1 +1,40 @@
-rails_options: "<%= '--skip-listen' if ENV.fetch('RAILS_VERSION', '') < '5.0' %>"
+# Greetings Hyrax developer, you may be surprised to see this file.
+# Hyrax is moving to using Postgresql for testing in CircleCI and
+# hopefully by Hyrax developers during local development. Previously,
+# we used sqlite.
+#
+# And while installing Postgresql is beyond the scope of this
+# community, I (Jeremy) installed Postgresql via homebrew (brew.sh),
+# and have used the following for testing (note `hyrax-testup` is
+# defined later on):
+#
+# ```console
+# hyrax-testup
+# brew services start postgresql
+# export DATABASE_URL="postgresql://localhost:5432/internal_development"
+# bundle exec rspec
+# ```
+#
+# But, before running that, I have a shell alias (see
+# https://github.com/jeremyf/dotzshrc/blob/trunk/configs/aliases.zsh)
+# that I call.  The alias ensures that I have:
+#
+#   * clean set of solr indices
+#   * running solr indices
+#   * running fcrepo
+#   * running redis server
+#
+# ```console
+# alias hyrax-testup='cd $HOME/git/samvera/hyrax/.internal_test_app ; \
+#   rm -rf tmp/solr-valkyrie-test/server/solr/hyrax-valkyrie-test ; \
+#   rm -rf tmp/solr-test/server/solr/hydra-test ; \
+#   fcrepo_wrapper --config config/fcrepo_wrapper_test.yml & \
+#   solr_wrapper --config config/solr_wrapper_test.yml & \
+#   solr_wrapper --config config/solr_wrapper_valkyrie_test.yml & \
+#   redis-server &'
+# ```
+#
+# Best luck, and I (Jeremy) hope to add this to the Wiki at some point
+# once this current code is accepted into the main-line.
+rails_options:
+  - "--database=postgresql" # Caution, as you may only get "one option" until this is merged. https://github.com/cbeer/engine_cart/pull/102

data/.gitignore

@@ -25,6 +25,9 @@ tmtags
 ## VIM
 *.sw[pon]
 
+## VSCode
+.vscode
+
 ## OSX
 .DS_Store
 nohup.out
@@ -78,3 +81,4 @@ _yardoc
 lib/bundler/man
 spec/reports
 /spec/examples.txt
+node_modules

data/.regen

@@ -1 +1 @@
-3
+28e

data/.rubocop.yml

@@ -1,10 +1,11 @@
+inherit_from:
+  - .rubocop_fixme.yml
+
 inherit_gem:
   bixby: bixby_default.yml
 
-inherit_from: .rubocop_fixme.yml
-
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.4
   DisplayCopNames: true
   Exclude:
     - 'db/**/*'
@@ -17,6 +18,10 @@ Lint/ImplicitStringConcatenation:
   Exclude:
     - 'lib/generators/hyrax/**/*'
 
+Rails/Output:
+  Exclude:
+    - 'lib/generators/**/*'
+
 Metrics/BlockLength:
   ExcludedMethods: ['included']
   Exclude:
@@ -32,10 +37,6 @@ Metrics/BlockLength:
     - 'lib/tasks/*.rake'
     - 'spec/**/*.rb'
 
-# Naming/FileName: # https://github.com/bbatsov/rubocop/issues/2973
-#   Exclude:
-#     - 'Gemfile'
-
 Style/AsciiComments:
   Enabled: false
 
@@ -47,21 +48,6 @@ Style/CollectionMethods:
     detect: 'find'
     find_all: 'select'
 
-# disable frozen string literal comment. We can't safely introduce this
-# system-wide until a major version because it freezes strings that downstream
-# users might be mutating. Please use the frozen string literal pragma on new
-# files
-Style/FrozenStringLiteralComment:
-  Enabled: false
-
-Style/MethodMissing:
-  Exclude:
-    - 'app/models/concerns/hyrax/file_set/characterization.rb'
-
-Style/NumericPredicate:
-  Exclude:
-    - 'app/controllers/hyrax/file_sets_controller.rb'
-
 Style/SymbolArray:
   Enabled: false
 
@@ -71,16 +57,15 @@ Style/ClassAndModuleChildren:
 Style/SingleLineBlockParams:
   Enabled: false
 
-Style/ZeroLengthPredicate:
-  Exclude:
-    - 'app/controllers/hyrax/file_sets_controller.rb'
-
 Rails/ApplicationJob:
   Enabled: false
 
 Rails/ApplicationRecord:
   Enabled: false
 
+Rails/RakeEnvironment:
+  Enabled: false
+
 # We define custom methods like `find_by_user_key`,
 # `find_by_created_date`, etc
 Rails/DynamicFindBy:
@@ -121,10 +106,6 @@ RSpec/DescribeClass:
 RSpec/MessageSpies:
   Enabled: false
 
-RSpec/InstanceVariable:
-  Exclude:
-    - 'spec/services/hyrax/derivative_service_spec.rb'
-
 RSpec/ExpectActual:
   Enabled: false
 

data/.rubocop_fixme.yml

@@ -21,11 +21,6 @@ Metrics/ParameterLists:
   Exclude:
     - 'app/jobs/batch_create_job.rb'
 
-Metrics/AbcSize:
-  Exclude:
-    - 'app/indexers/hyrax/file_set_indexer.rb'
-    - 'app/services/hyrax/workflow/permission_query.rb'
-
 Metrics/ModuleLength:
   Exclude:
     - 'app/controllers/concerns/hyrax/works_controller_behavior.rb'
@@ -36,45 +31,6 @@ Metrics/ModuleLength:
     # TODO:  extract CollectionAccessControls or something, so we don't have to skip this check?
     - 'app/models/concerns/hyrax/collection_behavior.rb'
 
-Metrics/MethodLength:
-  Exclude:
-    - 'app/controllers/concerns/hyrax/api.rb'
-    - 'app/controllers/concerns/hyrax/works_controller_behavior.rb'
-    - 'app/indexers/hyrax/file_set_indexer.rb'
-    - 'app/inputs/multi_value_select_input.rb'
-    - 'app/models/concerns/hyrax/solr_document/export.rb'
-    - 'app/services/hyrax/workflow/permission_query.rb'
-    - 'lib/generators/hyrax/install_generator.rb'
-    - 'lib/hyrax/rails/routes.rb'
-    - 'spec/support/**/*'
-
-
-Naming/PredicateName:
-  Exclude:
-    - 'app/helpers/hyrax/collections_helper.rb'
-
-
-# TODO: remove when https://github.com/bbatsov/rubocop/issues/4539 is fixed
-Style/FormatStringToken:
-  Exclude:
-    - 'config/routes.rb'
-
-Style/DateTime:
-  Enabled: false
-
-# TODO: remove when https://github.com/bbatsov/rubocop/issues/5161 is fixed
-Style/CommentedKeyword:
-  Exclude:
-    - 'app/models/vocab/fedora_resource_status.rb'
-
-Style/SpecialGlobalVars:
-  Exclude:
-    - 'tasks/hyrax_dev.rake'
-
-Rails/Output:
-  Exclude:
-    - 'lib/generators/**/*'
-
 RSpec/NamedSubject:
   Enabled: false
 
@@ -129,6 +85,7 @@ RSpec/ExampleLength:
     - 'spec/services/hyrax/workflow/state_machine_generator_spec.rb'
     - 'spec/services/hyrax/workflow/workflow_importer_spec.rb'
     - 'spec/views/**/*'
+    - 'spec/wings/valkyrie/persister_spec.rb'
 
 RSpec/VerifiedDoubles:
   Enabled: false
@@ -141,26 +98,27 @@ RSpec/SubjectStub:
     - 'spec/models/hyrax/work_behavior_spec.rb'
     - 'spec/search_builders/hyrax/file_set_search_builder_spec.rb'
     - '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'
+    - 'spec/services/hyrax/database_migrator_spec.rb'
 
 RSpec/AnyInstance:
   Exclude:
     - 'spec/actors/hyrax/actors/generic_work_actor_spec.rb'
-    - 'spec/controllers/hyrax/admin/admin_sets_controller_spec.rb'
     - 'spec/controllers/hyrax/api/items_controller_spec.rb'
     - 'spec/controllers/hyrax/api/zotero_controller_spec.rb'
     - 'spec/controllers/hyrax/batch_edits_controller_spec.rb'
-    - 'spec/controllers/hyrax/dashboard_controller_spec.rb'
     - 'spec/controllers/hyrax/stats_controller_spec.rb'
-    - 'spec/jobs/file_set_attached_event_job_spec.rb'
-    - 'spec/jobs/content_update_event_job_spec.rb'
+    - 'spec/controllers/hyrax/users_controller_spec.rb'
     - '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/content_deposit_event_job_spec.rb'
+    - 'spec/jobs/file_set_attached_event_job_spec.rb'
     - 'spec/jobs/hyrax/grant_edit_to_members_job_spec.rb'
     - 'spec/jobs/hyrax/grant_read_to_members_job_spec.rb'
     - 'spec/jobs/hyrax/revoke_edit_from_members_job_spec.rb'
-    - 'spec/lib/hyrax/arkivo/actor_spec.rb'
     - 'spec/lib/hyrax/arkivo/create_subscription_job_spec.rb'
     - 'spec/presenters/hyrax/file_usage_spec.rb'
     - 'spec/presenters/hyrax/work_usage_spec.rb'
@@ -174,15 +132,6 @@ RSpec/AnyInstance:
 RSpec/ExpectInHook:
   Enabled: false
 
-# Offense count: 31
-RSpec/LetBeforeExamples:
-  Exclude:
-    - 'spec/forms/hyrax/forms/collection_form_spec.rb'
-    - 'spec/presenters/hyrax/collection_presenter_spec.rb'
-    - 'spec/presenters/hyrax/trophy_presenter_spec.rb'
-    - 'spec/services/hyrax/workflow/action_taken_service_spec.rb'
-    - 'spec/services/hyrax/workflow/notification_service_spec.rb'
-
 # Offense count: 27
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: and_return, block
@@ -200,3 +149,30 @@ RSpec/ReturnFromStub:
     - 'spec/views/hyrax/base/file_manager.html.erb_spec.rb'
     - 'spec/views/hyrax/dashboard/profiles/edit.html.erb_spec.rb'
     - 'spec/views/hyrax/users/_user_info.html.erb_spec.rb'
+
+# Offense count: 26
+RSpec/RepeatedDescription:
+  Exclude:
+    - 'spec/models/sipity/agent_spec.rb'
+    - 'spec/models/sipity/comment_spec.rb'
+    - 'spec/models/sipity/entity_spec.rb'
+    - 'spec/models/sipity/entity_specific_responsibility_spec.rb'
+    - 'spec/models/sipity/role_spec.rb'
+    - 'spec/models/sipity/workflow_action_spec.rb'
+    - 'spec/models/sipity/workflow_responsibility_spec.rb'
+    - 'spec/models/sipity/workflow_role_spec.rb'
+    - 'spec/models/sipity/workflow_state_action_permission_spec.rb'
+    - 'spec/models/sipity/workflow_state_action_spec.rb'
+    - 'spec/models/sipity/workflow_state_spec.rb'
+
+# Offense count: 1
+# Configuration parameters: Include.
+# Include: app/models/**/*.rb
+Rails/HasManyOrHasOneDependent:
+  Exclude:
+    - 'app/models/admin_set.rb'
+
+# Offense count: 1
+Style/MethodMissingSuper:
+  Exclude:
+    - 'app/models/concerns/hyrax/file_set/characterization.rb'