bulkrax 4.1.0 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7196362349b79b42a3d22ea7939383d43fbd44332184096dfbce2e37faa0504e
-  data.tar.gz: bfdf2c501e0c7fc9bbd0ea00586c1457d46c0bc4ebc379c9767bee3bc07418fb
+  metadata.gz: 11a3549082d5c6493135ed66fe5729474b4303bb8dec30ee20a8e00fe66f563d
+  data.tar.gz: '08a021e73dc020a2791d1cf6e7f086a2cebdc5b511ffa2c83db004f31592a6af'
 SHA512:
-  metadata.gz: 8095b741060d85acf813b9fcdb6794d811c5585ead33cc2a530dc0d125dd2224682514414cd352e67aed849d17774b32e9e198c5dcfa44bc002a9a65f352c657
-  data.tar.gz: fff5bf8fed8bfd1acd314c9e5c05bbe7fe5ba457165a65856d518e27db80873b76bd39bc479e0b6fc8d06185255a61e4e108ab446f6734701c8d8de561309815
+  metadata.gz: '049aaefb66b149b6e57857f75ded3408a910578cdbbd3c8094a85fedeffc2416124e0369e22cab136e2620cd56c9516f7fcf9bf906897682f09f8b32b2ef9dcc'
+  data.tar.gz: bf1a0ff60588f3b66295f6eb7941c80b4c2cb06cbbc68755145e5ec1688906103a8efd6e7ebb6fab5137460de9f1d3d6b5fe8191beac47cd8241ce0c35b250b2

data/app/jobs/bulkrax/import_file_set_job.rb

@@ -12,7 +12,8 @@ module Bulkrax
     def perform(entry_id, importer_run_id)
       @importer_run_id = importer_run_id
       entry = Entry.find(entry_id)
-      parent_identifier = entry.raw_metadata[entry.related_parents_raw_mapping]&.strip
+      # 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)
 
@@ -57,7 +58,7 @@ module Bulkrax
     end
 
     def check_parent_exists!(parent_identifier)
-      raise MissingParentError, %(Unable to find a record with the identifier "#{parent_identifier}") if parent_record.blank?
+      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)
@@ -66,8 +67,7 @@ module Bulkrax
     end
 
     def find_parent_record(parent_identifier)
-      @parent_record ||= find_record(parent_identifier, importer_run_id)
-      @parent_record = parent_record.last if parent_record.is_a? Array
+      _, @parent_record = find_record(parent_identifier, importer_run_id)
     end
   end
 end

data/app/parsers/bulkrax/application_parser.rb

@@ -75,7 +75,7 @@ module Bulkrax
     def get_field_mapping_hash_for(key)
       return instance_variable_get("@#{key}_hash") if instance_variable_get("@#{key}_hash").present?
 
-      mapping = importerexporter.field_mapping == [{}] ? {} : importerexporter.field_mapping
+      mapping = importerexporter.field_mapping.is_a?(Hash) ? importerexporter.field_mapping : {}
       instance_variable_set(
         "@#{key}_hash",
         mapping&.with_indifferent_access&.select { |_, h| h.key?(key) }
@@ -264,6 +264,8 @@ module Bulkrax
 
       Dir["#{exporter_export_path}/**"].each do |folder|
         zip_path = "#{exporter_export_zip_path.split('/').last}_#{folder.split('/').last}.zip"
+        FileUtils.rm_rf("#{exporter_export_zip_path}/#{zip_path}")
+
         Zip::File.open(File.join("#{exporter_export_zip_path}/#{zip_path}"), create: true) do |zip_file|
           Dir["#{folder}/**/**"].each do |file|
             zip_file.add(file.sub("#{folder}/", ''), file)

data/app/parsers/bulkrax/csv_parser.rb

@@ -283,6 +283,10 @@ module Bulkrax
       CsvFileSetEntry
     end
 
+    def valid_entry_types
+      ['Bulkrax::CsvCollectionEntry', 'Bulkrax::CsvFileSetEntry', 'Bulkrax::CsvEntry']
+    end
+
     # TODO: figure out why using the version of this method that's in the bagit parser
     # breaks specs for the "if importer?" line
     def total
@@ -324,7 +328,8 @@ module Bulkrax
     def write_files
       require 'open-uri'
       folder_count = 0
-      sorted_entries = sort_entries(importerexporter.entries)
+      sorted_entries = sort_entries(importerexporter.entries.uniq(&:identifier))
+                       .select { |e| valid_entry_types.include?(e.type) }
 
       sorted_entries[0..limit || total].in_groups_of(records_split_count, false) do |group|
         folder_count += 1
@@ -342,6 +347,8 @@ module Bulkrax
 
     def store_files(identifier, folder_count)
       record = ActiveFedora::Base.find(identifier)
+      return unless record
+
       file_sets = record.file_set? ? Array.wrap(record) : record.file_sets
       file_sets << record.thumbnail if exporter.include_thumbnails && record.thumbnail.present? && record.work?
       file_sets.each do |fs|
@@ -356,6 +363,8 @@ module Bulkrax
           f.close
         end
       end
+    rescue Ldp::Gone
+      return
     end
 
     def export_key_allowed(key)
@@ -391,12 +400,12 @@ module Bulkrax
       # always export models in the same order: work, collection, file set
       entries.sort_by do |entry|
         case entry.type
-        when 'Bulkrax::CsvEntry'
-          '0'
         when 'Bulkrax::CsvCollectionEntry'
           '1'
         when 'Bulkrax::CsvFileSetEntry'
           '2'
+        else
+          '0'
         end
       end
     end

data/lib/bulkrax/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bulkrax
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.2.1
 platform: ruby
 authors:
 - Rob Kaufman
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-18 00:00:00.000000000 Z
+date: 2022-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails