bulkrax 3.3.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c6719caedaf4adb707986e0b6771f1025ce1e08d0bf46afa78a85d99faded2b
-  data.tar.gz: 7af41a63f79c6d9792066cf545f35bb723c7667970f0ea1e3a87c04dceda28d0
+  metadata.gz: 2525e4aed8b31a897668d556c311b29189ec1b7a951b4303604acd3ccb11fcc8
+  data.tar.gz: d642de2af38c8c82108b113641ab1e191ae05b96b2ce3528dde7d7c908639291
 SHA512:
-  metadata.gz: 7ed10c67e81885b4ff3b40d2731b93b790495e19cad51fb9dfb0dcc5bebcd4c60fecc86fe0932f058d100a7937cedab43c1df050c98efd2107c086fdb2fd93a2
-  data.tar.gz: 5a81d4cd7d0289b5d27a13876f20c29b0b40f0989ecbac7caaf26599a1cbdea5c27a2473f759783690562345e8b5d7c515a4f4a0f92d5241803897887e2e9214
+  metadata.gz: 6547c0283f75626cda95a8cc09cceff84ac576b7ca4034b72d729ab16d50c71657dac0e78739b5ef6f2d83aa85e1ddc8c45646f6c44408a0a989b4b33b93c487
+  data.tar.gz: 9ae11d35d0b3caf9d45237590e42541c0004268e6c86e8d44e6754900b253894813c7e817b471ed9379b7eefad1ec3a27d2cfebbe94865727ecb69b6b8652480

data/app/factories/bulkrax/object_factory.rb

@@ -61,6 +61,7 @@ module Bulkrax
           work_actor.update(environment(attrs))
         end
       end
+      object.apply_depositor_metadata(@user) && object.save! if object.depositor.nil?
       log_updated(object)
     end
 
@@ -107,6 +108,7 @@ module Bulkrax
           end
         end
       end
+      object.apply_depositor_metadata(@user) && object.save! if object.depositor.nil?
       log_created(object)
     end
 
@@ -141,7 +143,6 @@ module Bulkrax
       attrs = clean_attrs(attrs)
       attrs = collection_type(attrs)
       object.attributes = attrs
-      object.apply_depositor_metadata(@user)
       object.save!
     end
 

data/app/jobs/bulkrax/create_relationships_job.rb

@@ -33,7 +33,7 @@ module Bulkrax
     # is the child in the relationship, and vice versa if a child_identifier is passed.
     def perform(parent_identifier:, importer_run_id:) # rubocop:disable Metrics/AbcSize
       pending_relationships = Bulkrax::PendingRelationship.find_each.select do |rel|
-        rel.bulkrax_importer_run_id == importer_run_id && rel.parent_id == parent_identifier
+        rel.importer_run_id == importer_run_id && rel.parent_id == parent_identifier
       end.sort_by(&:order)
 
       @importer_run_id = importer_run_id

data/app/models/bulkrax/importer_run.rb

@@ -4,9 +4,10 @@ module Bulkrax
   class ImporterRun < ApplicationRecord
     belongs_to :importer
     has_many :statuses, as: :runnable, dependent: :destroy
+    has_many :pending_relationships, dependent: :destroy
 
     def parents
-      PendingRelationship.where(bulkrax_importer_run_id: id).pluck(:parent_id).uniq
+      pending_relationships.pluck(:parent_id).uniq
     end
   end
 end

data/app/models/bulkrax/pending_relationship.rb

@@ -2,6 +2,6 @@
 
 module Bulkrax
   class PendingRelationship < ApplicationRecord
-    belongs_to :bulkrax_importer_run, class_name: "::Bulkrax::ImporterRun"
+    belongs_to :importer_run
   end
 end

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

@@ -50,7 +50,7 @@ module Bulkrax
       self.parsed_metadata[related_parents_parsed_mapping].each do |parent_identifier|
         next if parent_identifier.blank?
 
-        PendingRelationship.create!(child_id: self.identifier, parent_id: parent_identifier, bulkrax_importer_run_id: importerexporter.last_run.id, order: self.id)
+        PendingRelationship.create!(child_id: self.identifier, parent_id: parent_identifier, importer_run_id: importerexporter.last_run.id, order: self.id)
       end
     end
 
@@ -58,7 +58,7 @@ module Bulkrax
       self.parsed_metadata[related_children_parsed_mapping].each do |child_identifier|
         next if child_identifier.blank?
 
-        PendingRelationship.create!(parent_id: self.identifier, child_id: child_identifier, bulkrax_importer_run_id: importerexporter.last_run.id, order: self.id)
+        PendingRelationship.create!(parent_id: self.identifier, child_id: child_identifier, importer_run_id: importerexporter.last_run.id, order: self.id)
       end
     end
 

data/app/parsers/bulkrax/application_parser.rb

@@ -261,6 +261,7 @@ module Bulkrax
     end
 
     def zip
+      require 'zip'
       FileUtils.rm_rf(exporter_export_zip_path)
       Zip::File.open(exporter_export_zip_path, create: true) do |zip_file|
         Dir["#{exporter_export_path}/**/**"].each do |file|

data/db/migrate/20220609001128_rename_bulkrax_importer_run_to_importer_run.rb

@@ -0,0 +1,7 @@
+class RenameBulkraxImporterRunToImporterRun < ActiveRecord::Migration[5.2]
+  def change
+    if column_exists?(:bulkrax_pending_relationships, :bulkrax_importer_run_id)
+      rename_column :bulkrax_pending_relationships, :bulkrax_importer_run_id, :importer_run_id
+    end
+  end
+end

data/lib/bulkrax/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bulkrax
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.1
 platform: ruby
 authors:
 - Rob Kaufman
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-08 00:00:00.000000000 Z
+date: 2022-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -374,6 +374,7 @@ files:
 - db/migrate/20220303212810_add_order_to_bulkrax_pending_relationships.rb
 - db/migrate/20220412233954_add_include_thumbnails_to_bulkrax_exporters.rb
 - db/migrate/20220413180915_add_generated_metadata_to_bulkrax_exporters.rb
+- db/migrate/20220609001128_rename_bulkrax_importer_run_to_importer_run.rb
 - lib/bulkrax.rb
 - lib/bulkrax/engine.rb
 - lib/bulkrax/version.rb
@@ -389,7 +390,7 @@ homepage: https://github.com/samvera-labs/bulkrax
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -404,8 +405,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key:
+rubygems_version: 3.1.4
+signing_key: 
 specification_version: 4
 summary: Import and export tool for Hyrax and Hyku
 test_files: []