bulkrax 8.2.0 → 8.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7886fb5eefc500cc8e567d9097e6930e67cee2908fa7fa0d79ce05fc714db392
-  data.tar.gz: c6e720816dd152931df91e06be37977216a7ef06875a98386350706e4df1e3ea
+  metadata.gz: 35107691013ec9d3827b2e217fb19fc9a5332a6737c63345ebd15f78cb6f2625
+  data.tar.gz: 3ae32479f173a61e1c73eb63d615099d09645f2b69aebcfc0c553787db9c4de3
 SHA512:
-  metadata.gz: 62971f4eab58de239643d016ec8f8701b6e71953bbb8ccc4bf1d74fd8a88d3798c506004704203107e6f676218bc0dcd337776ecccc423b6c932aeddcd0dacf5
-  data.tar.gz: f3710a5e394a470753ea83d5e007505afd91a8fcdc3c383465fdaa7f2eb9c0901b3bef7cb69ae2c9bfa6d508231095e44ac7781cc9c52565162adfe2e58a5c3d
+  metadata.gz: 006d594d7fe8dd7b0efab965bf4662804ad77e5455d7772b402da5091824c1809652ede97195a1cc47e423eb417d15f44a092b2e7642d9525c76439305a6dfa0
+  data.tar.gz: 7cc96869b7dd2f382513568fb8bd4224c906d8e67506cfb292f8c3c2c26c8f98c1bf10b2e47b76aa47b73c184e589d0325ba7246f5fd89c1ad98f2bc7d1fa5b5

data/README.md

@@ -24,6 +24,14 @@ $ rails db:migrate
 
 If using Sidekiq, set up queues for `import` and `export`.
 
+### Bundle errors on ARM
+
+If posix-spawn is failing to bundle on an ARM based processor, try the following
+
+`bundle config build.posix-spawn --with-cflags="-Wno-incompatible-function-pointer-types"`
+
+Then rebundle. See https://github.com/rtomayko/posix-spawn/issues/92
+
 ### Manual Installation
 
 Add this line to your application's Gemfile:

data/app/controllers/concerns/bulkrax/datatables_behavior.rb

@@ -132,7 +132,7 @@ module Bulkrax
           status_message: status_message_for(e),
           type: e.type,
           updated_at: e.updated_at,
-          errors: e.latest_status&.error_class&.present? ? view_context.link_to(e.latest_status.error_class, view_context.item_entry_path(item, e), title: e.latest_status.error_message) : "",
+          errors: e.status_message == 'Failed' ? view_context.link_to(e.error_class, view_context.item_entry_path(item, e)) : "",
           actions: entry_util_links(e, item)
         }
       end

data/app/factories/bulkrax/object_factory.rb

@@ -165,7 +165,10 @@ module Bulkrax
     end
 
     def delete(_user)
-      find&.delete
+      obj = find
+      return false unless obj
+
+      obj.delete(eradicate: true)
     end
 
     private

data/app/jobs/bulkrax/delete_file_set_job.rb

@@ -10,11 +10,11 @@ module Bulkrax
           om = parent.ordered_members.to_a
           om.delete(file_set)
           parent.ordered_members = om
-        elsif parent.respond_to?(:member_ids)
+          parent.save
+        elsif parent&.respond_to?(:member_ids)
           parent.member_ids.delete(file_set.id)
           Hyrax.persister.save(resource: parent)
         end
-        parent.save
       end
 
       super

data/app/models/bulkrax/status.rb

@@ -2,7 +2,7 @@
 
 module Bulkrax
   class Status < ApplicationRecord
-    belongs_to :statusable, polymorphic: true, denormalize: { fields: %i[status_message], if: :latest? }
+    belongs_to :statusable, polymorphic: true, denormalize: { fields: %i[status_message error_class], if: :latest? }
     belongs_to :runnable, polymorphic: true
     serialize :error_backtrace, Array
 

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

@@ -26,11 +26,15 @@ 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)
-      # NOTE: Will this work with Valkyrie?
       return if file_set.original_file.blank?
