HYC-1823 - Update to bulkrax 6.0.1 (#1073)

* Update to bulkrax 6.0.1 * Update bulkrax_api.yml from upstream * Add missing new field
UNC-Libraries · Feb 9, 2024 · d7ac497 · d7ac497
1 parent 679f582
commit d7ac497
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 55 deletions.
diff --git a/Gemfile b/Gemfile
@@ -13,7 +13,7 @@ gem 'blacklight_advanced_search', '~> 8.0.0.alpha2'
 gem 'blacklight_oai_provider', '7.0.2'
 gem 'blacklight_range_limit', '~> 8.3.0'
 gem 'bootstrap', '~> 4.0'
-gem 'bulkrax', git: 'https://github.com/UNC-Libraries/bulkrax.git', branch: 'unc-bulkrax-5-development'
+gem 'bulkrax', '6.0.1'
 gem 'clamav-client', require: 'clamav/client'
 # Use CoffeeScript for .coffee assets and views
 gem 'coffee-rails', '~> 5.0.0'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -14,27 +14,6 @@ GIT
       rails (>= 5.1, < 7.1)
       view_component (>= 2.66, < 4)
 
-GIT
-  remote: https://github.com/UNC-Libraries/bulkrax.git
-  revision: 605a43a5d9725cebb87d796b729991080970741f
-  branch: unc-bulkrax-5-development
-  specs:
-    bulkrax (5.4.1)
-      bagit (~> 0.4)
-      coderay
-      dry-monads (~> 1.5.0)
-      iso8601 (~> 0.9.0)
-      kaminari
-      language_list (~> 1.2, >= 1.2.1)
-      libxml-ruby (~> 3.2.4)
-      loofah (>= 2.2.3)
-      oai (>= 0.4, < 2.x)
-      rack (>= 2.0.6)
-      rails (>= 5.1.6)
-      rdf (>= 2.0.2, < 4.0)
-      rubyzip
-      simple_form
-
 GIT
   remote: https://github.com/UNC-Libraries/hyrax.git
   revision: 6127e4878a833f807e9b884899294a708be226e0
@@ -254,6 +233,20 @@ GEM
       signet (~> 0.8)
       typhoeus
     builder (3.2.4)
+    bulkrax (6.0.1)
+      bagit (~> 0.4)
+      coderay
+      iso8601 (~> 0.9.0)
+      kaminari
+      language_list (~> 1.2, >= 1.2.1)
+      libxml-ruby (~> 3.2.4)
+      loofah (>= 2.2.3)
+      oai (>= 0.4, < 2.x)
+      rack (>= 2.0.6)
+      rails (>= 5.1.6)
+      rdf (>= 2.0.2, < 4.0)
+      rubyzip
+      simple_form
     byebug (11.1.3)
     cancancan (3.5.0)
     capybara (3.39.2)
@@ -1084,7 +1077,7 @@ DEPENDENCIES
   blacklight_oai_provider (= 7.0.2)
   blacklight_range_limit (~> 8.3.0)
   bootstrap (~> 4.0)
-  bulkrax!
+  bulkrax (= 6.0.1)
   byebug (~> 11.1.3)
   capybara (~> 3.36)
   clamav-client

diff --git a/app/views/bulkrax/importers/new.html.erb b/app/views/bulkrax/importers/new.html.erb
diff --git a/config/bulkrax_api.yml b/config/bulkrax_api.yml
@@ -81,4 +81,6 @@ bulkrax:
         - "Update and Import (importer has not yet been run)"
     auth_token:
       definition: 'Authentication token. Required for JSON requests only.'
-      required: true
+      required: true
+    port:
+      definition: 'Port to use in http request. Defaults to 80. May need to set to 3000 when running in the development environment'
diff --git a/config/initializers/bulkrax.rb b/config/initializers/bulkrax.rb
@@ -9,7 +9,7 @@
   # ]
 
   # WorkType to use as the default if none is specified in the import
-  # Default is the first returned by Hyrax.config.curation_concerns
+  # Default is the first returned by Hyrax.config.curation_concerns, stringified
   # config.default_work_type = MyWork
 
   # Factory Class to use when generating and saving objects

diff --git a/spec/models/bulkrax/object_factory_spec.rb b/spec/models/bulkrax/object_factory_spec.rb
@@ -6,6 +6,7 @@ module Bulkrax
       subject { described_class.new(attributes: attributes,
                                     source_identifier_value: '9p2909328',
                                     work_identifier: '9p2909328',
+                                    work_identifier_search_field: 'id',
                                     klass: General)
       }