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.
Files changed (307) hide show
  1. checksums.yaml +4 -4
  2. data/.circleci/config.yml +14 -0
  3. data/.dassie/app/listeners/hyrax_listener.rb +81 -0
  4. data/.dassie/config/environments/test.rb +0 -5
  5. data/.dassie/config/initializers/hyrax.rb +5 -0
  6. data/.dassie/config/initializers/publisher.rb +3 -0
  7. data/.dassie/config/initializers/riiif.rb +77 -0
  8. data/.gitignore +4 -0
  9. data/.koppie/.env +2 -2
  10. data/.koppie/app/forms/collection_resource_form.rb +1 -0
  11. data/.koppie/app/indexers/collection_resource_indexer.rb +1 -0
  12. data/.koppie/app/listeners/hyrax_listener.rb +81 -0
  13. data/.koppie/app/models/collection.rb +1 -1
  14. data/.koppie/app/models/collection_resource.rb +1 -0
  15. data/.koppie/config/analytics.yml +5 -5
  16. data/.koppie/config/initializers/publisher.rb +3 -0
  17. data/.koppie/config/initializers/riiif.rb +78 -0
  18. data/.koppie/config/metadata/collection_resource.yaml +8 -166
  19. data/.koppie/config/metadata/sample_metadata.yaml +4 -0
  20. data/CONTAINERS.md +39 -2
  21. data/Dockerfile +14 -11
  22. data/Gemfile +8 -7
  23. data/README.md +2 -0
  24. data/app/actors/hyrax/actors/base_actor.rb +6 -3
  25. data/app/actors/hyrax/actors/file_actor.rb +1 -1
  26. data/app/actors/hyrax/actors/lease_actor.rb +3 -6
  27. data/app/assets/javascripts/hyrax/save_work/uploaded_files.es6 +10 -2
  28. data/app/assets/stylesheets/hyrax/sidebar.scss +6 -1
  29. data/app/controllers/concerns/hyrax/collections_controller_behavior.rb +1 -1
  30. data/app/controllers/concerns/hyrax/local_file_downloads_controller_behavior.rb +12 -19
  31. data/app/controllers/concerns/hyrax/stream_file_downloads_controller_behavior.rb +54 -0
  32. data/app/controllers/concerns/hyrax/valkyrie_downloads_controller_behavior.rb +38 -9
  33. data/app/controllers/concerns/hyrax/works_controller_behavior.rb +19 -14
  34. data/app/controllers/hyrax/admin/admin_sets_controller.rb +2 -2
  35. data/app/controllers/hyrax/admin/analytics/work_reports_controller.rb +5 -5
  36. data/app/controllers/hyrax/dashboard/collections_controller.rb +2 -2
  37. data/app/controllers/hyrax/downloads_controller.rb +1 -0
  38. data/app/controllers/hyrax/file_sets_controller.rb +3 -2
  39. data/app/controllers/hyrax/my/collections_controller.rb +1 -1
  40. data/app/forms/concerns/hyrax/basic_metadata_form_fields_behavior.rb +1 -0
  41. data/app/forms/concerns/hyrax/contained_in_works_behavior.rb +24 -0
  42. data/app/forms/concerns/hyrax/deposit_agreement_behavior.rb +12 -0
  43. data/app/forms/concerns/hyrax/leaseability_behavior.rb +49 -0
  44. data/app/forms/concerns/hyrax/permission_behavior.rb +20 -0
  45. data/app/forms/hyrax/forms/administrative_set_form.rb +1 -5
  46. data/app/forms/hyrax/forms/collection_form.rb +19 -0
  47. data/app/forms/hyrax/forms/file_set_form.rb +5 -0
  48. data/app/forms/hyrax/forms/pcdm_collection_form.rb +1 -5
  49. data/app/forms/hyrax/forms/pcdm_object_form.rb +13 -22
  50. data/app/forms/hyrax/forms/resource_batch_edit_form.rb +7 -2
  51. data/app/forms/hyrax/forms/resource_form.rb +30 -100
  52. data/app/forms/hyrax/forms.rb +52 -0
  53. data/app/helpers/hyrax/hyrax_helper_behavior.rb +2 -0
  54. data/app/indexers/{hyrax → concerns/hyrax}/location_indexer.rb +1 -5
  55. data/app/indexers/{hyrax → concerns/hyrax}/permission_indexer.rb +2 -2
  56. data/app/indexers/{hyrax → concerns/hyrax}/visibility_indexer.rb +1 -1
  57. data/app/indexers/hyrax/administrative_set_indexer.rb +5 -17
  58. data/app/indexers/hyrax/indexers/administrative_set_indexer.rb +25 -0
  59. data/app/indexers/hyrax/indexers/file_set_indexer.rb +144 -0
  60. data/app/indexers/hyrax/indexers/pcdm_collection_indexer.rb +27 -0
  61. data/app/indexers/hyrax/indexers/pcdm_object_indexer.rb +72 -0
  62. data/app/indexers/hyrax/indexers/resource_indexer.rb +86 -0
  63. data/app/indexers/hyrax/indexers.rb +54 -0
  64. data/app/indexers/hyrax/pcdm_collection_indexer.rb +5 -18
  65. data/app/indexers/hyrax/valkyrie_collection_indexer.rb +6 -4
  66. data/app/indexers/hyrax/valkyrie_file_set_indexer.rb +5 -136
  67. data/app/indexers/hyrax/valkyrie_indexer.rb +8 -112
  68. data/app/indexers/hyrax/valkyrie_work_indexer.rb +5 -64
  69. data/app/indexers/hyrax/work_indexer.rb +1 -0
  70. data/app/jobs/create_work_job.rb +1 -0
  71. data/app/models/admin_set.rb +20 -1
  72. data/app/models/collection.rb +5 -0
  73. data/app/models/concerns/hyrax/ability/admin_set_ability.rb +13 -28
  74. data/app/models/concerns/hyrax/ability/collection_ability.rb +26 -28
  75. data/app/models/concerns/hyrax/ability/resource_ability.rb +19 -0
  76. data/app/models/concerns/hyrax/ability.rb +11 -9
  77. data/app/models/concerns/hyrax/collection_behavior.rb +8 -0
  78. data/app/models/concerns/hyrax/solr_document_behavior.rb +15 -5
  79. data/app/models/concerns/hyrax/work_behavior.rb +4 -0
  80. data/app/models/featured_work.rb +12 -4
  81. data/app/models/file_set.rb +5 -0
  82. data/app/models/hyrax/administrative_set.rb +1 -1
  83. data/app/models/hyrax/change_set.rb +2 -2
  84. data/app/models/hyrax/file_metadata.rb +34 -7
  85. data/app/models/hyrax/file_set.rb +2 -2
  86. data/app/models/hyrax/group.rb +9 -38
  87. data/app/models/hyrax/group_behavior.rb +58 -0
  88. data/app/models/hyrax/model_registry.rb +111 -0
  89. data/app/models/hyrax/pcdm_collection.rb +1 -7
  90. data/app/models/hyrax/resource.rb +66 -8
  91. data/app/models/hyrax/statistic.rb +1 -1
  92. data/app/models/hyrax/work.rb +1 -7
  93. data/app/presenters/hyrax/collapsable_section_presenter.rb +7 -3
  94. data/app/presenters/hyrax/file_set_presenter.rb +8 -6
  95. data/app/presenters/hyrax/lease_presenter.rb +4 -0
  96. data/app/presenters/hyrax/menu_presenter.rb +14 -2
  97. data/app/presenters/hyrax/pcdm_member_presenter_factory.rb +1 -1
  98. data/app/presenters/hyrax/version_list_presenter.rb +6 -4
  99. data/app/search_builders/hyrax/admin_set_search_builder.rb +1 -1
  100. data/app/search_builders/hyrax/catalog_search_builder.rb +2 -2
  101. data/app/search_builders/hyrax/dashboard/collections_search_builder.rb +5 -3
  102. data/app/search_builders/hyrax/exposed_models_relation.rb +1 -1
  103. data/app/search_builders/hyrax/file_set_search_builder.rb +1 -1
  104. data/app/search_builders/hyrax/filter_by_type.rb +3 -2
  105. data/app/search_builders/hyrax/member_with_files_search_builder.rb +1 -1
  106. data/app/search_builders/hyrax/my/collections_search_builder.rb +2 -2
  107. data/app/search_builders/hyrax/my/find_works_search_builder.rb +8 -3
  108. data/app/services/hyrax/access_control_list.rb +21 -4
  109. data/app/services/hyrax/action/create_valkyrie_work.rb +80 -0
  110. data/app/services/hyrax/admin_set_create_service.rb +7 -3
  111. data/app/services/hyrax/admin_set_service.rb +2 -2
  112. data/app/services/hyrax/collections/collection_member_search_service.rb +2 -0
  113. data/app/services/hyrax/collections/permissions_service.rb +27 -9
  114. data/app/services/hyrax/custom_queries/find_collections_by_type.rb +1 -1
  115. data/app/services/hyrax/custom_queries/find_file_metadata.rb +1 -1
  116. data/app/services/hyrax/custom_queries/navigators/find_files.rb +1 -1
  117. data/app/services/hyrax/custom_queries/navigators/parent_work_navigator.rb +1 -1
  118. data/app/services/hyrax/edit_permissions_service.rb +1 -1
  119. data/app/services/hyrax/embargo_manager.rb +1 -1
  120. data/app/services/hyrax/file_set_file_service.rb +21 -10
  121. data/app/services/hyrax/form_factory.rb +1 -1
  122. data/app/services/hyrax/lease_manager.rb +39 -16
  123. data/app/services/hyrax/lease_service.rb +12 -6
  124. data/app/services/hyrax/listeners/acl_index_listener.rb +1 -1
  125. data/app/services/hyrax/listeners/active_fedora_acl_index_listener.rb +1 -1
  126. data/app/services/hyrax/listeners/member_cleanup_listener.rb +15 -1
  127. data/app/services/hyrax/listeners/object_lifecycle_listener.rb +5 -1
  128. data/app/services/hyrax/listeners/trophy_cleanup_listener.rb +2 -1
  129. data/app/services/hyrax/listeners/workflow_listener.rb +13 -0
  130. data/app/services/hyrax/listeners.rb +2 -1
  131. data/app/services/hyrax/location_service.rb +3 -0
  132. data/app/services/hyrax/multiple_membership_checker.rb +1 -1
  133. data/app/services/hyrax/simple_schema_loader.rb +1 -1
  134. data/app/services/hyrax/solr_service.rb +19 -5
  135. data/app/services/hyrax/statistics/collections/over_time.rb +1 -1
  136. data/app/services/hyrax/statistics/query_service.rb +6 -0
  137. data/app/services/hyrax/valkyrie_persist_derivatives.rb +11 -4
  138. data/app/services/hyrax/valkyrie_upload.rb +1 -1
  139. data/app/services/hyrax/work_uploads_handler.rb +5 -4
  140. data/app/views/_user_util_links.html.erb +1 -1
  141. data/app/views/collections/edit_fields/_based_near.html.erb +11 -7
  142. data/app/views/hyrax/admin/admin_sets/_form_participants.html.erb +67 -67
  143. data/app/views/hyrax/admin/admin_sets/edit.html.erb +1 -1
  144. data/app/views/hyrax/admin/collection_types/_form_participants.html.erb +3 -1
  145. data/app/views/hyrax/base/_attribute_rows.html.erb +1 -0
  146. data/app/views/hyrax/base/_base_form_files_prepend.html.erb +4 -0
  147. data/app/views/hyrax/base/_form_files.html.erb +65 -64
  148. data/app/views/hyrax/base/show.html.erb +2 -3
  149. data/app/views/hyrax/collections/show.html.erb +7 -9
  150. data/app/views/hyrax/dashboard/_sidebar.html.erb +4 -3
  151. data/app/views/hyrax/dashboard/collections/_form_share_table.html.erb +2 -2
  152. data/app/views/hyrax/file_sets/media_display/_audio.html.erb +1 -1
  153. data/app/views/hyrax/file_sets/media_display/_video.html.erb +1 -1
  154. data/app/views/hyrax/my/facet.html.erb +1 -1
  155. data/app/views/layouts/_head_tag_content.html.erb +1 -0
  156. data/app/views/shared/_footer.html.erb +1 -1
  157. data/chart/hyrax/Chart.yaml +3 -3
  158. data/chart/hyrax/values.yaml +9 -1
  159. data/config/initializers/listeners.rb +1 -1
  160. data/config/locales/hyrax.de.yml +5 -0
  161. data/config/locales/hyrax.en.yml +10 -0
  162. data/config/locales/hyrax.es.yml +5 -0
  163. data/config/locales/hyrax.fr.yml +5 -0
  164. data/config/locales/hyrax.it.yml +5 -0
  165. data/config/locales/hyrax.pt-BR.yml +5 -0
  166. data/config/locales/hyrax.zh.yml +5 -0
  167. data/config/metadata/basic_metadata.yaml +1 -0
  168. data/config/metadata/core_metadata.yaml +2 -0
  169. data/config/metadata/file_set_metadata.yaml +2 -0
  170. data/docker-compose-koppie.yml +3 -3
  171. data/docker-compose-sirenia.yml +3 -3
  172. data/documentation/developing-your-hyrax-based-app.md +77 -60
  173. data/hyrax.gemspec +9 -2
  174. data/lib/generators/hyrax/collection_resource/templates/collection_indexer.rb.erb +1 -1
  175. data/lib/generators/hyrax/config_generator.rb +12 -0
  176. data/lib/generators/hyrax/install_generator.rb +37 -7
  177. data/lib/generators/hyrax/listeners_generator.rb +18 -0
  178. data/lib/generators/hyrax/models_generator.rb +1 -10
  179. data/lib/generators/hyrax/riiif_generator.rb +6 -4
  180. data/lib/generators/hyrax/templates/.env +9 -0
  181. data/lib/generators/hyrax/templates/.lando.yml +50 -0
  182. data/lib/generators/hyrax/templates/app/listeners/hyrax_listener.rb +81 -0
  183. data/lib/generators/hyrax/templates/app/models/file_set.rb +1 -2
  184. data/lib/generators/hyrax/templates/config/initializers/1_valkyrie.rb +102 -0
  185. data/lib/generators/hyrax/templates/config/initializers/file_services.rb +6 -0
  186. data/lib/generators/hyrax/templates/config/initializers/hyrax.rb +41 -5
  187. data/lib/generators/hyrax/templates/config/initializers/publisher.rb +3 -0
  188. data/lib/generators/hyrax/templates/config/initializers/riiif.rb +77 -0
  189. data/lib/generators/hyrax/templates/config/locales/hyrax.de.yml +1 -1
  190. data/lib/generators/hyrax/templates/config/locales/hyrax.en.yml +1 -1
  191. data/lib/generators/hyrax/templates/config/locales/hyrax.es.yml +1 -1
  192. data/lib/generators/hyrax/templates/config/locales/hyrax.fr.yml +1 -1
  193. data/lib/generators/hyrax/templates/config/locales/hyrax.it.yml +1 -1
  194. data/lib/generators/hyrax/templates/config/locales/hyrax.pt-BR.yml +1 -1
  195. data/lib/generators/hyrax/templates/config/locales/hyrax.zh.yml +1 -1
  196. data/lib/generators/hyrax/templates/config/redis.yml +3 -6
  197. data/lib/generators/hyrax/templates/config/valkyrie_index.yml +4 -9
  198. data/lib/generators/hyrax/work_resource/templates/indexer.rb.erb +1 -1
  199. data/lib/hyrax/configuration.rb +95 -7
  200. data/lib/hyrax/indexer.rb +1 -1
  201. data/lib/hyrax/publisher.rb +5 -2
  202. data/lib/hyrax/resource_sync/change_list_writer.rb +1 -1
  203. data/lib/hyrax/resource_sync/resource_list_writer.rb +1 -1
  204. data/lib/hyrax/specs/capybara.rb +1 -0
  205. data/lib/hyrax/specs/shared_specs/hydra_works.rb +78 -20
  206. data/lib/hyrax/specs/shared_specs/indexers.rb +1 -1
  207. data/lib/hyrax/transactions/admin_set_destroy.rb +2 -1
  208. data/lib/hyrax/transactions/container.rb +5 -0
  209. data/lib/hyrax/transactions/steps/add_to_parent.rb +1 -0
  210. data/lib/hyrax/transactions/steps/check_for_default_admin_set.rb +32 -0
  211. data/lib/hyrax/transactions/steps/check_for_empty_admin_set.rb +1 -1
  212. data/lib/hyrax/transactions/steps/save.rb +2 -1
  213. data/lib/hyrax/transactions/steps/set_user_as_creator.rb +1 -1
  214. data/lib/hyrax/transactions/steps/update_work_members.rb +2 -0
  215. data/lib/hyrax/version.rb +1 -1
  216. data/lib/hyrax.rb +1 -0
  217. data/lib/tasks/embargo_lease.rake +1 -0
  218. data/lib/valkyrie/indexing/solr/indexing_adapter.rb +21 -7
  219. data/lib/wings/active_fedora_converter/default_work.rb +4 -5
  220. data/lib/wings/active_fedora_converter/file_metadata_node.rb +1 -1
  221. data/lib/wings/model_registry.rb +8 -0
  222. data/lib/wings/model_transformer.rb +19 -2
  223. data/lib/wings/orm_converter.rb +4 -0
  224. data/lib/wings/services/custom_queries/find_ids_by_model.rb +2 -2
  225. data/lib/wings/valkyrie/query_service.rb +5 -2
  226. data/lib/wings.rb +3 -0
  227. data/spec/factories/access_control.rb +12 -0
  228. data/spec/factories/admin_sets.rb +32 -0
  229. data/spec/factories/admin_sets_lw.rb +222 -0
  230. data/spec/factories/administrative_sets.rb +79 -0
  231. data/spec/factories/api_items.rb +92 -0
  232. data/spec/factories/collection_branding_infos.rb +12 -0
  233. data/spec/factories/collection_type_participants.rb +9 -0
  234. data/spec/factories/collection_types.rb +139 -0
  235. data/spec/factories/collections.rb +282 -0
  236. data/spec/factories/collections_factory.rb +107 -0
  237. data/spec/factories/content_blocks.rb +5 -0
  238. data/spec/factories/counter_metrics.rb +12 -0
  239. data/spec/factories/featured_works.rb +5 -0
  240. data/spec/factories/file_sets.rb +45 -0
  241. data/spec/factories/generic_works.rb +200 -0
  242. data/spec/factories/hyrax_collection.rb +92 -0
  243. data/spec/factories/hyrax_default_admin_set.rb +7 -0
  244. data/spec/factories/hyrax_embargo.rb +18 -0
  245. data/spec/factories/hyrax_file_metadata.rb +92 -0
  246. data/spec/factories/hyrax_file_set.rb +129 -0
  247. data/spec/factories/hyrax_lease.rb +18 -0
  248. data/spec/factories/hyrax_resource.rb +15 -0
  249. data/spec/factories/hyrax_work.rb +221 -0
  250. data/spec/factories/object_id.rb +7 -0
  251. data/spec/factories/operations.rb +22 -0
  252. data/spec/factories/permission.rb +7 -0
  253. data/spec/factories/permission_template_accesses.rb +17 -0
  254. data/spec/factories/permission_templates.rb +111 -0
  255. data/spec/factories/proxy_deposit_requests.rb +7 -0
  256. data/spec/factories/single_use_links.rb +14 -0
  257. data/spec/factories/sipity_entities.rb +17 -0
  258. data/spec/factories/uploaded_files.rb +11 -0
  259. data/spec/factories/users.rb +52 -0
  260. data/spec/factories/workflow_actions.rb +7 -0
  261. data/spec/factories/workflow_states.rb +7 -0
  262. data/spec/factories/workflows.rb +7 -0
  263. data/spec/support/book_resource.rb +36 -0
  264. data/spec/support/can_can_overrides.rb +43 -0
  265. data/spec/support/clean_solr.rb +7 -0
  266. data/spec/support/controller_level_helpers.rb +27 -0
  267. data/spec/support/factory_helpers.rb +94 -0
  268. data/spec/support/fakes/fake_actor.rb +22 -0
  269. data/spec/support/fakes/fake_authority.rb +14 -0
  270. data/spec/support/fakes/fake_search_builder_scope.rb +44 -0
  271. data/spec/support/fakes/indexing_adapter.rb +17 -0
  272. data/spec/support/fakes/test_hydra_group_service.rb +55 -0
  273. data/spec/support/features/batch_edit_actions.rb +37 -0
  274. data/spec/support/features/session_helpers.rb +15 -0
  275. data/spec/support/features/workflow.rb +10 -0
  276. data/spec/support/features.rb +11 -0
  277. data/spec/support/form_with_validations.rb +15 -0
  278. data/spec/support/input_support.rb +12 -0
  279. data/spec/support/logging_formatter.rb +67 -0
  280. data/spec/support/matchers/api_responses.rb +27 -0
  281. data/spec/support/matchers/collection_type_property_matchers.rb +30 -0
  282. data/spec/support/matchers/embargo.rb +9 -0
  283. data/spec/support/matchers/lease.rb +9 -0
  284. data/spec/support/matchers/match_valkyrie_ids_with_af_ids.rb +12 -0
  285. data/spec/support/matchers/pcdm_matchers.rb +34 -0
  286. data/spec/support/matchers/permission.rb +31 -0
  287. data/spec/support/matchers/response_matchers.rb +8 -0
  288. data/spec/support/optional_example.rb +17 -0
  289. data/spec/support/rake.rb +42 -0
  290. data/spec/support/selectors.rb +112 -0
  291. data/spec/support/shared_examples_for_collection_presenter.rb +44 -0
  292. data/spec/support/simple_work.rb +28 -0
  293. data/spec/support/spec_statistic.rb +24 -0
  294. data/spec/support/speedup.rb +7 -0
  295. data/spec/support/statistic_helper.rb +10 -0
  296. data/spec/support/valkyrie_indexing.rb +2 -0
  297. data/spec/support/wings_models.rb +9 -0
  298. data/template.rb +1 -3
  299. metadata +112 -30
  300. data/app/indexers/hyrax/resource_indexer.rb +0 -15
  301. data/app/models/concerns/hyrax/riiif_file.rb +0 -30
  302. data/app/services/hyrax/characterization/model_wrapper.rb +0 -0
  303. data/app/services/hyrax/custom_queries/find_by_collection_type.rb +0 -0
  304. data/app/services/hyrax/query_service.rb +0 -0
  305. data/app/services/hyrax/riiif_file_resolver.rb +0 -50
  306. data/lib/hyrax/specs/disable_animations_in_test_environment.rb +0 -53
  307. /data/app/indexers/{hyrax → concerns/hyrax}/thumbnail_indexer.rb +0 -0
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 951cca50f478f6a77b0b4dfd7f7127de250891ae5f26af3d0aad431e84987506
4
- data.tar.gz: 4748c1f1c6a6a744e9ddbf364de06d028548f3699aa5a25c33104259672b412d
3
+ metadata.gz: 020c1b9b867c89474795692fb51cc03751ecfd10feb8dd300750b12891b3687c
4
+ data.tar.gz: 41385b0600e001653ed3eb30b239b1520125fb52192af6543d6be53ffb76d0e4
5
5
  SHA512:
