bulkrax 7.0.0 → 8.0.0

data/lib/tasks/reset.rake

@@ -12,8 +12,7 @@ namespace :hyrax do
     desc 'Reset fedora / solr and corresponding database tables w/o clearing other active record tables like users'
     task works_and_collections: [:environment] do
       confirm('You are about to delete all works and collections, this is not reversable!')
-      require 'active_fedora/cleaner'
-      ActiveFedora::Cleaner.clean!
+      Bulkrax.object_factory.clean!
       Hyrax::PermissionTemplateAccess.delete_all
       Hyrax::PermissionTemplate.delete_all
       Bulkrax::PendingRelationship.delete_all
@@ -33,16 +32,17 @@ namespace :hyrax do
       Mailboxer::Conversation::OptOut.delete_all
       Mailboxer::Conversation.delete_all
       AccountElevator.switch!(Site.instance.account) if defined?(AccountElevator)
+
       # we need to wait till Fedora is done with its cleanup
       # otherwise creating the admin set will fail
-      while AdminSet.exists?(AdminSet::DEFAULT_ID)
+      while Bulkrax.object_factory.default_admin_set_or_nil
         puts 'waiting for delete to finish before reinitializing Fedora'
         sleep 20
       end
 
       Hyrax::CollectionType.find_or_create_default_collection_type
       Hyrax::CollectionType.find_or_create_admin_set_type
-      AdminSet.find_or_create_default_admin_set_id
+      Bulkrax.object_factory.find_or_create_default_admin_set
 
       collection_types = Hyrax::CollectionType.all
       collection_types.each do |c|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bulkrax
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 8.0.0
 platform: ruby
 authors:
 - Rob Kaufman
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-02 00:00:00.000000000 Z
+date: 2024-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.4.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.4.6
 - !ruby/object:Gem::Dependency
   name: coderay
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: marcel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: iso8601
   requirement: !ruby/object:Gem::Requirement
@@ -328,6 +342,8 @@ files:
 - app/controllers/concerns/bulkrax/datatables_behavior.rb
 - app/controllers/concerns/bulkrax/download_behavior.rb
 - app/factories/bulkrax/object_factory.rb
+- app/factories/bulkrax/object_factory_interface.rb
+- app/factories/bulkrax/valkyrie_object_factory.rb
 - app/helpers/bulkrax/application_helper.rb
 - app/helpers/bulkrax/exporters_helper.rb
 - app/helpers/bulkrax/importers_helper.rb
@@ -395,6 +411,8 @@ files:
 - app/parsers/bulkrax/xml_parser.rb
 - app/services/bulkrax/factory_class_finder.rb
 - app/services/bulkrax/remove_relationships_for_importer.rb
+- app/services/hyrax/custom_queries/find_by_source_identifier.rb
+- app/services/wings/custom_queries/find_by_source_identifier.rb
 - app/views/bulkrax/entries/_parsed_metadata.html.erb
 - app/views/bulkrax/entries/_raw_metadata.html.erb
 - app/views/bulkrax/entries/show.html.erb
@@ -462,12 +480,10 @@ files:
 - db/migrate/20230608153601_add_indices_to_bulkrax.rb
 - db/migrate/20240208005801_denormalize_status_message.rb
 - db/migrate/20240209070952_update_identifier_index.rb
+- db/migrate/20240307053156_add_index_to_metadata_bulkrax_identifier.rb
 - lib/bulkrax.rb
 - lib/bulkrax/engine.rb
 - lib/bulkrax/entry_spec_helper.rb
-- lib/bulkrax/persistence_layer.rb
-- lib/bulkrax/persistence_layer/active_fedora_adapter.rb
-- lib/bulkrax/persistence_layer/valkyrie_adapter.rb
 - lib/bulkrax/version.rb
 - lib/generators/bulkrax/install_generator.rb
 - lib/generators/bulkrax/templates/README
@@ -497,7 +513,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.5
 signing_key:
 specification_version: 4
 summary: Import and export tool for Hyrax and Hyku

data/lib/bulkrax/persistence_layer/active_fedora_adapter.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-module Bulkrax
-  module PersistenceLayer
-    class ActiveFedoraAdapter < AbstractAdapter
-      def self.find(id)
-        ActiveFedora::Base.find(id)
-      rescue ActiveFedora::ObjectNotFoundError => e
-        raise PersistenceLayer::RecordNotFound, e.message
-      end
-
-      def self.query(q, **kwargs)
-        ActiveFedora::SolrService.query(q, **kwargs)
-      end
-
-      def self.clean!
-        super do
-          ActiveFedora::Cleaner.clean!
-        end
-      end
-
-      def self.solr_name(field_name)
-        ActiveFedora.index_field_mapper.solr_name(field_name)
-      end
-    end
-  end
-end

data/lib/bulkrax/persistence_layer/valkyrie_adapter.rb

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-module Bulkrax
-  module PersistenceLayer
-    class ValkyrieAdapter < AbstractAdapter
-    end
-  end
-end

data/lib/bulkrax/persistence_layer.rb

@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-module Bulkrax
-  ##
-  # The target data layer where we write and read our imported {Bulkrax::Entry} objects.
-  module PersistenceLayer
-    # We're inheriting from an ActiveRecord exception as that is something we know will be here; and
-    # something that the main_app will be expect to be able to handle.
-    class ObjectNotFoundError < ActiveRecord::RecordNotFound
-    end
-
-    # We're inheriting from an ActiveRecord exception as that is something we know will be here; and
-    # something that the main_app will be expect to be able to handle.
-    class RecordInvalid < ActiveRecord::RecordInvalid
-    end
-
-    class AbstractAdapter
-      # @see ActiveFedora::Base.find
-      def self.find(id)
-        raise NotImplementedError, "#{self}.#{__method__}"
-      end
-
-      def self.solr_name(field_name)
-        raise NotImplementedError, "#{self}.#{__method__}"
-      end
-
-      # @yield when Rails application is running in test environment.
-      def self.clean!
-        return true unless Rails.env.test?
-        yield
-      end
-
-      def self.query(q, **kwargs)
-        raise NotImplementedError, "#{self}.#{__method__}"
-      end
-    end
-  end
-end