Valkyrie update

.circleci/config.yml

@@ -7,7 +7,7 @@ jobs:
   build:
     docker:
     # legacy needed for phantomjs
-    - image: circleci/ruby:2.5.1-node-browsers-legacy
+    - image: cimg/ruby:3.2.2-browsers
     - image: circleci/redis:4
     - image: ualbertalib/docker-fcrepo4:4.7
       environment:
@@ -89,7 +89,7 @@ jobs:
     - run:
         name: Load config into SolrCloud
         command: |
-          cd .internal_test_app/solr/config
+          cd .internal_test_app/solr/conf
           zip -1 -r solr_hyrax_config.zip ./*
           curl -H "Content-type:application/octet-stream" --data-binary @solr_hyrax_config.zip "http://localhost:8985/solr/admin/configs?action=UPLOAD&name=hyrax"
           curl -H 'Content-type: application/json' http://localhost:8985/api/collections/ -d '{create: {name: hydra-test, config: hyrax, numShards: 1}}'

.gitignore

@@ -14,3 +14,4 @@ Gemfile.lock
 # This is for @afred to keep scripts and docs for sprint demos.
 # Please keep this here until we cut a 1.x release. Thanks!
 demos/**/*
+*.~undo-tree~

app/controllers/hyrax/batch_ingest/batches_controller.rb

@@ -66,7 +66,7 @@ def summary
         def available_admin_sets
           # Restrict available_admin_sets to only those current user can desposit to.
           @available_admin_sets ||= Hyrax::Collections::PermissionsService.source_ids_for_deposit(ability: current_ability, source_type: 'admin_set').map do |admin_set_id|
-            [AdminSet.find(admin_set_id).title.first, admin_set_id]
+            [Hyrax.query_service.find_by(id: admin_set_id).title.first, admin_set_id.to_s]
           end
         end
 

app/jobs/hyrax/batch_ingest/batch_item_processing_job.rb

@@ -39,6 +39,7 @@ class BatchItemProcessingJob < ApplicationJob
       end
 
       def perform(batch_item:)
+        # TODO Rob - does this work?
         ingester_class = config(batch_item).ingester
         ingester_options = config(batch_item).ingester_options
         @work = ingester_class.new(batch_item, ingester_options).ingest

app/models/hyrax/batch_ingest/batch.rb

@@ -16,7 +16,7 @@ def completed?
 
     def admin_set
       return unless admin_set_id
-      @admin_set ||= AdminSet.find(admin_set_id)
+      @admin_set ||= Hyrax.query_service.find_by(id: admin_set_id)
     end
 
     def collection

hyrax-batch_ingest.gemspec

@@ -17,9 +17,9 @@ Gem::Specification.new do |s|
 
   s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.md"]
 
-  s.add_dependency 'rails', '~> 5.1.6'
-  s.add_dependency 'hyrax', '~> 2.2'
-  s.add_dependency 'roo', '~> 2.7.0'
+  s.add_dependency 'rails', '~> 6.0'
+  s.add_dependency 'hyrax', '>= 4.0', '< 6.0'
+  s.add_dependency 'roo', '~> 2.7'
 
   s.add_development_dependency 'bixby'
   s.add_development_dependency 'capybara'
@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'engine_cart', '~> 2.2'
   s.add_development_dependency 'factory_bot_rails', '~> 4.11'
   s.add_development_dependency 'fcrepo_wrapper'
-  s.add_development_dependency "sqlite3"
+  s.add_development_dependency "sqlite3", '~> 1.4'
   s.add_development_dependency "rspec-rails", "~> 3.8"
   s.add_development_dependency "rspec-collection_matchers"
   s.add_development_dependency 'solr_wrapper', '~> 2.1'

lib/hyrax/batch_ingest.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require "hyrax/batch_ingest/version"
 require "hyrax/batch_ingest/engine"
 require 'hyrax/batch_ingest/config'
 require 'hyrax'

lib/hyrax/batch_ingest/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Hyrax
   module BatchIngest
-    VERSION = '0.2.0'
+    VERSION = '0.2.0b'
   end
 end