6
- metadata.gz: e24d5fd70134e1c27b39cd266a51b18838fc8b29d815b91d9df80e96c53f5348ba0b87647cf15894886de61ac4c7e49afbb4ecb9b9708b38f74959d74b339480
7
- data.tar.gz: 745e7abf8b5f773864867f91b75f74a1768c97dddd7de35085b65d7dae48513bc2b06dd233365de9445940ebc3af9ad01bd53276e6b58bd4fcffc217e63aaa94
6
+ metadata.gz: 1c56457afe4451c9bd228ef1b45e2d431c60855ba1b744c14f4320ceefa92020d9c4bff083d0d39271c8e8cf2d3db3a79ff0630ece9f676180c21a6b928fee13
7
+ data.tar.gz: 144eda52bc5bee7caba33a113324e27fa5c00102c9422264758f68ab28f59844d6a1bb8ff6301d251cd17fc34e6e8cc4aa089c1b22c11249d3988070e935dcb8
data/.circleci/config.yml CHANGED
@@ -119,6 +119,7 @@ jobs:
119
119
  HYRAX_VALKYRIE: << parameters.hyrax_valkyrie >>
120
120
  IN_DOCKER: true
121
121
  KARMA_BROWSER: remote-chromium
122
+ SOLR_URL: http://127.0.0.1:8985/solr/hydra-test
122
123
  VALKYRIE_SOLR_CORE: valkyrie-test
