bulkrax 7.0.0 → 8.1.0

data/app/services/bulkrax/remove_relationships_for_importer.rb

@@ -57,7 +57,7 @@ module Bulkrax
         obj = entry.factory.find
         next if obj.is_a?(Bulkrax.file_model_class) # FileSets must be attached to a Work
 
-        if obj.is_a?(Collection)
+        if obj.is_a?(Bulkrax.collection_model_class)
           remove_relationships_from_collection(obj)
         else
           remove_relationships_from_work(obj)
@@ -78,12 +78,14 @@ module Bulkrax
 
       return if defined?(Hyrax)
 
+      # NOTE: This should not need to be migrated to the object factory.
       # Remove parent collection relationships
       collection.member_of_collections.each do |parent_col|
         Hyrax::Collections::NestedCollectionPersistenceService
           .remove_nested_relationship_for(parent: parent_col, child: collection)
       end
 
+      # NOTE: This should not need to be migrated to the object factory.
       # Remove child collection relationships
       collection.member_collections.each do |child_col|
         Hyrax::Collections::NestedCollectionPersistenceService

data/app/services/hyrax/custom_queries/find_by_source_identifier.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module Hyrax
+  module CustomQueries
+    ##
+    # @see https://github.com/samvera/valkyrie/wiki/Queries#custom-queries
+    class FindBySourceIdentifier
+      def self.queries
+        [:find_by_model_and_property_value]
+      end
+
+      def initialize(query_service:)
+        @query_service = query_service
+      end
+
+      attr_reader :query_service
+      delegate :resource_factory, to: :query_service
+      delegate :orm_class, to: :resource_factory
+
+      ##
+      # @param model [Class, #internal_resource]
+      # @param property [#to_s] the name of the property we're attempting to
+      #        query.
+      # @param value [#to_s] the propety's value that we're trying to match.
+      #
+      # @return [NilClass] when no record was found
+      # @return [Valkyrie::Resource] when a record was found
+      #
+      # @note This is not a real estate transaction nor a Zillow lookup.
+      def find_by_model_and_property_value(model:, property:, value:)
+        sql_query = sql_for_find_by_model_and_property_value
+        # NOTE: Do we need to ask the model for it's internal_resource?
+        # TODO: no => undefined method `internal_resource' for Image:Class
+        query_service.run_query(sql_query, model, property, value).first
+      end
+
+      private
+
+      def sql_for_find_by_model_and_property_value
+        # NOTE: This is querying the first element of the property, but we might
+        # want to check all of the elements.
+        <<-SQL
+          SELECT * FROM orm_resources
+          WHERE internal_resource = ? AND metadata -> ? ->> 0 = ?
+          LIMIT 1;
+        SQL
+      end
+    end
+  end
+end

data/app/services/wings/custom_queries/find_by_source_identifier.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Wings
+  module CustomQueries
+    class FindBySourceIdentifier
+      # Custom query override specific to Wings
+
+      def self.queries
+        [:find_by_model_and_property_value]
+      end
+
+      attr_reader :query_service
+      delegate :resource_factory, to: :query_service
+
+      def initialize(query_service:)
+        @query_service = query_service
+      end
+
+      def find_by_model_and_property_value(model:, property:, value:, use_valkyrie: Hyrax.config.use_valkyrie?)
+        # NOTE: This is using the Bulkrax::ObjectFactory (e.g. the one
+        # envisioned for ActiveFedora).  In doing this, we avoid the situation
+        # where Bulkrax::ValkyrieObjectFactory calls this custom query.
+        af_object = Bulkrax::ObjectFactory.search_by_property(value: value, klass: model, field: property)
+
+        return if af_object.blank?
+        return af_object unless use_valkyrie
+
+        resource_factory.to_resource(object: af_object)
+      end
+    end
+  end
+end

data/app/views/bulkrax/entries/_parsed_metadata.html.erb

@@ -5,7 +5,7 @@
         Parsed Metadata:
       </a>
       <a role="button" data-toggle="collapse" data-target="#parsed-metadata-show" aria-expanded="true" aria-controls="parsed-metadata-show">
