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.
Files changed (431) hide show
  1. checksums.yaml +4 -4
  2. data/.circleci/config.yml +25 -4
  3. data/.dassie/.env +5 -1
  4. data/.dassie/Gemfile +27 -42
  5. data/.dassie/Gemfile.dassie +2 -0
  6. data/.dassie/app/assets/config/manifest.js +2 -0
  7. data/.dassie/app/assets/stylesheets/hyrax.scss +1 -0
  8. data/.dassie/app/listeners/hyrax_listener.rb +81 -0
  9. data/.dassie/config/environments/test.rb +0 -5
  10. data/.dassie/config/initializers/hyrax.rb +5 -0
  11. data/.dassie/config/initializers/publisher.rb +3 -0
  12. data/.dassie/config/initializers/riiif.rb +82 -11
  13. data/.dassie/config/metadata/collection_resource.yaml +3 -0
  14. data/.dassie/config/metadata/monograph.yaml +8 -0
  15. data/.dassie/config/metadata/sample_metadata.yaml +1 -0
  16. data/.dassie/config/redis.yml +2 -0
  17. data/.dassie/db/migrate/20230725222727_create_hyrax_counter_metrics.hyrax.rb +14 -0
  18. data/.dassie/db/migrate/20230803165135_change_work_id_to_string.rb +5 -0
  19. data/.dassie/db/migrate/20230808102105_add_indices_to_hyrax_counter_metrics.hyrax.rb +8 -0
  20. data/.dassie/db/migrate/20230821153635_add_fields_to_counter_metric.rb +8 -0
  21. data/.dassie/db/schema.rb +20 -1
  22. data/.dockerignore +2 -1
  23. data/.gitignore +5 -1
  24. data/.koppie/.env +10 -4
  25. data/.koppie/Gemfile +10 -12
  26. data/.koppie/Gemfile.koppie +2 -0
  27. data/.koppie/Rakefile +0 -2
  28. data/.koppie/app/listeners/hyrax_listener.rb +81 -0
  29. data/.koppie/app/models/ability.rb +1 -5
  30. data/.koppie/app/models/collection.rb +1 -1
  31. data/.koppie/app/models/user.rb +0 -2
  32. data/.koppie/config/analytics.yml +5 -5
  33. data/.koppie/config/application.rb +2 -1
  34. data/.koppie/config/arkivo.yml +6 -0
  35. data/.koppie/config/blacklight.yml +2 -2
  36. data/.koppie/config/features.yml +2 -0
  37. data/.koppie/config/initializers/1_valkyrie.rb +29 -6
  38. data/.koppie/config/initializers/arkivo_constraint.rb +12 -0
  39. data/.koppie/config/initializers/hyrax.rb +2 -2
  40. data/.koppie/config/initializers/publisher.rb +3 -0
  41. data/.koppie/config/initializers/riiif.rb +84 -11
  42. data/.koppie/config/metadata/collection_resource.yaml +19 -1
  43. data/.koppie/config/metadata/generic_work.yaml +2 -0
  44. data/.koppie/config/metadata/monograph.yaml +10 -0
  45. data/.koppie/config/metadata/sample_metadata.yaml +4 -0
  46. data/.koppie/config/role_map.yml +3 -25
  47. data/.koppie/config/routes.rb +1 -2
  48. data/.koppie/config/solr.yml +1 -1
  49. data/.koppie/config/valkyrie_index.yml +4 -10
  50. data/.koppie/config/zotero.yml +6 -0
  51. data/.koppie/db/migrate/20230725222727_create_hyrax_counter_metrics.hyrax.rb +14 -0
  52. data/.koppie/db/migrate/20230803165135_change_work_id_to_string.rb +5 -0
  53. data/.koppie/db/schema.rb +12 -1
  54. data/CONTAINERS.md +39 -4
  55. data/Dockerfile +25 -13
  56. data/Gemfile +8 -24
  57. data/Gemfile.dassie +2 -0
  58. data/Gemfile.koppie +2 -0
  59. data/README.md +2 -1
  60. data/Rakefile +0 -11
  61. data/app/actors/hyrax/actors/base_actor.rb +6 -3
  62. data/app/actors/hyrax/actors/embargo_actor.rb +3 -6
  63. data/app/actors/hyrax/actors/file_actor.rb +1 -1
  64. data/app/actors/hyrax/actors/lease_actor.rb +3 -6
  65. data/app/assets/javascripts/hyrax/batch_select_all.js +1 -1
  66. data/app/assets/javascripts/hyrax/file_manager/member.es6 +1 -1
  67. data/app/assets/javascripts/hyrax/save_work/uploaded_files.es6 +10 -2
  68. data/app/assets/stylesheets/hyrax/_file-listing.scss +0 -2
  69. data/app/assets/stylesheets/hyrax/_work-show.scss +19 -3
  70. data/app/assets/stylesheets/hyrax/sidebar.scss +29 -1
  71. data/app/controllers/concerns/hyrax/collections_controller_behavior.rb +1 -1
  72. data/app/controllers/concerns/hyrax/embargoes_controller_behavior.rb +7 -1
  73. data/app/controllers/concerns/hyrax/leases_controller_behavior.rb +7 -1
  74. data/app/controllers/concerns/hyrax/local_file_downloads_controller_behavior.rb +12 -19
  75. data/app/controllers/concerns/hyrax/stream_file_downloads_controller_behavior.rb +54 -0
  76. data/app/controllers/concerns/hyrax/valkyrie_downloads_controller_behavior.rb +52 -18
  77. data/app/controllers/concerns/hyrax/works_controller_behavior.rb +69 -23
  78. data/app/controllers/hyrax/admin/admin_sets_controller.rb +2 -2
  79. data/app/controllers/hyrax/admin/analytics/work_reports_controller.rb +5 -5
  80. data/app/controllers/hyrax/api/items_controller.rb +2 -3
  81. data/app/controllers/hyrax/batch_edits_controller.rb +6 -6
  82. data/app/controllers/hyrax/batch_uploads_controller.rb +5 -1
  83. data/app/controllers/hyrax/dashboard/collections_controller.rb +6 -3
  84. data/app/controllers/hyrax/downloads_controller.rb +1 -0
  85. data/app/controllers/hyrax/file_sets_controller.rb +51 -7
  86. data/app/controllers/hyrax/my/collections_controller.rb +3 -1
  87. data/app/controllers/hyrax/single_use_links_viewer_controller.rb +16 -2
  88. data/app/forms/concerns/hyrax/basic_metadata_form_fields_behavior.rb +39 -0
  89. data/app/forms/concerns/hyrax/contained_in_works_behavior.rb +24 -0
  90. data/app/forms/concerns/hyrax/deposit_agreement_behavior.rb +12 -0
  91. data/app/forms/concerns/hyrax/leaseability_behavior.rb +49 -0
  92. data/app/forms/concerns/hyrax/permission_behavior.rb +20 -0
  93. data/app/forms/hyrax/forms/administrative_set_form.rb +1 -5
  94. data/app/forms/hyrax/forms/collection_form.rb +16 -12
  95. data/app/forms/hyrax/forms/dashboard/nest_collection_form.rb +0 -34
  96. data/app/forms/hyrax/forms/file_set_form.rb +7 -2
  97. data/app/forms/hyrax/forms/pcdm_collection_form.rb +1 -5
  98. data/app/forms/hyrax/forms/pcdm_object_form.rb +13 -1
  99. data/app/forms/hyrax/forms/permission_template_form.rb +0 -7
  100. data/app/forms/hyrax/forms/resource_batch_edit_form.rb +55 -22
  101. data/app/forms/hyrax/forms/resource_form.rb +31 -114
  102. data/app/forms/hyrax/forms.rb +52 -0
  103. data/app/helpers/hyrax/dashboard_helper_behavior.rb +13 -0
  104. data/app/helpers/hyrax/hyrax_helper_behavior.rb +2 -0
  105. data/app/indexers/concerns/hyrax/location_indexer.rb +25 -0
  106. data/app/indexers/{hyrax → concerns/hyrax}/permission_indexer.rb +2 -2
  107. data/app/indexers/{hyrax → concerns/hyrax}/visibility_indexer.rb +1 -1
  108. data/app/indexers/hyrax/administrative_set_indexer.rb +5 -17
  109. data/app/indexers/hyrax/indexers/administrative_set_indexer.rb +25 -0
  110. data/app/indexers/hyrax/indexers/file_set_indexer.rb +144 -0
  111. data/app/indexers/hyrax/indexers/pcdm_collection_indexer.rb +27 -0
  112. data/app/indexers/hyrax/indexers/pcdm_object_indexer.rb +72 -0
  113. data/app/indexers/hyrax/indexers/resource_indexer.rb +86 -0
  114. data/app/indexers/hyrax/indexers.rb +54 -0
  115. data/app/indexers/hyrax/pcdm_collection_indexer.rb +5 -26
  116. data/app/indexers/hyrax/valkyrie_collection_indexer.rb +6 -4
  117. data/app/indexers/hyrax/valkyrie_file_set_indexer.rb +5 -141
  118. data/app/indexers/hyrax/valkyrie_indexer.rb +8 -112
  119. data/app/indexers/hyrax/valkyrie_work_indexer.rb +5 -63
  120. data/app/indexers/hyrax/work_indexer.rb +1 -0
  121. data/app/inputs/controlled_vocabulary_input.rb +1 -1
  122. data/app/jobs/characterize_job.rb +1 -1
  123. data/app/jobs/create_work_job.rb +37 -4
  124. data/app/jobs/valkyrie_characterization_job.rb +9 -0
  125. data/app/jobs/valkyrie_ingest_job.rb +1 -3
  126. data/app/models/admin_set.rb +20 -1
  127. data/app/models/collection.rb +5 -0
  128. data/app/models/collection_branding_info.rb +2 -9
  129. data/app/models/concerns/hyrax/ability/admin_set_ability.rb +13 -28
  130. data/app/models/concerns/hyrax/ability/collection_ability.rb +26 -28
  131. data/app/models/concerns/hyrax/ability/resource_ability.rb +19 -0
  132. data/app/models/concerns/hyrax/ability.rb +12 -9
  133. data/app/models/concerns/hyrax/collection_behavior.rb +12 -12
  134. data/app/models/concerns/hyrax/solr_document_behavior.rb +33 -6
  135. data/app/models/concerns/hyrax/work_behavior.rb +4 -0
  136. data/app/models/featured_work.rb +12 -4
  137. data/app/models/file_set.rb +5 -0
  138. data/app/models/hyrax/administrative_set.rb +1 -1
  139. data/app/models/hyrax/change_set.rb +2 -2
  140. data/app/models/hyrax/counter_metric.rb +7 -0
  141. data/app/models/hyrax/file_metadata.rb +37 -9
  142. data/app/models/hyrax/file_set.rb +77 -24
  143. data/app/models/hyrax/group.rb +9 -38
  144. data/app/models/hyrax/group_behavior.rb +58 -0
  145. data/app/models/hyrax/model_registry.rb +111 -0
  146. data/app/models/hyrax/orcid_validator.rb +0 -6
  147. data/app/models/hyrax/pcdm_collection.rb +1 -7
  148. data/app/models/hyrax/resource.rb +66 -8
  149. data/app/models/hyrax/statistic.rb +1 -1
  150. data/app/models/hyrax/work.rb +3 -12
  151. data/app/presenters/hyrax/collapsable_section_presenter.rb +7 -3
  152. data/app/presenters/hyrax/collection_presenter.rb +0 -17
  153. data/app/presenters/hyrax/embargo_presenter.rb +4 -0
  154. data/app/presenters/hyrax/file_set_presenter.rb +8 -6
  155. data/app/presenters/hyrax/lease_presenter.rb +4 -0
  156. data/app/presenters/hyrax/menu_presenter.rb +14 -2
  157. data/app/presenters/hyrax/pcdm_member_presenter_factory.rb +7 -5
  158. data/app/presenters/hyrax/version_list_presenter.rb +25 -14
  159. data/app/presenters/hyrax/version_presenter.rb +19 -4
  160. data/app/search_builders/hyrax/admin_set_search_builder.rb +1 -1
  161. data/app/search_builders/hyrax/catalog_search_builder.rb +2 -2
  162. data/app/search_builders/hyrax/dashboard/collections_search_builder.rb +5 -3
  163. data/app/search_builders/hyrax/exposed_models_relation.rb +1 -1
  164. data/app/search_builders/hyrax/file_set_search_builder.rb +1 -1
  165. data/app/search_builders/hyrax/filter_by_type.rb +3 -2
  166. data/app/search_builders/hyrax/member_with_files_search_builder.rb +1 -1
  167. data/app/search_builders/hyrax/my/collections_search_builder.rb +2 -2
  168. data/app/search_builders/hyrax/my/find_works_search_builder.rb +8 -3
  169. data/app/services/hyrax/access_control_list.rb +21 -4
  170. data/app/services/hyrax/action/create_valkyrie_work.rb +80 -0
  171. data/app/services/hyrax/admin_set_create_service.rb +7 -20
  172. data/app/services/hyrax/admin_set_service.rb +2 -2
  173. data/app/services/hyrax/characterization/valkyrie_characterization_service.rb +5 -0
  174. data/app/services/hyrax/collections/collection_member_search_service.rb +2 -0
  175. data/app/services/hyrax/collections/collection_member_service.rb +1 -1
  176. data/app/services/hyrax/collections/permissions_service.rb +27 -9
  177. data/app/services/hyrax/custom_queries/find_collections_by_type.rb +1 -1
  178. data/app/services/hyrax/custom_queries/find_file_metadata.rb +1 -1
  179. data/app/services/hyrax/custom_queries/navigators/find_files.rb +1 -1
  180. data/app/services/hyrax/custom_queries/navigators/parent_work_navigator.rb +1 -1
  181. data/app/services/hyrax/edit_permissions_service.rb +1 -1
  182. data/app/services/hyrax/embargo_manager.rb +44 -17
  183. data/app/services/hyrax/embargo_service.rb +12 -10
  184. data/app/services/hyrax/file_set_derivatives_service.rb +11 -11
  185. data/app/services/hyrax/file_set_file_service.rb +21 -10
  186. data/app/services/hyrax/fixity_check_failure_service.rb +1 -1
  187. data/app/services/hyrax/form_factory.rb +1 -1
  188. data/app/services/hyrax/identifier/dispatcher.rb +9 -2
  189. data/app/services/hyrax/lease_manager.rb +39 -16
  190. data/app/services/hyrax/lease_service.rb +12 -6
  191. data/app/services/hyrax/listeners/acl_index_listener.rb +1 -1
  192. data/app/services/hyrax/listeners/active_fedora_acl_index_listener.rb +1 -1
  193. data/app/services/hyrax/listeners/file_metadata_listener.rb +14 -6
  194. data/app/services/hyrax/listeners/member_cleanup_listener.rb +12 -24
  195. data/app/services/hyrax/listeners/metadata_index_listener.rb +11 -0
  196. data/app/services/hyrax/listeners/object_lifecycle_listener.rb +5 -1
  197. data/app/services/hyrax/listeners/trophy_cleanup_listener.rb +2 -1
  198. data/app/services/hyrax/listeners/workflow_listener.rb +13 -0
  199. data/app/services/hyrax/listeners.rb +2 -1
  200. data/app/services/hyrax/location_service.rb +3 -0
  201. data/app/services/hyrax/lock_manager.rb +1 -2
  202. data/app/services/hyrax/multiple_membership_checker.rb +1 -1
  203. data/app/services/hyrax/simple_schema_loader.rb +32 -1
  204. data/app/services/hyrax/solr_service.rb +19 -5
  205. data/app/services/hyrax/statistics/collections/over_time.rb +1 -1
  206. data/app/services/hyrax/statistics/query_service.rb +6 -0
  207. data/app/services/hyrax/valkyrie_persist_derivatives.rb +12 -5
  208. data/app/services/hyrax/valkyrie_upload.rb +13 -27
  209. data/app/services/hyrax/versioning_service.rb +29 -15
  210. data/app/services/hyrax/work_uploads_handler.rb +6 -5
  211. data/app/validators/hyrax/collection_membership_validator.rb +1 -1
  212. data/app/views/_user_util_links.html.erb +1 -1
  213. data/app/views/catalog/_search_form.html.erb +1 -1
  214. data/app/views/collections/edit_fields/_based_near.html.erb +11 -7
  215. data/app/views/hyrax/admin/admin_sets/_form_participants.html.erb +67 -67
  216. data/app/views/hyrax/admin/admin_sets/edit.html.erb +1 -1
  217. data/app/views/hyrax/admin/collection_types/_form_participants.html.erb +3 -1
  218. data/app/views/hyrax/admin/collection_types/index.html.erb +1 -1
  219. data/app/views/hyrax/base/_attribute_rows.html.erb +1 -0
  220. data/app/views/hyrax/base/_base_form_files_prepend.html.erb +4 -0
  221. data/app/views/hyrax/base/_file_manager_resource_form.html.erb +1 -1
  222. data/app/views/hyrax/base/_form_files.html.erb +65 -64
  223. data/app/views/hyrax/base/_form_visibility_component.html.erb +4 -4
  224. data/app/views/hyrax/base/_show_actions.html.erb +1 -1
  225. data/app/views/hyrax/base/_workflow_actions.html.erb +25 -23
  226. data/app/views/hyrax/base/show.html.erb +2 -3
  227. data/app/views/hyrax/base/show.json.jbuilder +2 -1
  228. data/app/views/hyrax/collections/_show_document_list_row.html.erb +1 -1
  229. data/app/views/hyrax/collections/show.html.erb +7 -9
  230. data/app/views/hyrax/dashboard/_sidebar.html.erb +4 -3
  231. data/app/views/hyrax/dashboard/collections/_form_share_table.html.erb +2 -2
  232. data/app/views/hyrax/dashboard/collections/_list_collections.html.erb +1 -1
  233. data/app/views/hyrax/dashboard/collections/_show_document_list_row.html.erb +1 -1
  234. data/app/views/hyrax/dashboard/collections/_sort_and_per_page.html.erb +3 -3
  235. data/app/views/hyrax/file_sets/_versioning.html.erb +5 -5
  236. data/app/views/hyrax/file_sets/media_display/_audio.html.erb +5 -5
  237. data/app/views/hyrax/file_sets/media_display/_default.html.erb +1 -1
  238. data/app/views/hyrax/file_sets/media_display/_video.html.erb +3 -3
  239. data/app/views/hyrax/my/_search_form.html.erb +1 -1
  240. data/app/views/hyrax/my/facet.html.erb +1 -1
  241. data/app/views/hyrax/notifications/_notifications.html.erb +1 -1
  242. data/app/views/hyrax/users/_vitals.html.erb +1 -1
  243. data/app/views/layouts/_head_tag_content.html.erb +1 -0
  244. data/app/views/shared/_footer.html.erb +1 -1
  245. data/bin/dev-entrypoint.sh +13 -0
  246. data/chart/hyrax/Chart.yaml +5 -5
  247. data/chart/hyrax/templates/_helpers.tpl +8 -0
  248. data/chart/hyrax/templates/configmap-env.yaml +1 -1
  249. data/chart/hyrax/values.yaml +12 -1
  250. data/config/initializers/file_length_patch.rb +10 -0
  251. data/config/initializers/listeners.rb +1 -1
  252. data/config/locales/hyrax.de.yml +5 -0
  253. data/config/locales/hyrax.en.yml +10 -0
  254. data/config/locales/hyrax.es.yml +5 -0
  255. data/config/locales/hyrax.fr.yml +5 -0
  256. data/config/locales/hyrax.it.yml +5 -0
  257. data/config/locales/hyrax.pt-BR.yml +5 -0
  258. data/config/locales/hyrax.zh.yml +5 -0
  259. data/config/metadata/basic_metadata.yaml +53 -0
  260. data/config/metadata/core_metadata.yaml +6 -0
  261. data/config/metadata/file_set_metadata.yaml +21 -0
  262. data/config/metadata/hyrax_internal_metadata.yaml +57 -0
  263. data/docker-compose-koppie.yml +26 -25
  264. data/docker-compose-sirenia.yml +202 -0
  265. data/docker-compose.yml +27 -24
  266. data/documentation/developing-your-hyrax-based-app.md +77 -60
  267. data/hyrax.gemspec +18 -12
  268. data/karma.conf.js +1 -1
  269. data/lib/generators/hyrax/collection_resource/templates/collection_indexer.rb.erb +1 -1
  270. data/lib/generators/hyrax/collection_resource/templates/collection_metadata.yaml +2 -0
  271. data/lib/generators/hyrax/config_generator.rb +12 -0
  272. data/lib/generators/hyrax/install_generator.rb +37 -7
  273. data/lib/generators/hyrax/listeners_generator.rb +18 -0
  274. data/lib/generators/hyrax/models_generator.rb +1 -10
  275. data/lib/generators/hyrax/riiif_generator.rb +6 -4
  276. data/lib/generators/hyrax/templates/.env +9 -0
  277. data/lib/generators/hyrax/templates/.lando.yml +50 -0
  278. data/lib/generators/hyrax/templates/app/listeners/hyrax_listener.rb +81 -0
  279. data/lib/generators/hyrax/templates/app/models/file_set.rb +1 -2
  280. data/lib/generators/hyrax/templates/config/initializers/1_valkyrie.rb +102 -0
  281. data/lib/generators/hyrax/templates/config/initializers/file_services.rb +6 -0
  282. data/lib/generators/hyrax/templates/config/initializers/hyrax.rb +41 -5
  283. data/lib/generators/hyrax/templates/config/initializers/publisher.rb +3 -0
  284. data/lib/generators/hyrax/templates/config/initializers/riiif.rb +90 -19
  285. data/lib/generators/hyrax/templates/config/locales/hyrax.de.yml +1 -1
  286. data/lib/generators/hyrax/templates/config/locales/hyrax.en.yml +1 -1
  287. data/lib/generators/hyrax/templates/config/locales/hyrax.es.yml +1 -1
  288. data/lib/generators/hyrax/templates/config/locales/hyrax.fr.yml +1 -1
  289. data/lib/generators/hyrax/templates/config/locales/hyrax.it.yml +1 -1
  290. data/lib/generators/hyrax/templates/config/locales/hyrax.pt-BR.yml +1 -1
  291. data/lib/generators/hyrax/templates/config/locales/hyrax.zh.yml +1 -1
  292. data/lib/generators/hyrax/templates/config/redis.yml +3 -6
  293. data/lib/generators/hyrax/templates/config/valkyrie_index.yml +4 -9
  294. data/lib/generators/hyrax/templates/db/migrate/20230725222727_create_hyrax_counter_metrics.rb.erb +14 -0
  295. data/lib/generators/hyrax/templates/db/migrate/20230803165135_change_work_id_to_string.rb.erb +5 -0
  296. data/lib/generators/hyrax/templates/db/migrate/20230808102105_add_indices_to_hyrax_counter_metrics.rb.erb +8 -0
  297. data/lib/generators/hyrax/templates/db/migrate/20230821153635_add_fields_to_counter_metric.rb.erb +8 -0
  298. data/lib/generators/hyrax/templates/db/seeds.rb +1 -1
  299. data/lib/generators/hyrax/work_resource/templates/form.rb.erb +1 -1
  300. data/lib/generators/hyrax/work_resource/templates/indexer.rb.erb +1 -1
  301. data/lib/generators/hyrax/work_resource/templates/metadata.yaml +2 -0
  302. data/lib/hyrax/configuration.rb +241 -55
  303. data/lib/hyrax/controlled_vocabularies/location.rb +7 -1
  304. data/lib/hyrax/engine.rb +0 -1
  305. data/lib/hyrax/form_fields.rb +6 -0
  306. data/lib/hyrax/indexer.rb +1 -1
  307. data/lib/hyrax/publisher.rb +9 -2
  308. data/lib/hyrax/redis_event_store.rb +7 -8
  309. data/lib/hyrax/resource_name.rb +4 -0
  310. data/lib/hyrax/resource_sync/change_list_writer.rb +1 -1
  311. data/lib/hyrax/resource_sync/resource_list_writer.rb +1 -1
  312. data/lib/hyrax/specs/capybara.rb +26 -42
  313. data/lib/hyrax/specs/shared_specs/hydra_works.rb +112 -27
  314. data/lib/hyrax/specs/shared_specs/indexers.rb +25 -7
  315. data/lib/hyrax/transactions/admin_set_destroy.rb +2 -1
  316. data/lib/hyrax/transactions/collection_destroy.rb +3 -2
  317. data/lib/hyrax/transactions/container.rb +47 -0
  318. data/lib/hyrax/transactions/file_metadata_destroy.rb +20 -0
  319. data/lib/hyrax/transactions/file_set_destroy.rb +3 -1
  320. data/lib/hyrax/transactions/file_set_update.rb +21 -0
  321. data/lib/hyrax/transactions/steps/add_to_parent.rb +2 -1
  322. data/lib/hyrax/transactions/steps/check_for_default_admin_set.rb +32 -0
  323. data/lib/hyrax/transactions/steps/check_for_empty_admin_set.rb +1 -1
  324. data/lib/hyrax/transactions/steps/delete_all_file_metadata.rb +46 -0
  325. data/lib/hyrax/transactions/steps/delete_all_file_sets.rb +46 -0
  326. data/lib/hyrax/transactions/steps/file_metadata_delete.rb +40 -0
  327. data/lib/hyrax/transactions/steps/remove_from_membership.rb +45 -0
  328. data/lib/hyrax/transactions/steps/save.rb +2 -1
  329. data/lib/hyrax/transactions/steps/set_user_as_creator.rb +1 -1
  330. data/lib/hyrax/transactions/steps/update_work_members.rb +2 -0
  331. data/lib/hyrax/transactions/work_destroy.rb +3 -2
  332. data/lib/hyrax/version.rb +1 -1
  333. data/lib/hyrax.rb +1 -0
  334. data/lib/tasks/collection_type_global_id.rake +9 -4
  335. data/lib/tasks/embargo_lease.rake +2 -0
  336. data/lib/valkyrie/indexing/solr/indexing_adapter.rb +22 -6
  337. data/lib/wings/active_fedora_converter/default_work.rb +4 -5
  338. data/lib/wings/active_fedora_converter/file_metadata_node.rb +1 -1
  339. data/lib/wings/active_fedora_converter.rb +6 -0
  340. data/lib/wings/attribute_transformer.rb +24 -17
  341. data/lib/wings/model_registry.rb +8 -0
  342. data/lib/wings/model_transformer.rb +19 -10
  343. data/lib/wings/orm_converter.rb +27 -18
  344. data/lib/wings/services/custom_queries/find_ids_by_model.rb +2 -2
  345. data/lib/wings/setup.rb +2 -2
  346. data/lib/wings/valkyrie/query_service.rb +5 -2
  347. data/lib/wings/valkyrie/storage.rb +8 -90
  348. data/lib/wings.rb +8 -0
  349. data/spec/factories/access_control.rb +12 -0
  350. data/spec/factories/admin_sets.rb +32 -0
  351. data/spec/factories/admin_sets_lw.rb +222 -0
  352. data/spec/factories/administrative_sets.rb +79 -0
  353. data/spec/factories/api_items.rb +92 -0
  354. data/spec/factories/collection_branding_infos.rb +12 -0
  355. data/spec/factories/collection_type_participants.rb +9 -0
  356. data/spec/factories/collection_types.rb +139 -0
  357. data/spec/factories/collections.rb +282 -0
  358. data/spec/factories/collections_factory.rb +107 -0
  359. data/spec/factories/content_blocks.rb +5 -0
  360. data/spec/factories/counter_metrics.rb +12 -0
  361. data/spec/factories/featured_works.rb +5 -0
  362. data/spec/factories/file_sets.rb +45 -0
  363. data/spec/factories/generic_works.rb +200 -0
  364. data/spec/factories/hyrax_collection.rb +92 -0
  365. data/spec/factories/hyrax_default_admin_set.rb +7 -0
  366. data/spec/factories/hyrax_embargo.rb +18 -0
  367. data/spec/factories/hyrax_file_metadata.rb +92 -0
  368. data/spec/factories/hyrax_file_set.rb +129 -0
  369. data/spec/factories/hyrax_lease.rb +18 -0
  370. data/spec/factories/hyrax_resource.rb +15 -0
  371. data/spec/factories/hyrax_work.rb +221 -0
  372. data/spec/factories/object_id.rb +7 -0
  373. data/spec/factories/operations.rb +22 -0
  374. data/spec/factories/permission.rb +7 -0
  375. data/spec/factories/permission_template_accesses.rb +17 -0
  376. data/spec/factories/permission_templates.rb +111 -0
  377. data/spec/factories/proxy_deposit_requests.rb +7 -0
  378. data/spec/factories/single_use_links.rb +14 -0
  379. data/spec/factories/sipity_entities.rb +17 -0
  380. data/spec/factories/uploaded_files.rb +11 -0
  381. data/spec/factories/users.rb +52 -0
  382. data/spec/factories/workflow_actions.rb +7 -0
  383. data/spec/factories/workflow_states.rb +7 -0
  384. data/spec/factories/workflows.rb +7 -0
  385. data/spec/support/book_resource.rb +36 -0
  386. data/spec/support/can_can_overrides.rb +43 -0
  387. data/spec/support/clean_solr.rb +7 -0
  388. data/spec/support/controller_level_helpers.rb +27 -0
  389. data/spec/support/factory_helpers.rb +94 -0
  390. data/spec/support/fakes/fake_actor.rb +22 -0
  391. data/spec/support/fakes/fake_authority.rb +14 -0
  392. data/spec/support/fakes/fake_search_builder_scope.rb +44 -0
  393. data/spec/support/fakes/indexing_adapter.rb +17 -0
  394. data/spec/support/fakes/test_hydra_group_service.rb +55 -0
  395. data/spec/support/features/batch_edit_actions.rb +37 -0
  396. data/spec/support/features/session_helpers.rb +15 -0
  397. data/spec/support/features/workflow.rb +10 -0
  398. data/spec/support/features.rb +11 -0
  399. data/spec/support/form_with_validations.rb +15 -0
  400. data/spec/support/input_support.rb +12 -0
  401. data/spec/support/logging_formatter.rb +67 -0
  402. data/spec/support/matchers/api_responses.rb +27 -0
  403. data/spec/support/matchers/collection_type_property_matchers.rb +30 -0
  404. data/spec/support/matchers/embargo.rb +9 -0
  405. data/spec/support/matchers/lease.rb +9 -0
  406. data/spec/support/matchers/match_valkyrie_ids_with_af_ids.rb +12 -0
  407. data/spec/support/matchers/pcdm_matchers.rb +34 -0
  408. data/spec/support/matchers/permission.rb +31 -0
  409. data/spec/support/matchers/response_matchers.rb +8 -0
  410. data/spec/support/optional_example.rb +17 -0
  411. data/spec/support/rake.rb +42 -0
  412. data/spec/support/selectors.rb +112 -0
  413. data/spec/support/shared_examples_for_collection_presenter.rb +44 -0
  414. data/spec/support/simple_work.rb +28 -0
  415. data/spec/support/spec_statistic.rb +24 -0
  416. data/spec/support/speedup.rb +7 -0
  417. data/spec/support/statistic_helper.rb +10 -0
  418. data/spec/support/valkyrie_indexing.rb +2 -0
  419. data/spec/support/wings_models.rb +9 -0
  420. data/tasks/hyrax_dev.rake +2 -33
  421. data/template.rb +1 -3
  422. metadata +184 -84
  423. data/.engine_cart.yml +0 -3
  424. data/app/indexers/hyrax/resource_indexer.rb +0 -15
  425. data/app/services/hyrax/characterization/model_wrapper.rb +0 -0
  426. data/app/services/hyrax/custom_queries/find_by_collection_type.rb +0 -0
  427. data/app/services/hyrax/query_service.rb +0 -0
  428. data/app/views/hyrax/users/_user_util_links_extra.html.erb +0 -0
  429. data/lib/hyrax/specs/disable_animations_in_test_environment.rb +0 -53
  430. data/lib/hyrax/specs/shared_specs/valkyrie_storage_versions.rb +0 -9
  431. /data/app/indexers/{hyrax → concerns/hyrax}/thumbnail_indexer.rb +0 -0