123
124
  VALKYRIE_SOLR_PORT: 8985
124
125
  steps:
@@ -165,3 +166,16 @@ workflows:
165
166
  hyrax_valkyrie: "1"
166
167
  requires:
167
168
  - dassie-build
169
+
170
+ koppie:
171
+ jobs:
172
+ - kaniko-build:
173
+ name: "koppie-build"
174
+ ruby_version: "3.2.2"
175
+ hyrax_app: "koppie"
176
+ - hyrax-test:
177
+ name: "koppie-test"
178
+ ruby_version: "3.2.2"
179
+ hyrax_app: "koppie"
180
+ requires:
181
+ - koppie-build
@@ -0,0 +1,81 @@
1
+ # frozen_string_literal: true
2
+
3
+ ##
4
+ # Generated by hyrax:listeners
5
+ #
6
+ # The Hyrax engine uses a publish/subscribe programming model to allow
7
+ # pluggable behavior in response to certain repository events. A range of events
8
+ # are published on a topic based event bus.
9
+ #
10
+ # This listener provides a template.
11
+ #
12
+ # For simple use cases, it's fine to add behavior to the `#on_*` methods in this
13
+ # Listener. If you have more than trivial behavior here, you probably want to add
14
+ # new classes that are named narrowly scoped and named for what the listener is
15
+ # for.
16
+ #
17
+ # When writing listener methods, it's important to carefully consider error,
18
+ # handling. Unhandled exceptions short-circuit behavior for other listeners,
19
+ # so it's a good idea to be paying attention to failure cases.
20
+ #
21
+ # @see https://github.com/samvera/hyrax/wiki/Hyrax's-Event-Bus-(Hyrax::Publisher)
22
+ # @see https://www.rubydoc.info/gems/hyrax/Hyrax/Publisher
23
+ # @see https://dry-rb.org/gems/dry-events
24
+ class HyraxListener
25
+ # def on_batch_created
26
+ # end
27
+
28
+ # def on_collection_deleted
29
+ # end
30
+
31
+ # def on_collection_metadata_updated
32
+ # end
33
+
34
+ # def on_collection_membership_update
35
+ # end
36
+
37
+ # def on_file_characterized
38
+ # end
39
+
40
+ # def on_file_downloaded
41
+ # end
42
+
43
+ # def on_file_metadata_updated
44
+ # end
45
+
46
+ # def on_file_metadata_deleted
47
+ # end
48
+
49
+ # def on_file_uploaded
50
+ # end
51
+
52
+ # def on_file_set_audited
53
+ # end
54
+
55
+ # def on_file_set_attached
56
+ # end
57
+
58
+ # def on_file_set_url_imported
59
+ # end
60
+
61
+ # def on_file_set_restored
62
+ # end
63
+
64
+ # def on_object_deleted
65
+ # end
66
+
67
+ # def on_object_failed_deposit
68
+ # end
69
+
70
+ # def on_object_deposited
71
+ # end
72
+
73
+ # def on_object_acl_updated
74
+ # end
75
+
76
+ # def on_object_membership_updated
77
+ # end
78
+
79
+ # def on_object_metadata_updated
80
+ # end
81
+ end
@@ -1,5 +1,3 @@
1
- require 'hyrax/specs/disable_animations_in_test_environment'
2
-
3
1
  Rails.application.configure do
4
2
  # Settings specified here will take precedence over those in config/application.rb.
5
3
  config.assets.debug = true
@@ -46,7 +44,4 @@ Rails.application.configure do
46
44
 
47
45
  # Raises error for missing translations
48
46
  config.action_view.raise_on_missing_translations = true
49
-
50
- # disable animations with shared hyrax code
51
- config.middleware.use DisableAnimationsInTestEnvironment
52
47
  end
@@ -63,6 +63,11 @@ Hyrax.config do |config|
63
63
  # config.collection_model = 'Hyrax::PcdmCollection' # collection without basic metadata
64
64
  # config.collection_model = 'CollectionResource' # collection with basic metadata
65
65
  # config.admin_set_model = 'Hyrax::AdministrativeSet'
66
+
67
+ # dassie needs legacy AF models
68
+ config.collection_model = '::Collection'
69
+ config.admin_set_model = 'AdminSet'
70
+ config.file_set_model = '::FileSet'
66
71
  end
67
72
 
68
73
  Date::DATE_FORMATS[:standard] = "%m/%d/%Y"
@@ -0,0 +1,3 @@
1
+ # frozen_string_literal: true
2
+
3
+ # Hyrax.publisher.subscribe(HyraxListener.new)
@@ -31,3 +31,80 @@ Rails.application.reloader.to_prepare do
31
31
 
