bulkrax 8.3.0 → 9.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a409c17f35bc09ef0a8c63d06a064d01fbff68a0e4c0b91c9bfaed45d6e8169
-  data.tar.gz: 7fad94124795ff133b83d05030c550f2a52f808ac017fdd3a436c17ce039cd01
+  metadata.gz: 2d5a97916d5e7efb9a589f19f850af0c4c2bae1d0197032cdc449fa32ed9470e
+  data.tar.gz: 32e1ed599b25b75b238acff7bd8f24fcc8fe9ea71d09e8d10fa88383c41c79ba
 SHA512:
-  metadata.gz: 65280762e81baa620e73d965d5e7c58ec4ccb40d303c00cf634e7f9b3b3850e541cc9964900ce7b9aec9f6be1a7fe81dd9781db5b74209a9f8661f5f8a96f595
-  data.tar.gz: e91e65f6de8edc1640dd9b6e75c246fff4fd0812a3f87f6b4600dd9c95afc095be6076c9a80c5bca50ccc73c3831fc0a30c1160b46f18c483a6d68277bf762a8
+  metadata.gz: 23c692b80ac68dc92d67a95635496656e8d2e1e411ac788338d71d55494d34204ea49702f4e14addb623ee9f818e16156e65ecffe1da993d85662a53ad86a44f
+  data.tar.gz: 5583e8ae05b357a28fec59474badf3a26d68bf2b27ed2b37db94ea532b65957a949371a2924694ba8f5e1c9e5dd7bbd8158c8bd9d0e7a023edfd4105b88b2fc3

data/app/assets/stylesheets/bulkrax/import_export.scss