data/.koppie/Gemfile CHANGED
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+ # Attempts to determine if a global gem source has ready been added by another Gemfile
1
3
  if @sources.global_rubygems_source == Bundler::SourceList.new.global_rubygems_source
2
4
  Bundler.ui.info '[Koppie] Adding global rubygems source.'
3
5
  source 'https://rubygems.org'
@@ -10,15 +12,14 @@ gem 'bootsnap', '>= 1.1.0', require: false
10
12
  gem 'bootstrap', '~> 4.0'
11
13
  gem 'coffee-rails', '~> 4.2'
12
14
  gem 'dalli'
13
- gem 'devise', '4.8.0'
14
- gem 'devise-guests', '0.8.1'
15
- gem 'hydra-role-management'
15
+ gem 'devise'
16
+ gem 'devise-guests', '~> 0.8'
16
17
  gemspec name: 'hyrax', path: ENV.fetch('HYRAX_ENGINE_PATH', '..')
17
18
  gem 'jbuilder', '~> 2.5'
18
19
  gem 'jquery-rails'
19
20
  gem 'pg', '~> 1.3'
20
- gem 'puma', '~> 5.5.2'
21
- gem 'rails', '~> 6.0'
21
+ gem 'puma'
22
+ gem 'rails', '~> 6.1'
22
23
  gem 'riiif', '~> 2.1'
23
24
  gem 'rsolr', '>= 1.0', '< 3'
24
25
  gem 'sass-rails', '~> 6.0'
@@ -41,11 +42,8 @@ group :development do
41
42
  end
42
43
 
43
44
  group :development, :test do
44
- gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
45
- gem "pry-byebug"
46
- gem "pry-doc"
47
- gem "pry-rails"
48
- gem "pry-rescue"
49
- gem 'rspec-rails'
50
- gem 'solr_wrapper', '>= 0.3'
45
+ gem 'debug', '>= 1.0.0'
46
+ gem 'pry-doc'
47
+ gem 'pry-rails'
48
+ gem 'pry-rescue'
51
49
  end
@@ -0,0 +1,2 @@
1
+ # Use dedicated lock files for dassie/koppie to avoid gem mismatches
2
+ eval_gemfile 'Gemfile'
data/.koppie/Rakefile CHANGED
@@ -4,5 +4,3 @@
4
4
  require_relative 'config/application'
5
5
 
6
6
  Rails.application.load_tasks
7
-
8
- require 'solr_wrapper/rake_task' unless Rails.env.production?
@@ -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,15 +1,11 @@
1
1
  class Ability
2
2
  include Hydra::Ability
3
-
3
+
4
4
  include Hyrax::Ability