32
32
  Riiif::Engine.config.cache_duration = 1.day
33
33
  end
34
+
35
+ module Hyrax
36
+ # Adds file locking to Riiif::File
37
+ # @see RiiifFileResolver
38
+ class RiiifFile < Riiif::File
39
+ include ActiveSupport::Benchmarkable
40
+
41
+ attr_reader :id
42
+ def initialize(input_path, tempfile = nil, id:)
43
+ super(input_path, tempfile)
44
+ raise(ArgumentError, "must specify id") if id.blank?
45
+ @id = id
46
+ end
47
+
48
+ # Wrap extract in a read lock and benchmark it
49
+ def extract(transformation, image_info = nil)
50
+ Riiif::Image.file_resolver.file_locks[id].with_read_lock do
51
+ benchmark "RiiifFile extracted #{path} with #{transformation.to_params}", level: :debug do
52
+ super
53
+ end
54
+ end
55
+ end
56
+
57
+ private
58
+
59
+ def logger
60
+ Hyrax.logger
61
+ end
62
+ end
63
+
64
+ class RiiifFileResolver
65
+ include ActiveSupport::Benchmarkable
66
+
67
+ # @param [String] id from iiif manifest
68
+ # @return [Riiif::File]
69
+ def find(id)
70
+ path = nil
71
+ file_locks[id].with_write_lock do
72
+ path = build_path(id)
73
+ path = build_path(id, force: true) unless File.exist?(path) # Ensures the file is locally available
74
+ end
75
+ RiiifFile.new(path, id: id)
76
+ end
77
+
78
+ # tracks individual file locks
79
+ # @see RiiifFile
80
+ # @return [Concurrent::Map<Concurrent::ReadWriteLock>]
81
+ def file_locks
82
+ @file_locks ||= Concurrent::Map.new do |k, v|
83
+ k.compute_if_absent(v) { Concurrent::ReadWriteLock.new }
84
+ end
85
+ end
86
+
87
+ private
88
+
89
+ def build_path(id, force: false)
90
+ Riiif::Image.cache.fetch("riiif:" + Digest::MD5.hexdigest("path:#{id}"),
91
+ expires_in: Riiif::Image.expires_in,
92
+ force: force) do
93
+ load_file(id)
94
+ end
95
+ end
96
+
97
+ def load_file(id)
98
+ benchmark "RiiifFileResolver loaded #{id}", level: :debug do
99
+ fs_id = id.sub(/\A([^\/]*)\/.*/, '\1')
100
+ file_set = Hyrax.query_service.find_by(id: fs_id)
101
+ file_metadata = Hyrax.custom_queries.find_original_file(file_set: file_set)
102
+ file_metadata.file.disk_path.to_s # Stores a local copy in tmpdir
103
+ end
104
+ end
105
+
106
+ def logger
107
+ Hyrax.logger
108
+ end
109
+ end
110
+ end
data/.gitignore CHANGED
@@ -10,6 +10,10 @@ Gemfile*.lock
10
10
  fcrepo4-data