-        <div class="accordion-icon glyphicon glyphicon-remove-circle" aria-hidden="true"></div>
+        <div class="accordion-icon fa fa-times-circle" aria-hidden="true"></div>
       </a>
     </div>
     <div id="parsed-metadata-show" class="accordion-collapse collapse" role="tabpanel" aria-labelledby="parsed-metadata-show">
@@ -16,4 +16,4 @@
       </div>
     </div>
   </div>
-<% end %>
+<% end %>

data/app/views/bulkrax/entries/_raw_metadata.html.erb

@@ -5,7 +5,7 @@
         Raw Metadata:
       </a>
       <a role="button" data-toggle="collapse" data-target="#raw-metadata-show" aria-expanded="true" aria-controls="raw-metadata-show">
-        <div class="accordion-icon glyphicon glyphicon-remove-circle" aria-hidden="true"></div>
+        <div class="accordion-icon fa fa-times-circle" aria-hidden="true"></div>
       </a>
     </div>
     <div id="raw-metadata-show" class="accordion-collapse collapse" role="tabpanel" aria-labelledby="raw-metadata-show">
@@ -16,4 +16,4 @@
       </div>
     </div>
   </div>
-<% end %>
+<% end %>

data/app/views/bulkrax/entries/show.html.erb

@@ -33,13 +33,14 @@
 
     <p class='bulkrax-p-align'>
       <% if @importer.present? %>
+	<%# TODO Consider how to account for Bulkrax.collection_model_class %>
         <% factory_record = @entry.factory.find %>
         <% if factory_record.present? && @entry.factory_class %>
-          <strong><%= @entry.factory_class.to_s %> Link:</strong>
-          <% if @entry.factory_class.to_s == 'Collection' %>
-            <%= link_to @entry.factory_class.to_s, hyrax.polymorphic_path(factory_record) %>
+          <strong><%= @entry.factory_class.model_name.human %> Link:</strong>
+          <% if defined?(Hyrax) && @entry.factory_class.model_name.human == 'Collection' %>
+            <%= link_to @entry.factory_class.model_name.human, hyrax.polymorphic_path(factory_record) %>
           <% else %>
-            <%= link_to @entry.factory_class.to_s, main_app.polymorphic_path(factory_record) %>
+            <%= link_to @entry.factory_class.model_name.human, main_app.polymorphic_path(factory_record) %>
           <% end %>
         <% else %>
           <strong>Item Link:</strong> Item has not yet been imported successfully
@@ -47,11 +48,11 @@
       <% else %>
         <% record = @entry&.hyrax_record %>
         <% if record.present? && @entry.factory_class %>
-          <strong><%= record.class.to_s %> Link:</strong>
-          <% if defined?(Collection) && record.is_a?(Collection) %>
-            <%= link_to record.class.to_s, hyrax.polymorphic_path(record) %>
+          <strong><%= record.model_name.human %> Link:</strong>
+          <% if defined?(Hyrax) && record.model_name.human == "Collection" %>
+            <%= link_to record.model_name.human, hyrax.polymorphic_path(record) %>
           <% else %>
-            <%= link_to record.class.to_s, main_app.polymorphic_path(record) %>
+            <%= link_to record.model_name.human, main_app.polymorphic_path(record) %>
           <% end %>
         <% else %>
           <strong>Item Link:</strong> No item associated with this entry or class unknown

data/app/views/bulkrax/exporters/edit.html.erb

@@ -14,7 +14,7 @@
             <%= form.button :submit, value: 'Update and Re-Export All Items', class: 'btn btn-primary' %>
             |
             <% cancel_path = form.object.persisted? ? exporter_path(form.object) : exporters_path %>
-            <%= link_to t('.cancel'), cancel_path, class: 'btn btn-default ' %>
+            <%= link_to t('bulkrax.cancel'), cancel_path, class: 'btn btn-default ' %>
           </div>
         </div>
       <% end %>