@@ -1,3 +1,8 @@
+.bulkrax-card-footer {
+    min-height: 60px;
+
+}
+
 div.importer_parser_fields_file_style span.radio {
   display: inline;
   margin-right: 20px;

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(eradicate: true)
+      obj = find
+      return false unless obj
+
+      obj.delete(eradicate: true)
     end
 
     private

data/app/factories/bulkrax/object_factory_interface.rb

@@ -319,9 +319,9 @@ module Bulkrax
     #
     # @return [Object] when we've found the object by the entry's :id or by it's
     #         source_identifier
-    # @return [FalseClass] when we cannot find the object.
+    # @return [NilClass] when we cannot find the object.
     def find
-      find_by_id || search_by_identifier || false
+      find_by_id || search_by_identifier || nil
     end
 
     ##

data/app/factories/bulkrax/valkyrie_object_factory.rb

@@ -81,7 +81,8 @@ module Bulkrax
       return false unless field_supported?(field: field, model: model)
 
       if model.respond_to?(:schema)
-        dry_type = model.schema.key(field.to_sym)
+        schema = model.new.singleton_class.schema || model.schema
+        dry_type = schema.key(field.to_sym)
         return true if dry_type.respond_to?(:primitive) && dry_type.primitive == Array
 
         false
@@ -193,7 +194,8 @@ module Bulkrax
       @schema_properties_map ||= {}
 
       klass_key = klass.name
-      @schema_properties_map[klass_key] = klass.schema.map { |k| k.name.to_s } unless @schema_properties_map.key?(klass_key)
+      schema = klass.new.singleton_class.schema || klass.schema
+      @schema_properties_map[klass_key] = schema.map { |k| k.name.to_s } unless @schema_properties_map.key?(klass_key)
 
       @schema_properties_map[klass_key]
     end

data/app/jobs/bulkrax/export_work_job.rb

@@ -26,7 +26,7 @@ module Bulkrax
         end
         # rubocop:enable Rails/SkipsModelValidations
       end
-      return entry if exporter_run.enqueued_records.positive?
+      return entry if exporter_run.reload.enqueued_records.positive?
 
       if exporter_run.failed_records.positive?
         exporter_run.exporter.set_status_info('Complete (with failures)')

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/app/views/bulkrax/entries/show.html.erb

@@ -1,6 +1,6 @@
 <p id="notice"><%= notice %></p>
-<div class="panel panel-default">
-  <div class="panel-body">
+<div class="panel card panel-default">
+  <div class="panel-body card-body">
     <p class='bulkrax-p-align'>
       <strong><%= t('bulkrax.importer.labels.identifier') %>:</strong>
       <%= @entry.identifier %>

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

@@ -1,4 +1,4 @@
-<div class="panel-body">
+<div class="panel-body card-body">
   <% if exporter.errors.any? %>
     <div id="error_explanation">
       <h2><%= pluralize(exporter.errors.count, "error") %> prohibited this exporter from being saved:</h2>

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

@@ -4,10 +4,10 @@
 
 <div class="row">
   <div class="col-md-12">
-    <div class="panel panel-default tabs exporter-form">
+    <div class="panel card panel-default exporter-form">
       <%= simple_form_for @exporter do |form| %>
         <%= render 'form', exporter: @exporter, form: form %>
-        <div class="panel-footer">
+        <div class="panel-footer card-footer bulkrax-card-footer">
           <div class='pull-right'>
             <%= form.button :submit, value: 'Update Exporter', class: 'btn btn-primary' %>
             |

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

@@ -11,8 +11,8 @@
   <meta name="turbolinks-cache-control" content="no-cache">
 <% end %>
 
-<div class="panel panel-default">
-  <div class="panel-body">
+<div class="panel card panel-default">
+  <div class="panel-body card-body">
     <div class="table-responsive">
       <table id='exporters-table' class="table table-striped">
         <thead>

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

@@ -4,10 +4,10 @@
 
 <div class="row">
   <div class="col-md-12">
-    <div class="panel panel-default tabs exporter-form">
+    <div class="panel card panel-default exporter-form">
       <%= simple_form_for @exporter do |form| %>
         <%= render 'form', exporter: @exporter, form: form %>
-        <div class="panel-footer">
+        <div class="panel-footer card-footer bulkrax-card-footer">
           <div class='pull-right'>
             <%= form.button :submit, value: 'Create and Export', class: 'btn btn-primary' %>
             |

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

@@ -4,8 +4,8 @@
   <h1><span class='fa fa-cloud-download' aria-hidden='true'></span> Exporter: <%= @exporter.name %></h1>
 </div>
 
-<div class='panel panel-default'>
-  <div class='panel-body'>
+<div class='panel card panel-default'>
+  <div class='panel-body card-body'>
 
     <% if File.exist?(@exporter.exporter_export_zip_path) %>
       <%= simple_form_for @exporter, method: :get, url: exporter_download_path(@exporter), html: { class: 'form-inline bulkrax-p-align' } do |form| %>

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

@@ -1,4 +1,4 @@
-<div class="panel-body">
+<div class="panel-body card-body">
   <% if importer.errors.any? %>
     <div id="error_explanation">
       <h2><%= pluralize(importer.errors.count, "error") %> prohibited this importer from being saved:</h2>

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

@@ -4,11 +4,11 @@
 
 <div class="row">
   <div class="col-md-12">
-    <div class="panel panel-default tabs importer-form">
+    <div class="panel card panel-default importer-form">
 
       <%= simple_form_for @importer, html: { multipart: true } do |form| %>
         <%= render 'form', importer: @importer, form: form %>
-        <div class="panel-footer">
+        <div class="panel-footer card-footer bulkrax-card-footer">
           <div class='pull-right'>
             <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#bulkraxModal">
               Update Importer
@@ -21,4 +21,4 @@
       <% end %>
     </div>
   </div>
-</div>
+</div>

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

@@ -11,8 +11,8 @@
   <meta name="turbolinks-cache-control" content="no-cache">
 <% end %>
 
-<div class="panel panel-default">
-  <div class="panel-body">
+<div class="panel card panel-default">
+  <div class="panel-body card-body">
     <div class="table-responsive">
       <table id='importers-table' class="table table-striped">
         <thead>

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

@@ -4,10 +4,10 @@
 
 <div class="row">
   <div class="col-md-12">
-    <div class="panel panel-default tabs importer-form">
+    <div class="panel card panel-default importer-form">
       <%= simple_form_for @importer, html: { multipart: true } do |form| %>
         <%= render 'form', importer: @importer, form: form %>
-        <div class="panel-footer">
+        <div class="panel-footer card-footer bulkrax-card-footer">
           <div class='pull-right'>
             <% if ENV['SHOW_CREATE_AND_VALIDATE'] == 'true' %>
               <%= form.button :submit, value: 'Create and Validate', class: 'btn btn-primary' %>

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

@@ -8,8 +8,8 @@
     <% end %>
   </div>
 </div>
-<div class="panel panel-default bulkrax-align-text">
-  <div class="panel-body">
+<div class="panel card panel-default bulkrax-align-text">
+  <div class="panel-body card-body">
     <p class="bulkrax-p-align">
       <strong><%= t('bulkrax.importer.labels.name') %>:</strong>
       <%= @importer.name %>

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

@@ -2,8 +2,8 @@
   <h1><span class='fa fa-cloud-upload' aria-hidden='true'></span> Upload Corrected Entries: <%= @importer.name %></h1>
 </div>
 
-<div class='panel panel-default'>
-  <div class='panel-body'>
+<div class='panel card panel-default'>
+  <div class='panel-body card-body'>
     <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 %>

data/db/migrate/20240806161142_add_file_name_to_uploaded_files.rb

@@ -1,5 +1,5 @@
 class AddFileNameToUploadedFiles < ActiveRecord::Migration[5.2]
   def change
-    add_column :uploaded_files, :filename, :string unless column_exists?(:uploaded_files, :filename)
+    add_column :uploaded_files, :filename, :string if table_exists?(:uploaded_files) && !column_exists?(:uploaded_files, :filename)
   end
 end

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.3.0'
+  VERSION = '9.0.0'
 end

data/lib/bulkrax.rb

@@ -92,7 +92,7 @@ module Bulkrax
     end
 
     def collection_model_class
-      @collection_model_class ||= Collection
+      @collection_model_class ||= Collection if defined?(::Hyrax)
     end
 
     attr_writer :collection_model_class

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.3.0
+  version: 9.0.0
 platform: ruby
 authors:
 - Rob Kaufman
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-02 00:00:00.000000000 Z
+date: 2024-12-20 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
@@ -487,6 +487,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
@@ -519,7 +521,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.20
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Import and export tool for Hyrax and Hyku