5
5
  self.ability_logic += [:everyone_can_create_curation_concerns]
6
6
 
7
7
  # Define any customized permissions here.
8
8
  def custom_permissions
9
- if current_user.admin?
10
- can [:create, :show, :add_user, :remove_user, :index, :edit, :update, :destroy], Role
11
- end
12
-
13
9
  # Limits deleting objects to a the admin user
14
10
  #
15
11
  # if current_user.admin?
@@ -1 +1 @@
1
- Collection = Hyrax::PcdmCollection
1
+ Collection = CollectionResource
@@ -1,8 +1,6 @@
1
1
  class User < ApplicationRecord
2
2
  # Connects this user object to Hydra behaviors.
3
3
  include Hydra::User
4
- # Connects this user object to Role-management behaviors.
5
- include Hydra::RoleManagement::UserRoles
6
4
 
7
5
  # Connects this user object to Hyrax behaviors.
8
6
  include Hyrax::User
@@ -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'] %>
@@ -6,7 +6,7 @@ require 'rails/all'
6
6
  # you've limited to :test, :development, or :production.
7
7
  Bundler.require(*Rails.groups)
8
8
 
9
- module NuraxPg
9
+ module Koppie
10
10
  class Application < Rails::Application
11
11
  # Initialize configuration defaults for originally generated Rails version.