11
11
  fcrepo4-test-data
12
12
 
13
+ ## JS lock files
14
+ yarn.lock
15
+ package-lock.json
16
+
13
17
  ## MAC OS
14
18
  .DS_Store
15
19
 
data/.koppie/.env CHANGED
@@ -43,6 +43,6 @@ SOLR_CORES=koppie
43
43
  SOLR_HOST=solr
44
44
  SOLR_PORT=8983
45
45
  SOLR_URL=http://solr:8983/solr/koppie
46
- SOLR_TEST_URL=http://solr:8983/solr/koppie_test
46
+ SOLR_TEST_URL=http://solr:8983/solr/hydra-test
47
47
  VALKYRIE_METADATA_ADAPTER=pg_metadata
48
- VALKYRIE_STORAGE_ADAPTER=versioned_disk_storage
48
+ VALKYRIE_STORAGE_ADAPTER=versioned_disk_storage
@@ -3,5 +3,6 @@
3
3
  # Generated via
4
4
  # `rails generate hyrax:collection_resource CollectionResource`
5
5
  class CollectionResourceForm < Hyrax::Forms::PcdmCollectionForm
6
+ include Hyrax::FormFields(:basic_metadata)
6
7
  include Hyrax::FormFields(:collection_resource)
7
8
  end
@@ -3,5 +3,6 @@
3
3
  # Generated via
4
4
  # `rails generate hyrax:collection_resource CollectionResource`
5
5
  class CollectionResourceIndexer < Hyrax::PcdmCollectionIndexer
6
+ include Hyrax::Indexer(:basic_metadata)
6
7
  include Hyrax::Indexer(:collection_resource)
7
8
  end
