bulkrax 3.0.0.beta5 → 3.0.0.beta6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 994ee06cdd4ed63d0dfa79e0e77b1fb6b017528926a7b891d8ff702a15cf7347
-  data.tar.gz: 55298f93ce2078f1157a1426ce63823b78ae8a04cd4b076947a2ba1ad93ad05c
+  metadata.gz: 744a122509bc57b9b9a24367c2eee3660d3184bd8209543de43e7f9bf3b1c6ef
+  data.tar.gz: c9156dba83a463872cf700d93d12770b5967a1e28f269aba0141d0ae9a280e8e
 SHA512:
-  metadata.gz: 512b254802875cca2dae6377a1317439b25d35038aacd56ce2db18ee2aaaf9d0f1d22bb2f521ce16366a7a5630d5768468f3949579216fc02502b36e06e6159a
-  data.tar.gz: b25f1d98da59db8bc91f02d90fe44003350d7bf7eb7b67d5610d2006f7e0f5e1b72e9d37601b3a41f01faf34c8c07d8c388e173084edc6ebaf985e5f124f7d4a
+  metadata.gz: 3abe5abd1a882ebe4090a75c8600a9c9e35ede83fdaab22aaf33966d5b412fc256835ccef6ab7eaf3776f5ff7a4b0c27eaf94ac77fccf99985b7ad1dc2172c78
+  data.tar.gz: 6f1387ce3876c65f23b15cb0cf6824040af2071f59a7f2c3d68377c78994d543f1bd7beced5a334e9467bc7285c1930da9acc6ac7c9e2fdddbdcd0b156541386

data/app/models/bulkrax/csv_entry.rb

@@ -59,6 +59,7 @@ module Bulkrax
       if factory_class == Collection
         add_collection_type_gid
       elsif factory_class == FileSet
+        validate_presence_of_filename!
         add_path_to_file
         validate_presence_of_parent!
       else
@@ -250,7 +251,7 @@ module Bulkrax
       split_references = record[parent_field_mapping].split(/\s*[;|]\s*/)
       split_references.each do |c_reference|
         matching_collection_entries = importerexporter.entries.select do |e|
-          (e.raw_metadata[source_identifier] == c_reference) &&
+          (e.raw_metadata&.[](source_identifier) == c_reference) &&
             e.is_a?(CsvCollectionEntry)
         end
         raise ::StandardError, 'Only expected to find one matching entry' if matching_collection_entries.count > 1

data/app/models/bulkrax/csv_file_set_entry.rb

@@ -17,6 +17,12 @@ module Bulkrax
       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?
 

data/app/parsers/bulkrax/csv_parser.rb

@@ -193,7 +193,7 @@ module Bulkrax
         instance_variable_set(instance_var, ActiveFedora::SolrService.post(
           extra_filters.to_s,
           fq: [
-            "#{work_identifier}_sim:(#{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.0.0.beta5'
+  VERSION = '3.0.0.beta6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bulkrax
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta5
+  version: 3.0.0.beta6
 platform: ruby
 authors:
 - Rob Kaufman