bulkrax 9.5.0 → 10.0.0

data/app/services/bulkrax/csv_template/mapping_manager.rb

@@ -35,16 +35,18 @@ module Bulkrax
 
       # Returns the column names that target a given object name via the
       # `object:` field-mapping pattern. The template generator uses this to
-      # emit the per-child columns (e.g. redirect_path, redirect_canonical,
-      # redirect_sequence) instead of the bare property name (redirects).
-      # Numbering is intentionally omitted — the template shows the column
-      # shape once; CSV rows can repeat the column with numeric suffixes
-      # (e.g. redirect_path_1, redirect_path_2) at import time.
+      # emit the per-child columns (e.g. redirect_path, redirect_display_url)
+      # instead of the bare property name (redirects). Numbering is
+      # intentionally omitted — the template shows the column shape once;
+      # CSV rows can repeat the column with numeric suffixes (e.g.
+      # redirect_path_1, redirect_path_2) at import time.
+      # An import accepts every `from:` alias, but offering them all here would
+      # put two columns for the same field on the template.
       def object_columns_for(object_name)
         @mappings
           .select { |_k, v| v.is_a?(Hash) && v["object"] == object_name }
-          .values
-          .flat_map { |v| Array(v["from"]) }
+          .keys
+          .map { |key| key_to_mapped_column(key) }
           .uniq
       end
 

data/app/services/bulkrax/csv_template/schema_analyzer.rb

@@ -36,11 +36,7 @@ module Bulkrax
       def load_schema
         return nil unless @klass.respond_to?(:schema)
 
-        if @admin_set_id.present? && defined?(Hyrax) && Hyrax.respond_to?(:schema_for)
-          Hyrax.schema_for(klass: @klass, admin_set_id: @admin_set_id)
-        else
-          @klass.new.singleton_class.schema || @klass.schema
-        end
+        Bulkrax::ValkyrieObjectFactory.cached_schema_for(klass: @klass, admin_set_id: @admin_set_id)
       rescue StandardError
         nil
       end

data/lib/bulkrax/engine.rb

@@ -26,7 +26,7 @@ module Bulkrax
     config.after_initialize do
       # We want to ensure that Bulkrax is earlier in the lookup for view_paths than Hyrax.  That is
       # we favor view in Bulkrax over those in Hyrax.
-      if defined?(Hyrax)
+      if Bulkrax.hyrax_loaded?
         my_engine_root = Bulkrax::Engine.root.to_s
         hyrax_engine_root = Hyrax::Engine.root.to_s
         paths = ActionController::Base.view_paths.collect(&:to_s)

data/lib/bulkrax/version.rb

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

data/lib/bulkrax.rb

@@ -6,6 +6,7 @@ require 'active_support/all'
 
 require 'coderay'
 require 'csv'
+require 'deprecation'
 require 'denormalize_fields'
 require 'erb'
 require 'iso8601'
@@ -15,8 +16,6 @@ require 'nokogiri'
 require 'ostruct'
 require 'zip'
 
-require 'wings/custom_queries/find_by_source_identifier'
-
 def conditional_require(gem_name)
   require gem_name
 rescue LoadError
@@ -31,6 +30,10 @@ module Bulkrax
   extend self # rubocop:disable Style/ModuleFunction
   extend Forwardable
 
+  def hyrax_loaded?
+    defined?(::Hyrax::Engine) ? true : false
+  end
+
   ##
   # @api public
   class Configuration
@@ -85,7 +88,7 @@ module Bulkrax
     def solr_key_for_member_file_ids
       return @solr_key_for_member_file_ids if @solr_key_for_member_file_ids.present?
 
-      return "member_ids_ssim" if defined?(Hyrax)
+      return "member_ids_ssim" if Bulkrax.hyrax_loaded?
 
       "#{file_model_class.name.to_s.underscore}_ids_ssim"
     end
@@ -110,10 +113,13 @@ module Bulkrax
     end
 
     def collection_model_class
-      @collection_model_class ||= Collection if defined?(::Hyrax)
+      @collection_model_class ||= Collection if Bulkrax.hyrax_loaded?
     end
 
-    attr_writer :collection_model_class
+    def collection_model_class=(klass)
+      @collection_model_names = nil
+      @collection_model_class = klass
+    end
 
     def collection_model_internal_resource
       # WARN: Using #try on :internal_resource can yield unexpected results.
@@ -129,11 +135,30 @@ module Bulkrax
       instance.respond_to?(:internal_resource) ? instance.internal_resource : collection_model_class.to_s
     end
 
+    # A sheet written against either side of a Wings pair has to import, since
+    # both names resolve to the same object.
+    def collection_model_names
+      @collection_model_names ||=
+        model_names_for(collection_model_class, twin: curation_concern_twin_for(collection_model_class))
+    end
+
+    attr_writer :collection_model_names
+
+    def collection_model_name?(model_name)
+      name = model_name.to_s.strip
+      return false if name.empty?
+
+      collection_model_names.any? { |known| name.casecmp(known).zero? }
+    end
+
     def file_model_class
