bulkrax 3.0.0.beta3 → 3.0.0.beta6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 144e5a05fdf0d22faa759b2f8529ec971af9001f10c8bbe74d705d954b85e048
-  data.tar.gz: 569cdb00a7f533e5b0e234079d5e2ae0996f7c5230675fec158ce62c06a82987
+  metadata.gz: 744a122509bc57b9b9a24367c2eee3660d3184bd8209543de43e7f9bf3b1c6ef
+  data.tar.gz: c9156dba83a463872cf700d93d12770b5967a1e28f269aba0141d0ae9a280e8e
 SHA512:
-  metadata.gz: 961ef2fcaccad86d47563de89538446a3757b54cd1abbaabe81e2479b902088ea62a06181fa22819e37df52cd6a32ce4a6c52892cd57ef89983b09a8bea403ef
-  data.tar.gz: 432704c4491eef71eb3a3bc4a294d13b9fa4e08b616c031a71510579919cdde96fa06d697f096016858725f6abf6d4a77414b2533f7aaeaa863e9031725f7ce5
+  metadata.gz: 3abe5abd1a882ebe4090a75c8600a9c9e35ede83fdaab22aaf33966d5b412fc256835ccef6ab7eaf3776f5ff7a4b0c27eaf94ac77fccf99985b7ad1dc2172c78
+  data.tar.gz: 6f1387ce3876c65f23b15cb0cf6824040af2071f59a7f2c3d68377c78994d543f1bd7beced5a334e9467bc7285c1930da9acc6ac7c9e2fdddbdcd0b156541386

data/app/factories/bulkrax/object_factory.rb

@@ -7,10 +7,10 @@ module Bulkrax
     include DynamicRecordLookup
 
     define_model_callbacks :save, :create
-    attr_reader :attributes, :object, :source_identifier_value, :klass, :replace_files, :update_files, :work_identifier, :related_parents_parsed_mapping
+    attr_reader :attributes, :object, :source_identifier_value, :klass, :replace_files, :update_files, :work_identifier, :related_parents_parsed_mapping, :importer_run_id
 
     # rubocop:disable Metrics/ParameterLists
-    def initialize(attributes:, source_identifier_value:, work_identifier:, related_parents_parsed_mapping: nil, replace_files: false, user: nil, klass: nil, update_files: false)
+    def initialize(attributes:, source_identifier_value:, work_identifier:, related_parents_parsed_mapping: nil, replace_files: false, user: nil, klass: nil, importer_run_id: nil, update_files: false)
       @attributes = ActiveSupport::HashWithIndifferentAccess.new(attributes)
       @replace_files = replace_files
       @update_files = update_files
@@ -19,6 +19,7 @@ module Bulkrax
       @related_parents_parsed_mapping = related_parents_parsed_mapping
       @source_identifier_value = source_identifier_value
       @klass = klass || Bulkrax.default_work_type.constantize
+      @importer_run_id = importer_run_id
     end
     # rubocop:enable Metrics/ParameterLists
 
@@ -137,23 +138,25 @@ module Bulkrax
     end
 
     def create_collection(attrs)
+      attrs = clean_attrs(attrs)
       attrs = collection_type(attrs)
-      persist_collection_memberships(parent: find_collection(attributes[related_parents_parsed_mapping]), child: object) if attributes[related_parents_parsed_mapping].present?
       object.attributes = attrs
       object.apply_depositor_metadata(@user)
       object.save!
+      pass_collection_to_be_persisted(parent: find_collection(attributes[related_parents_parsed_mapping]), child: object) if attributes[related_parents_parsed_mapping].present?
     end
 
     def update_collection(attrs)
-      persist_collection_memberships(parent: find_collection(attributes[related_parents_parsed_mapping]), child: object) if attributes[related_parents_parsed_mapping].present?
       object.attributes = attrs
       object.save!
+      pass_collection_to_be_persisted(parent: find_collection(attributes[related_parents_parsed_mapping]), child: object) if attributes[related_parents_parsed_mapping].present?
     end
 
     # This method is heavily inspired by Hyrax's AttachFilesToWorkJob
     def create_file_set(attrs)
