Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

♻️ Move method and remove single instance definition #937

Merged
merged 1 commit into from
Mar 13, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 12 additions & 18 deletions lib/bulkrax.rb
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,10 @@ module Bulkrax
# @api public
class Configuration
attr_accessor :api_definition,
:curation_concerns,
:default_field_mapping,
:default_work_type,
:export_path,
:field_mappings,
:file_model_class,
:generated_metadata_mapping,
:import_path,
:multi_value_element_join_on,
Expand Down Expand Up @@ -97,6 +95,18 @@ def factory_class_name_coercer
@factory_class_name_coercer || Bulkrax::FactoryClassFinder::DefaultCoercer
end

def file_model_class
@file_model_class ||= defined?(::Hyrax) ? ::FileSet : File
end

attr_writer :file_model_class

def curation_concerns
@curation_concerns ||= defined?(::Hyrax) ? ::Hyrax.config.curation_concerns : []
end

attr_writer :curation_concerns

attr_writer :ingest_queue_name
##
# @return [String, Proc]
Expand Down Expand Up @@ -222,22 +232,6 @@ def config
conf.relationship_job_class = "Bulkrax::CreateRelationshipsJob"
conf.required_elements = ['title']

def conf.curation_concerns
@curation_concerns ||= defined?(::Hyrax) ? ::Hyrax.config.curation_concerns : []
end

def conf.curation_concerns=(val)
@curation_concerns = val
end

def conf.file_model_class
@file_model_class ||= defined?(::Hyrax) ? ::FileSet : File
end

def conf.file_model_class=(val)
@file_model_class = val
end

# Hash of Generic field_mappings for use in the view
# There must be one field_mappings hash per view partial
# Based on Hyrax CoreMetadata && BasicMetadata
Expand Down
Loading