data/app/views/bulkrax/exporters/new.html.erb

@@ -14,7 +14,7 @@
             <%= form.button :submit, value: 'Create', class: 'btn btn-primary' %>
             |
             <% cancel_path = form.object.persisted? ? exporter_path(form.object) : exporters_path %>
-            <%= link_to t('.cancel'), cancel_path, class: 'btn btn-default ' %>
+            <%= link_to t('bulkrax.cancel'), cancel_path, class: 'btn btn-default ' %>
           </div>
         </div>
       <% end %>

data/app/views/bulkrax/exporters/show.html.erb

@@ -39,8 +39,10 @@
       <strong><%= t('bulkrax.exporter.labels.export_source') %>:</strong>
       <% case @exporter.export_from %>
       <% when 'collection' %>
-        <% collection = Collection.find(@exporter.export_source) %>
-        <%= link_to collection&.title&.first, hyrax.dashboard_collection_path(collection.id) %>
+	<% collection = Bulkrax.object_factory.find_or_nil(@exporter.export_source) %>
+	<% id = collection&.id || @exporter.export_source %>
+	<% title = collection&.title&.first || @exporter.export_source %>
+        <%= link_to title, hyrax.dashboard_collection_path(id) %>
       <% when 'importer' %>
         <% importer = Bulkrax::Importer.find(@exporter.export_source) %>
         <%= link_to importer.name, bulkrax.importer_path(importer.id) %>

data/app/views/bulkrax/importers/_browse_everything.html.erb

@@ -3,10 +3,10 @@
 	f = "#{form.lookup_action}_importer"
 	f = "#{f}_#{@importer.id}" unless @importer.new_record?
 %>
-<div id='cloud-files'> 
+<div id='cloud-files'>
 	<button type="button" data-toggle="browse-everything" data-route="<%=browse_everything_engine.root_path%>"
 		data-target="#<%= f %>" class="btn btn-primary" id="browse">
-		<span class="glyphicon glyphicon-plus"></span>
+		<span class="fa fa-plus"></span>
 		Add Cloud Files
 	</button>
 </div>

data/app/views/bulkrax/importers/_csv_fields.html.erb

@@ -29,7 +29,7 @@
   <% file_style_list << 'Existing Entries' unless importer.new_record? %>
   <%= fi.input :file_style, collection: file_style_list, as: :radio_buttons, label: false %>
   <div id='file_upload'>
-    <%= fi.input 'file', as: :file, input_html: { accept: 'text/csv,application/zip' } %><br />
+    <%= fi.input 'file', as: :file, input_html: { accept: 'text/csv,application/zip,application/gzip' } %><br />
   </div>
   <div id='file_path'>
     <%= fi.input :import_file_path, as: :string, input_html: { value: importer.parser_fields['import_file_path'] } %>

data/app/views/bulkrax/importers/edit.html.erb

@@ -15,7 +15,7 @@
             </button>
             <%= render 'edit_form_buttons', form: form %>
            <% cancel_path = form.object.persisted? ? importer_path(form.object) : importers_path %>
-            | <%= link_to t('.cancel'), cancel_path, class: 'btn btn-default ' %>
+            | <%= link_to t('bulkrax.cancel'), cancel_path, class: 'btn btn-default ' %>
           </div>
         </div>
       <% end %>

data/app/views/bulkrax/importers/new.html.erb

@@ -18,7 +18,7 @@
             <%= form.button :submit, value: 'Create', class: 'btn btn-primary' %>
             |
             <% cancel_path = form.object.persisted? ? importer_path(form.object) : importers_path %>
-            <%= link_to t('.cancel'), cancel_path, class: 'btn btn-default ' %>
+            <%= link_to t('bulkrax.cancel'), cancel_path, class: 'btn btn-default ' %>
           </div>
         </div>
       <% end %>

data/app/views/bulkrax/importers/show.html.erb

@@ -45,7 +45,7 @@
           Parser fields:
         </a>
         <a role="button" data-toggle="collapse" data-target="#parser-fields-importer-show" aria-expanded="true" aria-controls="parser-fields-importer-show">