@@ -0,0 +1,81 @@
1
+ # frozen_string_literal: true
2
+
3
+ ##
4
+ # Generated by hyrax:listeners
5
+ #
6
+ # The Hyrax engine uses a publish/subscribe programming model to allow
7
+ # pluggable behavior in response to certain repository events. A range of events
8
+ # are published on a topic based event bus.
9
+ #
10
+ # This listener provides a template.
11
+ #
12
+ # For simple use cases, it's fine to add behavior to the `#on_*` methods in this
13
+ # Listener. If you have more than trivial behavior here, you probably want to add
14
+ # new classes that are named narrowly scoped and named for what the listener is
15
+ # for.
16
+ #
17
+ # When writing listener methods, it's important to carefully consider error,
18
+ # handling. Unhandled exceptions short-circuit behavior for other listeners,
19
+ # so it's a good idea to be paying attention to failure cases.
20
+ #
21
+ # @see https://github.com/samvera/hyrax/wiki/Hyrax's-Event-Bus-(Hyrax::Publisher)
22
+ # @see https://www.rubydoc.info/gems/hyrax/Hyrax/Publisher
23
+ # @see https://dry-rb.org/gems/dry-events
24
+ class HyraxListener
25
+ # def on_batch_created
26
+ # end
27
+
28
+ # def on_collection_deleted
29
+ # end
30
+
31
+ # def on_collection_metadata_updated
32
+ # end
33
+
34
+ # def on_collection_membership_update
35
+ # end
36
+
37
+ # def on_file_characterized
38
+ # end
39
+
40
+ # def on_file_downloaded
41
+ # end
42
+
43
+ # def on_file_metadata_updated
44
+ # end
45
+
46
+ # def on_file_metadata_deleted
47
+ # end
48
+
49
+ # def on_file_uploaded
50
+ # end
51
+
52
+ # def on_file_set_audited
53
+ # end
54
+
55
+ # def on_file_set_attached
56
+ # end
57
+
58
+ # def on_file_set_url_imported
59
+ # end
60
+
61
+ # def on_file_set_restored
62
+ # end
63
+
64
+ # def on_object_deleted
65
+ # end
66
+
67
+ # def on_object_failed_deposit
68
+ # end
69
+
70
+ # def on_object_deposited
71
+ # end
72
+
73
+ # def on_object_acl_updated
74
+ # end
75
+
76
+ # def on_object_membership_updated
77
+ # end
78
+
79
+ # def on_object_metadata_updated
80
+ # end
81
+ end
@@ -1 +1 @@
1
- Collection = Hyrax::PcdmCollection
1
+ Collection = CollectionResource
@@ -27,5 +27,6 @@ class CollectionResource < Hyrax::PcdmCollection
27
27
  # * add Valkyrie attributes to this class
28
28
  # * update form and indexer to process the attributes
29
29
  #
30
+ include Hyrax::Schema(:basic_metadata)
30
31
  include Hyrax::Schema(:collection_resource)
31
32
  end
@@ -1,12 +1,12 @@
1
1
  analytics:
2
2
  google:
3
3
  analytics_id: <%= ENV['GOOGLE_ANALYTICS_ID'] %>
4
- app_name: <%= ENV.fetch('GOOGLE_OAUTH_APP_NAME', 'nurax-pg') %>
5
- app_version: <%= ENV.fetch['GOOGLE_OAUTH_APP_VERSION'] %>
4
+ app_name: <%= ENV['GOOGLE_OAUTH_APP_NAME'] %>
5
+ app_version: <%= ENV['GOOGLE_OAUTH_APP_VERSION'] %>
6
6
  privkey_value: <%= ENV['GOOGLE_OAUTH_PRIVATE_KEY_VALUE'] %>
7
- privkey_path: <%= ENV.fetch['GOOGLE_OAUTH_PRIVATE_KEY_PATH'] %>
8
- privkey_secret: <%= ENV.fetch['GOOGLE_OAUTH_PRIVATE_KEY_SECRET'] %>
9
- client_email: <%= ENV.fetch['GOOGLE_OAUTH_CLIENT_EMAIL'] %>
7
+ privkey_path: <%= ENV['GOOGLE_OAUTH_PRIVATE_KEY_PATH'] %>
8
+ privkey_secret: <%= ENV['GOOGLE_OAUTH_PRIVATE_KEY_SECRET'] %>
9
+ client_email: <%= ENV['GOOGLE_OAUTH_CLIENT_EMAIL'] %>
10
10
  matomo:
11
11
  base_url: <%= ENV['MATOMO_BASE_URL'] %>
12
12
  site_id: <%= ENV['MATOMO_SITE_ID'] %>
@@ -0,0 +1,3 @@
1
+ # frozen_string_literal: true
2
+
3
+ # Hyrax.publisher.subscribe(HyraxListener.new)
@@ -31,3 +31,81 @@ Rails.application.reloader.to_prepare do
31
31
 
32
32
  Riiif::Engine.config.cache_duration = 1.day
33
33
  end
34
+
35
+ module Hyrax
36
+ # Adds file locking to Riiif::File
37
+ # @see RiiifFileResolver
38
+ class RiiifFile < Riiif::File
39
+ include ActiveSupport::Benchmarkable
40
+
41
+ attr_reader :id
42
+ def initialize(input_path, tempfile = nil, id:)
43
+ super(input_path, tempfile)
44
+ raise(ArgumentError, "must specify id") if id.blank?
45
+ @id = id
46
+ end
47
+
48
+ # Wrap extract in a read lock and benchmark it
49
+ def extract(transformation, image_info = nil)
50
+ Riiif::Image.file_resolver.file_locks[id].with_read_lock do
51
+ benchmark "RiiifFile extracted #{path} with #{transformation.to_params}", level: :debug do
52
+ super
53
+ end
54
+ end
55
+ end
56
+
57
+ private
58
+
59
+ def logger
60
+ Hyrax.logger
61
+ end
62
+ end
63
+
64
+ class RiiifFileResolver
65
+ include ActiveSupport::Benchmarkable
66
+
67
+ # @param [String] id from iiif manifest
68
+ # @return [Riiif::File]
69
+ def find(id)
70
+ path = nil
71
+ file_locks[id].with_write_lock do
72
+ path = build_path(id)
73
+ path = build_path(id, force: true) unless File.exist?(path) # Ensures the file is locally available
74
+ end
75
+ RiiifFile.new(path, id: id)
76
+ end
77
+
78
+ # tracks individual file locks
79
+ # @see RiiifFile
80
+ # @return [Concurrent::Map<Concurrent::ReadWriteLock>]
81
+ def file_locks
82
+ @file_locks ||= Concurrent::Map.new do |k, v|
83
+ k.compute_if_absent(v) { Concurrent::ReadWriteLock.new }
84
+ end
85
+ end
86
+
87
+ private
88
+
89
+ def build_path(id, force: false)
90
+ Riiif::Image.cache.fetch("riiif:" + Digest::MD5.hexdigest("path:#{id}"),
91
+ expires_in: Riiif::Image.expires_in,
92
+ force: force) do
93
+ load_file(id)
94
+ end
95
+ end
96
+
97
+ def load_file(id)
98
+ benchmark "RiiifFileResolver loaded #{id}", level: :debug do
99
+ fs_id = id.sub(/\A([^\/]*)\/.*/, '\1')
100
+ file_set = Hyrax.query_service.find_by(id: fs_id)
101
+ file_metadata = Hyrax.custom_queries.find_original_file(file_set: file_set)
102
+ file_metadata.file.disk_path.to_s # Stores a local copy in tmpdir
103
+ end
104
+ end
105
+
106
+ def logger
107
+ Hyrax.logger
108
+ end
109
+ end
110
+ end
111
+
@@ -22,177 +22,19 @@
22
22
  # `rails generate hyrax:collection_resource CollectionResource`