-      work = find_record(attributes[related_parents_parsed_mapping].first)
+      _, work = find_record(attributes[related_parents_parsed_mapping].first, importer_run_id)
       work_permissions = work.permissions.map(&:to_hash)
+      attrs = clean_attrs(attrs)
       file_set_attrs = attrs.slice(*object.attributes.keys)
       object.assign_attributes(file_set_attrs)
 
@@ -179,9 +182,17 @@ module Bulkrax
       actor.update_metadata(file_set_attrs)
     end
 
+    def pass_collection_to_be_persisted(parent:, child:)
+      if parent.is_a? Array
+        parent.each { |par| persist_collection_memberships(par, child) }
+      else
+        persist_collection_memberships(parent, child)
+      end
+    end
+
     # Add child to parent's #member_collections
     # Add parent to child's #member_of_collections
-    def persist_collection_memberships(parent:, child:)
+    def persist_collection_memberships(parent, child)
       parent.reject!(&:blank?) if parent.respond_to?(:reject!)
       child.reject!(&:blank?) if child.respond_to?(:reject!)
       return if parent.blank? || child.blank?
@@ -202,8 +213,16 @@ module Bulkrax
       end
     end
 
+    def clean_attrs(attrs)
+      # avoid the "ArgumentError: Identifier must be a string of size > 0 in order to be treeified" error
+      # when setting object.attributes
+      attrs.delete('id') if attrs['id'].blank?
+      attrs
+    end
+
     def collection_type(attrs)
       return attrs if attrs['collection_type_gid'].present?
+
       attrs['collection_type_gid'] = Hyrax::CollectionType.find_or_create_default_collection_type.gid
       attrs
     end

data/app/jobs/bulkrax/create_relationships_job.rb

@@ -21,7 +21,7 @@ module Bulkrax
 
     queue_as :import
 
-    attr_accessor :child_records, :parent_record, :parent_entry, :importer_run_id
+    attr_accessor :child_records, :child_entry, :parent_record, :parent_entry, :importer_run_id
 
     # @param parent_identifier [String] Work/Collection ID or Bulkrax::Entry source_identifiers
     # @param importer_run [Bulkrax::ImporterRun] current importer run (needed to properly update counters)
@@ -31,17 +31,17 @@ module Bulkrax
     # Whether the @base_entry is the parent or the child in the relationship is determined by the presence of a
     # parent_identifier or child_identifier param. For example, if a parent_identifier is passed, we know @base_entry
     # is the child in the relationship, and vice versa if a child_identifier is passed.
-    def perform(parent_identifier:, importer_run_id:)
+    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
       end.sort_by(&:order)
 
       @importer_run_id = importer_run_id
-      @parent_record = find_record(parent_identifier)
+      @parent_entry, @parent_record = find_record(parent_identifier, importer_run_id)
       @child_records = { works: [], collections: [] }
       pending_relationships.each do |rel|
         raise ::StandardError, %("#{rel}" needs either a child or a parent to create a relationship) if rel.child_id.nil? || rel.parent_id.nil?
-        child_record = find_record(rel.child_id)
+        @child_entry, child_record = find_record(rel.child_id, importer_run_id)
         child_record.is_a?(::Collection) ? @child_records[:collections] << child_record : @child_records[:works] << child_record
       end
 
@@ -53,13 +53,13 @@ module Bulkrax
         return false # stop current job from continuing to run after rescheduling
       end
 
-      @parent_entry = Bulkrax::Entry.where(identifier: parent_identifier,
-                                           importerexporter_id: ImporterRun.find(importer_run_id).importer_id,
-                                           importerexporter_type: "Bulkrax::Importer").first
+      @parent_entry ||= Bulkrax::Entry.where(identifier: parent_identifier,
+                                             importerexporter_id: ImporterRun.find(importer_run_id).importer_id,
+                                             importerexporter_type: "Bulkrax::Importer").first
       create_relationships
       pending_relationships.each(&:destroy)
     rescue ::StandardError => e