-          <div class="accordion-icon glyphicon glyphicon-remove-circle" aria-hidden="true"></div>
+          <div class="accordion-icon fa fa-times-circle" aria-hidden="true"></div>
         </a>
       </div>
       <div id="parser-fields-importer-show" class="accordion-collapse collapse" role="tabpanel" aria-labelledby="parser-fields-heading">

data/app/views/bulkrax/importers/upload_corrected_entries.html.erb

@@ -7,7 +7,7 @@
     <p>
     Upload <b>only</b> the corrected entries for the <b><%= @importer.name %></b> importer. To export failed entries for correction,
     <%= link_to importer_export_errors_path(@importer.id) do %>
-      click here <span class='glyphicon glyphicon-download-alt'></span>
+      click here <span class='fa fa-download'></span>
     <% end %>
     </p>
     <p>Only CSV files are allowed.</p>
@@ -18,7 +18,7 @@
           <div class='fileupload-buttonbar hide-required-tag'>
             <%= fi.input 'file',
               as: :file,
-              label: "<span class='glyphicon glyphicon-plus'></span><span> Add file...</span>".html_safe,
+              label: "<span class='fa fa-plus'></span><span> Add file...</span>".html_safe,
               label_html: {
                 class: 'btn btn-success'
               },

data/app/views/bulkrax/shared/_bulkrax_errors.html.erb

@@ -5,7 +5,7 @@
         Errors:
       </a>
       <a role="button" data-toggle="collapse" data-target="#error-trace-show" aria-expanded="true" aria-controls="error-trace-show">
-        <div class="accordion-icon glyphicon glyphicon-remove-circle" aria-hidden="true"></div>
+        <div class="accordion-icon fa fa-times-circle" aria-hidden="true"></div>
       </a>
     </div>
     <div id="error-trace-show" class="accordion-collapse collapse" role="tabpanel" aria-labelledby="error-trace-show">

data/app/views/bulkrax/shared/_bulkrax_field_mapping.html.erb

@@ -5,7 +5,7 @@
         <strong>Field mapping:</strong>
       </a>
       <a role="button" data-toggle="collapse" data-target="#field-mapping-show" aria-expanded="true" aria-controls="field-mapping-show">
-        <div class="accordion-icon glyphicon glyphicon-remove-circle" aria-hidden="true"></div>
+        <div class="accordion-icon fa fa-times-circle" aria-hidden="true"></div>
       </a>
     </div>
     <div id="field-mapping-show" class="accordion-collapse collapse" role="tabpanel" aria-labelledby="field-mapping-show">

data/config/locales/bulkrax.en.yml

@@ -1,9 +1,16 @@
 en:
+  helpers: 
+    action: 
+      importer:
+        new: "New"
+      exporter: 
+        new: "New"
   bulkrax:
     admin:
       sidebar:
         exporters: Exporters
         importers: Importers
+    cancel: "Cancel"
     exporter:
       labels:
         all: All

data/db/migrate/20230608153601_add_indices_to_bulkrax.rb

@@ -1,14 +1,25 @@
+# This migration comes from bulkrax (originally 20230608153601)
 class AddIndicesToBulkrax < ActiveRecord::Migration[5.1]
   def change
