bulkrax 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23cd36b2c3dc13769f7d20da3c0d53f2d5c2cabef15d5beeeccee75aed6d679a
-  data.tar.gz: 868f0ec5c54862943e126af0ecf63d49771bc9a4ac88e566074205d7077e063c
+  metadata.gz: 41dde3161532c80ff433be4697fa6c42f0f453dfea3547181c44914a68e3b466
+  data.tar.gz: 67473e62b537f71aa77aa664c361ba1e86c60e77451e4813a44597a9f465010b
 SHA512:
-  metadata.gz: a4f9c359a539054dba54000ca30bd1209bb862254c75463c2598807e8fd91e7e562e3bd6203f5f347ffe17da22f58d7915c1090109e88aabccac774c0281b1ee
-  data.tar.gz: 11c0083e67c4add719f04c01d20fac3216f6e994407dfdc48ae5f6d82696241a2b81ef6156279568b92e4bd56d3598085e83bac3718d04892a4fc96bbefd1028
+  metadata.gz: 3859148384111048a2a2c096cee9bde5a9c78cb8e5a73b5ddb1d31c3ddefe7a221d1ebff97e3b1f96f09e746ac60b3ec1c14e615ef162fe1a5e16f883a3a7ecf
+  data.tar.gz: bbc83265d59d5026546e6e92ccab3b93d6d4bf35ae08145ab6b27112ed587449572d763fdf3d876ec391dfce43d8b5fa96154e8507053ff2fac7b81bc2409580

data/README.md

@@ -1,7 +1,6 @@
 # Bulkrax
 Bulkrax is a batteries included importer for Samvera applications. It currently includes support for OAI-PMH (DC and Qualified DC) and CSV out of the box. It is also designed to be extensible, allowing you to easily add new importers in to your application or to include them with other gems. Bulkrax provides a full admin interface including creating, editing, scheduling and reviewing imports.
 
-
 ## Installation
 
 ### Install Generator
@@ -9,9 +8,9 @@ Bulkrax is a batteries included importer for Samvera applications. It currently
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'bulkrax', '1.0.0'
+gem 'bulkrax'
 # or if using from github
-gem 'bulkrax', git: 'https://github.com/samvera-labs/bulkrax.git'
+gem 'bulkrax', git: 'https://github.com/samvera-labs/bulkrax.git', branch: 'main'
 ```
 
 And then execute:
@@ -27,7 +26,7 @@ If using Sidekiq, set up queues for `import` and `export`.
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'bulkrax', git: 'https://github.com/samvera-labs/bulkrax.git'
+gem 'bulkrax'
 ```
 
 And then execute:

data/app/jobs/bulkrax/create_relationships_job.rb

@@ -46,18 +46,16 @@ module Bulkrax
       end
 
       if (child_records[:collections].blank? && child_records[:works].blank?) || parent_record.blank?
-        reschedule(
-          parent_identifier: parent_identifier,
-          importer_run_id: importer_run_id
-        )
+        reschedule({ parent_identifier: parent_identifier, importer_run_id: importer_run_id })
         return false # stop current job from continuing to run after rescheduling
       end
-
+      importer_id = ImporterRun.find(importer_run_id).importer_id
       @parent_entry ||= Bulkrax::Entry.where(identifier: parent_identifier,
-                                             importerexporter_id: ImporterRun.find(importer_run_id).importer_id,
+                                             importerexporter_id: importer_id,
                                              importerexporter_type: "Bulkrax::Importer").first
       create_relationships
       pending_relationships.each(&:destroy)
+      Bulkrax::Importer.find(importer_id).record_status
     rescue ::StandardError => e
       parent_entry ? parent_entry.status_info(e) : child_entry.status_info(e)
       Bulkrax::ImporterRun.find(importer_run_id).increment!(:failed_relationships) # rubocop:disable Rails/SkipsModelValidations

data/app/jobs/bulkrax/import_collection_job.rb

@@ -9,16 +9,18 @@ module Bulkrax
       entry = Entry.find(args[0])
       begin
         entry.build
-        entry.save
+        entry.save!
         ImporterRun.find(args[1]).increment!(:processed_records)
         ImporterRun.find(args[1]).increment!(:processed_collections)
-        ImporterRun.find(args[1]).decrement!(:enqueued_records)
+        ImporterRun.find(args[1]).decrement!(:enqueued_records) unless ImporterRun.find(args[1]).enqueued_records <= 0 # rubocop:disable Style/IdenticalConditionalBranches
       rescue => e
         ImporterRun.find(args[1]).increment!(:failed_records)
         ImporterRun.find(args[1]).increment!(:failed_collections)
-        ImporterRun.find(args[1]).decrement!(:enqueued_records)
+        ImporterRun.find(args[1]).decrement!(:enqueued_records) unless ImporterRun.find(args[1]).enqueued_records <= 0 # rubocop:disable Style/IdenticalConditionalBranches
         raise e
       end
+      entry.importer.current_run = ImporterRun.find(args[1])
+      entry.importer.record_status
     end
     # rubocop:enable Rails/SkipsModelValidations
   end

data/app/jobs/bulkrax/import_file_set_job.rb

@@ -26,17 +26,17 @@ module Bulkrax
         ImporterRun.find(importer_run_id).increment!(:failed_file_sets)
         # rubocop:enable Rails/SkipsModelValidations
       end