12
12
  config.load_defaults 6.0
@@ -15,6 +15,7 @@ module NuraxPg
15
15
  # Application configuration can go into files in config/initializers
16
16
  # -- all .rb files in that directory are automatically loaded after loading
17
17
  # the framework and any gems in your application.
18
+ config.session_store :cookie_store, key: "_#{ENV.fetch('APP_NAME', 'koppie')}_session"
18
19
 
19
20
  # use SideKiq by default
20
21
  config.active_job.queue_adapter = :sidekiq
@@ -0,0 +1,6 @@
1
+ development:
2
+ url: http://localhost:8888/
3
+ test:
4
+ url: http://localhost:8888/
5
+ production:
6
+ url: http://production.host/
@@ -1,9 +1,9 @@
1
1
  development:
2
2
  adapter: solr
3
- url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:8983/solr/nurax-pg-blacklight-dev" %>
3
+ url: <%= ENV['SOLR_DEVELOPMENT_URL'] || ENV['SOLR_URL'] || "http://127.0.0.1:8983/solr/nurax-pg-blacklight-dev" %>
4
4
  test: &test
5
5
  adapter: solr
6
- url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:#{ENV.fetch('SOLR_TEST_PORT', 8985)}/solr/nurax-pg-test" %>
6
+ url: <%= ENV['SOLR_TEST_URL'] || ENV['SOLR_URL'] || "http://127.0.0.1:#{ENV.fetch('SOLR_TEST_PORT', 8985)}/solr/nurax-pg-test" %>
7
7
  production:
