bulkrax 8.0.0 → 8.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ca767b1e461d5830774bb4d7c49eade799d14298625bdbdccdcbdc0ac997f88
-  data.tar.gz: b5024ea772132123fcb922fbe183d22950428ea50b7a8b4152c6bd781b94510f
+  metadata.gz: 0c787263cc1d6eece0eee9e403e317670cc5d4a86c0a9d08f5ef069ffd0489c9
+  data.tar.gz: c52e09a8c5e263e4e641a4bede55acf22d9ea5c254d33c18347f08e535ef3ea6
 SHA512:
-  metadata.gz: 91004f88a97054107a3bbbcbe7f3b3dd84226a286df47992c13bfc5fb483c3bfd4aaa9190e08e567258e5105a317a37bba58fa7857ee6c534153ba930b608ad7
-  data.tar.gz: 89a32c155c3931e486b2d41215942b291eb724c59833a031fdc4815a72d26a2df13b015c1b1e2c0dafd608e58ec481a574e20da7bcf95ed76b3e45c3d5f19287
+  metadata.gz: b2abb43af9365afee05600fa60ddb7d3424a76070e29ca5e9a707f94da6abb3d94893c34715a793f2ce8be5882d6e9fa96ede1f807e17e6ccdd4eb9d890a5006
+  data.tar.gz: eef45e1ac6d6a06e3eb3dd9a29b37f85b0d79c6b3bc3cd6a57f15935f57e68cc7ae549095bc3e73100a08e957f24c5f6a428f9330f1bea986a8dcb3f535cb6dd

data/app/concerns/loggable.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Loggable
+  extend ActiveSupport::Concern
+
+  def log_created(obj)
+    log_action('Created', obj)
+  end
+
+  def log_updated(obj)
+    log_action('Updated', obj)
+  end
+
+  def log_deleted_fs(obj)
+    msg = "Deleted All Files from #{obj.id}"
+    Rails.logger.info("#{msg} (#{Array(obj.attributes[work_identifier]).first})")
+  end
+
+  private
+
+  def log_action(action, obj)
+    msg = "#{action} #{obj.class.model_name.human} #{obj.id}"
+    Rails.logger.info("#{msg} (#{Array(obj.attributes[work_identifier]).first})")
+  end
+end

data/app/factories/bulkrax/object_factory_interface.rb

@@ -20,6 +20,7 @@ module Bulkrax
   class ObjectFactoryInterface
     extend ActiveModel::Callbacks
     include DynamicRecordLookup
+    include Loggable
 
     # 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
@@ -224,6 +225,12 @@ module Bulkrax
                       id
                       read_groups
                       visibility
+                      visibility_during_embargo
+                      embargo_release_date
+                      visibility_after_embargo
+                      visibility_during_lease
+                      lease_expiration_date
+                      visibility_after_lease
                       work_members_attributes
                     ]
 
@@ -398,21 +405,6 @@ module Bulkrax
       self.class.add_user_to_collection_permissions(**arguments)
     end
 
-    def log_created(obj)
-      msg = "Created #{klass.model_name.human} #{obj.id}"
-      Rails.logger.info("#{msg} (#{Array(attributes[work_identifier]).first})")
-    end
-
-    def log_updated(obj)
-      msg = "Updated #{klass.model_name.human} #{obj.id}"
-      Rails.logger.info("#{msg} (#{Array(attributes[work_identifier]).first})")
-    end
-
-    def log_deleted_fs(obj)
-      msg = "Deleted All Files from #{obj.id}"
-      Rails.logger.info("#{msg} (#{Array(attributes[work_identifier]).first})")
-    end
-
     private
 
     def apply_depositor_metadata

data/app/factories/bulkrax/valkyrize-hyku.code-workspace

@@ -0,0 +1,19 @@
+{
+  "folders": [
+    {
+      "path": "../../../../../hyku"
+    },
+    {
+      "path": "../../../../hyrax"
+    },
+    {
+      "path": "../../.."
+    },
+    {
+      "path": "../../../../iiif_print"
+    }
+  ],
+  "settings": {
+    "github.copilot.inlineSuggest.enable": true
+  }
+}

data/app/jobs/bulkrax/import_file_set_job.rb

@@ -16,7 +16,12 @@ module Bulkrax
       # e.g. "parents" or "parents_1"
       parent_identifier = (entry.raw_metadata[entry.related_parents_raw_mapping] || entry.raw_metadata["#{entry.related_parents_raw_mapping}_1"])&.strip
 
-      validate_parent!(parent_identifier)
+      begin
+        validate_parent!(parent_identifier)
+      rescue MissingParentError => e
+        handle_retry(entry, importer_run_id, e)
+        return
+      end
 
       entry.build
       if entry.succeeded?
@@ -32,17 +37,6 @@ module Bulkrax
       entry.save!
       entry.importer.current_run = ImporterRun.find(importer_run_id)
       entry.importer.record_status