-      fn = file_set.original_file.file_name.first
-      mime = ::Marcel::MimeType.for(file_set.original_file.mime_type)
-      ext_mime = ::Marcel::MimeType.for(file_set.original_file.file_name)
+      if file_set.original_file.respond_to?(:original_filename) # valkyrie
+        fn = file_set.original_file.original_filename
+        mime = ::Marcel::MimeType.for(file_set.original_file.file.io)
+      else # original non valkyrie version
+        fn = file_set.original_file.file_name.first
+        mime = ::Marcel::MimeType.for(declared_type: file_set.original_file.mime_type)
+      end
+      ext_mime = ::Marcel::MimeType.for(name: fn)
       if fn.include?(file_set.id) || importerexporter.metadata_only?
         filename = "#{fn}.#{mime.to_sym}"
         filename = fn if mime.to_s == ext_mime.to_s

data/app/parsers/bulkrax/csv_parser.rb

@@ -244,7 +244,10 @@ module Bulkrax
       record = Bulkrax.object_factory.find(identifier)
       return unless record
 
-      file_sets = record.file_set? ? Array.wrap(record) : record.file_sets
+      file_sets = Array.wrap(record) if record.file_set?
+      if file_sets.nil? # for valkyrie
+        file_sets = record.respond_to?(:file_sets) ? record.file_sets : record.members&.select(&:file_set?)
+      end
       file_sets << record.thumbnail if exporter.include_thumbnails && record.thumbnail.present? && record.work?
       file_sets.each do |fs|
         path = File.join(exporter_export_path, folder_count, 'files')
@@ -252,7 +255,7 @@ module Bulkrax
         file = filename(fs)
         next if file.blank? || fs.original_file.blank?
 
-        io = open(fs.original_file.uri)
+        io = fs.original_file.respond_to?(:uri) ? open(fs.original_file.uri) : fs.original_file.file.io
         File.open(File.join(path, file), 'wb') do |f|
           f.write(io.read)
           f.close

data/app/parsers/bulkrax/parser_export_record_set.rb

@@ -173,7 +173,7 @@ module Bulkrax
       # @see https://github.com/samvera/hyrax/blob/64c0bbf0dc0d3e1b49f040b50ea70d177cc9d8f6/app/indexers/hyrax/work_indexer.rb#L15-L18
       def file_sets
         @file_sets ||= ParserExportRecordSet.in_batches(candidate_file_set_ids) do |batch_of_ids|