-      parent_entry.status_info(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
     end
 
@@ -87,11 +87,12 @@ module Bulkrax
         ObjectFactory.new(
           attributes: attrs,
           source_identifier_value: nil, # sending the :id in the attrs means the factory doesn't need a :source_identifier_value
-          work_identifier: parent_entry.parser.work_identifier,
-          related_parents_parsed_mapping: parent_entry.parser.related_parents_parsed_mapping,
+          work_identifier: parent_entry&.parser&.work_identifier,
+          related_parents_parsed_mapping: parent_entry&.parser&.related_parents_parsed_mapping,
           replace_files: false,
           user: user,
-          klass: child_record.class
+          klass: child_record.class,
+          importer_run_id: importer_run_id
         ).run
         # TODO: add counters for :processed_parents and :failed_parents
         Bulkrax::ImporterRun.find(importer_run_id).increment!(:processed_relationships) # rubocop:disable Rails/SkipsModelValidations
@@ -105,11 +106,12 @@ module Bulkrax
       ObjectFactory.new(
         attributes: attrs,
         source_identifier_value: nil, # sending the :id in the attrs means the factory doesn't need a :source_identifier_value
-        work_identifier: parent_entry.parser.work_identifier,
-        related_parents_parsed_mapping: parent_entry.parser.related_parents_parsed_mapping,
+        work_identifier: parent_entry&.parser&.work_identifier,
+        related_parents_parsed_mapping: parent_entry&.parser&.related_parents_parsed_mapping,
         replace_files: false,
         user: user,
-        klass: parent_record.class
+        klass: parent_record.class,
+        importer_run_id: importer_run_id
       ).run
       # TODO: add counters for :processed_parents and :failed_parents
       Bulkrax::ImporterRun.find(importer_run_id).increment!(:processed_relationships) # rubocop:disable Rails/SkipsModelValidations
@@ -128,11 +130,12 @@ module Bulkrax
       ObjectFactory.new(
         attributes: attrs,
         source_identifier_value: nil, # sending the :id in the attrs means the factory doesn't need a :source_identifier_value
-        work_identifier: parent_entry.parser.work_identifier,
-        related_parents_parsed_mapping: parent_entry.parser.related_parents_parsed_mapping,
+        work_identifier: parent_entry&.parser&.work_identifier,
+        related_parents_parsed_mapping: parent_entry&.parser&.related_parents_parsed_mapping,
         replace_files: false,
         user: user,
-        klass: parent_record.class
+        klass: parent_record.class,
+        importer_run_id: importer_run_id
       ).run
       # TODO: add counters for :processed_parents and :failed_parents
       Bulkrax::ImporterRun.find(importer_run_id).increment!(:processed_relationships) # rubocop:disable Rails/SkipsModelValidations

data/app/jobs/bulkrax/import_file_set_job.rb

@@ -7,7 +7,10 @@ module Bulkrax
 
     queue_as :import
 
+    attr_reader :importer_run_id
+
     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
 
@@ -63,7 +66,8 @@ module Bulkrax
     end
 
     def find_parent_record(parent_identifier)
-      @parent_record ||= find_record(parent_identifier)
+      @parent_record ||= find_record(parent_identifier, importer_run_id)
+      @parent_record = parent_record.last if parent_record.is_a? Array
     end
   end
 end

data/app/models/bulkrax/csv_entry.rb

@@ -41,6 +41,8 @@ module Bulkrax
       self.parsed_metadata = {}
       add_identifier
       add_ingested_metadata
+      # TODO(alishaevn): remove the collections stuff entirely and only reference collections via the new parents code
+      add_collections
       add_visibility
       add_metadata_for_model
       add_rights_statement
@@ -57,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
@@ -238,35 +241,40 @@ module Bulkrax
       Bulkrax::CsvMatcher
     end
 
-    def possible_collection_ids
-      return @possible_collection_ids if @possible_collection_ids.present?
+    def collection_identifiers
+      return @collection_identifiers if @collection_identifiers.present?
 
-      collection_field_mapping = self.class.parent_field(parser)
-      return [] unless collection_field_mapping.present? && record[collection_field_mapping].present?
+      parent_field_mapping = self.class.parent_field(parser)
+      return [] unless parent_field_mapping.present? && record[parent_field_mapping].present?
 
       identifiers = []
-      split_titles = record[collection_field_mapping].split(/\s*[;|]\s*/)
-      split_titles.each do |c_title|
-        matching_collection_entries = importerexporter.entries.select { |e| e.raw_metadata['title'] == c_title }
+      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.is_a?(CsvCollectionEntry)
+        end
         raise ::StandardError, 'Only expected to find one matching entry' if matching_collection_entries.count > 1
         identifiers << matching_collection_entries.first&.identifier
       end
-      @possible_collection_ids = identifiers.compact.presence || []
+
+      @collection_identifiers = identifiers.compact.presence || []
     end
 
     def collections_created?
-      possible_collection_ids.length == self.collection_ids.length
+      collection_identifiers.length == self.collection_ids.length
     end
 
     def find_collection_ids
       return self.collection_ids if collections_created?
-      if possible_collection_ids.present?
-        possible_collection_ids.each do |collection_id|
+      if collection_identifiers.present?
+        collection_identifiers.each do |collection_id|
           c = find_collection(collection_id)
           skip = c.blank? || self.collection_ids.include?(c.id)
           self.collection_ids << c.id unless skip
         end
       end
+
       self.collection_ids
     end
 

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/models/bulkrax/importer_run.rb

@@ -5,6 +5,8 @@ module Bulkrax
     belongs_to :importer
     has_many :statuses, as: :runnable, dependent: :destroy
 
-    serialize :parents, Array
+    def parents
+      PendingRelationship.where(bulkrax_importer_run_id: id).pluck(:parent_id).uniq
+    end
   end
 end

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

@@ -6,9 +6,16 @@ module Bulkrax
     # has the provided identifier.
     #
     # @param identifier [String] Work/Collection ID or Bulkrax::Entry source_identifier
-    # @return [Work, Collection, nil] Work or Collection if found, otherwise nil
-    def find_record(identifier)
-      record = Entry.find_by(identifier: identifier)
+    # @param importer_run_id [Number] ID of the current_run of this Importer Job
+    # @return [Entry, nil], [Work, Collection, nil] Entry if found, otherwise nil and a Work or Collection if found, otherwise nil
+    def find_record(identifier, importer_run_id = nil)
+      # check for our entry in our current importer first
+      importer_id = ImporterRun.find(importer_run_id).importer_id
+      default_scope = { identifier: identifier, importerexporter_type: 'Bulkrax::Importer' }
+      record = Entry.find_by(default_scope, importerexporter_id: importer_id) || Entry.find_by(default_scope)
+
+      # TODO(alishaevn): discuss whether we are only looking for Collection models here
+      # use ActiveFedora::Base.find(identifier) instead?
       record ||= ::Collection.where(id: identifier).first # rubocop:disable Rails/FindBy
       if record.blank?
         available_work_types.each do |work_type|
@@ -16,7 +23,9 @@ module Bulkrax
         end
       end
 
-      record.is_a?(Entry) ? record.factory.find : record
+      # return the found entry here instead of searching for it again in the CreateRelationshipsJob
+      # also accounts for when the found entry isn't a part of this importer
+      record.is_a?(Entry) ? [record, record.factory.find] : [nil, record]
     end
 
     # Check if the record is a Work

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

@@ -45,6 +45,8 @@ module Bulkrax
     end
 
     def new_remote_files
+      return if object.is_a? FileSet
+
       @new_remote_files ||= if object.present? && object.file_sets.present?
                               parsed_remote_files.select do |file|
                                 # is the url valid?
@@ -101,7 +103,12 @@ module Bulkrax
     end
 
     def local_file_sets
-      @local_file_sets ||= object&.ordered_file_sets
+      @local_file_sets ||= ordered_file_sets
+    end
+
+    def ordered_file_sets
+      # OVERRIDE Hyrda-works 1.2.0 - this method was deprecated in v1.0
+      object&.ordered_members.to_a.select(&:file_set?)
     end
 
     def import_files

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

@@ -28,7 +28,6 @@ module Bulkrax
       self.parsed_metadata[related_parents_parsed_mapping].each do |parent_identifier|
         next if parent_identifier.blank?
 
-        add_parent_to_import_run(parent_identifier, importerexporter.last_run)
         PendingRelationship.create!(child_id: self.identifier, parent_id: parent_identifier, bulkrax_importer_run_id: importerexporter.last_run.id, order: self.id)
       end
     end
@@ -37,16 +36,10 @@ module Bulkrax
       self.parsed_metadata[related_children_parsed_mapping].each do |child_identifier|
         next if child_identifier.blank?
 
-        add_parent_to_import_run(self.identifier, importerexporter.last_run)
         PendingRelationship.create!(parent_id: self.identifier, child_id: child_identifier, bulkrax_importer_run_id: importerexporter.last_run.id, order: self.id)
       end
     end
 
-    def add_parent_to_import_run(parent_id, run)
-      run.parents << parent_id
-      run.save
-    end
-
     def find_collection_ids
       self.collection_ids
     end
@@ -98,6 +91,7 @@ module Bulkrax
                                               replace_files: replace_files,
                                               user: user,
                                               klass: factory_class,
+                                              importer_run_id: importerexporter.last_run.id,
                                               update_files: update_files)
     end
 

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