-      @file_model_class ||= defined?(::Hyrax) ? ::FileSet : File
+      @file_model_class ||= Bulkrax.hyrax_loaded? ? ::FileSet : File
     end
 
-    attr_writer :file_model_class
+    def file_model_class=(klass)
+      @file_model_names = nil
+      @file_model_class = klass
+    end
 
     def file_model_internal_resource
       # WARN: Using #try on :internal_resource can yield unexpected results.
@@ -149,8 +174,43 @@ module Bulkrax
       instance.respond_to?(:internal_resource) ? instance.internal_resource : file_model_class.to_s
     end
 
+    # As #collection_model_names, for file set rows. Wings pairs file sets by
+    # namespace rather than a `Resource` suffix: `Wings::ModelRegistry` maps
+    # both `FileSet` and `Hyrax::FileSet` onto the same object, so whichever
+    # one is configured, the other is its twin.
+    def file_model_names
+      @file_model_names ||= model_names_for(file_model_class, twin: file_set_twin_for(file_model_class))
+    end
+
+    attr_writer :file_model_names
+
+    def file_model_name?(model_name)
+      name = model_name.to_s.strip
+      return false if name.empty?
+
+      file_model_names.any? { |known| name.casecmp(known).zero? }
+    end
+
+    # Constantizing is what distinguishes a Wings install from a name that
+    # merely looks like one.
+    def model_names_for(klass, twin:)
+      names = [klass.to_s]
+      names << twin.to_s if twin.present? && twin.to_s.safe_constantize
+      names.uniq
+    end
+
+    def curation_concern_twin_for(klass)
+      name = klass.to_s
+      name.end_with?('Resource') ? name.delete_suffix('Resource') : "#{name}Resource"
+    end
+
+    def file_set_twin_for(klass)
+      name = klass.to_s
+      name.start_with?('Hyrax::') ? name.delete_prefix('Hyrax::') : "Hyrax::#{name}"
+    end
+
     def curation_concerns
-      @curation_concerns ||= defined?(::Hyrax) ? ::Hyrax.config.curation_concerns : []
+      @curation_concerns ||= Bulkrax.hyrax_loaded? ? ::Hyrax.config.curation_concerns : []
     end
 
     attr_writer :curation_concerns
@@ -176,7 +236,7 @@ module Bulkrax
     # @return [String, Proc]
     def ingest_queue_name
       return @ingest_queue_name if @ingest_queue_name.present?
-      return Hyrax.config.ingest_queue_name if defined?(Hyrax)
+      return Hyrax.config.ingest_queue_name if Bulkrax.hyrax_loaded?
       :import
     end
 
@@ -224,6 +284,9 @@ module Bulkrax
                  :collection_model_class,
                  :collection_model_internal_resource,
                  :collection_model_class=,
+                 :collection_model_name?,
+                 :collection_model_names,
+                 :collection_model_names=,
                  :curation_concerns,
                  :curation_concerns=,
                  :curation_concern_internal_resources,
@@ -240,6 +303,9 @@ module Bulkrax
                  :file_model_class,
                  :file_model_class=,
                  :file_model_internal_resource,
+                 :file_model_name?,
+                 :file_model_names,
+                 :file_model_names=,
                  :fill_in_blank_source_identifiers,
                  :fill_in_blank_source_identifiers=,
                  :generated_metadata_mapping,
@@ -433,7 +499,7 @@ module Bulkrax
   end
 
   def fallback_user_for_importer_exporter_processing
-    return User.batch_user if defined?(Hyrax) && User.respond_to?(:batch_user)
+    return User.batch_user if Bulkrax.hyrax_loaded? && User.respond_to?(:batch_user)
 
     raise "We have no fallback user available for Bulkrax.fallback_user_for_importer_exporter_processing"
   end

data/lib/generators/bulkrax/install_generator.rb

@@ -58,18 +58,30 @@ class Bulkrax::InstallGenerator < Rails::Generators::Base
   def add_ability
     file = 'app/models/ability.rb'
     file_text = File.read(file)
-    import_line = 'def can_import_works?'
-    export_line = 'def can_export_works?'
-    unless file_text.include?(import_line)
-      insert_into_file file, before: /^end/ do
-        "  def can_import_works?\n    can_create_any_work?\n  end"
-      end
-    end
+    include_line = 'include Bulkrax::AbilityBehavior'
 
     # rubocop:disable Style/GuardClause
-    unless file_text.include?(export_line)
-      insert_into_file file, before: /^end/ do
-        "  def can_export_works?\n    can_create_any_work?\n  end"
+    unless file_text.include?(include_line)
+      insert_into_file file, after: /include\s+\S+Ability[^\n]*\n/ do
+        "  include Bulkrax::AbilityBehavior\n" \
+          "  self.ability_logic += [:bulkrax_default_abilities]\n\n" \
+          "  # Override Bulkrax::AbilityBehavior methods as needed, for example:\n" \
+        "  #\n" \
+        "  #   def can_import_works?\n" \
+        "  #     can_create_any_work?\n" \
+        "  #   end\n" \
+        "  #\n" \
+        "  #   def can_export_works?\n" \
+        "  #     can_create_any_work?\n" \
+        "  #   end\n" \
+        "  #\n" \
+        "  #   def can_admin_importers?\n" \
+        "  #     current_user.admin?\n" \
+        "  #   end\n" \
+        "  #\n" \
+        "  #   def can_admin_exporters?\n" \
+        "  #     current_user.admin?\n" \
+        "  #   end\n"
       end
     end
     # rubocop:enable Style/GuardClause