-          fsq = "has_model_ssim:#{Bulkrax.file_model_internal_resource} AND id:(\"" + batch_of_ids.join('" OR "') + "\")"
+          fsq = "has_model_ssim:\"#{Bulkrax.file_model_internal_resource.demodulize}\" AND id:(\"" + batch_of_ids.join('" OR "') + "\")"
           fsq += extra_filters if extra_filters.present?
           Bulkrax.object_factory.query(
             fsq,

data/db/migrate/20241203010707_entry_error_denormalization.rb

@@ -0,0 +1,7 @@
+class EntryErrorDenormalization < ActiveRecord::Migration[5.1]
+  def change
+    add_column :bulkrax_entries, :error_class, :string unless column_exists?(:bulkrax_entries, :error_class)
+    add_column :bulkrax_importers, :error_class, :string unless column_exists?(:bulkrax_importers, :error_class)
+    add_column :bulkrax_exporters, :error_class, :string unless column_exists?(:bulkrax_exporters, :error_class)
+  end
+end

data/db/migrate/20241205212513_faster_first_entry.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+class FasterFirstEntry < ActiveRecord::Migration[5.2]
+  def change
+    add_index :bulkrax_entries, [:importerexporter_id, :importerexporter_type, :id], name: 'index_bulkrax_entries_on_importerexporter_id_type_and_id' unless index_exists?(:bulkrax_entries, [:importerexporter_id, :importerexporter_type, :id],
+      name: 'index_bulkrax_entries_on_importerexporter_id_type_and_id')
+  end
+end

data/lib/bulkrax/version.rb

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

data/lib/bulkrax.rb

@@ -98,7 +98,20 @@ module Bulkrax
     attr_writer :collection_model_class
 
     def collection_model_internal_resource
-      collection_model_class.try(:internal_resource) || collection_model_class.to_s
+      # WARN: Using #try on :internal_resource can yield unexpected results.
+      # If the method is undefined, it can return a truthy value instead of
+      # the typical nil.
+      #
+      # E.g.
+      # ```ruby
+      # Hyrax::FileSet.try(:internal_resource) || 'hi'
+      # => #<Dry::Types::Result::Failure input=:internal_resource error=...
+      # ```
+      if collection_model_class.respond_to?(:internal_resource)
+        collection_model_class.internal_resource
+      else
+        collection_model_class.to_s
+      end
     end
 
     def file_model_class
@@ -108,7 +121,20 @@ module Bulkrax
     attr_writer :file_model_class
 
     def file_model_internal_resource
-      file_model_class.try(:internal_resource) || file_model_class.to_s
+      # WARN: Using #try on :internal_resource can yield unexpected results.
+      # If the method is undefined, it can return a truthy value instead of
+      # the typical nil.
+      #
+      # E.g.
+      # ```ruby
+      # Hyrax::FileSet.try(:internal_resource) || 'hi'
+      # => #<Dry::Types::Result::Failure input=:internal_resource error=...
+      # ```
+      if file_model_class.respond_to?(:internal_resource)
+        file_model_class.internal_resource
+      else
+        file_model_class.to_s
+      end
     end
 
     def curation_concerns
@@ -118,7 +144,18 @@ module Bulkrax
     attr_writer :curation_concerns
 
     def curation_concern_internal_resources
-      curation_concerns.map { |cc| cc.try(:internal_resource) || cc.to_s }.uniq
+      curation_concerns.map do |cc|
+        # WARN: Using #try on :internal_resource can yield unexpected results.
+        # If the method is undefined, it can return a truthy value instead of
+        # the typical nil.
+        #
+        # E.g.
+        # ```ruby
+        # Hyrax::FileSet.try(:internal_resource) || 'hi'
+        # => #<Dry::Types::Result::Failure input=:internal_resource error=...
+        # ```
+        cc.respond_to?(:internal_resource) ? cc.internal_resource : cc.to_s
+      end.uniq
     end
 
     attr_writer :ingest_queue_name

data/lib/tasks/bulkrax_tasks.rake

@@ -9,7 +9,7 @@ namespace :bulkrax do
                                    progress_mark: ' ',
                                    remainder_mark: "\u{FF65}")
     Bulkrax::Status.latest_by_statusable.includes(:statusable).find_each do |status|
-      status.statusable.update(status_message: status.status_message)
+      status.statusable.update(status_message: status.status_message, error_class: status.error_class)
       @progress.increment
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bulkrax
 version: !ruby/object:Gem::Version
-  version: 8.2.0
+  version: 8.2.2
 platform: ruby
 authors:
 - Rob Kaufman
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-19 00:00:00.000000000 Z
+date: 2024-12-17 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.6
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.6
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: coderay
   requirement: !ruby/object:Gem::Requirement
@@ -134,14 +134,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.4
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.4
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: loofah
   requirement: !ruby/object:Gem::Requirement
@@ -486,6 +486,8 @@ files:
 - db/migrate/20240823173525_add_error_tracking_to_pending_relationships.rb
 - db/migrate/20240916182737_add_last_imported_at_to_bulkrax_importers.rb
 - db/migrate/20240916182823_add_next_import_at_to_bulkrax_importers.rb
+- db/migrate/20241203010707_entry_error_denormalization.rb
+- db/migrate/20241205212513_faster_first_entry.rb
 - lib/bulkrax.rb
 - lib/bulkrax/engine.rb
 - lib/bulkrax/entry_spec_helper.rb
@@ -518,7 +520,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Import and export tool for Hyrax and Hyku