@@ -79,13 +79,12 @@
       <%= @exporter.exporter_runs.last&.total_work_entries %>
     </p>
     <br>
-    <div class="bulkrax-nav-tab-table-left-align">
+    <div class='bulkrax-nav-tab-table-left-align'>
       <h2>Entries</h2>
       <table class='table table-striped'>
         <thead>
           <tr>
             <th>Identifier</th>
-            <th>Collection</th>
             <th>Entry ID</th>
             <th>Status</th>
             <th>Errors</th>
@@ -97,17 +96,12 @@
           <% @work_entries.each do |e| %>
             <tr>
               <td><%= link_to e.identifier, bulkrax.exporter_entry_path(@exporter.id, e.id) %></td>
-              <% if e.parsed_metadata.present? && e.parsed_metadata.dig('collections').present? %>
-                <td><%= e.parsed_metadata.dig('collections').map {|c| c['id'] }.join('; ') %></td>
-              <% elsif e.raw_metadata.present? %>
-                <td><%= Array.wrap(e.raw_metadata.dig('collection')).join(';') %></td>
-              <% else %>
-              <td></td>
-              <% end %>
               <td><%= e.id %></td>
               <% if e.status == 'Complete' %>
                 <td><span class='glyphicon glyphicon-ok' style='color: green;'></span> <%= e.status %></td>