-    add_index :bulkrax_entries, :identifier unless index_exists?(:bulkrax_entries, :identifier)
-    add_index :bulkrax_entries, :type unless index_exists?(:bulkrax_entries, :type)
-    add_index :bulkrax_entries, [:importerexporter_id, :importerexporter_type], name: 'bulkrax_entries_importerexporter_idx' unless index_exists?(:bulkrax_entries, [:importerexporter_id, :importerexporter_type], name: 'bulkrax_entries_importerexporter_idx')
-
-    add_index :bulkrax_pending_relationships, :parent_id unless index_exists?(:bulkrax_pending_relationships, :parent_id)
-    add_index :bulkrax_pending_relationships, :child_id unless index_exists?(:bulkrax_pending_relationships, :child_id) 
+    check_and_add_index :bulkrax_entries, :identifier
+    check_and_add_index :bulkrax_entries, :type
+    check_and_add_index :bulkrax_entries, [:importerexporter_id, :importerexporter_type], name: 'bulkrax_entries_importerexporter_idx'
+    check_and_add_index :bulkrax_pending_relationships, :parent_id
+    check_and_add_index :bulkrax_pending_relationships, :child_id
+    check_and_add_index :bulkrax_statuses, [:statusable_id, :statusable_type], name: 'bulkrax_statuses_statusable_idx'
+    check_and_add_index :bulkrax_statuses, [:runnable_id, :runnable_type], name: 'bulkrax_statuses_runnable_idx'
+    check_and_add_index :bulkrax_statuses, :error_class
+  end
 
-    add_index :bulkrax_statuses, [:statusable_id, :statusable_type], name: 'bulkrax_statuses_statusable_idx' unless index_exists?(:bulkrax_statuses, [:statusable_id, :statusable_type], name: 'bulkrax_statuses_statusable_idx')
-    add_index :bulkrax_statuses, [:runnable_id, :runnable_type], name: 'bulkrax_statuses_runnable_idx' unless index_exists?(:bulkrax_statuses, [:runnable_id, :runnable_type], name: 'bulkrax_statuses_runnable_idx')
-    add_index :bulkrax_statuses, :error_class unless index_exists?(:bulkrax_statuses, :error_class)
+  if RUBY_VERSION =~ /^2/
+    def check_and_add_index(table_name, column_name, options = {})
+      add_index(table_name, column_name, options) unless index_exists?(table_name, column_name, options)
+    end
+  elsif RUBY_VERSION =~ /^3/
+    def check_and_add_index(table_name, column_name, **options)
+      add_index(table_name, column_name, **options) unless index_exists?(table_name, column_name, **options)
+    end
+  else
+    raise "Ruby version #{RUBY_VERSION} is unknown"
   end
 end

data/db/migrate/20240307053156_add_index_to_metadata_bulkrax_identifier.rb

@@ -0,0 +1,18 @@
+class AddIndexToMetadataBulkraxIdentifier < ActiveRecord::Migration[5.2]
+  def up
+    return unless table_exists?(:orm_resources)
+    return if index_exists?(:orm_resources, "(((metadata -> 'bulkrax_identifier'::text) ->> 0))", name: 'index_on_bulkrax_identifier')
+
+    # This creates an expression index on the first element of the bulkrax_identifier array
+    add_index :orm_resources,
+              "(metadata -> 'bulkrax_identifier' ->> 0)",
+              name: 'index_on_bulkrax_identifier',
+              where: "metadata -> 'bulkrax_identifier' IS NOT NULL"
+  end
+
+  def down
+    return unless table_exists?(:orm_resources)
+
+    remove_index :orm_resources, name: 'index_on_bulkrax_identifier'
+  end
+end

data/lib/bulkrax/engine.rb

@@ -5,6 +5,7 @@ require 'oai'
 module Bulkrax
   class Engine < ::Rails::Engine
     isolate_namespace Bulkrax
+
     initializer :append_migrations do |app|
       if !app.root.to_s.match(root.to_s) && app.root.join('db/migrate').children.none? { |path| path.fnmatch?("*.bulkrax.rb") }
         config.paths["db/migrate"].expanded.each do |expanded_path|
@@ -13,12 +14,6 @@ module Bulkrax
       end
     end
 
-    initializer 'requires' do
-      require 'bulkrax/persistence_layer'
-      require 'bulkrax/persistence_layer/active_fedora_adapter' if defined?(ActiveFedora)
-      require 'bulkrax/persistence_layer/valkyrie_adapter' if defined?(Valkyrie)
-    end
-
     config.generators do |g|
       g.test_framework :rspec
       begin