-
-    rescue MissingParentError => e
-      # try waiting for the parent record to be created
-      entry.import_attempts += 1
-      entry.save!
-      if entry.import_attempts < 5
-        ImportFileSetJob.set(wait: (entry.import_attempts + 1).minutes).perform_later(entry_id, importer_run_id)
-      else
-        ImporterRun.decrement_counter(:enqueued_records, importer_run_id) # rubocop:disable Rails/SkipsModelValidations
-        entry.set_status_info(e)
-      end
     end
 
     private
@@ -54,14 +48,9 @@ module Bulkrax
       return if parent_identifier.blank?
 
       find_parent_record(parent_identifier)
-      check_parent_exists!(parent_identifier)
       check_parent_is_a_work!(parent_identifier)
     end
 
-    def check_parent_exists!(parent_identifier)
-      raise MissingParentError, %(Unable to find a record with the identifier "#{parent_identifier}") if parent_record.nil?
-    end
-
     def check_parent_is_a_work!(parent_identifier)
       case parent_record
       when Bulkrax.collection_model_class, Bulkrax.file_model_class
@@ -72,6 +61,18 @@ module Bulkrax
 
     def find_parent_record(parent_identifier)
       _, @parent_record = find_record(parent_identifier, importer_run_id)
+      raise MissingParentError, %(Unable to find a record with the identifier "#{parent_identifier}") unless parent_record
+    end
+
+    def handle_retry(entry, importer_run_id, e)
+      entry.import_attempts += 1
+      entry.save!
+      if entry.import_attempts < 5
+        ImportFileSetJob.set(wait: (entry.import_attempts + 1).minutes).perform_later(entry.id, importer_run_id)
+      else
+        ImporterRun.decrement_counter(:enqueued_records, importer_run_id) # rubocop:disable Rails/SkipsModelValidations
+        entry.set_status_info(e)
+      end
     end
   end
 end

data/app/models/concerns/bulkrax/file_factory.rb

@@ -32,6 +32,8 @@ module Bulkrax
     end
 
     class InnerWorkings
+      include Loggable
+
       def initialize(object_factory:)
         @object_factory = object_factory
       end
@@ -119,7 +121,7 @@ module Bulkrax
       def destroy_existing_files
         return unless object.present? && object.file_sets.present?
         object.file_sets.each do |fs|
-          Hyrax::Actors::FileSetActor.new(fs, @user).destroy
+          Hyrax::Actors::FileSetActor.new(fs, user).destroy
         end
         @object = object.reload
         log_deleted_fs(object)
@@ -155,6 +157,8 @@ module Bulkrax
       end
 
       def ordered_file_sets
+        return [] if object.blank?
+
         Bulkrax.object_factory.ordered_file_sets_for(object)
       end
 

data/app/models/concerns/bulkrax/has_matchers.rb

@@ -148,7 +148,18 @@ module Bulkrax
     end
 
     def fields_that_are_always_multiple
-      %w[id delete model visibility]
+      @fields_that_are_always_multiple = %w[
+        id
+        delete
+        model
+        visibility
+        visibility_during_embargo
+        embargo_release_date
+        visibility_after_embargo
+        visibility_during_lease
+        lease_expiration_date
+        visibility_after_lease
+      ]
     end
 
     def fields_that_are_always_singular

data/db/migrate/20240307053156_add_index_to_metadata_bulkrax_identifier.rb

@@ -1,4 +1,4 @@
-class AddIndexToMetadataBulkraxIdentifier < ActiveRecord::Migration[6.1]
+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')

data/lib/bulkrax/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bulkrax
 version: !ruby/object:Gem::Version
-  version: 8.0.0
+  version: 8.1.0
 platform: ruby
 authors:
 - Rob Kaufman
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-02 00:00:00.000000000 Z
+date: 2024-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -334,6 +334,7 @@ files:
 - app/assets/stylesheets/bulkrax/application.css
 - app/assets/stylesheets/bulkrax/coderay.scss
 - app/assets/stylesheets/bulkrax/import_export.scss
+- app/concerns/loggable.rb
 - app/controllers/bulkrax/application_controller.rb
 - app/controllers/bulkrax/entries_controller.rb
 - app/controllers/bulkrax/exporters_controller.rb
@@ -344,6 +345,7 @@ files:
 - app/factories/bulkrax/object_factory.rb
 - app/factories/bulkrax/object_factory_interface.rb
 - app/factories/bulkrax/valkyrie_object_factory.rb
+- app/factories/bulkrax/valkyrize-hyku.code-workspace
 - app/helpers/bulkrax/application_helper.rb
 - app/helpers/bulkrax/exporters_helper.rb
 - app/helpers/bulkrax/importers_helper.rb
@@ -513,7 +515,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.5
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Import and export tool for Hyrax and Hyku