-                <% else %>
+              <% elsif e.status == 'Pending' %>
+                <td><span class='glyphicon glyphicon-option-horizontal' style='color: blue;'></span> <%= e.status %></td>
+              <% else %>
                 <td><span class='glyphicon glyphicon-remove' style='color: red;'></span> <%= e.status %></td>
               <% end %>
               <% if e.last_error.present? %>

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

@@ -85,7 +85,6 @@
             <thead>
               <tr>
                 <th>Identifier</th>
-                <th>Collection</th>
                 <th>Entry ID</th>
                 <th>Status</th>
                 <th>Errors</th>
@@ -97,13 +96,6 @@
               <% @work_entries.each do |e| %>
                 <tr>
                   <td><%= link_to e.identifier, bulkrax.importer_entry_path(@importer.id, e.id) %></td>
-                  <% if e.parsed_metadata.present? && e.parsed_metadata.dig("collections").present? %>
-                    <td><%= e.parsed_metadata.dig("collections").map {|c| c['id'] }.join('; ') %></td>
-                  <% elsif e.raw_metadata.present? %>
-                    <td><%= Array.wrap(e.raw_metadata.dig("collection")).join(';') %></td>
-                  <% else %>
-                    <td></td>
-                  <% end %>
                   <td><%= e.id %></td>
                   <% if e.status == "Complete" %>
                     <td><span class="glyphicon glyphicon-ok" style="color: green;"></span> <%= e.status %></td>
