bulkrax 9.2.0 → 9.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb04fb1689c90c0cb7b96d0fbab95f371e4e4718509638812e62b0bffa1cc9e0
-  data.tar.gz: b3df0b413a151f7c49c6a39e07a705ec0e8c87d181a66de2a0ae75d567297f08
+  metadata.gz: 6b2230355bb1411a1ef0d5a17c70a957f87c88c0b1a5254fda5646eb89a07bc1
+  data.tar.gz: b8211fe255a2a094854b9a0174b3b2154de093c53f838befdc2c8f8246d7731b
 SHA512:
-  metadata.gz: 89a766b0116729946c1ffba1252362fff3f29fd57ab774aebab39fa5b6f2b207a511de3da801b47bce7352a8ef2ca2e3811f306ca0f701ef592acd2a66103f34
-  data.tar.gz: b559f0441c55c23a64568d95d1bcb533dc5b11cf12c9ad8aaed3ab852a0f9ea88b1e9140968b6272af54d05d2edae3ff3dadb5433e07fa6c55d90e615f42447d
+  metadata.gz: 555612ee946fcf1b48a353f93e20fafbe3c04052f28c99e129f3af7a216022416d4fcc3a51dca25943d5c10b2a86355871e1a788b5ab3046093cdf808efa7644
+  data.tar.gz: 3fae6e18a3bd810446dc7fb0dc2486e283ad74f28bad18c75426cc5589386b1fa32e05210eb1367fead50acf0649b7de64dd52a9c208b2450002fb10ece33e0d

data/app/assets/javascripts/bulkrax/importers.js.erb