@@ -38,6 +33,28 @@ module Bulkrax
         hyrax_view_path = paths.detect { |path| path.match(%r{^#{hyrax_engine_root}}) }
         paths.insert(paths.index(hyrax_view_path), File.join(my_engine_root, 'app', 'views')) if hyrax_view_path
         ActionController::Base.view_paths = paths.uniq
+
+        custom_query_strategies = {
+          find_by_model_and_property_value: :find_single_or_nil
+        }
+
+        if defined?(::Goddess::CustomQueryContainer)
+          strategies = ::Goddess::CustomQueryContainer.known_custom_queries_and_their_strategies
+          strategies = strategies.merge(custom_query_strategies)
+          ::Goddess::CustomQueryContainer.known_custom_queries_and_their_strategies = strategies
+        end
+
+        if defined?(::Frigg::CustomQueryContainer)
+          strategies = ::Frigg::CustomQueryContainer.known_custom_queries_and_their_strategies
+          strategies = strategies.merge(custom_query_strategies)
+          ::Frigg::CustomQueryContainer.known_custom_queries_and_their_strategies = strategies
+        end
+
+        if defined?(::Freyja::CustomQueryContainer)
+          strategies = ::Freyja::CustomQueryContainer.known_custom_queries_and_their_strategies
+          strategies = strategies.merge(custom_query_strategies)
+          ::Freyja::CustomQueryContainer.known_custom_queries_and_their_strategies = strategies
+        end
       end
     end
   end

data/lib/bulkrax/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bulkrax
-  VERSION = '7.0.0'
+  VERSION = '8.1.0'
 end

data/lib/bulkrax.rb

@@ -3,8 +3,27 @@
 require "bulkrax/version"
 require "bulkrax/engine"
 require 'active_support/all'
+
 require 'coderay'
+require 'csv'
 require 'denormalize_fields'
+require 'erb'
+require 'iso8601'
+require 'language_list'
+require 'marcel'
+require 'nokogiri'
+require 'ostruct'
+require 'zip'
+
+def conditional_require(gem_name)
+  require gem_name
+rescue LoadError
+  ENV["BULKRAX_NO_#{gem_name.upcase}"] = 'true'
+end
+
+conditional_require 'bagit'
+conditional_require 'rdf'
+
 # rubocop:disable Metrics/ModuleLength
 module Bulkrax
   extend self # rubocop:disable Style/ModuleFunction
@@ -14,12 +33,10 @@ module Bulkrax
   # @api public
   class Configuration
     attr_accessor :api_definition,
-                  :curation_concerns,
                   :default_field_mapping,
                   :default_work_type,
                   :export_path,
                   :field_mappings,
-                  :file_model_class,
                   :generated_metadata_mapping,
                   :import_path,
                   :multi_value_element_join_on,
@@ -40,10 +57,6 @@ module Bulkrax
     #         second parameter is an Integer for the index of the record encountered in the import.
     attr_accessor :fill_in_blank_source_identifiers
 
-    ##
-    # @param adapter [Class<Bulkrax::PersistenceLayer::AbstractAdapter>]
-    attr_writer :persistence_adapter
-
     ##
     # @param [String]
     attr_writer :solr_key_for_member_file_ids
@@ -78,6 +91,36 @@ module Bulkrax
       @factory_class_name_coercer || Bulkrax::FactoryClassFinder::DefaultCoercer
     end
 
+    def collection_model_class
+      @collection_model_class ||= Collection
+    end
+
+    attr_writer :collection_model_class
+
+    def collection_model_internal_resource
+      collection_model_class.try(:internal_resource) || collection_model_class.to_s
+    end
+
+    def file_model_class
+      @file_model_class ||= defined?(::Hyrax) ? ::FileSet : File
+    end
+
+    attr_writer :file_model_class
+
+    def file_model_internal_resource
+      file_model_class.try(:internal_resource) || file_model_class.to_s
+    end
+
+    def curation_concerns
+      @curation_concerns ||= defined?(::Hyrax) ? ::Hyrax.config.curation_concerns : []
+    end
+
+    attr_writer :curation_concerns
+
+    def curation_concern_internal_resources
+      curation_concerns.map { |cc| cc.try(:internal_resource) || cc.to_s }.uniq
+    end
+
     attr_writer :ingest_queue_name
     ##
     # @return [String, Proc]
@@ -87,34 +130,6 @@ module Bulkrax
       :import
     end
 
-    ##
-    # Configure the persistence adapter used for persisting imported data.
-    #
-    # @return [Class<Bulkrax::PersistenceLayer::AbstractAdapter>]
-    # @see Bulkrax::PersistenceLayer
-    def persistence_adapter
-      @persistence_adapter || derived_persistence_adapter
-    end
-
-    def derived_persistence_adapter
-      if defined?(Hyrax)
-        # There's probably some configuration of Hyrax we could use to better refine this; but it's
-        # likely a reasonable guess.  The main goal is to not break existing implementations and
-        # maintain an upgrade path.
-        if Gem::Version.new(Hyrax::VERSION) >= Gem::Version.new('6.0.0')
-          Bulkrax::PersistenceLayer::ValkyrieAdapter
-        else
-          Bulkrax::PersistenceLayer::ActiveFedoraAdapter
-        end
-      elsif defined?(ActiveFedora)
-        Bulkrax::PersistenceLayer::ActiveFedoraAdapter
-      elsif defined?(Valkyrie)
-        Bulkrax::PersistenceLayer::ValkyrieAdapter
-      else
-        raise "Unable to derive a persistence adapter"
-      end
-    end
-
     attr_writer :use_locking
 
     def use_locking
@@ -135,8 +150,12 @@ module Bulkrax
   def_delegators :@config,
                  :api_definition,
                  :api_definition=,
+                 :collection_model_class,
+                 :collection_model_internal_resource,
+                 :collection_model_class=,
                  :curation_concerns,
                  :curation_concerns=,
+                 :curation_concern_internal_resources,
                  :default_field_mapping,
                  :default_field_mapping=,
                  :default_work_type,
@@ -149,6 +168,7 @@ module Bulkrax
                  :field_mappings=,
                  :file_model_class,
                  :file_model_class=,
+                 :file_model_internal_resource,
                  :fill_in_blank_source_identifiers,
                  :fill_in_blank_source_identifiers=,
                  :generated_metadata_mapping,
@@ -163,8 +183,6 @@ module Bulkrax
                  :object_factory=,
                  :parsers,
                  :parsers=,
-                 :persistence_adapter,
-                 :persistence_adapter=,
                  :qa_controlled_properties,
                  :qa_controlled_properties=,
                  :related_children_field_mapping,
@@ -203,22 +221,6 @@ module Bulkrax
     conf.relationship_job_class = "Bulkrax::CreateRelationshipsJob"
     conf.required_elements = ['title']
 
-    def conf.curation_concerns
-      @curation_concerns ||= defined?(::Hyrax) ? ::Hyrax.config.curation_concerns : []
-    end
-
-    def conf.curation_concerns=(val)
-      @curation_concerns = val
-    end
-
-    def conf.file_model_class
-      @file_model_class ||= defined?(::Hyrax) ? ::FileSet : File
-    end
-
-    def conf.file_model_class=(val)
-      @file_model_class = val
-    end
-
     # Hash of Generic field_mappings for use in the view
     # There must be one field_mappings hash per view partial
     # Based on Hyrax CoreMetadata && BasicMetadata

data/lib/generators/bulkrax/templates/config/initializers/bulkrax.rb

@@ -12,6 +12,8 @@ Bulkrax.setup do |config|
 
   # Factory Class to use when generating and saving objects
   config.object_factory = Bulkrax::ObjectFactory
+  # Use this for a Postgres-backed Valkyrized Hyrax
+  # config.object_factory = Bulkrax::ValkyrieObjectFactory
 
   # Path to store pending imports
   # config.import_path = 'tmp/imports'

data/lib/tasks/bulkrax_tasks.rake

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require 'ruby-progressbar'
 
 namespace :bulkrax do
   desc 'Update all status messages from the latest status. This is to refresh the denormalized field'