hyrax 5.0.0.rc2 → 5.0.0
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 -5
- 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 +8 -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/templates/_tmplvalues.tpl +38 -0
- data/chart/hyrax/templates/deployment-worker.yaml +6 -2
- data/chart/hyrax/templates/deployment.yaml +9 -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 +89 -67
- 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 +113 -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,11 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
# spec/support/features.rb
|
3
|
+
require File.expand_path('../features/session_helpers', __FILE__)
|
4
|
+
require File.expand_path('../features/workflow', __FILE__)
|
5
|
+
require File.expand_path('../features/batch_edit_actions', __FILE__)
|
6
|
+
require File.expand_path('../selectors', __FILE__)
|
7
|
+
require File.expand_path('../statistic_helper', __FILE__)
|
8
|
+
|
9
|
+
RSpec.configure do |config|
|
10
|
+
config.include Features::SessionHelpers, type: :feature
|
11
|
+
end
|
@@ -0,0 +1,15 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
module Hyrax
|
3
|
+
module Test
|
4
|
+
class FormWithValidations < Hyrax::Forms::ResourceForm
|
5
|
+
property :title
|
6
|
+
|
7
|
+
validates :title, presence: true
|
8
|
+
|
9
|
+
# Added to comply with Hyrax::Forms::FailedSubmissionFormWrapper
|
10
|
+
def permitted_params
|
11
|
+
{ title: [] }
|
12
|
+
end
|
13
|
+
end
|
14
|
+
end
|
15
|
+
end
|
@@ -0,0 +1,12 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
module InputSupport
|
3
|
+
extend ActiveSupport::Concern
|
4
|
+
|
5
|
+
include RSpec::Rails::HelperExampleGroup
|
6
|
+
|
7
|
+
def input_for(object, attribute_name, options = {})
|
8
|
+
helper.simple_form_for object, url: '' do |f|
|
9
|
+
f.input attribute_name, options
|
10
|
+
end
|
11
|
+
end
|
12
|
+
end
|
@@ -0,0 +1,67 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
RSpec::Support.require_rspec_core "formatters/base_text_formatter"
|
3
|
+
class LoggingFormatter < RSpec::Core::Formatters::ProgressFormatter
|
4
|
+
RSpec::Core::Formatters.register self, :example_started, :example_passed, :dump_profile
|
5
|
+
def initialize(output)
|
6
|
+
@profile = []
|
7
|
+
reset!
|
8
|
+
ActiveSupport::Notifications.subscribe("http.ldp", method(:record_request))
|
9
|
+
super
|
10
|
+
end
|
11
|
+
|
12
|
+
def record_request(*_unused, data)
|
13
|
+
@request_count += 1
|
14
|
+
@request_count_by_name[data[:name]] += 1
|
15
|
+
end
|
16
|
+
|
17
|
+
def example_passed(passed)
|
18
|
+
super
|
19
|
+
@profile << { description: passed.example.full_description,
|
20
|
+
count: @request_count,
|
21
|
+
location: passed.example.location,
|
22
|
+
count_by_name: @request_count_by_name }
|
23
|
+
end
|
24
|
+
|
25
|
+
def example_started(_passed)
|
26
|
+
reset!
|
27
|
+
end
|
28
|
+
|
29
|
+
def reset!
|
30
|
+
@request_count = 0
|
31
|
+
@request_count_by_name = { 'HEAD' => 0,
|
32
|
+
'GET' => 0,
|
33
|
+
'POST' => 0,
|
34
|
+
'DELETE' => 0,
|
35
|
+
'PUT' => 0,
|
36
|
+
'PATCH' => 0 }
|
37
|
+
end
|
38
|
+
|
39
|
+
def dump_profile(profile)
|
40
|
+
dump_most_ldp_exampes(profile)
|
41
|
+
output.puts ""
|
42
|
+
dump_slowest_examples(profile)
|
43
|
+
end
|
44
|
+
|
45
|
+
private
|
46
|
+
|
47
|
+
def dump_most_ldp_exampes(_prof)
|
48
|
+
output.puts "Examples with the most LDP requests"
|
49
|
+
top = @profile.sort_by { |hash| hash[:count] }.last(10)
|
50
|
+
top.each do |hash|
|
51
|
+
result = hash[:count_by_name].select { |_, v| v.positive? }
|
52
|
+
next if result.empty?
|
53
|
+
output.puts " #{hash[:description]}"
|
54
|
+
output.puts " #{hash[:location]}"
|
55
|
+
output.puts " Total LDP: #{hash[:count]} #{result}"
|
56
|
+
end
|
57
|
+
end
|
58
|
+
|
59
|
+
def dump_slowest_examples(profile)
|
60
|
+
output.puts "Slowest examples"
|
61
|
+
profile.slowest_examples.each do |slowest_example|
|
62
|
+
output.puts " #{slowest_example.full_description}"
|
63
|
+
output.puts " #{slowest_example.location}"
|
64
|
+
output.puts " #{slowest_example.execution_result.run_time} seconds"
|
65
|
+
end
|
66
|
+
end
|
67
|
+
end
|
@@ -0,0 +1,27 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
# RSpec matchers for API default JSON responses.
|
3
|
+
# Creates a matcher like respond_forbidden or respond_not_found corresponding to each of the Api::V1.default_responses
|
4
|
+
# Accepts optional overrides to the expected response body.
|
5
|
+
# @example Override the description expected in the JSON body of a :forbidden response
|
6
|
+
# expect(response).to respond_forbidden(description:"You can't create for that identity")
|
7
|
+
::Hyrax::API.default_responses.each_pair do |response_type, default_response_body|
|
8
|
+
RSpec::Matchers.define "respond_#{response_type}".to_sym do |expectation_options|
|
9
|
+
match do |response|
|
10
|
+
@expected_response_body = expectation_options.nil? ? default_response_body : default_response_body.merge(expectation_options)
|
11
|
+
expect(response.body).not_to be_empty
|
12
|
+
json = JSON.parse(response.body)
|
13
|
+
expect(response.code).to eq(@expected_response_body[:code].to_s)
|
14
|
+
@expected_response_body.each_pair do |key, value|
|
15
|
+
expect(json[key.to_s]).to eq(value.as_json)
|
16
|
+
end
|
17
|
+
end
|
18
|
+
|
19
|
+
failure_message do |actual|
|
20
|
+
"expected #{default_response_body[:code]} status code. Got #{actual.code} status code.\n" \
|
21
|
+
"expected an Authentication Required response like this:\n" \
|
22
|
+
" #{@expected_response_body.to_json} \ngot\n #{actual.body}\n" \
|
23
|
+
"To override expectations about the response body, provide a Hash of overrides in " \
|
24
|
+
"your call to :respond_#{response_type} "
|
25
|
+
end
|
26
|
+
end
|
27
|
+
end
|
@@ -0,0 +1,30 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
RSpec::Matchers.define :require_membership do
|
3
|
+
match do |actual|
|
4
|
+
actual&.require_membership?
|
5
|
+
end
|
6
|
+
end
|
7
|
+
|
8
|
+
RSpec::Matchers.define :allow_multiple_membership do
|
9
|
+
match do |actual|
|
10
|
+
actual&.allow_multiple_membership?
|
11
|
+
end
|
12
|
+
end
|
13
|
+
|
14
|
+
RSpec::Matchers.define :assign_visibility do
|
15
|
+
match do |actual|
|
16
|
+
actual&.assigns_visibility?
|
17
|
+
end
|
18
|
+
end
|
19
|
+
|
20
|
+
RSpec::Matchers.define :assign_workflow do
|
21
|
+
match do |actual|
|
22
|
+
actual&.assigns_workflow?
|
23
|
+
end
|
24
|
+
end
|
25
|
+
|
26
|
+
RSpec::Matchers.define :have_collections do
|
27
|
+
match do |actual|
|
28
|
+
actual&.collections&.any?
|
29
|
+
end
|
30
|
+
end
|
@@ -0,0 +1,9 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
RSpec::Matchers.define :be_an_embargo_matching do |embargo_args|
|
4
|
+
match do |embargo|
|
5
|
+
(embargo.visibility_after_embargo == embargo_args[:after]) &&
|
6
|
+
(embargo.visibility_during_embargo == embargo_args[:during]) &&
|
7
|
+
embargo.embargo_release_date.to_s.start_with?(embargo_args[:release_date][0..9])
|
8
|
+
end
|
9
|
+
end
|
@@ -0,0 +1,9 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
RSpec::Matchers.define :be_a_lease_matching do |lease_args|
|
4
|
+
match do |lease|
|
5
|
+
(lease.visibility_after_lease == lease_args[:after]) &&
|
6
|
+
(lease.visibility_during_lease == lease_args[:during]) &&
|
7
|
+
lease.lease_expiration_date.to_s.start_with?(lease_args[:release_date][0..9])
|
8
|
+
end
|
9
|
+
end
|
@@ -0,0 +1,12 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
module Hyrax::Matchers
|
3
|
+
class MatchValkyrieIdsWithActiveFedoraIds < RSpec::Matchers::BuiltIn::ContainExactly
|
4
|
+
def match_when_sorted?
|
5
|
+
values_match?(safe_sort(expected), safe_sort(actual.map(&:id)))
|
6
|
+
end
|
7
|
+
end
|
8
|
+
|
9
|
+
def match_valkyrie_ids_with_active_fedora_ids(expected_fedora_ids)
|
10
|
+
MatchValkyrieIdsWithActiveFedoraIds.new(expected_fedora_ids)
|
11
|
+
end
|
12
|
+
end
|
@@ -0,0 +1,34 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
RSpec::Matchers.define :have_file_set_members do |*expected_file_sets|
|
3
|
+
match do |actual_work|
|
4
|
+
actual_file_sets = Hyrax.custom_queries.find_child_file_sets(resource: actual_work)
|
5
|
+
|
6
|
+
expect(actual_file_sets).to contain_exactly(*expected_file_sets)
|
7
|
+
end
|
8
|
+
end
|
9
|
+
|
10
|
+
RSpec::Matchers.define :have_attached_files do |*expected_files|
|
11
|
+
match do |actual_file_set|
|
12
|
+
@actual_files = Hyrax.custom_queries.find_files(file_set: actual_file_set)
|
13
|
+
|
14
|
+
(expected_files.empty? && @actual_files.any?) ||
|
15
|
+
values_match?(expected_files, @actual_files)
|
16
|
+
end
|
17
|
+
|
18
|
+
failure_message_for_should do |actual_file_set|
|
19
|
+
if expected_files.empty?
|
20
|
+
"Expected #{actual_file_set} to have at least one file.\n" \
|
21
|
+
"Found #{@actual_files}."
|
22
|
+
else
|
23
|
+
"Expected #{actual_file_set} to have files: #{expected_files}\n" \
|
24
|
+
"Found #{@actual_files}."
|
25
|
+
end
|
26
|
+
end
|
27
|
+
end
|
28
|
+
|
29
|
+
RSpec::Matchers.define :be_a_resource_with_permissions do |*expected_permissions|
|
30
|
+
match do |actual_resource|
|
31
|
+
expect(Hyrax::AccessControlList.new(resource: actual_resource).permissions)
|
32
|
+
.to include(*expected_permissions)
|
33
|
+
end
|
34
|
+
end
|
@@ -0,0 +1,31 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
RSpec::Matchers.define :grant_permission do |acl_type|
|
4
|
+
match do |permission|
|
5
|
+
access_match = permission.access == acl_type.to_s
|
6
|
+
|
7
|
+
agent_match =
|
8
|
+
if user_id
|
9
|
+
permission.type == 'person' &&
|
10
|
+
permission.agent.first.id.include?(user_id.to_s)
|
11
|
+
elsif group_id
|
12
|
+
permission.type == 'group' &&
|
13
|
+
permission.agent.first.id.include?(group_id.to_s)
|
14
|
+
else
|
15
|
+
true
|
16
|
+
end
|
17
|
+
|
18
|
+
target_match =
|
19
|
+
if access_to_id
|
20
|
+
permission.access_to_id == access_to_id.to_s
|
21
|
+
else
|
22
|
+
true
|
23
|
+
end
|
24
|
+
|
25
|
+
return access_match && agent_match && target_match
|
26
|
+
end
|
27
|
+
|
28
|
+
chain :on, :access_to_id
|
29
|
+
chain :to_user, :user_id
|
30
|
+
chain :to_group, :group_id
|
31
|
+
end
|
@@ -0,0 +1,17 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
module OptionalExample
|
3
|
+
RSpec.configure do |config|
|
4
|
+
config.after do |example|
|
5
|
+
if example.metadata[:optional] && (RSpec::Core::Pending::PendingExampleFixedError === example.display_exception) # rubocop:disable Style/CaseEquality
|
6
|
+
ex = example.display_exception
|
7
|
+
example.display_exception = nil
|
8
|
+
example.execution_result.pending_exception = ex
|
9
|
+
end
|
10
|
+
end
|
11
|
+
end
|
12
|
+
|
13
|
+
def optional(message)
|
14
|
+
RSpec.current_example.metadata[:optional] = true
|
15
|
+
pending(message)
|
16
|
+
end
|
17
|
+
end
|
@@ -0,0 +1,42 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
require 'rake'
|
3
|
+
|
4
|
+
module RakeHelper
|
5
|
+
def load_rake_environment(files)
|
6
|
+
@rake = Rake::Application.new
|
7
|
+
Rake.application = @rake
|
8
|
+
Rake::Task.define_task(:environment)
|
9
|
+
files.each { |file| load file }
|
10
|
+
end
|
11
|
+
|
12
|
+
def run_task(task, arg = nil)
|
13
|
+
capture_stdout_stderr do
|
14
|
+
@rake[task].invoke(arg)
|
15
|
+
end
|
16
|
+
end
|
17
|
+
|
18
|
+
# saves original $stdout in variable
|
19
|
+
# set $stdout as local instance of StringIO
|
20
|
+
# yields to code execution
|
21
|
+
# returns the local instance of StringIO
|
22
|
+
# resets $stdout to original value
|
23
|
+
def capture_stdout_stderr
|
24
|
+
out = StringIO.new
|
25
|
+
err = StringIO.new
|
26
|
+
$stdout = out
|
27
|
+
$stderr = err
|
28
|
+
begin
|
29
|
+
yield
|
30
|
+
rescue SystemExit => e
|
31
|
+
puts "error = #{e.inspect}"
|
32
|
+
end
|
33
|
+
"Output: #{out.string}\n Errors:#{err.string}"
|
34
|
+
ensure
|
35
|
+
$stdout = STDOUT
|
36
|
+
$stdout = STDERR
|
37
|
+
end
|
38
|
+
|
39
|
+
RSpec.configure do |config|
|
40
|
+
config.include RakeHelper
|
41
|
+
end
|
42
|
+
end
|
@@ -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/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.rc2'
|
2
|
+
gem 'hyrax', '5.0.0'
|
5
3
|
run 'bundle install'
|
6
4
|
generate 'hyrax:install', '-f'
|