23
23
 
24
24
  attributes:
25
- description:
25
+ target_audience:
26
26
  type: string
27
- multiple: true
28
27
  form:
29
28
  primary: true
30
- index_keys:
31
- - "description_tesim"
32
- predicate: http://purl.org/dc/elements/1.1/description
33
- creator:
29
+ multiple: true
30
+ predicate: http://hyrax-example.com/target_audience
31
+ department:
34
32
  type: string
35
- multiple: true
36
33
  form:
37
- required: false
38
- primary: false
39
- index_keys:
40
- - "creator_tesim"
41
- predicate: http://purl.org/dc/elements/1.1/creator
42
- rights_statement:
43
- type: string
44
- multiple: true
45
- form:
46
- primary: false
47
- index_keys:
48
- - "rights_statement_tesim"
49
- predicate: http://www.europeana.eu/schemas/edm/rights
50
- abstract:
51
- type: string
52
- multiple: true
53
- form:
54
- primary: false
55
- index_keys:
56
- - "abstract_tesim"
57
- predicate: http://purl.org/dc/terms/abstract
58
- access_right:
59
- type: string
60
- multiple: true
61
- form:
62
- primary: false
63
- index_keys:
64
- - "access_right_tesim"
65
- predicate: http://purl.org/dc/terms/accessRights
66
- alternative_title:
67
- type: string
68
- multiple: true
69
- form:
70
- primary: false
71
- index_keys:
72
- - "alternative_title_tesim"
73
- predicate: http://purl.org/dc/terms/alternative
74
- based_near:
75
- type: string
76
- multiple: true
77
- form:
78
- primary: false
79
- index_keys:
80
- - "based_near_sim"
81
- - "based_near_tesim"
82
- predicate: http://xmlns.com/foaf/0.1/based_near
83
- bibliographic_citation:
84
- type: string
85
- multiple: true
86
- predicate: http://purl.org/dc/terms/bibliographicCitation
87
- contributor:
88
- type: string
89
- multiple: true
90
- form:
91
- primary: false
92
- index_keys:
93
- - "contributor_tesim"
94
- predicate: http://purl.org/dc/elements/1.1/contributor
95
- date_created:
96
- type: date_time
97
- multiple: true
98
- form:
99
- primary: false
100
- index_keys:
101
- - "date_created_tesim"
102
- predicate: http://purl.org/dc/terms/created
103
- identifier:
104
- type: string
105
- multiple: true
106
- form:
107
- primary: false
108
- index_keys:
109
- - "identifier_tesim"
110
- predicate: http://purl.org/dc/terms/identifier
111
- import_url:
112
- type: string
113
- predicate: http://scholarsphere.psu.edu/ns#importUrl
114
- keyword:
115
- type: string
116
- multiple: true
117
- index_keys:
118
- - "keyword_sim"
119
- - "keyword_tesim"
120
- form:
121
- primary: false
122
- predicate: http://schema.org/keywords
123
- publisher:
124
- type: string
125
- multiple: true
126
- form:
127
- primary: false
128
- index_keys:
129
- - "publisher_tesim"
130
- predicate: http://purl.org/dc/elements/1.1/publisher
131
- label:
132
- type: string
133
- form:
134
- primary: false
135
- index_keys:
136
- - "label_tesim"
137
- predicate: info:fedora/fedora-system:def/model#downloadFilename
138
- language:
139
- type: string
140
- multiple: true
141
- form:
142
- primary: false
143
- index_keys:
144
- - "language_tesim"
145
- predicate: http://purl.org/dc/elements/1.1/language
146
- license:
147
- type: string
148
- multiple: true
149
- form:
150
- primary: false
151
- index_keys:
152
- - "license_tesim"
153
- predicate: http://purl.org/dc/terms/license
154
- relative_path:
155
- type: string
156
- predicate: http://scholarsphere.psu.edu/ns#relativePath
157
- related_url:
158
- type: string
159
- multiple: true
160
- form:
161
- primary: false
162
- index_keys:
163
- - "related_url_tesim"
164
- predicate: http://www.w3.org/2000/01/rdf-schema#seeAlso
165
- resource_type:
166
- type: string
167
- multiple: true
168
- form:
169
- primary: false
170
- index_keys:
171
- - "resource_type_sim"
172
- - "resource_type_tesim"
173
- predicate: http://purl.org/dc/terms/type
174
- rights_notes:
175
- type: string
176
- multiple: true
177
- form:
178
- primary: false
179
- index_keys:
180
- - "rights_notes_tesim"
181
- predicate: http://purl.org/dc/elements/1.1/rights
182
- source:
183
- type: string
184
- multiple: true
185
- form:
186
- primary: false
187
- index_keys:
188
- - "source_tesim"
189
- predicate: http://purl.org/dc/terms/source
190
- subject:
34
+ primary: true
35
+ predicate: http://hyrax-example.com/department
36
+ course:
191
37
  type: string
192
- multiple: true
193
- index_keys:
194
- - "subject_sim"
195
- - "subject_tesim"
196
38
  form:
197
39
  primary: false
198
- predicate: http://purl.org/dc/elements/1.1/subject
40
+ predicate: http://hyrax-example.com/course
@@ -0,0 +1,4 @@
1
+ attributes:
2
+ sample_attribute:
3
+ type: string
4
+ predicate: http://hyrax-example.com/sample_attribute