hyrax 5.0.0.rc2 → 5.0.0.rc3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.circleci/config.yml +14 -0
- data/.dassie/app/listeners/hyrax_listener.rb +81 -0
- data/.dassie/config/environments/test.rb +0 -5
- data/.dassie/config/initializers/hyrax.rb +5 -0
- data/.dassie/config/initializers/publisher.rb +3 -0
- data/.dassie/config/initializers/riiif.rb +77 -0
- data/.gitignore +4 -0
- data/.koppie/.env +2 -2
- data/.koppie/app/forms/collection_resource_form.rb +1 -0
- data/.koppie/app/indexers/collection_resource_indexer.rb +1 -0
- data/.koppie/app/listeners/hyrax_listener.rb +81 -0
- data/.koppie/app/models/collection.rb +1 -1
- data/.koppie/app/models/collection_resource.rb +1 -0
- data/.koppie/config/analytics.yml +5 -5
- data/.koppie/config/initializers/publisher.rb +3 -0
- data/.koppie/config/initializers/riiif.rb +78 -0
- data/.koppie/config/metadata/collection_resource.yaml +8 -166
- data/.koppie/config/metadata/sample_metadata.yaml +4 -0
- data/CONTAINERS.md +39 -2
- data/Dockerfile +14 -11
- data/Gemfile +8 -7
- data/README.md +2 -0
- data/app/actors/hyrax/actors/base_actor.rb +6 -3
- data/app/actors/hyrax/actors/file_actor.rb +1 -1
- data/app/actors/hyrax/actors/lease_actor.rb +3 -6
- data/app/assets/javascripts/hyrax/save_work/uploaded_files.es6 +10 -2
- data/app/assets/stylesheets/hyrax/sidebar.scss +6 -1
- data/app/controllers/concerns/hyrax/collections_controller_behavior.rb +1 -1
- data/app/controllers/concerns/hyrax/local_file_downloads_controller_behavior.rb +12 -19
- data/app/controllers/concerns/hyrax/stream_file_downloads_controller_behavior.rb +54 -0
- data/app/controllers/concerns/hyrax/valkyrie_downloads_controller_behavior.rb +38 -9
- data/app/controllers/concerns/hyrax/works_controller_behavior.rb +19 -14
- data/app/controllers/hyrax/admin/admin_sets_controller.rb +2 -2
- data/app/controllers/hyrax/admin/analytics/work_reports_controller.rb +5 -5
- data/app/controllers/hyrax/dashboard/collections_controller.rb +2 -2
- data/app/controllers/hyrax/downloads_controller.rb +1 -0
- data/app/controllers/hyrax/file_sets_controller.rb +3 -2
- data/app/controllers/hyrax/my/collections_controller.rb +1 -1
- data/app/forms/concerns/hyrax/basic_metadata_form_fields_behavior.rb +1 -0
- data/app/forms/concerns/hyrax/contained_in_works_behavior.rb +24 -0
- data/app/forms/concerns/hyrax/deposit_agreement_behavior.rb +12 -0
- data/app/forms/concerns/hyrax/leaseability_behavior.rb +49 -0
- data/app/forms/concerns/hyrax/permission_behavior.rb +20 -0
- data/app/forms/hyrax/forms/administrative_set_form.rb +1 -5
- data/app/forms/hyrax/forms/collection_form.rb +19 -0
- data/app/forms/hyrax/forms/file_set_form.rb +5 -0
- data/app/forms/hyrax/forms/pcdm_collection_form.rb +1 -5
- data/app/forms/hyrax/forms/pcdm_object_form.rb +13 -22
- data/app/forms/hyrax/forms/resource_batch_edit_form.rb +7 -2
- data/app/forms/hyrax/forms/resource_form.rb +30 -100
- data/app/forms/hyrax/forms.rb +52 -0
- data/app/helpers/hyrax/hyrax_helper_behavior.rb +2 -0
- data/app/indexers/{hyrax → concerns/hyrax}/location_indexer.rb +1 -5
- data/app/indexers/{hyrax → concerns/hyrax}/permission_indexer.rb +2 -2
- data/app/indexers/{hyrax → concerns/hyrax}/visibility_indexer.rb +1 -1
- data/app/indexers/hyrax/administrative_set_indexer.rb +5 -17
- data/app/indexers/hyrax/indexers/administrative_set_indexer.rb +25 -0
- data/app/indexers/hyrax/indexers/file_set_indexer.rb +144 -0
- data/app/indexers/hyrax/indexers/pcdm_collection_indexer.rb +27 -0
- data/app/indexers/hyrax/indexers/pcdm_object_indexer.rb +72 -0
- data/app/indexers/hyrax/indexers/resource_indexer.rb +86 -0
- data/app/indexers/hyrax/indexers.rb +54 -0
- data/app/indexers/hyrax/pcdm_collection_indexer.rb +5 -18
- data/app/indexers/hyrax/valkyrie_collection_indexer.rb +6 -4
- data/app/indexers/hyrax/valkyrie_file_set_indexer.rb +5 -136
- data/app/indexers/hyrax/valkyrie_indexer.rb +8 -112
- data/app/indexers/hyrax/valkyrie_work_indexer.rb +5 -64
- data/app/indexers/hyrax/work_indexer.rb +1 -0
- data/app/jobs/create_work_job.rb +1 -0
- data/app/models/admin_set.rb +20 -1
- data/app/models/collection.rb +5 -0
- data/app/models/concerns/hyrax/ability/admin_set_ability.rb +13 -28
- data/app/models/concerns/hyrax/ability/collection_ability.rb +26 -28
- data/app/models/concerns/hyrax/ability/resource_ability.rb +19 -0
- data/app/models/concerns/hyrax/ability.rb +11 -9
- data/app/models/concerns/hyrax/collection_behavior.rb +8 -0
- data/app/models/concerns/hyrax/solr_document_behavior.rb +15 -5
- data/app/models/concerns/hyrax/work_behavior.rb +4 -0
- data/app/models/featured_work.rb +12 -4
- data/app/models/file_set.rb +5 -0
- data/app/models/hyrax/administrative_set.rb +1 -1
- data/app/models/hyrax/change_set.rb +2 -2
- data/app/models/hyrax/file_metadata.rb +34 -7
- data/app/models/hyrax/file_set.rb +2 -2
- data/app/models/hyrax/group.rb +9 -38
- data/app/models/hyrax/group_behavior.rb +58 -0
- data/app/models/hyrax/model_registry.rb +111 -0
- data/app/models/hyrax/pcdm_collection.rb +1 -7
- data/app/models/hyrax/resource.rb +66 -8
- data/app/models/hyrax/statistic.rb +1 -1
- data/app/models/hyrax/work.rb +1 -7
- data/app/presenters/hyrax/collapsable_section_presenter.rb +7 -3
- data/app/presenters/hyrax/file_set_presenter.rb +8 -6
- data/app/presenters/hyrax/lease_presenter.rb +4 -0
- data/app/presenters/hyrax/menu_presenter.rb +14 -2
- data/app/presenters/hyrax/pcdm_member_presenter_factory.rb +1 -1
- data/app/presenters/hyrax/version_list_presenter.rb +6 -4
- data/app/search_builders/hyrax/admin_set_search_builder.rb +1 -1
- data/app/search_builders/hyrax/catalog_search_builder.rb +2 -2
- data/app/search_builders/hyrax/dashboard/collections_search_builder.rb +5 -3
- data/app/search_builders/hyrax/exposed_models_relation.rb +1 -1
- data/app/search_builders/hyrax/file_set_search_builder.rb +1 -1
- data/app/search_builders/hyrax/filter_by_type.rb +3 -2
- data/app/search_builders/hyrax/member_with_files_search_builder.rb +1 -1
- data/app/search_builders/hyrax/my/collections_search_builder.rb +2 -2
- data/app/search_builders/hyrax/my/find_works_search_builder.rb +8 -3
- data/app/services/hyrax/access_control_list.rb +21 -4
- data/app/services/hyrax/action/create_valkyrie_work.rb +80 -0
- data/app/services/hyrax/admin_set_create_service.rb +7 -3
- data/app/services/hyrax/admin_set_service.rb +2 -2
- data/app/services/hyrax/collections/collection_member_search_service.rb +2 -0
- data/app/services/hyrax/collections/permissions_service.rb +27 -9
- data/app/services/hyrax/custom_queries/find_collections_by_type.rb +1 -1
- data/app/services/hyrax/custom_queries/find_file_metadata.rb +1 -1
- data/app/services/hyrax/custom_queries/navigators/find_files.rb +1 -1
- data/app/services/hyrax/custom_queries/navigators/parent_work_navigator.rb +1 -1
- data/app/services/hyrax/edit_permissions_service.rb +1 -1
- data/app/services/hyrax/embargo_manager.rb +1 -1
- data/app/services/hyrax/file_set_file_service.rb +21 -10
- data/app/services/hyrax/form_factory.rb +1 -1
- data/app/services/hyrax/lease_manager.rb +39 -16
- data/app/services/hyrax/lease_service.rb +12 -6
- data/app/services/hyrax/listeners/acl_index_listener.rb +1 -1
- data/app/services/hyrax/listeners/active_fedora_acl_index_listener.rb +1 -1
- data/app/services/hyrax/listeners/member_cleanup_listener.rb +15 -1
- data/app/services/hyrax/listeners/object_lifecycle_listener.rb +5 -1
- data/app/services/hyrax/listeners/trophy_cleanup_listener.rb +2 -1
- data/app/services/hyrax/listeners/workflow_listener.rb +13 -0
- data/app/services/hyrax/listeners.rb +2 -1
- data/app/services/hyrax/location_service.rb +3 -0
- data/app/services/hyrax/multiple_membership_checker.rb +1 -1
- data/app/services/hyrax/simple_schema_loader.rb +1 -1
- data/app/services/hyrax/solr_service.rb +19 -5
- data/app/services/hyrax/statistics/collections/over_time.rb +1 -1
- data/app/services/hyrax/statistics/query_service.rb +6 -0
- data/app/services/hyrax/valkyrie_persist_derivatives.rb +11 -4
- data/app/services/hyrax/valkyrie_upload.rb +1 -1
- data/app/services/hyrax/work_uploads_handler.rb +5 -4
- data/app/views/_user_util_links.html.erb +1 -1
- data/app/views/collections/edit_fields/_based_near.html.erb +11 -7
- data/app/views/hyrax/admin/admin_sets/_form_participants.html.erb +67 -67
- data/app/views/hyrax/admin/admin_sets/edit.html.erb +1 -1
- data/app/views/hyrax/admin/collection_types/_form_participants.html.erb +3 -1
- data/app/views/hyrax/base/_attribute_rows.html.erb +1 -0
- data/app/views/hyrax/base/_base_form_files_prepend.html.erb +4 -0
- data/app/views/hyrax/base/_form_files.html.erb +65 -64
- data/app/views/hyrax/base/show.html.erb +2 -3
- data/app/views/hyrax/collections/show.html.erb +7 -9
- data/app/views/hyrax/dashboard/_sidebar.html.erb +4 -3
- data/app/views/hyrax/dashboard/collections/_form_share_table.html.erb +2 -2
- data/app/views/hyrax/file_sets/media_display/_audio.html.erb +1 -1
- data/app/views/hyrax/file_sets/media_display/_video.html.erb +1 -1
- data/app/views/hyrax/my/facet.html.erb +1 -1
- data/app/views/layouts/_head_tag_content.html.erb +1 -0
- data/app/views/shared/_footer.html.erb +1 -1
- data/chart/hyrax/Chart.yaml +3 -3
- data/chart/hyrax/values.yaml +9 -1
- data/config/initializers/listeners.rb +1 -1
- data/config/locales/hyrax.de.yml +5 -0
- data/config/locales/hyrax.en.yml +10 -0
- data/config/locales/hyrax.es.yml +5 -0
- data/config/locales/hyrax.fr.yml +5 -0
- data/config/locales/hyrax.it.yml +5 -0
- data/config/locales/hyrax.pt-BR.yml +5 -0
- data/config/locales/hyrax.zh.yml +5 -0
- data/config/metadata/basic_metadata.yaml +1 -0
- data/config/metadata/core_metadata.yaml +2 -0
- data/config/metadata/file_set_metadata.yaml +2 -0
- data/docker-compose-koppie.yml +3 -3
- data/docker-compose-sirenia.yml +3 -3
- data/documentation/developing-your-hyrax-based-app.md +77 -60
- data/hyrax.gemspec +9 -2
- data/lib/generators/hyrax/collection_resource/templates/collection_indexer.rb.erb +1 -1
- data/lib/generators/hyrax/config_generator.rb +12 -0
- data/lib/generators/hyrax/install_generator.rb +37 -7
- data/lib/generators/hyrax/listeners_generator.rb +18 -0
- data/lib/generators/hyrax/models_generator.rb +1 -10
- data/lib/generators/hyrax/riiif_generator.rb +6 -4
- data/lib/generators/hyrax/templates/.env +9 -0
- data/lib/generators/hyrax/templates/.lando.yml +50 -0
- data/lib/generators/hyrax/templates/app/listeners/hyrax_listener.rb +81 -0
- data/lib/generators/hyrax/templates/app/models/file_set.rb +1 -2
- data/lib/generators/hyrax/templates/config/initializers/1_valkyrie.rb +102 -0
- data/lib/generators/hyrax/templates/config/initializers/file_services.rb +6 -0
- data/lib/generators/hyrax/templates/config/initializers/hyrax.rb +41 -5
- data/lib/generators/hyrax/templates/config/initializers/publisher.rb +3 -0
- data/lib/generators/hyrax/templates/config/initializers/riiif.rb +77 -0
- data/lib/generators/hyrax/templates/config/locales/hyrax.de.yml +1 -1
- data/lib/generators/hyrax/templates/config/locales/hyrax.en.yml +1 -1
- data/lib/generators/hyrax/templates/config/locales/hyrax.es.yml +1 -1
- data/lib/generators/hyrax/templates/config/locales/hyrax.fr.yml +1 -1
- data/lib/generators/hyrax/templates/config/locales/hyrax.it.yml +1 -1
- data/lib/generators/hyrax/templates/config/locales/hyrax.pt-BR.yml +1 -1
- data/lib/generators/hyrax/templates/config/locales/hyrax.zh.yml +1 -1
- data/lib/generators/hyrax/templates/config/redis.yml +3 -6
- data/lib/generators/hyrax/templates/config/valkyrie_index.yml +4 -9
- data/lib/generators/hyrax/work_resource/templates/indexer.rb.erb +1 -1
- data/lib/hyrax/configuration.rb +95 -7
- data/lib/hyrax/indexer.rb +1 -1
- data/lib/hyrax/publisher.rb +5 -2
- data/lib/hyrax/resource_sync/change_list_writer.rb +1 -1
- data/lib/hyrax/resource_sync/resource_list_writer.rb +1 -1
- data/lib/hyrax/specs/capybara.rb +1 -0
- data/lib/hyrax/specs/shared_specs/hydra_works.rb +78 -20
- data/lib/hyrax/specs/shared_specs/indexers.rb +1 -1
- data/lib/hyrax/transactions/admin_set_destroy.rb +2 -1
- data/lib/hyrax/transactions/container.rb +5 -0
- data/lib/hyrax/transactions/steps/add_to_parent.rb +1 -0
- data/lib/hyrax/transactions/steps/check_for_default_admin_set.rb +32 -0
- data/lib/hyrax/transactions/steps/check_for_empty_admin_set.rb +1 -1
- data/lib/hyrax/transactions/steps/save.rb +2 -1
- data/lib/hyrax/transactions/steps/set_user_as_creator.rb +1 -1
- data/lib/hyrax/transactions/steps/update_work_members.rb +2 -0
- data/lib/hyrax/version.rb +1 -1
- data/lib/hyrax.rb +1 -0
- data/lib/tasks/embargo_lease.rake +1 -0
- data/lib/valkyrie/indexing/solr/indexing_adapter.rb +21 -7
- data/lib/wings/active_fedora_converter/default_work.rb +4 -5
- data/lib/wings/active_fedora_converter/file_metadata_node.rb +1 -1
- data/lib/wings/model_registry.rb +8 -0
- data/lib/wings/model_transformer.rb +19 -2
- data/lib/wings/orm_converter.rb +4 -0
- data/lib/wings/services/custom_queries/find_ids_by_model.rb +2 -2
- data/lib/wings/valkyrie/query_service.rb +5 -2
- data/lib/wings.rb +3 -0
- data/spec/factories/access_control.rb +12 -0
- data/spec/factories/admin_sets.rb +32 -0
- data/spec/factories/admin_sets_lw.rb +222 -0
- data/spec/factories/administrative_sets.rb +79 -0
- data/spec/factories/api_items.rb +92 -0
- data/spec/factories/collection_branding_infos.rb +12 -0
- data/spec/factories/collection_type_participants.rb +9 -0
- data/spec/factories/collection_types.rb +139 -0
- data/spec/factories/collections.rb +282 -0
- data/spec/factories/collections_factory.rb +107 -0
- data/spec/factories/content_blocks.rb +5 -0
- data/spec/factories/counter_metrics.rb +12 -0
- data/spec/factories/featured_works.rb +5 -0
- data/spec/factories/file_sets.rb +45 -0
- data/spec/factories/generic_works.rb +200 -0
- data/spec/factories/hyrax_collection.rb +92 -0
- data/spec/factories/hyrax_default_admin_set.rb +7 -0
- data/spec/factories/hyrax_embargo.rb +18 -0
- data/spec/factories/hyrax_file_metadata.rb +92 -0
- data/spec/factories/hyrax_file_set.rb +129 -0
- data/spec/factories/hyrax_lease.rb +18 -0
- data/spec/factories/hyrax_resource.rb +15 -0
- data/spec/factories/hyrax_work.rb +221 -0
- data/spec/factories/object_id.rb +7 -0
- data/spec/factories/operations.rb +22 -0
- data/spec/factories/permission.rb +7 -0
- data/spec/factories/permission_template_accesses.rb +17 -0
- data/spec/factories/permission_templates.rb +111 -0
- data/spec/factories/proxy_deposit_requests.rb +7 -0
- data/spec/factories/single_use_links.rb +14 -0
- data/spec/factories/sipity_entities.rb +17 -0
- data/spec/factories/uploaded_files.rb +11 -0
- data/spec/factories/users.rb +52 -0
- data/spec/factories/workflow_actions.rb +7 -0
- data/spec/factories/workflow_states.rb +7 -0
- data/spec/factories/workflows.rb +7 -0
- data/spec/support/book_resource.rb +36 -0
- data/spec/support/can_can_overrides.rb +43 -0
- data/spec/support/clean_solr.rb +7 -0
- data/spec/support/controller_level_helpers.rb +27 -0
- data/spec/support/factory_helpers.rb +94 -0
- data/spec/support/fakes/fake_actor.rb +22 -0
- data/spec/support/fakes/fake_authority.rb +14 -0
- data/spec/support/fakes/fake_search_builder_scope.rb +44 -0
- data/spec/support/fakes/indexing_adapter.rb +17 -0
- data/spec/support/fakes/test_hydra_group_service.rb +55 -0
- data/spec/support/features/batch_edit_actions.rb +37 -0
- data/spec/support/features/session_helpers.rb +15 -0
- data/spec/support/features/workflow.rb +10 -0
- data/spec/support/features.rb +11 -0
- data/spec/support/form_with_validations.rb +15 -0
- data/spec/support/input_support.rb +12 -0
- data/spec/support/logging_formatter.rb +67 -0
- data/spec/support/matchers/api_responses.rb +27 -0
- data/spec/support/matchers/collection_type_property_matchers.rb +30 -0
- data/spec/support/matchers/embargo.rb +9 -0
- data/spec/support/matchers/lease.rb +9 -0
- data/spec/support/matchers/match_valkyrie_ids_with_af_ids.rb +12 -0
- data/spec/support/matchers/pcdm_matchers.rb +34 -0
- data/spec/support/matchers/permission.rb +31 -0
- data/spec/support/matchers/response_matchers.rb +8 -0
- data/spec/support/optional_example.rb +17 -0
- data/spec/support/rake.rb +42 -0
- data/spec/support/selectors.rb +112 -0
- data/spec/support/shared_examples_for_collection_presenter.rb +44 -0
- data/spec/support/simple_work.rb +28 -0
- data/spec/support/spec_statistic.rb +24 -0
- data/spec/support/speedup.rb +7 -0
- data/spec/support/statistic_helper.rb +10 -0
- data/spec/support/valkyrie_indexing.rb +2 -0
- data/spec/support/wings_models.rb +9 -0
- data/template.rb +1 -3
- metadata +112 -30
- data/app/indexers/hyrax/resource_indexer.rb +0 -15
- data/app/models/concerns/hyrax/riiif_file.rb +0 -30
- data/app/services/hyrax/characterization/model_wrapper.rb +0 -0
- data/app/services/hyrax/custom_queries/find_by_collection_type.rb +0 -0
- data/app/services/hyrax/query_service.rb +0 -0
- data/app/services/hyrax/riiif_file_resolver.rb +0 -50
- data/lib/hyrax/specs/disable_animations_in_test_environment.rb +0 -53
- /data/app/indexers/{hyrax → concerns/hyrax}/thumbnail_indexer.rb +0 -0
@@ -0,0 +1,221 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
##
|
4
|
+
# Use this factory for generic Hyrax/HydraWorks Works in valkyrie.
|
5
|
+
FactoryBot.define do
|
6
|
+
factory :hyrax_work, class: 'Hyrax::Test::SimpleWork' do
|
7
|
+
trait :under_embargo do
|
8
|
+
association :embargo, factory: :hyrax_embargo
|
9
|
+
|
10
|
+
after(:create) do |work, _e|
|
11
|
+
Hyrax::EmbargoManager.new(resource: work).apply
|
12
|
+
work.permission_manager.acl.save
|
13
|
+
end
|
14
|
+
end
|
15
|
+
|
16
|
+
trait :with_expired_enforced_embargo do
|
17
|
+
after(:build) do |work, _evaluator|
|
18
|
+
work.embargo = FactoryBot.valkyrie_create(:hyrax_embargo, :expired)
|
19
|
+
end
|
20
|
+
|
21
|
+
after(:create) do |work, _evaluator|
|
22
|
+
allow(Hyrax::TimeService).to receive(:time_in_utc).and_return(10.days.ago)
|
23
|
+
Hyrax::EmbargoManager.new(resource: work).apply
|
24
|
+
work.permission_manager.acl.save
|
25
|
+
allow(Hyrax::TimeService).to receive(:time_in_utc).and_call_original
|
26
|
+
end
|
27
|
+
end
|
28
|
+
|
29
|
+
trait :under_lease do
|
30
|
+
association :lease, factory: :hyrax_lease
|
31
|
+
|
32
|
+
after(:create) do |work, _e|
|
33
|
+
Hyrax::LeaseManager.new(resource: work).apply
|
34
|
+
work.permission_manager.acl.save
|
35
|
+
end
|
36
|
+
end
|
37
|
+
|
38
|
+
trait :with_expired_enforced_lease do
|
39
|
+
after(:build) do |work, _evaluator|
|
40
|
+
work.lease = FactoryBot.valkyrie_create(:hyrax_lease, :expired)
|
41
|
+
end
|
42
|
+
|
43
|
+
after(:create) do |work, _evaluator|
|
44
|
+
allow(Hyrax::TimeService).to receive(:time_in_utc).and_return(10.days.ago)
|
45
|
+
Hyrax::LeaseManager.new(resource: work).apply
|
46
|
+
work.permission_manager.acl.save
|
47
|
+
allow(Hyrax::TimeService).to receive(:time_in_utc).and_call_original
|
48
|
+
end
|
49
|
+
end
|
50
|
+
|
51
|
+
transient do
|
52
|
+
edit_users { [] }
|
53
|
+
edit_groups { [] }
|
54
|
+
read_users { [] }
|
55
|
+
read_groups { [] }
|
56
|
+
members { nil }
|
57
|
+
visibility_setting { nil }
|
58
|
+
with_index { true }
|
59
|
+
uploaded_files { [] }
|
60
|
+
end
|
61
|
+
|
62
|
+
after(:build) do |work, evaluator|
|
63
|
+
if evaluator.visibility_setting
|
64
|
+
Hyrax::VisibilityWriter
|
65
|
+
.new(resource: work)
|
66
|
+
.assign_access_for(visibility: evaluator.visibility_setting)
|
67
|
+
end
|
68
|
+
|
69
|
+
work.permission_manager.edit_groups = work.permission_manager.edit_groups.to_a + evaluator.edit_groups
|
70
|
+
work.permission_manager.edit_users = work.permission_manager.edit_users.to_a + evaluator.edit_users
|
71
|
+
work.permission_manager.read_users = work.permission_manager.read_users.to_a + evaluator.read_users
|
72
|
+
work.permission_manager.read_groups = work.permission_manager.read_groups.to_a + evaluator.read_groups
|
73
|
+
|
74
|
+
work.member_ids = evaluator.members.compact.map(&:id) if evaluator.members
|
75
|
+
end
|
76
|
+
|
77
|
+
after(:create) do |work, evaluator|
|
78
|
+
if evaluator.visibility_setting
|
79
|
+
Hyrax::VisibilityWriter
|
80
|
+
.new(resource: work)
|
81
|
+
.assign_access_for(visibility: evaluator.visibility_setting)
|
82
|
+
end
|
83
|
+
work.permission_manager.edit_groups = work.permission_manager.edit_groups.to_a + evaluator.edit_groups
|
84
|
+
work.permission_manager.edit_users = work.permission_manager.edit_users.to_a + evaluator.edit_users
|
85
|
+
work.permission_manager.read_users = work.permission_manager.read_users.to_a + evaluator.read_users
|
86
|
+
work.permission_manager.read_groups = work.permission_manager.read_groups.to_a + evaluator.read_groups
|
87
|
+
|
88
|
+
# these are both no-ops if an active embargo/lease isn't present
|
89
|
+
Hyrax::EmbargoManager.new(resource: work).apply
|
90
|
+
Hyrax::LeaseManager.new(resource: work).apply
|
91
|
+
|
92
|
+
work.permission_manager.acl.save
|
93
|
+
|
94
|
+
# This has to happen after permissions for permissions to propagate.
|
95
|
+
if evaluator.uploaded_files.present?
|
96
|
+
allow(Hyrax.config.characterization_service).to receive(:run).and_return(true)
|
97
|
+
perform_enqueued_jobs(only: ValkyrieIngestJob) do
|
98
|
+
Hyrax::WorkUploadsHandler.new(work: Hyrax.query_service.find_by(id: work.id)).add(files: evaluator.uploaded_files).attach
|
99
|
+
end
|
100
|
+
# I'm not sure why, but Wings required this reload.
|
101
|
+
work.member_ids = Hyrax.query_service.find_by(id: work.id).member_ids
|
102
|
+
end
|
103
|
+
|
104
|
+
Hyrax.index_adapter.save(resource: Hyrax.query_service.find_by(id: work.id)) if evaluator.with_index
|
105
|
+
end
|
106
|
+
|
107
|
+
trait :public do
|
108
|
+
transient do
|
109
|
+
visibility_setting { Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC }
|
110
|
+
end
|
111
|
+
end
|
112
|
+
|
113
|
+
trait :with_admin_set do
|
114
|
+
transient do
|
115
|
+
admin_set { valkyrie_create(:hyrax_admin_set) }
|
116
|
+
end
|
117
|
+
|
118
|
+
after(:build) do |work, evaluator|
|
119
|
+
work.admin_set_id = evaluator.admin_set&.id
|
120
|
+
end
|
121
|
+
end
|
122
|
+
|
123
|
+
trait :with_default_admin_set do
|
124
|
+
admin_set_id { Hyrax::EnsureWellFormedAdminSetService.call }
|
125
|
+
end
|
126
|
+
|
127
|
+
trait :with_member_works do
|
128
|
+
transient do
|
129
|
+
members do
|
130
|
+
# If you set a depositor on the containing work, propogate that into these members
|
131
|
+
additional_attributes = {}
|
132
|
+
additional_attributes[:depositor] = depositor if depositor
|
133
|
+
[valkyrie_create(:hyrax_work, additional_attributes), valkyrie_create(:hyrax_work, additional_attributes)]
|
134
|
+
end
|
135
|
+
end
|
136
|
+
end
|
137
|
+
|
138
|
+
trait :with_file_and_work do
|
139
|
+
transient do
|
140
|
+
members do
|
141
|
+
# If you set a depositor on the containing work, propogate that into these members
|
142
|
+
additional_attributes = {}
|
143
|
+
additional_attributes[:depositor] = depositor if depositor
|
144
|
+
[valkyrie_create(:hyrax_file_set, additional_attributes), valkyrie_create(:hyrax_work, additional_attributes)]
|
145
|
+
end
|
146
|
+
end
|
147
|
+
end
|
148
|
+
|
149
|
+
trait :with_one_file_set do
|
150
|
+
transient do
|
151
|
+
members do
|
152
|
+
# If you set a depositor on the containing work, propogate that into this member
|
153
|
+
additional_attributes = {}
|
154
|
+
additional_attributes[:depositor] = depositor if depositor
|
155
|
+
[valkyrie_create(:hyrax_file_set, additional_attributes)]
|
156
|
+
end
|
157
|
+
end
|
158
|
+
end
|
159
|
+
|
160
|
+
trait :with_member_file_sets do
|
161
|
+
transient do
|
162
|
+
members do
|
163
|
+
# If you set a depositor on the containing work, propogate that into these members
|
164
|
+
additional_attributes = {}
|
165
|
+
additional_attributes[:depositor] = depositor if depositor
|
166
|
+
[valkyrie_create(:hyrax_file_set, additional_attributes), valkyrie_create(:hyrax_file_set, additional_attributes)]
|
167
|
+
end
|
168
|
+
end
|
169
|
+
end
|
170
|
+
|
171
|
+
trait :with_thumbnail do
|
172
|
+
thumbnail_id do
|
173
|
+
file_set = members.find(&:file_set?) ||
|
174
|
+
valkyrie_create(:hyrax_file_set)
|
175
|
+
file_set.id
|
176
|
+
end
|
177
|
+
end
|
178
|
+
|
179
|
+
trait :with_representative do
|
180
|
+
representative_id do
|
181
|
+
file_set = members&.find(&:file_set?) ||
|
182
|
+
valkyrie_create(:hyrax_file_set)
|
183
|
+
file_set.id
|
184
|
+
end
|
185
|
+
end
|
186
|
+
|
187
|
+
trait :with_renderings do
|
188
|
+
rendering_ids do
|
189
|
+
file_set = members.find(&:file_set?) ||
|
190
|
+
valkyrie_create(:hyrax_file_set)
|
191
|
+
file_set.id
|
192
|
+
end
|
193
|
+
end
|
194
|
+
|
195
|
+
trait :as_collection_member do
|
196
|
+
member_of_collection_ids { [valkyrie_create(:hyrax_collection).id] }
|
197
|
+
end
|
198
|
+
|
199
|
+
trait :as_member_of_multiple_collections do
|
200
|
+
member_of_collection_ids do
|
201
|
+
[valkyrie_create(:hyrax_collection).id,
|
202
|
+
valkyrie_create(:hyrax_collection).id,
|
203
|
+
valkyrie_create(:hyrax_collection).id]
|
204
|
+
end
|
205
|
+
end
|
206
|
+
|
207
|
+
factory :monograph, class: 'Monograph' do
|
208
|
+
factory :comet_in_moominland do
|
209
|
+
title { 'Comet in Moominland' }
|
210
|
+
creator { 'Tove Jansson' }
|
211
|
+
record_info { 'An example monograph with enough metadata fill in required fields.' }
|
212
|
+
end
|
213
|
+
|
214
|
+
trait :with_member_works do
|
215
|
+
transient do
|
216
|
+
members { [valkyrie_create(:monograph), valkyrie_create(:monograph)] }
|
217
|
+
end
|
218
|
+
end
|
219
|
+
end
|
220
|
+
end
|
221
|
+
end
|
@@ -0,0 +1,22 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
FactoryBot.define do
|
3
|
+
factory :operation, class: Hyrax::Operation do
|
4
|
+
operation_type { "Test operation" }
|
5
|
+
|
6
|
+
trait :failing do
|
7
|
+
status { Hyrax::Operation::FAILURE }
|
8
|
+
end
|
9
|
+
|
10
|
+
trait :pending do
|
11
|
+
status { Hyrax::Operation::PENDING }
|
12
|
+
end
|
13
|
+
|
14
|
+
trait :successful do
|
15
|
+
status { Hyrax::Operation::SUCCESS }
|
16
|
+
end
|
17
|
+
|
18
|
+
factory :batch_create_operation, class: Hyrax::BatchCreateOperation do
|
19
|
+
operation_type { "Batch Create" }
|
20
|
+
end
|
21
|
+
end
|
22
|
+
end
|
@@ -0,0 +1,17 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
FactoryBot.define do
|
3
|
+
factory :permission_template_access, class: Hyrax::PermissionTemplateAccess do
|
4
|
+
permission_template
|
5
|
+
trait :manage do
|
6
|
+
access { 'manage' }
|
7
|
+
end
|
8
|
+
|
9
|
+
trait :deposit do
|
10
|
+
access { 'deposit' }
|
11
|
+
end
|
12
|
+
|
13
|
+
trait :view do
|
14
|
+
access { 'view' }
|
15
|
+
end
|
16
|
+
end
|
17
|
+
end
|
@@ -0,0 +1,111 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
FactoryBot.define do
|
3
|
+
factory :permission_template, class: Hyrax::PermissionTemplate do
|
4
|
+
# Given that there is a one to one strong relation between permission_template and admin_set,
|
5
|
+
# with a unique index on the source_id, I don't want to have duplication in source_id
|
6
|
+
sequence(:source_id) { |n| format("%010d", n) }
|
7
|
+
|
8
|
+
trait :with_immediate_release do
|
9
|
+
release_period { Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_NO_DELAY }
|
10
|
+
end
|
11
|
+
|
12
|
+
trait :with_delayed_release do
|
13
|
+
release_period { Hyrax::PermissionTemplate::RELEASE_TEXT_VALUE_6_MONTHS }
|
14
|
+
end
|
15
|
+
|
16
|
+
before(:create) do |permission_template, evaluator|
|
17
|
+
if evaluator.with_admin_set
|
18
|
+
source_id = permission_template.source_id
|
19
|
+
admin_set = SourceFinder.find_or_create_admin_set(source_id)
|
20
|
+
permission_template.source_id = admin_set.id
|
21
|
+
elsif evaluator.with_collection
|
22
|
+
source_id = permission_template.source_id
|
23
|
+
collection =
|
24
|
+
if source_id.present?
|
25
|
+
begin
|
26
|
+
Collection.find(source_id)
|
27
|
+
rescue ActiveFedora::ObjectNotFoundError
|
28
|
+
create(:collection, id: source_id)
|
29
|
+
end
|
30
|
+
else
|
31
|
+
create(:collection)
|
32
|
+
end
|
33
|
+
permission_template.source_id = collection.id
|
34
|
+
end
|
35
|
+
end
|
36
|
+
|
37
|
+
after(:create) do |permission_template, evaluator|
|
38
|
+
if evaluator.with_workflows
|
39
|
+
Hyrax::Workflow::WorkflowImporter.load_workflow_for(permission_template: permission_template)
|
40
|
+
Sipity::Workflow.activate!(permission_template: permission_template, workflow_id: permission_template.available_workflows.pick(:id))
|
41
|
+
end
|
42
|
+
if evaluator.with_active_workflow
|
43
|
+
workflow = create(:workflow, active: true, permission_template: permission_template)
|
44
|
+
create(:workflow_action, workflow: workflow) # Need to create a single action that can be taken
|
45
|
+
end
|
46
|
+
AccessHelper.create_access(permission_template, 'user', :manage, evaluator.manage_users) if evaluator.manage_users.present?
|
47
|
+
AccessHelper.create_access(permission_template, 'group', :manage, evaluator.manage_groups) if evaluator.manage_groups.present?
|
48
|
+
AccessHelper.create_access(permission_template, 'user', :deposit, evaluator.deposit_users) if evaluator.deposit_users.present?
|
49
|
+
AccessHelper.create_access(permission_template, 'group', :deposit, evaluator.deposit_groups) if evaluator.deposit_groups.present?
|
50
|
+
AccessHelper.create_access(permission_template, 'user', :view, evaluator.view_users) if evaluator.view_users.present?
|
51
|
+
AccessHelper.create_access(permission_template, 'group', :view, evaluator.view_groups) if evaluator.view_groups.present?
|
52
|
+
end
|
53
|
+
|
54
|
+
transient do
|
55
|
+
with_admin_set { false }
|
56
|
+
with_collection { false }
|
57
|
+
with_workflows { false }
|
58
|
+
with_active_workflow { false }
|
59
|
+
manage_users { nil }
|
60
|
+
manage_groups { nil }
|
61
|
+
deposit_users { nil }
|
62
|
+
deposit_groups { nil }
|
63
|
+
view_users { nil }
|
64
|
+
view_groups { nil }
|
65
|
+
end
|
66
|
+
end
|
67
|
+
|
68
|
+
class AccessHelper
|
69
|
+
def self.create_access(permission_template_id, agent_type, access, agent_ids)
|
70
|
+
agent_ids.each do |agent_id|
|
71
|
+
FactoryBot.create(:permission_template_access,
|
72
|
+
access,
|
73
|
+
permission_template: permission_template_id,
|
74
|
+
agent_type: agent_type,
|
75
|
+
agent_id: agent_id)
|
76
|
+
end
|
77
|
+
end
|
78
|
+
end
|
79
|
+
|
80
|
+
class SourceFinder
|
81
|
+
def self.find_or_create_admin_set(source_id)
|
82
|
+
Hyrax.config.use_valkyrie? ? find_or_create_admin_set_valkyrie(source_id) : find_or_create_admin_set_active_fedora(source_id)
|
83
|
+
end
|
84
|
+
|
85
|
+
def self.find_or_create_admin_set_active_fedora(source_id)
|
86
|
+
if source_id.present?
|
87
|
+
begin
|
88
|
+
AdminSet.find(source_id)
|
89
|
+
rescue ActiveFedora::ObjectNotFoundError
|
90
|
+
FactoryBot.create(:admin_set, id: source_id)
|
91
|
+
end
|
92
|
+
else
|
93
|
+
FactoryBot.create(:admin_set)
|
94
|
+
end
|
95
|
+
end
|
96
|
+
|
97
|
+
def self.find_or_create_admin_set_valkyrie(source_id)
|
98
|
+
if source_id.present?
|
99
|
+
begin
|
100
|
+
Hyrax.query_service.find_by(id: source_id)
|
101
|
+
rescue Valkyrie::Persistence::ObjectNotFoundError
|
102
|
+
# Creating an Administrative set with a pre-determined id will not work for all adapters
|
103
|
+
# so we're letting the adapter assign the id
|
104
|
+
FactoryBot.valkyrie_create(:hyrax_admin_set)
|
105
|
+
end
|
106
|
+
else
|
107
|
+
FactoryBot.valkyrie_create(:hyrax_admin_set)
|
108
|
+
end
|
109
|
+
end
|
110
|
+
end
|
111
|
+
end
|
@@ -0,0 +1,14 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
FactoryBot.define do
|
3
|
+
factory :single_use_link do
|
4
|
+
factory :show_link do
|
5
|
+
item_id { 'fs-id' }
|
6
|
+
path { '/concerns/generic_work/1234' }
|
7
|
+
end
|
8
|
+
|
9
|
+
factory :download_link do
|
10
|
+
item_id { 'fs-id' }
|
11
|
+
path { '/downloads/1234' }
|
12
|
+
end
|
13
|
+
end
|
14
|
+
end
|
@@ -0,0 +1,17 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
FactoryBot.define do
|
3
|
+
factory :sipity_entity, class: Sipity::Entity do
|
4
|
+
transient do
|
5
|
+
proxy_for { nil }
|
6
|
+
end
|
7
|
+
|
8
|
+
proxy_for_global_id { 'gid://internal/Mock/1' }
|
9
|
+
workflow { workflow_state.workflow }
|
10
|
+
workflow_state
|
11
|
+
|
12
|
+
after(:build) do |entity, evaluator|
|
13
|
+
entity.proxy_for_global_id = Hyrax::GlobalID(evaluator.proxy_for).to_s if
|
14
|
+
evaluator.proxy_for
|
15
|
+
end
|
16
|
+
end
|
17
|
+
end
|
@@ -0,0 +1,11 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
FactoryBot.define do
|
3
|
+
factory :uploaded_file, class: Hyrax::UploadedFile do
|
4
|
+
user
|
5
|
+
file { File.open(Hyrax::Engine.root.join('spec', 'fixtures', 'image.jp2').to_s) }
|
6
|
+
|
7
|
+
trait :audio do
|
8
|
+
file { File.open(Hyrax::Engine.root.join('spec', 'fixtures', 'sample_mpeg4.mp4').to_s) }
|
9
|
+
end
|
10
|
+
end
|
11
|
+
end
|
@@ -0,0 +1,52 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
FactoryBot.define do
|
3
|
+
factory :user do
|
4
|
+
sequence(:email) { |n| "user#{n}@example.com" }
|
5
|
+
password { 'password' }
|
6
|
+
|
7
|
+
transient do
|
8
|
+
# Allow for custom groups when a user is instantiated.
|
9
|
+
# @example create(:user, groups: 'avacado')
|
10
|
+
groups { [] }
|
11
|
+
end
|
12
|
+
|
13
|
+
after(:build) do |user, evaluator|
|
14
|
+
User.group_service.add(user: user, groups: evaluator.groups)
|
15
|
+
end
|
16
|
+
|
17
|
+
factory :admin do
|
18
|
+
groups { ['admin'] }
|
19
|
+
end
|
20
|
+
|
21
|
+
factory :user_with_mail do
|
22
|
+
after(:create) do |user|
|
23
|
+
# Create examples of single file successes and failures
|
24
|
+
(1..10).each do |number|
|
25
|
+
file = MockFile.new(number.to_s, "Single File #{number}")
|
26
|
+
User.batch_user.send_message(user, 'File 1 could not be updated. You do not have sufficient privileges to edit it.', file.to_s, false)
|
27
|
+
User.batch_user.send_message(user, 'File 1 has been saved', file.to_s, false)
|
28
|
+
end
|
29
|
+
|
30
|
+
# Create examples of mulitple file successes and failures
|
31
|
+
files = []
|
32
|
+
(1..50).each do |number|
|
33
|
+
files << MockFile.new(number.to_s, "File #{number}")
|
34
|
+
end
|
35
|
+
User.batch_user.send_message(user, 'These files could not be updated. You do not have sufficient privileges to edit them.', 'Batch upload permission denied', false)
|
36
|
+
User.batch_user.send_message(user, 'These files have been saved', 'Batch upload complete', false)
|
37
|
+
end
|
38
|
+
end
|
39
|
+
end
|
40
|
+
|
41
|
+
trait :guest do
|
42
|
+
guest { true }
|
43
|
+
end
|
44
|
+
end
|
45
|
+
|
46
|
+
class MockFile
|
47
|
+
attr_accessor :to_s, :id
|
48
|
+
def initialize(id, string)
|
49
|
+
self.id = id
|
50
|
+
self.to_s = string
|
51
|
+
end
|
52
|
+
end
|
@@ -0,0 +1,36 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
module Hyrax
|
3
|
+
module Test
|
4
|
+
##
|
5
|
+
# A simple Hyrax::Resource with some metadata.
|
6
|
+
#
|
7
|
+
# Use this for testing valkyrie models generically, with Hyrax assumptions
|
8
|
+
# but no PCDM modelling behavior.
|
9
|
+
class BookResource < Hyrax::Resource
|
10
|
+
attribute :author, Valkyrie::Types::String
|
11
|
+
attribute :created, Valkyrie::Types::Date
|
12
|
+
attribute :isbn, Valkyrie::Types::String
|
13
|
+
attribute :publisher, Valkyrie::Types::String
|
14
|
+
attribute :title, Valkyrie::Types::String
|
15
|
+
end
|
16
|
+
|
17
|
+
##
|
18
|
+
# A simple Hyrax::ChangeSet with one custom validation.
|
19
|
+
#
|
20
|
+
# Hyrax::Test::BookResource will use this based on naming convention by adding `ChangeSet`
|
21
|
+
# to the end of the resource class name.
|
22
|
+
class BookResourceChangeSet < Hyrax::ChangeSet
|
23
|
+
validates :isbn, presence: true
|
24
|
+
end
|
25
|
+
|
26
|
+
class Book < ActiveFedora::Base
|
27
|
+
property :author, predicate: ::RDF::URI('http://example.com/ns/author')
|
28
|
+
property :created, predicate: ::RDF::URI('http://example.com/ns/created')
|
29
|
+
property :isbn, predicate: ::RDF::URI('http://example.com/ns/isbn')
|
30
|
+
property :publisher, predicate: ::RDF::URI('http://example.com/ns/publisher')
|
31
|
+
property :title, predicate: ::RDF::URI("http://example.com/ns/title")
|
32
|
+
end
|
33
|
+
end
|
34
|
+
end
|
35
|
+
|
36
|
+
Wings::ModelRegistry.register(Hyrax::Test::BookResource, Hyrax::Test::Book) if defined?(Wings)
|
@@ -0,0 +1,43 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
##
|
3
|
+
# This monkey-patch shim is for both active_fedora and valkyrie resources for tests
|
4
|
+
# This shim handles the case where controllers are loaded with an ActiveFedora collection class
|
5
|
+
# different than a test mocks Hyrax.config.collection_class.
|
6
|
+
# This override checks the value in Hyrax.config and uses it when it is a known collection or admin set class.
|
7
|
+
# This override also memoizes the resource_class to avoid multiple lookups.
|
8
|
+
CanCan::ControllerResource.class_eval do
|
9
|
+
def resource_class
|
10
|
+
return @resource_class if @resource_class.present?
|
11
|
+
@resource_class = case @options[:class]
|
12
|
+
when false then
|
13
|
+
name.to_sym
|
14
|
+
when nil then
|
15
|
+
namespaced_name.to_s.camelize.constantize
|
16
|
+
when String then
|
17
|
+
@options[:class].constantize
|
18
|
+
else
|
19
|
+
@options[:class]
|
20
|
+
end
|
21
|
+
@resource_class = dynamically_resolve_class(@resource_class)
|
22
|
+
end
|
23
|
+
|
24
|
+
private
|
25
|
+
|
26
|
+
def dynamically_resolve_class(resource_class)
|
27
|
+
if collection_class?(resource_class)
|
28
|
+
Hyrax.config.collection_class
|
29
|
+
elsif admin_set_class?(resource_class)
|
30
|
+
Hyrax.config.admin_set_class
|
31
|
+
else
|
32
|
+
resource_class
|
33
|
+
end
|
34
|
+
end
|
35
|
+
|
36
|
+
def collection_class?(model_class)
|
37
|
+
model_class == Hyrax::PcdmCollection || model_class < Hyrax::PcdmCollection || model_class == ::Collection || model_class < ::Collection
|
38
|
+
end
|
39
|
+
|
40
|
+
def admin_set_class?(model_class)
|
41
|
+
model_class == Hyrax::AdministrativeSet || model_class < Hyrax::AdministrativeSet || model_class == AdminSet || model_class < AdminSet
|
42
|
+
end
|
43
|
+
end
|
@@ -0,0 +1,27 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module ControllerLevelHelpers
|
4
|
+
# This provides some common mock methods for view tests.
|
5
|
+
# These are normally provided by the controller.
|
6
|
+
module ControllerViewHelpers
|
7
|
+
def search_state
|
8
|
+
@search_state ||= CatalogController.search_state_class.new(params, blacklight_config, controller)
|
9
|
+
end
|
10
|
+
|
11
|
+
# This allows you to set the configuration
|
12
|
+
# @example: view.blacklight_config = Blacklight::Configuration.new
|
13
|
+
attr_writer :blacklight_config
|
14
|
+
|
15
|
+
def blacklight_config
|
16
|
+
@blacklight_config ||= CatalogController.blacklight_config
|
17
|
+
end
|
18
|
+
|
19
|
+
def blacklight_configuration_context
|
20
|
+
@blacklight_configuration_context ||= Blacklight::Configuration::Context.new(controller)
|
21
|
+
end
|
22
|
+
end
|
23
|
+
|
24
|
+
def initialize_controller_helpers(helper)
|
25
|
+
helper.extend ControllerViewHelpers
|
26
|
+
end
|
27
|
+
end
|