8
8
  adapter: solr
9
9
  url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:8983/solr/nurax-pg" %>
@@ -0,0 +1,2 @@
1
+ batch_upload:
2
+ enabled: "true"
@@ -1,4 +1,5 @@
1
1
  # frozen_string_literal: true
2
+ require 'faraday/multipart'
2
3
 
3
4
  # require "shrine/storage/s3"
4
5
  # require "valkyrie/storage/shrine"
@@ -24,9 +25,20 @@
24
25
  # :nurax_pg_metadata_adapter)
25
26
  Valkyrie::MetadataAdapter.register(
26
27
  Valkyrie::Persistence::Postgres::MetadataAdapter.new,
27
- :nurax_pg_metadata_adapter
28
+ :pg_metadata
28
29
  )
29
- Valkyrie.config.metadata_adapter = :nurax_pg_metadata_adapter
30
+
31
+ Valkyrie::MetadataAdapter.register(
32
+ Valkyrie::Persistence::Fedora::MetadataAdapter.new(
33
+ connection: ::Ldp::Client.new(Hyrax.config.fedora_connection_builder.call(
34
+ ENV.fetch('FCREPO_URL') { "http://localhost:8080/fcrepo/rest" })),
35
+ base_path: Rails.env,
36
+ schema: Valkyrie::Persistence::Fedora::PermissiveSchema.new(Hyrax::SimpleSchemaLoader.new.permissive_schema_for_valkrie_adapter),
37
+ fedora_version: 6
38
+ ), :fedora_metadata
39
+ )
40
+
41
+ Valkyrie.config.metadata_adapter = ENV.fetch('VALKYRIE_METADATA_ADAPTER') { :pg_metadata }.to_sym
30
42
 
31
43
  # shrine_s3_options = {
32
44
  # bucket: ENV.fetch("REPOSITORY_S3_BUCKET") { "nurax_pg#{Rails.env}" },
@@ -46,11 +58,22 @@ Valkyrie.config.metadata_adapter = :nurax_pg_metadata_adapter
46
58
  # )
47
59
  #
48
60
  # Valkyrie.config.storage_adapter = :repository_s3