data/lib/generators/bulkrax/templates/config/initializers/bulkrax.rb

@@ -83,6 +83,6 @@ end
 
 # Sidebar for hyrax 3+ support
 # rubocop:disable Style/IfUnlessModifier
-if Object.const_defined?(:Hyrax) && ::Hyrax::DashboardController&.respond_to?(:sidebar_partials)
+if Bulkrax.hyrax_loaded? && ::Hyrax::DashboardController&.respond_to?(:sidebar_partials)
   Hyrax::DashboardController.sidebar_partials[:repository_content] << "hyrax/dashboard/sidebar/bulkrax_sidebar_additions"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: bulkrax
 version: !ruby/object:Gem::Version
-  version: 9.5.0
+  version: 10.0.0
 platform: ruby
 authors:
 - Rob Kaufman
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-05-08 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,20 +15,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.6
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 8.0.0
+        version: 8.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.6
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 8.0.0
+        version: 8.2.0
 - !ruby/object:Gem::Dependency
   name: bagit
   requirement: !ruby/object:Gem::Requirement
@@ -72,6 +71,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: deprecation
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: marcel
   requirement: !ruby/object:Gem::Requirement
@@ -262,16 +275,22 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -401,7 +420,9 @@ files:
 - app/models/bulkrax/csv_collection_entry.rb
 - app/models/bulkrax/csv_entry.rb
 - app/models/bulkrax/csv_file_set_entry.rb
+- app/models/bulkrax/current.rb
 - app/models/bulkrax/entry.rb
+- app/models/bulkrax/export_scope.rb
 - app/models/bulkrax/exporter.rb
 - app/models/bulkrax/exporter_run.rb
 - app/models/bulkrax/import_failed.rb
@@ -417,6 +438,7 @@ files:
 - app/models/bulkrax/rdf_file_set_entry.rb
 - app/models/bulkrax/status.rb
 - app/models/bulkrax/xml_entry.rb
+- app/models/concerns/bulkrax/ability_behavior.rb
 - app/models/concerns/bulkrax/dynamic_record_lookup.rb
 - app/models/concerns/bulkrax/errored_entries.rb
 - app/models/concerns/bulkrax/export_behavior.rb
@@ -438,6 +460,7 @@ files:
 - app/parsers/concerns/bulkrax/csv_parser/csv_validation.rb
 - app/parsers/concerns/bulkrax/csv_parser/csv_validation_helpers.rb
 - app/parsers/concerns/bulkrax/csv_parser/csv_validation_hierarchy.rb
+- app/search_builders/bulkrax/export_search_builder.rb
 - app/services/bulkrax/csv_template/column_builder.rb
 - app/services/bulkrax/csv_template/column_descriptor.rb
 - app/services/bulkrax/csv_template/csv_builder.rb
@@ -564,12 +587,10 @@ files:
 - lib/generators/bulkrax/templates/config/initializers/bulkrax.rb
 - lib/tasks/bulkrax_tasks.rake
 - lib/tasks/reset.rake
-- lib/wings/custom_queries/find_by_source_identifier.rb
 homepage: https://github.com/samvera-labs/bulkrax
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -584,8 +605,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
-signing_key:
+rubygems_version: 4.0.22
 specification_version: 4
 summary: Import and export tool for Hyrax and Hyku
 test_files: []

data/lib/wings/custom_queries/find_by_source_identifier.rb

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-module Wings
-  module CustomQueries
-    class FindBySourceIdentifier
-      # Custom query override specific to Wings
-
-      def self.queries
-        [:find_by_property_value]
-      end
-
-      attr_reader :query_service
-      delegate :resource_factory, to: :query_service
-
-      def initialize(query_service:)
-        @query_service = query_service
-      end
-
-      # rubocop:disable Lint/UnusedMethodArgument
-      def find_by_property_value(property:, value:, search_field:, use_valkyrie: Hyrax.config.use_valkyrie?)
-        # rubocop:enable Lint/UnusedMethodArgument
-        # NOTE: This is using the Bulkrax::ObjectFactory (e.g. the one envisioned for ActiveFedora).
-        # In doing this, we avoid the situation where Bulkrax::ValkyrieObjectFactory calls this custom query.
-
-        # This is doing a solr search first, so we have to use the search_field instead of the property for "field"
-        # If it cannot find the object in Solr, it falls back to an ActiveFedora search, if the object is an ActiveFedora object
-        af_object = Bulkrax::ObjectFactory.search_by_property(
-          value: value,
-          klass: ActiveFedora::Base,
-          field: search_field,
-          name_field: property
-        )
-
-        return if af_object.blank?
-        return af_object unless use_valkyrie
-
-        resource_factory.to_resource(object: af_object)
-      end
-    end
-  end
-end