@@ -15,9 +15,11 @@ function prepBulkrax(event) {
   // Initialize the uploader only if hyraxUploader is defined
   if (typeof $.fn.hyraxUploader === 'function') {
     // Initialize the uploader
-    $('.fileupload-bulkrax').hyraxUploader({ 
+    var uploader = $('.fileupload-bulkrax');
+    var maxFileSize = uploader.data('max-file-size');
+    uploader.hyraxUploader({ 
       maxNumberOfFiles: 1,
-      maxFileSize: <%= (defined?(Hyrax) && Hyrax.config.uploader[:maxFileSize]) || 524288000 %>
+      maxFileSize: maxFileSize
     });
 
     // Function to toggle 'required' attribute based on uploaded files

data/app/factories/bulkrax/valkyrie_object_factory.rb

@@ -236,7 +236,8 @@ module Bulkrax
     # @input [Fileset or FileMetadata]
     # @return [FileMetadata] the original file
     def self.original_file(fileset:)
-      fileset.try(:original_file) || fileset
+      return fileset if fileset.is_a?(Hyrax::FileMetadata)
+      fileset.try(:original_file)
     end
 
     ##
@@ -293,6 +294,10 @@ module Bulkrax
     def delete(user)
       obj = find
       raise ObjectFactoryInterface::ObjectNotFoundError, "Object not found to delete" unless obj
+      # delete the file sets when we delete a work
+      # This has to be done before the work is deleted or we can't find them
+      # via the custom query
+      destroy_existing_files(object: obj)
 
       Hyrax.persister.delete(resource: obj)
       Hyrax.index_adapter.delete(resource: obj)
@@ -330,9 +335,19 @@ module Bulkrax
       nil
     end
 
+    # @note We perform the transaction against the *parent* here, because the FileSets are generated and updated in relationship with their parent, not in isolation
     def create_file_set(attrs)
-      # TODO: Make it work for Valkyrie
-      raise NotImplementedError, __method__.to_s
+      attrs = HashWithIndifferentAccess.new(attrs)
+      parent_object = find_record(attributes[related_parents_parsed_mapping].first, importer_run_id).last
+      perform_transaction_for(object: parent_object, attrs: {}) do
+        fs_attrs = attrs.merge(attributes).symbolize_keys
+        uploaded_files, = prep_fileset_content(attrs)
+        transactions['change_set.update_work']
+          .with_step_args(
+            'work_resource.add_file_sets' => { uploaded_files: uploaded_files, file_set_params: [fs_attrs] },
+            'work_resource.save_acl' => { permissions_params: [attrs.try('visibility') || 'open'].compact }
+          )
+      end
     end
 
     def create_work(attrs)
@@ -547,8 +562,9 @@ module Bulkrax
     end
 
     # @Override Destroy existing files with Hyrax::Transactions
-    def destroy_existing_files
+    def destroy_existing_files(object: @object)
       existing_files = Hyrax.custom_queries.find_child_file_sets(resource: object)
+      return if existing_files.empty?
 
       existing_files.each do |fs|
         transactions["file_set.destroy"]
@@ -558,10 +574,10 @@ module Bulkrax
           .value!
       end
 
-      @object.member_ids = @object.member_ids.reject { |m| existing_files.detect { |f| f.id == m } }
-      @object.rendering_ids = []
-      @object.representative_id = nil
-      @object.thumbnail_id = nil
+      object.member_ids = object.member_ids.reject { |m| existing_files.detect { |f| f.id == m } }
+      object.rendering_ids = []
+      object.representative_id = nil
+      object.thumbnail_id = nil
     end
 
     def transform_attributes(update: false)

data/app/jobs/bulkrax/create_relationships_job.rb

@@ -136,6 +136,7 @@ module Bulkrax
     # When the parent is a collection, we save the relationship on each child.
     # The parent does not need to be saved, as the relationship is stored on the child.
     # but we do reindex the parent after all the children are added.
+    # rubocop:disable Layout/RescueEnsureAlignment
     def process_parent_as_collection(parent_record:, parent_identifier:)
       ActiveRecord::Base.uncached do
         Bulkrax::PendingRelationship.where(parent_id: parent_identifier, importer_run_id: @importer_run_id)
@@ -151,7 +152,6 @@ module Bulkrax
           @errors << e
         end
       end
-
       # if collection members were added, we reindex the collection
       # The collection members have already saved the relationships
       # To index the parent, we want to make sure we have the latest version of the parent,
@@ -161,6 +161,7 @@ module Bulkrax
       Bulkrax.object_factory.update_index(resources: [reloaded_parent])
       Bulkrax.object_factory.publish(event: 'object.membership.updated', object: reloaded_parent, user: @user)
     end
+    # rubocop:enable Layout/RescueEnsureAlignment
 
     # When the parent is a work, we save the relationship on the parent.
     # We prefer to save all of the member relationships and then save the parent once. Concurrent
@@ -168,6 +169,7 @@ module Bulkrax
     # record while we are adding the children to it.
     # However the locking appears to not be working so as a workaround we will save each member as we go,
     # but only index the parent once at the end.
+    # rubocop:disable Layout/RescueEnsureAlignment
     def process_parent_as_work(parent_record:, parent_identifier:)
       conditionally_acquire_lock_for(parent_record.id.to_s) do
         ActiveRecord::Base.uncached do
@@ -193,6 +195,7 @@ module Bulkrax
         end
       end
     end
+    # rubocop:enable Layout/RescueEnsureAlignment
 
     # NOTE: the child changes are saved in the object factory.
     def add_to_collection(relationship:, parent_record:, ability:)

data/app/jobs/bulkrax/delete_and_import_job.rb

@@ -5,10 +5,13 @@ module Bulkrax
     queue_as :import
 
     def perform(entry, importer_run)
-      status = self.class::DELETE_CLASS.perform_now(entry, importer_run)
-      if status.status_message == "Deleted"
-        entry = Bulkrax::Entry.find(entry.id) # maximum reload
-        self.class::IMPORT_CLASS.perform_now(entry.id, importer_run.id)
+      # Delete the object if it exists, then reimport it.
+      # If the object doesn't exist, just reimport it.
+      begin
+        status = self.class::DELETE_CLASS.perform_now(entry, importer_run)
+        reimport(entry, importer_run) if status.status_message == "Deleted"
+      rescue Bulkrax::ObjectFactoryInterface::ObjectNotFoundError
+        reimport(entry, importer_run)
       end
 
     rescue => e
@@ -16,5 +19,10 @@ module Bulkrax
       # this causes caught exception to be reraised
       raise
     end
+
+    def reimport(entry, importer_run)
+      entry = Bulkrax::Entry.find(entry.id) # maximum reload
+      self.class::IMPORT_CLASS.perform_now(entry.id, importer_run.id)
+    end
   end
 end

data/app/jobs/bulkrax/delete_file_set_job.rb

@@ -3,7 +3,16 @@
 module Bulkrax
   class DeleteFileSetJob < DeleteJob
     def perform(entry, importer_run)
+      # Ensure the entry has metadata built for delete if it
+      # doesn't already so it can be found for deletion.
+      if entry.respond_to?(:build_metadata_for_delete) &&
+         entry.parsed_metadata.nil? &&
+         entry.raw_metadata.present?
+        entry.build_metadata_for_delete
+        entry.save!
+      end
       file_set = entry.factory.find
+
       if file_set
         parent = file_set.parent
         if parent&.respond_to?(:ordered_members)

data/app/models/bulkrax/csv_entry.rb

@@ -22,7 +22,12 @@ module Bulkrax
         super(message)
       end
     end
-    serialize :raw_metadata, Bulkrax::NormalizedJson
+
+    if Rails.version < '7.1'
+      serialize :raw_metadata, Bulkrax::NormalizedJson
+    else
+      serialize :raw_metadata, coder: Bulkrax::NormalizedJson
+    end
 
     def self.fields_from_data(data)
       data.headers.flatten.compact.uniq

data/app/models/bulkrax/entry.rb

@@ -18,9 +18,15 @@ module Bulkrax
     alias importer importerexporter
     alias exporter importerexporter
 
-    serialize :parsed_metadata, Bulkrax::NormalizedJson
-    # Do not serialize raw_metadata as so we can support xml or other formats
-    serialize :collection_ids, Array
+    if Rails.version < '7.1'
+      serialize :parsed_metadata, Bulkrax::NormalizedJson
+      # Do not serialize raw_metadata as so we can support xml or other formats
+      serialize :collection_ids, Array
+    else
+      serialize :parsed_metadata, coder: Bulkrax::NormalizedJson
+      # Do not serialize raw_metadata as so we can support xml or other formats
+      serialize :collection_ids, coder: YAML, type: Array
+    end
 
     paginates_per 5
 

data/app/models/bulkrax/exporter.rb

@@ -4,8 +4,13 @@ module Bulkrax
     include Bulkrax::ImporterExporterBehavior
     include Bulkrax::StatusInfo
 
-    serialize :parser_fields, JSON
-    serialize :field_mapping, JSON
+    if Rails.version < '7.1'
+      serialize :parser_fields, JSON
+      serialize :field_mapping, JSON
+    else
+      serialize :parser_fields, coder: JSON
+      serialize :field_mapping, coder: JSON
+    end
 
     belongs_to :user
     has_many :exporter_runs, dependent: :destroy

data/app/models/bulkrax/importer.rb

@@ -5,8 +5,13 @@ module Bulkrax
     include Bulkrax::ImporterExporterBehavior
     include Bulkrax::StatusInfo
 
-    serialize :parser_fields, JSON
-    serialize :field_mapping, JSON
+    if Rails.version < '7.1'
+      serialize :parser_fields, JSON
+      serialize :field_mapping, JSON
+    else
+      serialize :parser_fields, coder: JSON
+      serialize :field_mapping, coder: JSON
+    end
 
     belongs_to :user
     has_many :importer_runs, dependent: :destroy

data/app/models/bulkrax/oai_entry.rb

@@ -2,7 +2,11 @@
 
 module Bulkrax
   class OaiEntry < Entry
-    serialize :raw_metadata, Bulkrax::NormalizedJson
+    if Rails.version < '7.1'
+      serialize :raw_metadata, Bulkrax::NormalizedJson
+    else
+      serialize :raw_metadata, coder: Bulkrax::NormalizedJson
+    end
 
     delegate :record, to: :raw_record
 

data/app/models/bulkrax/rdf_entry.rb

@@ -3,7 +3,11 @@
 unless ENV.fetch('BULKRAX_NO_RDF', 'false').to_s == 'true'
   module Bulkrax
     class RdfEntry < Entry
-      serialize :raw_metadata, Bulkrax::NormalizedJson
+      if Rails.version < '7.1'
+        serialize :raw_metadata, Bulkrax::NormalizedJson
+      else
+        serialize :raw_metadata, coder: Bulkrax::NormalizedJson
+      end
 
       def self.read_data(path)
         RDF::Reader.open(path)

data/app/models/bulkrax/status.rb

@@ -4,7 +4,12 @@ module Bulkrax
   class Status < ApplicationRecord
     belongs_to :statusable, polymorphic: true, denormalize: { fields: %i[status_message error_class], if: :latest? }
     belongs_to :runnable, polymorphic: true
-    serialize :error_backtrace, Array
+
+    if Rails.version < '7.1'
+      serialize :error_backtrace, Array
+    else
+      serialize :error_backtrace, coder: YAML, type: Array
+    end
 
     scope :for_importers, -> { where(statusable_type: 'Bulkrax::Importer') }
     scope :for_exporters, -> { where(statusable_type: 'Bulkrax::Exporter') }

data/app/models/bulkrax/xml_entry.rb

@@ -3,7 +3,11 @@
 module Bulkrax
   # Generic XML Entry
   class XmlEntry < Entry
-    serialize :raw_metadata, Bulkrax::NormalizedJson
+    if Rails.version < '7.1'
+      serialize :raw_metadata, Bulkrax::NormalizedJson
+    else
+      serialize :raw_metadata, coder: Bulkrax::NormalizedJson
+    end
 
     def self.fields_from_data(data); end
 

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

@@ -27,10 +27,10 @@ module Bulkrax
     # Prepend the file_set id to ensure a unique filename and also one that is not longer than 255 characters
     def filename(file_set)
       # return if there are no files on the fileset
-      return if Bulkrax.object_factory.original_file(fileset: file_set).blank?
+      file = Bulkrax.object_factory.original_file(fileset: file_set)
+      return '' if file.blank?
 
       fn = Bulkrax.object_factory.filename_for(fileset: file_set)
-      file = Bulkrax.object_factory.original_file(fileset: file_set)
       ext = file_extension(file: file, filename: fn)
 
       # Prepend the file_set id to ensure a unique filename

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

@@ -1,4 +1,4 @@
-<div class="fileupload-bulkrax">
+<div class="fileupload-bulkrax" data-max-file-size="<%= (defined?(Hyrax) && Hyrax.config.uploader[:maxFileSize]) || 524288000 %>">
   <noscript><input type="hidden" name="redirect" value="<%= main_app.root_path %>" /></noscript>
   <table role="presentation" class="table table-striped"><tbody class="files"></tbody></table>
   <div class="fileupload-buttonbar">

data/lib/bulkrax/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bulkrax
 version: !ruby/object:Gem::Version
-  version: 9.2.0
+  version: 9.3.0
 platform: ruby
 authors:
 - Rob Kaufman
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-10 00:00:00.000000000 Z
+date: 2025-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -19,7 +19,7 @@ dependencies:
         version: 5.1.6
     - - "<"
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 8.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 5.1.6
     - - "<"
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 8.0.0
 - !ruby/object:Gem::Dependency
   name: bagit
   requirement: !ruby/object:Gem::Requirement
@@ -527,7 +527,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Import and export tool for Hyrax and Hyku