61
+
49
62
  Valkyrie::StorageAdapter.register(
50
- Valkyrie::Storage::Disk.new(base_path: Rails.root.join("storage", "files"),
51
- file_mover: FileUtils.method(:cp)),
52
- :disk
63
+ Valkyrie::Storage::Fedora.new(
64
+ connection: ::Ldp::Client.new(Hyrax.config.fedora_connection_builder.call(
65
+ ENV.fetch('FCREPO_URL') { "http://localhost:8080/fcrepo/rest" })),
66
+ base_path: Rails.env,
67
+ fedora_version: 6
68
+ ), :fedora_storage
53
69
  )
54
- Valkyrie.config.storage_adapter = :disk
70
+
71
+ Valkyrie::StorageAdapter.register(
72
+ Valkyrie::Storage::VersionedDisk.new(base_path: Rails.root.join("storage", "files"),
73
+ file_mover: FileUtils.method(:cp)),
74
+ :versioned_disk_storage
75
+ )
76
+
77
+ Valkyrie.config.storage_adapter = ENV.fetch('VALKYRIE_STORAGE_ADAPTER') { :versioned_disk_storage }.to_sym
55
78
 
56
79
  Valkyrie.config.indexing_adapter = :solr_index
@@ -0,0 +1,12 @@
1
+ # frozen_string_literal: true
2
+ module Hyrax
3
+ class ArkivoConstraint
4
+ def self.matches?(_request)
5
+ # Add your own logic here to authorize trusted connections to
6
+ # the API e.g., if your installation of Arkivo runs on a host
7
+ # with the 10.0.0.3 IP address, you could use:
8
+ # request.remote_ip == '10.0.0.3'
9
+ true
10
+ end
11
+ end
12
+ end
@@ -99,7 +99,7 @@ Hyrax.config do |config|
99
99
 
100
100
  # Hyrax can integrate with Zotero's Arkivo service for automatic deposit
101
101
  # of Zotero-managed research items.
102
- # config.arkivo_api = false
102
+ config.arkivo_api = true
103
103
 
104
104
  # Stream realtime notifications to users in the browser
105
105
  # config.realtime_notifications = true
@@ -249,7 +249,7 @@ Hyrax.config do |config|
249
249
  # Identify the model class name that will be used for Collections in your app
250
250
  # (i.e. ::Collection for ActiveFedora, Hyrax::PcdmCollection for Valkyrie)
251
251
  # config.collection_model = '::Collection'
252
- config.collection_model = 'Hyrax::PcdmCollection'
252
+ # config.collection_model = 'Hyrax::PcdmCollection'
253
253
  # Injected via `rails g hyrax:collection_resource CollectionResource`
254
254
  config.collection_model = 'CollectionResource'
255
255
 
@@ -0,0 +1,3 @@
1
+ # frozen_string_literal: true
2
+
3
+ # Hyrax.publisher.subscribe(HyraxListener.new)
@@ -1,12 +1,10 @@
1
1
  # frozen_string_literal: true
2
- ActiveSupport::Reloader.to_prepare do
3
- Riiif::Image.file_resolver = Riiif::HttpFileResolver.new
2
+ Rails.application.reloader.to_prepare do
4
3
  Riiif::Image.info_service = lambda do |id, _file|
5
4
  # id will look like a path to a pcdm:file
6
5
  # (e.g. rv042t299%2Ffiles%2F6d71677a-4f80-42f1-ae58-ed1063fd79c7)
7
6
  # but we just want the id for the FileSet it's attached to.
8
7
 
9
- # Capture everything before the first slash
10
8
  fs_id = id.sub(/\A([^\/]*)\/.*/, '\1')
11
9
  resp = Hyrax::SolrService.get("id:#{fs_id}")
12
10
  doc = resp['response']['docs'].first
@@ -15,24 +13,99 @@ ActiveSupport::Reloader.to_prepare do
15
13
  end
16
14
 
17
15
  if Hyrax.config.use_valkyrie?
18
- # Use Valkyrie adapter to make sure file is available locally. Riiif will just open it then
19
- # id comes in with the format "FILE_SET_ID/files/FILE_ID"
20
- Riiif::Image.file_resolver.id_to_uri = lambda do |id|
21
- file_metadata = Hyrax.query_service.find_by(id: id.split('/').last)
22
- file = Hyrax.storage_adapter.find_by(id: file_metadata.file_identifier)
23
- file.disk_path.to_s
24
- end
16
+ Riiif::Image.file_resolver = Hyrax::RiiifFileResolver.new
25
17
  else
18
+ Riiif::Image.file_resolver = Riiif::HttpFileResolver.new
19
+
26
20
  Riiif::Image.file_resolver.id_to_uri = lambda do |id|
27
21
  Hyrax::Base.id_to_uri(CGI.unescape(id)).tap do |url|
28
22
  Rails.logger.info "Riiif resolved #{id} to #{url}"
29
23
  end
30
24
  end
31
25
  end
26
+
32
27
  Riiif::Image.authorization_service = Hyrax::IiifAuthorizationService
33
28
 
34
29
  Riiif.not_found_image = Rails.root.join('app', 'assets', 'images', 'us_404.svg')
35
30
  Riiif.unauthorized_image = Rails.root.join('app', 'assets', 'images', 'us_404.svg')
36
31
 
37
- Riiif::Engine.config.cache_duration = 365.days
32
+ Riiif::Engine.config.cache_duration = 1.day
38
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
+
@@ -2,6 +2,8 @@
2
2
  # index key names, and form properties.
3
3
  #
4
4
  # Attributes must have a type but all other configuration options are optional.
5
+ # Please note: If using Valkyrie's Fedora Metadata Adapter, predicates for attributes
6
+ # must be placed here.
5
7
  #
6
8
  # attributes:
7
9
  # attribute_name:
@@ -19,4 +21,20 @@
19
21
  # Generated via
20
22
  # `rails generate hyrax:collection_resource CollectionResource`
21
23
 
22
- attributes: {}
24
+ attributes:
25
+ target_audience:
26
+ type: string
27
+ form:
28
+ primary: true
29
+ multiple: true
30
+ predicate: http://hyrax-example.com/target_audience
31
+ department:
32
+ type: string
33
+ form:
34
+ primary: true
35
+ predicate: http://hyrax-example.com/department
36
+ course:
37
+ type: string
38
+ form:
39
+ primary: false
40
+ predicate: http://hyrax-example.com/course
@@ -2,6 +2,8 @@
2
2
  # index key names, and form properties.
3
3
  #
4
4
  # Attributes must have a type but all other configuration options are optional.
5
+ # Please note: If using Valkyrie's Fedora Metadata Adapter, predicates for attributes
6
+ # must be placed here.
5
7
  #
6
8
  # attributes:
7
9
  # attribute_name:
@@ -2,6 +2,8 @@
2
2
  # index key names, and form properties.
3
3
  #
4
4
  # Attributes must have a type but all other configuration options are optional.
5
+ # Please note: If using Valkyrie's Fedora Metadata Adapter, predicates for attributes
6
+ # must be placed here.
5
7
  #