@@ -183,6 +175,8 @@
                   <td><%= e.id %></td>
                   <% if e.status == "Complete" %>
                     <td><span class="glyphicon glyphicon-ok" style="color: green;"></span> <%= e.status %></td>
+                  <% elsif e.status == "Pending" %>
+                    <td><span class="glyphicon glyphicon-option-horizontal" style="color: blue;"></span> <%= e.status %></td>
                   <% else %>
                     <td><span class="glyphicon glyphicon-remove" style="color: red;"></span> <%= e.status %></td>
                   <% end %>

data/db/migrate/20211203195233_rename_children_counters_to_relationships.rb

@@ -1,6 +1,6 @@
 class RenameChildrenCountersToRelationships < ActiveRecord::Migration[5.2]
   def change
-    rename_column :bulkrax_importer_runs, :processed_children, :processed_relationships
-    rename_column :bulkrax_importer_runs, :failed_children, :failed_relationships
+    rename_column :bulkrax_importer_runs, :processed_children, :processed_relationships unless column_exists?(:bulkrax_importer_runs, :processed_relationships)
+    rename_column :bulkrax_importer_runs, :failed_children, :failed_relationships unless column_exists?(:bulkrax_importer_runs, :failed_relationships)
   end
 end

data/db/migrate/20220301001839_create_bulkrax_pending_relationships.rb

@@ -1,11 +1,13 @@
 class CreateBulkraxPendingRelationships < ActiveRecord::Migration[5.2]
   def change
-    create_table :bulkrax_pending_relationships do |t|
-      t.belongs_to :bulkrax_importer_run, foreign_key: true, null: false
-      t.string :parent_id, null: false
-      t.string :child_id, null: false
+    unless table_exists?(:bulkrax_pending_relationships)
+      create_table :bulkrax_pending_relationships do |t|
+        t.belongs_to :bulkrax_importer_run, foreign_key: true, null: false
+        t.string :parent_id, null: false
+        t.string :child_id, null: false
 
-      t.timestamps
+        t.timestamps
+      end
     end
   end
 end

data/db/migrate/20220303212810_add_order_to_bulkrax_pending_relationships.rb

@@ -1,5 +1,5 @@
 class AddOrderToBulkraxPendingRelationships < ActiveRecord::Migration[5.2]
   def change
-    add_column :bulkrax_pending_relationships, :order, :integer, default: 0
+    add_column :bulkrax_pending_relationships, :order, :integer, default: 0 unless column_exists?(:bulkrax_pending_relationships, :order)
   end
 end

data/lib/bulkrax/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bulkrax
-  VERSION = '3.0.0.beta3'
+  VERSION = '3.0.0.beta6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bulkrax
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta3
+  version: 3.0.0.beta6
 platform: ruby
 authors:
 - Rob Kaufman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-30 00:00:00.000000000 Z
+date: 2022-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -366,9 +366,7 @@ files:
 - db/migrate/20220118001339_add_import_attempts_to_entries.rb
 - db/migrate/20220119213325_add_work_counters_to_importer_runs.rb
 - db/migrate/20220301001839_create_bulkrax_pending_relationships.rb
-- db/migrate/20220301020307_add_parents_to_bulkrax_importer_runs.rb
 - db/migrate/20220303212810_add_order_to_bulkrax_pending_relationships.rb
-- db/migrate/20220330165510_remove_array_true_from_importer_run_parents_column.rb
 - lib/bulkrax.rb
 - lib/bulkrax/engine.rb
 - lib/bulkrax/version.rb

data/db/migrate/20220301020307_add_parents_to_bulkrax_importer_runs.rb

@@ -1,5 +0,0 @@
-class AddParentsToBulkraxImporterRuns < ActiveRecord::Migration[5.1]
-  def change
-    add_column :bulkrax_importer_runs, :parents, :text, array: true
-  end
-end

data/db/migrate/20220330165510_remove_array_true_from_importer_run_parents_column.rb

@@ -1,5 +0,0 @@
-class RemoveArrayTrueFromImporterRunParentsColumn < ActiveRecord::Migration[5.2]
-  def change
-    change_column :bulkrax_importer_runs, :parents, :text, array: false, default: nil
-  end
-end