hyrax 5.0.0.rc1 → 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 +25 -4
- data/.dassie/.env +5 -1
- data/.dassie/Gemfile +27 -42
- data/.dassie/Gemfile.dassie +2 -0
- data/.dassie/app/assets/config/manifest.js +2 -0
- data/.dassie/app/assets/stylesheets/hyrax.scss +1 -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 +82 -11
- data/.dassie/config/metadata/collection_resource.yaml +3 -0
- data/.dassie/config/metadata/monograph.yaml +8 -0
- data/.dassie/config/metadata/sample_metadata.yaml +1 -0
- data/.dassie/config/redis.yml +2 -0
- data/.dassie/db/migrate/20230725222727_create_hyrax_counter_metrics.hyrax.rb +14 -0
- data/.dassie/db/migrate/20230803165135_change_work_id_to_string.rb +5 -0
- data/.dassie/db/migrate/20230808102105_add_indices_to_hyrax_counter_metrics.hyrax.rb +8 -0
- data/.dassie/db/migrate/20230821153635_add_fields_to_counter_metric.rb +8 -0
- data/.dassie/db/schema.rb +20 -1
- data/.dockerignore +2 -1
- data/.gitignore +5 -1
- data/.koppie/.env +10 -4
- data/.koppie/Gemfile +10 -12
- data/.koppie/Gemfile.koppie +2 -0
- data/.koppie/Rakefile +0 -2
- data/.koppie/app/listeners/hyrax_listener.rb +81 -0
- data/.koppie/app/models/ability.rb +1 -5
- data/.koppie/app/models/collection.rb +1 -1
- data/.koppie/app/models/user.rb +0 -2
- data/.koppie/config/analytics.yml +5 -5
- data/.koppie/config/application.rb +2 -1
- data/.koppie/config/arkivo.yml +6 -0
- data/.koppie/config/blacklight.yml +2 -2
- data/.koppie/config/features.yml +2 -0
- data/.koppie/config/initializers/1_valkyrie.rb +29 -6
- data/.koppie/config/initializers/arkivo_constraint.rb +12 -0
- data/.koppie/config/initializers/hyrax.rb +2 -2
- data/.koppie/config/initializers/publisher.rb +3 -0
- data/.koppie/config/initializers/riiif.rb +84 -11
- data/.koppie/config/metadata/collection_resource.yaml +19 -1
- data/.koppie/config/metadata/generic_work.yaml +2 -0
- data/.koppie/config/metadata/monograph.yaml +10 -0
- data/.koppie/config/metadata/sample_metadata.yaml +4 -0
- data/.koppie/config/role_map.yml +3 -25
- data/.koppie/config/routes.rb +1 -2
- data/.koppie/config/solr.yml +1 -1
- data/.koppie/config/valkyrie_index.yml +4 -10
- data/.koppie/config/zotero.yml +6 -0
- data/.koppie/db/migrate/20230725222727_create_hyrax_counter_metrics.hyrax.rb +14 -0
- data/.koppie/db/migrate/20230803165135_change_work_id_to_string.rb +5 -0
- data/.koppie/db/schema.rb +12 -1
- data/CONTAINERS.md +39 -4
- data/Dockerfile +25 -13
- data/Gemfile +8 -24
- data/Gemfile.dassie +2 -0
- data/Gemfile.koppie +2 -0
- data/README.md +2 -1
- data/Rakefile +0 -11
- data/app/actors/hyrax/actors/base_actor.rb +6 -3
- data/app/actors/hyrax/actors/embargo_actor.rb +3 -6
- 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/batch_select_all.js +1 -1
- data/app/assets/javascripts/hyrax/file_manager/member.es6 +1 -1
- data/app/assets/javascripts/hyrax/save_work/uploaded_files.es6 +10 -2
- data/app/assets/stylesheets/hyrax/_file-listing.scss +0 -2
- data/app/assets/stylesheets/hyrax/_work-show.scss +19 -3
- data/app/assets/stylesheets/hyrax/sidebar.scss +29 -1
- data/app/controllers/concerns/hyrax/collections_controller_behavior.rb +1 -1
- data/app/controllers/concerns/hyrax/embargoes_controller_behavior.rb +7 -1
- data/app/controllers/concerns/hyrax/leases_controller_behavior.rb +7 -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 +52 -18
- data/app/controllers/concerns/hyrax/works_controller_behavior.rb +69 -23
- 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/api/items_controller.rb +2 -3
- data/app/controllers/hyrax/batch_edits_controller.rb +6 -6
- data/app/controllers/hyrax/batch_uploads_controller.rb +5 -1
- data/app/controllers/hyrax/dashboard/collections_controller.rb +6 -3
- data/app/controllers/hyrax/downloads_controller.rb +1 -0
- data/app/controllers/hyrax/file_sets_controller.rb +51 -7
- data/app/controllers/hyrax/my/collections_controller.rb +3 -1
- data/app/controllers/hyrax/single_use_links_viewer_controller.rb +16 -2
- data/app/forms/concerns/hyrax/basic_metadata_form_fields_behavior.rb +39 -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 +16 -12
- data/app/forms/hyrax/forms/dashboard/nest_collection_form.rb +0 -34
- data/app/forms/hyrax/forms/file_set_form.rb +7 -2
- data/app/forms/hyrax/forms/pcdm_collection_form.rb +1 -5
- data/app/forms/hyrax/forms/pcdm_object_form.rb +13 -1
- data/app/forms/hyrax/forms/permission_template_form.rb +0 -7
- data/app/forms/hyrax/forms/resource_batch_edit_form.rb +55 -22
- data/app/forms/hyrax/forms/resource_form.rb +31 -114
- data/app/forms/hyrax/forms.rb +52 -0
- data/app/helpers/hyrax/dashboard_helper_behavior.rb +13 -0
- data/app/helpers/hyrax/hyrax_helper_behavior.rb +2 -0
- data/app/indexers/concerns/hyrax/location_indexer.rb +25 -0
- 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 -26
- data/app/indexers/hyrax/valkyrie_collection_indexer.rb +6 -4
- data/app/indexers/hyrax/valkyrie_file_set_indexer.rb +5 -141
- data/app/indexers/hyrax/valkyrie_indexer.rb +8 -112
- data/app/indexers/hyrax/valkyrie_work_indexer.rb +5 -63
- data/app/indexers/hyrax/work_indexer.rb +1 -0
- data/app/inputs/controlled_vocabulary_input.rb +1 -1
- data/app/jobs/characterize_job.rb +1 -1
- data/app/jobs/create_work_job.rb +37 -4
- data/app/jobs/valkyrie_characterization_job.rb +9 -0
- data/app/jobs/valkyrie_ingest_job.rb +1 -3
- data/app/models/admin_set.rb +20 -1
- data/app/models/collection.rb +5 -0
- data/app/models/collection_branding_info.rb +2 -9
- 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 +12 -9
- data/app/models/concerns/hyrax/collection_behavior.rb +12 -12
- data/app/models/concerns/hyrax/solr_document_behavior.rb +33 -6
- 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/counter_metric.rb +7 -0
- data/app/models/hyrax/file_metadata.rb +37 -9
- data/app/models/hyrax/file_set.rb +77 -24
- 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/orcid_validator.rb +0 -6
- 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 +3 -12
- data/app/presenters/hyrax/collapsable_section_presenter.rb +7 -3
- data/app/presenters/hyrax/collection_presenter.rb +0 -17
- data/app/presenters/hyrax/embargo_presenter.rb +4 -0
- 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 +7 -5
- data/app/presenters/hyrax/version_list_presenter.rb +25 -14
- data/app/presenters/hyrax/version_presenter.rb +19 -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 -20
- data/app/services/hyrax/admin_set_service.rb +2 -2
- data/app/services/hyrax/characterization/valkyrie_characterization_service.rb +5 -0
- data/app/services/hyrax/collections/collection_member_search_service.rb +2 -0
- data/app/services/hyrax/collections/collection_member_service.rb +1 -1
- 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 +44 -17
- data/app/services/hyrax/embargo_service.rb +12 -10
- data/app/services/hyrax/file_set_derivatives_service.rb +11 -11
- data/app/services/hyrax/file_set_file_service.rb +21 -10
- data/app/services/hyrax/fixity_check_failure_service.rb +1 -1
- data/app/services/hyrax/form_factory.rb +1 -1
- data/app/services/hyrax/identifier/dispatcher.rb +9 -2
- 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/file_metadata_listener.rb +14 -6
- data/app/services/hyrax/listeners/member_cleanup_listener.rb +12 -24
- data/app/services/hyrax/listeners/metadata_index_listener.rb +11 -0
- 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/lock_manager.rb +1 -2
- data/app/services/hyrax/multiple_membership_checker.rb +1 -1
- data/app/services/hyrax/simple_schema_loader.rb +32 -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 +12 -5
- data/app/services/hyrax/valkyrie_upload.rb +13 -27
- data/app/services/hyrax/versioning_service.rb +29 -15
- data/app/services/hyrax/work_uploads_handler.rb +6 -5
- data/app/validators/hyrax/collection_membership_validator.rb +1 -1
- data/app/views/_user_util_links.html.erb +1 -1
- data/app/views/catalog/_search_form.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/admin/collection_types/index.html.erb +1 -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/_file_manager_resource_form.html.erb +1 -1
- data/app/views/hyrax/base/_form_files.html.erb +65 -64
- data/app/views/hyrax/base/_form_visibility_component.html.erb +4 -4
- data/app/views/hyrax/base/_show_actions.html.erb +1 -1
- data/app/views/hyrax/base/_workflow_actions.html.erb +25 -23
- data/app/views/hyrax/base/show.html.erb +2 -3
- data/app/views/hyrax/base/show.json.jbuilder +2 -1
- data/app/views/hyrax/collections/_show_document_list_row.html.erb +1 -1
- 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/dashboard/collections/_list_collections.html.erb +1 -1
- data/app/views/hyrax/dashboard/collections/_show_document_list_row.html.erb +1 -1
- data/app/views/hyrax/dashboard/collections/_sort_and_per_page.html.erb +3 -3
- data/app/views/hyrax/file_sets/_versioning.html.erb +5 -5
- data/app/views/hyrax/file_sets/media_display/_audio.html.erb +5 -5
- data/app/views/hyrax/file_sets/media_display/_default.html.erb +1 -1
- data/app/views/hyrax/file_sets/media_display/_video.html.erb +3 -3
- data/app/views/hyrax/my/_search_form.html.erb +1 -1
- data/app/views/hyrax/my/facet.html.erb +1 -1
- data/app/views/hyrax/notifications/_notifications.html.erb +1 -1
- data/app/views/hyrax/users/_vitals.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/bin/dev-entrypoint.sh +13 -0
- data/chart/hyrax/Chart.yaml +5 -5
- data/chart/hyrax/templates/_helpers.tpl +8 -0
- data/chart/hyrax/templates/configmap-env.yaml +1 -1
- data/chart/hyrax/values.yaml +12 -1
- data/config/initializers/file_length_patch.rb +10 -0
- 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 +53 -0
- data/config/metadata/core_metadata.yaml +6 -0
- data/config/metadata/file_set_metadata.yaml +21 -0
- data/config/metadata/hyrax_internal_metadata.yaml +57 -0
- data/docker-compose-koppie.yml +26 -25
- data/docker-compose-sirenia.yml +202 -0
- data/docker-compose.yml +27 -24
- data/documentation/developing-your-hyrax-based-app.md +77 -60
- data/hyrax.gemspec +18 -12
- data/karma.conf.js +1 -1
- data/lib/generators/hyrax/collection_resource/templates/collection_indexer.rb.erb +1 -1
- data/lib/generators/hyrax/collection_resource/templates/collection_metadata.yaml +2 -0
- 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 +90 -19
- 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/templates/db/migrate/20230725222727_create_hyrax_counter_metrics.rb.erb +14 -0
- data/lib/generators/hyrax/templates/db/migrate/20230803165135_change_work_id_to_string.rb.erb +5 -0
- data/lib/generators/hyrax/templates/db/migrate/20230808102105_add_indices_to_hyrax_counter_metrics.rb.erb +8 -0
- data/lib/generators/hyrax/templates/db/migrate/20230821153635_add_fields_to_counter_metric.rb.erb +8 -0
- data/lib/generators/hyrax/templates/db/seeds.rb +1 -1
- data/lib/generators/hyrax/work_resource/templates/form.rb.erb +1 -1
- data/lib/generators/hyrax/work_resource/templates/indexer.rb.erb +1 -1
- data/lib/generators/hyrax/work_resource/templates/metadata.yaml +2 -0
- data/lib/hyrax/configuration.rb +241 -55
- data/lib/hyrax/controlled_vocabularies/location.rb +7 -1
- data/lib/hyrax/engine.rb +0 -1
- data/lib/hyrax/form_fields.rb +6 -0
- data/lib/hyrax/indexer.rb +1 -1
- data/lib/hyrax/publisher.rb +9 -2
- data/lib/hyrax/redis_event_store.rb +7 -8
- data/lib/hyrax/resource_name.rb +4 -0
- 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 +26 -42
- data/lib/hyrax/specs/shared_specs/hydra_works.rb +112 -27
- data/lib/hyrax/specs/shared_specs/indexers.rb +25 -7
- data/lib/hyrax/transactions/admin_set_destroy.rb +2 -1
- data/lib/hyrax/transactions/collection_destroy.rb +3 -2
- data/lib/hyrax/transactions/container.rb +47 -0
- data/lib/hyrax/transactions/file_metadata_destroy.rb +20 -0
- data/lib/hyrax/transactions/file_set_destroy.rb +3 -1
- data/lib/hyrax/transactions/file_set_update.rb +21 -0
- data/lib/hyrax/transactions/steps/add_to_parent.rb +2 -1
- 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/delete_all_file_metadata.rb +46 -0
- data/lib/hyrax/transactions/steps/delete_all_file_sets.rb +46 -0
- data/lib/hyrax/transactions/steps/file_metadata_delete.rb +40 -0
- data/lib/hyrax/transactions/steps/remove_from_membership.rb +45 -0
- 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/transactions/work_destroy.rb +3 -2
- data/lib/hyrax/version.rb +1 -1
- data/lib/hyrax.rb +1 -0
- data/lib/tasks/collection_type_global_id.rake +9 -4
- data/lib/tasks/embargo_lease.rake +2 -0
- data/lib/valkyrie/indexing/solr/indexing_adapter.rb +22 -6
- 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/active_fedora_converter.rb +6 -0
- data/lib/wings/attribute_transformer.rb +24 -17
- data/lib/wings/model_registry.rb +8 -0
- data/lib/wings/model_transformer.rb +19 -10
- data/lib/wings/orm_converter.rb +27 -18
- data/lib/wings/services/custom_queries/find_ids_by_model.rb +2 -2
- data/lib/wings/setup.rb +2 -2
- data/lib/wings/valkyrie/query_service.rb +5 -2
- data/lib/wings/valkyrie/storage.rb +8 -90
- data/lib/wings.rb +8 -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/tasks/hyrax_dev.rake +2 -33
- data/template.rb +1 -3
- metadata +184 -84
- data/.engine_cart.yml +0 -3
- data/app/indexers/hyrax/resource_indexer.rb +0 -15
- 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/views/hyrax/users/_user_util_links_extra.html.erb +0 -0
- data/lib/hyrax/specs/disable_animations_in_test_environment.rb +0 -53
- data/lib/hyrax/specs/shared_specs/valkyrie_storage_versions.rb +0 -9
- /data/app/indexers/{hyrax → concerns/hyrax}/thumbnail_indexer.rb +0 -0
@@ -0,0 +1,112 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
module Selectors
|
3
|
+
module Dashboard
|
4
|
+
def db_item_actions_toggle(item)
|
5
|
+
within "#document_#{item.id}" do
|
6
|
+
find '.dropdown-toggle'
|
7
|
+
end
|
8
|
+
end
|
9
|
+
|
10
|
+
# For use with javascript user selector that allows for searching for an existing user
|
11
|
+
# and granting them permission to an object.
|
12
|
+
# @param [User] user to select
|
13
|
+
# @param [String] role granting the user permission (e.g. 'Manager' | 'Depositor' | 'Viewer')
|
14
|
+
def select_user_for_admin_set(user, role = 'Depositor')
|
15
|
+
first('a.select2-choice').click
|
16
|
+
find('.select2-input').set(user.user_key)
|
17
|
+
first('div.select2-result-label').click
|
18
|
+
within('form.add-users') do
|
19
|
+
select(role)
|
20
|
+
click_button('Add')
|
21
|
+
end
|
22
|
+
end
|
23
|
+
|
24
|
+
# For use with javascript user selector that allows for searching for an existing user
|
25
|
+
# and granting them permission to an object.
|
26
|
+
# @param [User] user to select
|
27
|
+
# @param [String] role granting the user permission (e.g. 'Manager' | 'Depositor' | 'Viewer')
|
28
|
+
def select_user(user, role = 'Depositor')
|
29
|
+
first('a.select2-choice').click
|
30
|
+
find('.select2-input').set(user.user_key)
|
31
|
+
first('div.select2-result-label').click
|
32
|
+
within('div.add-users') do
|
33
|
+
select(role)
|
34
|
+
find('input.edit-collection-add-sharing-button').click
|
35
|
+
end
|
36
|
+
end
|
37
|
+
|
38
|
+
# For use with javascript collection selector that allows for searching for an existing collection from works relationship tab.
|
39
|
+
# Adds the collection and validates that the collection is listed in the Collection Relationship table once added.
|
40
|
+
# @param [Collection] collection to select
|
41
|
+
def select_collection(collection)
|
42
|
+
first('a.select2-choice').click
|
43
|
+
find('.select2-input').set(collection.title.first)
|
44
|
+
expect(page).to have_css('div.select2-result-label')
|
45
|
+
first('div.select2-result-label').click
|
46
|
+
first('[data-behavior~=add-relationship]').click
|
47
|
+
within('[data-behavior~=collection-relationships]') do
|
48
|
+
within('table.table.table-striped') do
|
49
|
+
expect(page).to have_content(collection.title.first)
|
50
|
+
end
|
51
|
+
end
|
52
|
+
end
|
53
|
+
|
54
|
+
# For use with javascript collection selector that allows for searching for an existing collection from add to collection modal.
|
55
|
+
# Does not save the selection. The calling test is expected to click Save and validate the collection membership was added to the work.
|
56
|
+
# @param [Collection] collection to select
|
57
|
+
def select_member_of_collection(collection) # rubocop:disable Metrics/MethodLength
|
58
|
+
find('#s2id_member_of_collection_ids').click
|
59
|
+
find('.select2-input').set(collection.title.first)
|
60
|
+
|
61
|
+
# Crude way of waiting for the AJAX response
|
62
|
+
select2_results = false
|
63
|
+
begin_time = current_time = Time.now.to_f
|
64
|
+
while !select2_results && (current_time - begin_time) < 3
|
65
|
+
select2_results = page.has_css?('li.select2-result')
|
66
|
+
current_time = Time.now.to_f
|
67
|
+
end
|
68
|
+
|
69
|
+
within ".select2-result" do
|
70
|
+
find("span", text: collection.title.first).click
|
71
|
+
end
|
72
|
+
end
|
73
|
+
end
|
74
|
+
|
75
|
+
module NewTransfers
|
76
|
+
def new_owner_dropdown
|
77
|
+
find '#s2id_proxy_deposit_request_transfer_to'
|
78
|
+
end
|
79
|
+
|
80
|
+
def new_owner_search_field
|
81
|
+
within '#select2-drop' do
|
82
|
+
find '.select2-input'
|
83
|
+
end
|
84
|
+
end
|
85
|
+
|
86
|
+
def new_owner_search_result
|
87
|
+
within '#select2-drop' do
|
88
|
+
find '.select2-result-selectable'
|
89
|
+
end
|
90
|
+
end
|
91
|
+
end
|
92
|
+
|
93
|
+
module Transfers
|
94
|
+
def first_sent_cancel_button
|
95
|
+
within '#outgoing-transfers' do
|
96
|
+
find '.btn.btn-danger'
|
97
|
+
end
|
98
|
+
end
|
99
|
+
|
100
|
+
def first_received_accept_dropdown
|
101
|
+
within '#incoming-transfers' do
|
102
|
+
find '.dropdown-toggle.accept'
|
103
|
+
end
|
104
|
+
end
|
105
|
+
|
106
|
+
def first_received_reject_button
|
107
|
+
within '#incoming-transfers' do
|
108
|
+
find '.btn.btn-danger'
|
109
|
+
end
|
110
|
+
end
|
111
|
+
end
|
112
|
+
end
|
@@ -0,0 +1,44 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
RSpec.shared_examples "a total_viewable method" do
|
4
|
+
context('empty collection') { it { is_expected.to eq 0 } }
|
5
|
+
|
6
|
+
context "null members" do
|
7
|
+
let(:presenter) { described_class.new(SolrDocument.new(id: '123'), ability) }
|
8
|
+
|
9
|
+
it { is_expected.to eq 0 }
|
10
|
+
end
|
11
|
+
end
|
12
|
+
|
13
|
+
RSpec.shared_examples "a collection with public work and sub-collection" do
|
14
|
+
context "collection with public work and sub-collection" do
|
15
|
+
let!(:work) { create(:public_work, member_of_collections: [collection]) }
|
16
|
+
let!(:subcollection) { create(:public_collection_lw, member_of_collections: [collection]) }
|
17
|
+
|
18
|
+
it { is_expected.to eq 1 }
|
19
|
+
end
|
20
|
+
end
|
21
|
+
|
22
|
+
RSpec.shared_examples "a collection with public collection" do
|
23
|
+
context "collection with public collection" do
|
24
|
+
let!(:subcollection) { create(:public_collection_lw, member_of_collections: [collection]) }
|
25
|
+
|
26
|
+
it { is_expected.to eq 1 }
|
27
|
+
end
|
28
|
+
end
|
29
|
+
|
30
|
+
RSpec.shared_examples "a collection with public work" do
|
31
|
+
context "collection with public work" do
|
32
|
+
let!(:work) { create(:public_work, member_of_collections: [collection]) }
|
33
|
+
|
34
|
+
it { is_expected.to eq 1 }
|
35
|
+
end
|
36
|
+
end
|
37
|
+
|
38
|
+
RSpec.shared_examples "a collection with private work" do
|
39
|
+
context "collection with private work" do
|
40
|
+
let!(:work) { create(:private_work, member_of_collections: [collection]) }
|
41
|
+
|
42
|
+
it { is_expected.to eq 0 }
|
43
|
+
end
|
44
|
+
end
|
@@ -0,0 +1,28 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Hyrax
|
4
|
+
module Test
|
5
|
+
##
|
6
|
+
# A generic PCDM Work, with only Hyrax "core" (required) metadata.
|
7
|
+
#
|
8
|
+
# @example building with FactoryBot
|
9
|
+
# work = FactoryBot.build(:hyrax_work, :public, title: ['Comet in Moominland'])
|
10
|
+
#
|
11
|
+
# @example creating with FactoryBot
|
12
|
+
# work = FactoryBot.valkyrie_create(:hyrax_work, :public, title: ['Comet in Moominland'])
|
13
|
+
class SimpleWork < Hyrax::Work; end
|
14
|
+
|
15
|
+
class SimpleWorkLegacy < ActiveFedora::Base
|
16
|
+
include WorkBehavior
|
17
|
+
include CoreMetadata
|
18
|
+
end
|
19
|
+
|
20
|
+
class SimpleWorkSearchBuilder < Hyrax::WorkSearchBuilder
|
21
|
+
def work_types
|
22
|
+
[Hyrax::Test::SimpleWorkLegacy]
|
23
|
+
end
|
24
|
+
end
|
25
|
+
end
|
26
|
+
end
|
27
|
+
|
28
|
+
Wings::ModelRegistry.register(Hyrax::Test::SimpleWork, Hyrax::Test::SimpleWorkLegacy) if defined?(Wings)
|
@@ -0,0 +1,24 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
# This is a replacement for the OpenStruct usage. The idea is to expose
|
3
|
+
# an object with a common interface.
|
4
|
+
class SpecStatistic
|
5
|
+
def initialize(**kargs)
|
6
|
+
@attributes = kargs.symbolize_keys
|
7
|
+
end
|
8
|
+
|
9
|
+
def [](key)
|
10
|
+
@attributes[key.to_sym]
|
11
|
+
end
|
12
|
+
|
13
|
+
def method_missing(method_name, *arguments, &block)
|
14
|
+
if @attributes.key?(method_name.to_sym)
|
15
|
+
@attributes[method_name]
|
16
|
+
else
|
17
|
+
super
|
18
|
+
end
|
19
|
+
end
|
20
|
+
|
21
|
+
def respond_to_missing?(method_name, include_private = false)
|
22
|
+
@attributes.key?(method_name.to_sym) || super
|
23
|
+
end
|
24
|
+
end
|
@@ -0,0 +1,9 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
return if Hyrax.config.disable_wings
|
4
|
+
|
5
|
+
# Clear existing Collection mapping to allow reverse lookups to resolve CollectionResource.
|
6
|
+
# Then restore PcdmCollection for any code directly using that model.
|
7
|
+
Wings::ModelRegistry.unregister(Hyrax::PcdmCollection)
|
8
|
+
Wings::ModelRegistry.register(CollectionResource, ::Collection)
|
9
|
+
Wings::ModelRegistry.register(Hyrax::PcdmCollection, ::Collection)
|
data/tasks/hyrax_dev.rake
CHANGED
@@ -1,7 +1,6 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
require 'English'
|
3
3
|
require 'rspec/core/rake_task'
|
4
|
-
require 'engine_cart/rake_task'
|
5
4
|
require 'rubocop/rake_task'
|
6
5
|
|
7
6
|
desc 'Run style checker'
|
@@ -11,16 +10,6 @@ end
|
|
11
10
|
|
12
11
|
RSpec::Core::RakeTask.new(:spec)
|
13
12
|
|
14
|
-
desc 'Spin up test servers and run specs'
|
15
|
-
task :spec_with_app_load do
|
16
|
-
require 'solr_wrapper' # necessary for rake_support to work
|
17
|
-
require 'fcrepo_wrapper' # necessary for rake_support to work
|
18
|
-
require 'active_fedora/rake_support'
|
19
|
-
with_test_server do
|
20
|
-
Rake::Task['spec'].invoke
|
21
|
-
end
|
22
|
-
end
|
23
|
-
|
24
13
|
desc "Sort locales keys in alphabetic order."
|
25
14
|
task :i18n_sorter do
|
26
15
|
require 'i18n_yaml_sorter'
|
@@ -34,28 +23,8 @@ task :i18n_sorter do
|
|
34
23
|
end
|
35
24
|
end
|
36
25
|
|
37
|
-
|
38
|
-
|
39
|
-
# This generate task should only add its action to an existing engine_cart:generate task
|
40
|
-
raise 'engine_cart:generate task should already be defined' unless Rake::Task.task_defined?('engine_cart:generate')
|
41
|
-
task :generate do |_task|
|
42
|
-
puts 'Running post-generation operations...'
|
43
|
-
Rake::Task['engine_cart:after_generate'].invoke
|
44
|
-
end
|
45
|
-
|
46
|
-
desc 'Operations that need to run after the test_app migrations have run'
|
47
|
-
task :after_generate do
|
48
|
-
puts 'Creating default collection type...'
|
49
|
-
EngineCart.within_test_app do
|
50
|
-
raise "EngineCart failed on with: #{$CHILD_STATUS}" unless
|
51
|
-
system('bundle exec rake hyrax:default_collection_types:create')
|
52
|
-
end
|
53
|
-
end
|
54
|
-
end
|
55
|
-
end
|
56
|
-
|
57
|
-
desc 'Generate the engine_cart and spin up test servers and run specs'
|
58
|
-
task ci: ['rubocop', 'engine_cart:generate'] do
|
26
|
+
desc 'Run rubocop and then run specs'
|
27
|
+
task ci: ['rubocop'] do
|
59
28
|
puts 'running continuous integration'
|
60
29
|
Rake::Task['spec_with_app_load'].invoke
|
61
30
|
end
|
data/template.rb
CHANGED
@@ -1,6 +1,4 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
-
|
3
|
-
gsub_file 'Gemfile', /^gem ["']sqlite3["']$/, 'gem "sqlite3", "~> 1.3.0"'
|
4
|
-
gem 'hyrax', '5.0.0.rc1'
|
2
|
+
gem 'hyrax', '5.0.0.rc3'
|
5
3
|
run 'bundle install'
|
6
4
|
generate 'hyrax:install', '-f'
|