-      ImporterRun.find(importer_run_id).decrement!(:enqueued_records) # rubocop:disable Rails/SkipsModelValidations
+      ImporterRun.find(importer_run_id).decrement!(:enqueued_records) unless ImporterRun.find(importer_run_id).enqueued_records <= 0 # rubocop:disable Rails/SkipsModelValidations
       entry.save!
+      entry.importer.current_run = ImporterRun.find(importer_run_id)
+      entry.importer.record_status
 
     rescue MissingParentError => e
       # try waiting for the parent record to be created
       entry.import_attempts += 1
       entry.save!
       if entry.import_attempts < 5
-        ImportFileSetJob
-          .set(wait: (entry.import_attempts + 1).minutes)
-          .perform_later(entry_id, importer_run_id)
+        ImportFileSetJob.set(wait: (entry.import_attempts + 1).minutes).perform_later(entry_id, importer_run_id)
       else
         ImporterRun.find(importer_run_id).decrement!(:enqueued_records) # rubocop:disable Rails/SkipsModelValidations
         entry.status_info(e)

data/app/models/bulkrax/csv_file_set_entry.rb

@@ -2,31 +2,6 @@
 
 module Bulkrax
   class CsvFileSetEntry < CsvEntry
-    def factory_class
-      ::FileSet
-    end
-
-    def add_path_to_file
-      parsed_metadata['file'].each_with_index do |filename, i|
-        path_to_file = ::File.join(parser.path_to_files, filename)
-
-        parsed_metadata['file'][i] = path_to_file
-      end
-      raise ::StandardError, "one or more file paths are invalid: #{parsed_metadata['file'].join(', ')}" unless parsed_metadata['file'].map { |file_path| ::File.file?(file_path) }.all?
-
-      parsed_metadata['file']
-    end
-
-    def validate_presence_of_filename!
-      return if parsed_metadata&.[]('file')&.map(&:present?)&.any?
-
-      raise StandardError, 'File set must have a filename'
-    end
-
-    def validate_presence_of_parent!
-      return if parsed_metadata[related_parents_parsed_mapping]&.map(&:present?)&.any?
-
-      raise StandardError, 'File set must be related to at least one work'
-    end
+    include FileSetEntryBehavior
   end
 end

data/app/models/bulkrax/rdf_file_set_entry.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Bulkrax
+  class RdfFileSetEntry < RdfEntry
+    include FileSetEntryBehavior
+  end
+end

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

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Bulkrax
+  module FileSetEntryBehavior
+    def factory_class
+      ::FileSet
+    end
+
+    def add_path_to_file
+      parsed_metadata['file'].each_with_index do |filename, i|
+        path_to_file = ::File.join(parser.path_to_files, filename)
+
+        parsed_metadata['file'][i] = path_to_file
+      end
+      raise ::StandardError, "one or more file paths are invalid: #{parsed_metadata['file'].join(', ')}" unless parsed_metadata['file'].map { |file_path| ::File.file?(file_path) }.all?
+
+      parsed_metadata['file']
+    end
+
+    def validate_presence_of_filename!
+      return if parsed_metadata&.[]('file')&.map(&:present?)&.any?
+
+      raise StandardError, 'File set must have a filename'
+    end
+
+    def validate_presence_of_parent!
+      return if parsed_metadata[related_parents_parsed_mapping]&.map(&:present?)&.any?
+
+      raise StandardError, 'File set must be related to at least one work'
+    end
+  end
+end

data/app/parsers/bulkrax/bagit_parser.rb

@@ -23,6 +23,11 @@ module Bulkrax
       Entry
     end
 
+    def file_set_entry_class
+      csv_format = Bulkrax::Importer.last.parser_fields['metadata_format'] == "Bulkrax::CsvEntry"
+      csv_format ? CsvFileSetEntry : RdfFileSetEntry
+    end
+
     # Take a random sample of 10 metadata_paths and work out the import fields from that
     def import_fields
       raise StandardError, 'No metadata files were found' if metadata_paths.blank?

data/app/parsers/bulkrax/csv_parser.rb

@@ -217,7 +217,7 @@ module Bulkrax
         instance_variable_set(instance_var, ActiveFedora::SolrService.post(
           extra_filters.to_s,
           fq: [
-            "#{::Solrizer.solr_name(work_identifier)}:(#{complete_entry_identifiers.join(' OR ')})",
+            %(#{::Solrizer.solr_name(work_identifier)}:("#{complete_entry_identifiers.join('" OR "')}")),
             "has_model_ssim:(#{models_to_search.join(' OR ')})"
           ],
           fl: 'id',

data/lib/bulkrax/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bulkrax
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Rob Kaufman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-19 00:00:00.000000000 Z
+date: 2022-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -291,6 +291,7 @@ files:
 - app/models/bulkrax/pending_relationship.rb
 - app/models/bulkrax/rdf_collection_entry.rb
 - app/models/bulkrax/rdf_entry.rb
+- app/models/bulkrax/rdf_file_set_entry.rb
 - app/models/bulkrax/status.rb
 - app/models/bulkrax/xml_entry.rb
 - app/models/concerns/bulkrax/download_behavior.rb
@@ -298,6 +299,7 @@ files:
 - app/models/concerns/bulkrax/errored_entries.rb
 - app/models/concerns/bulkrax/export_behavior.rb
 - app/models/concerns/bulkrax/file_factory.rb
+- app/models/concerns/bulkrax/file_set_entry_behavior.rb
 - app/models/concerns/bulkrax/has_local_processing.rb
 - app/models/concerns/bulkrax/has_matchers.rb
 - app/models/concerns/bulkrax/import_behavior.rb