6
8
  # attributes:
7
9
  # attribute_name:
@@ -23,6 +25,7 @@
23
25
  attributes:
24
26
  monograph_title:
25
27
  type: string
28
+ predicate: http://hyrax-example.com/monograph_title
26
29
  record_info:
27
30
  type: string
28
31
  form:
@@ -30,26 +33,33 @@ attributes:
30
33
  primary: true
31
34
  index_keys:
32
35
  - "record_info_tesim"
36
+ predicate: http://hyrax-example.com/record_info
33
37
  place_of_publication:
34
38
  type: string
35
39
  form:
36
40
  required: false
37
41
  primary: true
42
+ predicate: http://hyrax-example.com/place_of_publication
38
43
  genre:
39
44
  type: string
40
45
  form:
41
46
  primary: true
47
+ predicate: http://hyrax-example.com/genre
42
48
  series_title:
43
49
  type: string
44
50
  form:
45
51
  primary: false
52
+ predicate: http://hyrax-example.com/series_title
46
53
  target_audience:
47
54
  type: string
48
55
  form:
49
56
  multiple: true
57
+ predicate: http://hyrax-example.com/target_audience
50
58
  table_of_contents:
51
59
  type: string
52
60
  form:
53
61
  multiple: false
62
+ predicate: http://hyrax-example.com/table_of_contents
54
63
  date_of_issuance:
55
64
  type: string
65
+ predicate: http://hyrax-example.com/date_of_issuance
@@ -0,0 +1,4 @@
1
+ attributes:
2
+ sample_attribute:
3
+ type: string
4
+ predicate: http://hyrax-example.com/sample_attribute
@@ -1,28 +1,6 @@
1
- # nurax-pg uses Hydra::RoleManagement for user and role definition. The following
2
- # examples show how to perform common setup actions.
3
- #
4
- # @see https://github.com/samvera/hydra-role-management
5
- #
6
- # Create admin role
7
- #
8
- # admin_role = Role.find_or_create_by(name: 'admin')
9
- #
10
- # Create a user
11
- #
12
- # admin_user = User.find_or_create_by(email: 'user@example.com') do |user|
13
- # user.password = 'change_me'
14
- # user.password_confirmation = 'change_me'
15
- # user.confirmed_at = DateTime.now
16
- # end
17
- # admin_user.roles << admin_role unless admin_user.roles.include?(admin_role)
18
- # admin_user.save!(validate: false)
19
- #
20
- # You can create non-admin roles and assign users to those roles using a similar pattern.
21
- #
22
- # The following roles might be used for testing, so they remain here. They will not
23
- # be available for use when logged in through the browser.
24
- #
25
1
  development:
2
+ admin:
3
+ - admin@example.com
26
4
  archivist:
27
5
  - archivist1@example.com
28
6
 
@@ -45,4 +23,4 @@ test:
45
23
 
46
24
  production:
47
25
  admin:
48
- - systems@curationexperts.com
26
+ - admin@example.com
@@ -5,14 +5,13 @@ Rails.application.routes.draw do
5
5
  mount BrowseEverything::Engine => '/browse'
6
6
 
7
7
  mount Blacklight::Engine => '/'
8
-
8
+
9
9
  concern :searchable, Blacklight::Routes::Searchable.new
10
10
 
11
11
  resource :catalog, only: [:index], as: 'catalog', path: '/catalog', controller: 'catalog' do
12
12
  concerns :searchable
13
13
  end
14
14
  devise_for :users
15
- mount Hydra::RoleManagement::Engine => '/'
16
15
  mount Sidekiq::Web => '/sidekiq'
17
16
  mount Qa::Engine => '/authorities'
18
17
  mount Hyrax::Engine, at: '/'
@@ -2,6 +2,6 @@
2
2
  development:
3
3
  url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:8983/solr/nurax-pg-solr-dev" %>
4
4
  test: &test
5
- url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:#{ENV.fetch('SOLR_TEST_PORT', 8985)}/solr/nurax-pg-test" %>
5
+ url: <%= ENV['TEST_SOLR_URL'] ||ENV['SOLR_URL'] || "http://127.0.0.1:#{ENV.fetch('SOLR_TEST_PORT', 8985)}/solr/nurax-pg-test" %>
6
6
  production:
7
7
  url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:8983/solr/nurax-pg" %>
@@ -1,12 +1,6 @@
1
1
  development:
2
- host: <%= ENV['VALKYRIE_SOLR_HOST'] || 'localhost' %>
3
- port: <%= ENV['VALKYRIE_SOLR_PORT'] || 8987 %>
4
- core: <%= ENV['VALKYRIE_SOLR_CORE'] || 'nurax-pg-valkyrie-dev' %>
5
- test:
6
- host: <%= ENV['VALKYRIE_SOLR_HOST'] || 'localhost' %>
7
- port: <%= ENV['VALKYRIE_SOLR_PORT'] || 8987 %>
8
- core: <%= ENV['VALKYRIE_SOLR_CORE'] || 'nurax-pg-test' %>
2
+ url: <%= ENV['SOLR_DEVELOPMENT_URL'] || ENV['SOLR_URL'] || "http://127.0.0.1:8983/solr/koppie" %>
3
+ test: &test
4
+ url: <%= ENV['SOLR_TEST_URL'] || ENV['SOLR_URL'] || "http://127.0.0.1:#{ENV.fetch('SOLR_TEST_PORT', 8985)}/solr/koppie-test" %>
9
5
  production:
10
- host: <%= ENV['VALKYRIE_SOLR_HOST'] %>
11
- port: <%= ENV['VALKYRIE_SOLR_PORT'] %>
12
- core: <%= ENV['VALKYRIE_SOLR_CORE'] %>
6
+ url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:8983/solr/koppie-prod" %>
@@ -0,0 +1,6 @@
1
+ #
2
+ # To integrate your app with Zotero, set ENV variables with your API info
3
+ #
4
+ zotero:
5
+ client_key: <%= ENV["ZOTERO_CLIENT_KEY"] %>
6
+ client_secret: <%= ENV["ZOTERO_CLIENT_SECRET"] %>
@@ -0,0 +1,14 @@
1
+ class CreateHyraxCounterMetrics < ActiveRecord::Migration[6.0]
2
+ def change
3
+ create_table :hyrax_counter_metrics do |t|
4
+ t.string :worktype
5
+ t.string :resource_type
6
+ t.integer :work_id
7
+ t.date :date
8
+ t.integer :total_item_investigations
9
+ t.integer :total_item_requests
10
+
11
+ t.timestamps
12
+ end
13
+ end
14
+ end
@@ -0,0 +1,5 @@
1
+ class ChangeWorkIdToString < ActiveRecord::Migration[6.1]
2
+ def change
3
+ change_column :hyrax_counter_metrics, :work_id, :string
4
+ end
5
+ end