hyrax 3.0.0.pre.beta2 → 3.0.0.pre.beta3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (441) hide show
  1. checksums.yaml +4 -4
  2. data/.circleci/config.yml +118 -181
  3. data/.gitignore +3 -0
  4. data/.regen +1 -0
  5. data/.rubocop_fixme.yml +1 -1
  6. data/README.md +11 -15
  7. data/app/actors/hyrax/actors/active_fedora_to_valkyrie.rb +59 -0
  8. data/app/actors/hyrax/actors/add_to_work_actor.rb +28 -5
  9. data/app/actors/hyrax/actors/apply_order_actor.rb +2 -2
  10. data/app/actors/hyrax/actors/attach_members_actor.rb +50 -28
  11. data/app/actors/hyrax/actors/base_actor.rb +17 -2
  12. data/app/actors/hyrax/actors/cleanup_file_sets_actor.rb +1 -1
  13. data/app/actors/hyrax/actors/collections_membership_actor.rb +2 -8
  14. data/app/actors/hyrax/actors/create_with_files_actor.rb +16 -6
  15. data/app/actors/hyrax/actors/create_with_files_ordered_members_actor.rb +2 -2
  16. data/app/actors/hyrax/actors/create_with_remote_files_actor.rb +2 -1
  17. data/app/actors/hyrax/actors/create_with_remote_files_ordered_members_actor.rb +8 -6
  18. data/app/actors/hyrax/actors/environment.rb +8 -16
  19. data/app/actors/hyrax/actors/file_actor.rb +75 -13
  20. data/app/actors/hyrax/actors/interpret_visibility_actor.rb +6 -8
  21. data/app/actors/hyrax/actors/valkyrie_to_active_fedora.rb +60 -0
  22. data/app/assets/javascripts/hyrax/collections.js +5 -4
  23. data/app/assets/javascripts/hyrax/nav_safety.js +4 -2
  24. data/app/assets/javascripts/hyrax/proxy_rights.js +8 -0
  25. data/app/assets/stylesheets/fileupload/jquery.fileupload-ui.scss +1 -15
  26. data/app/assets/stylesheets/hyrax/_collections.scss +1 -1
  27. data/app/assets/stylesheets/hyrax/_home-page.scss +6 -0
  28. data/app/assets/stylesheets/hyrax/_users.scss +11 -0
  29. data/app/assets/stylesheets/hyrax/_viewer.scss +14 -3
  30. data/app/controllers/concerns/hyrax/breadcrumbs.rb +2 -0
  31. data/app/controllers/concerns/hyrax/collections_controller_behavior.rb +1 -1
  32. data/app/controllers/concerns/hyrax/embargoes_controller_behavior.rb +2 -1
  33. data/app/controllers/concerns/hyrax/leases_controller_behavior.rb +2 -1
  34. data/app/controllers/concerns/hyrax/local_file_downloads_controller_behavior.rb +2 -1
  35. data/app/controllers/hyrax/batch_edits_controller.rb +3 -3
  36. data/app/controllers/hyrax/dashboard/collections_controller.rb +16 -5
  37. data/app/controllers/hyrax/dashboard_controller.rb +9 -0
  38. data/app/controllers/hyrax/depositors_controller.rb +4 -6
  39. data/app/controllers/hyrax/downloads_controller.rb +1 -1
  40. data/app/controllers/hyrax/file_sets_controller.rb +3 -2
  41. data/app/controllers/hyrax/homepage_controller.rb +1 -1
  42. data/app/controllers/hyrax/my/works_controller.rb +2 -2
  43. data/app/controllers/hyrax/my_controller.rb +2 -2
  44. data/app/controllers/hyrax/permissions_controller.rb +1 -1
  45. data/app/controllers/hyrax/single_use_links_viewer_controller.rb +1 -1
  46. data/app/controllers/hyrax/workflow_actions_controller.rb +1 -1
  47. data/app/forms/hyrax/forms/admin_set_form.rb +8 -0
  48. data/app/forms/hyrax/forms/batch_edit_form.rb +1 -1
  49. data/app/forms/hyrax/forms/collection_form.rb +34 -3
  50. data/app/forms/hyrax/forms/file_set_edit_form.rb +1 -1
  51. data/app/forms/hyrax/forms/work_form.rb +34 -7
  52. data/app/forms/hyrax/forms/workflow_responsibility_form.rb +0 -4
  53. data/app/helpers/hyrax/hyrax_helper_behavior.rb +3 -4
  54. data/app/helpers/hyrax/iiif_helper.rb +8 -0
  55. data/app/indexers/hyrax/admin_set_indexer.rb +1 -1
  56. data/app/indexers/hyrax/basic_metadata_indexer.rb +1 -1
  57. data/app/indexers/hyrax/collection_indexer.rb +2 -2
  58. data/app/indexers/hyrax/file_set_indexer.rb +7 -0
  59. data/app/indexers/hyrax/indexes_workflow.rb +3 -5
  60. data/app/indexers/hyrax/valkyrie_indexers/base_indexer.rb +19 -0
  61. data/app/indexers/hyrax/work_indexer.rb +1 -1
  62. data/app/jobs/attach_files_to_work_job.rb +9 -1
  63. data/app/jobs/characterize_job.rb +20 -5
  64. data/app/jobs/import_url_job.rb +9 -16
  65. data/app/jobs/ingest_local_file_job.rb +4 -0
  66. data/app/jobs/visibility_copy_job.rb +3 -17
  67. data/app/models/admin_set.rb +5 -0
  68. data/app/models/concerns/hyrax/ability.rb +3 -3
  69. data/app/models/concerns/hyrax/basic_metadata.rb +6 -2
  70. data/app/models/concerns/hyrax/collection_behavior.rb +22 -12
  71. data/app/models/concerns/hyrax/collection_nesting.rb +1 -1
  72. data/app/models/concerns/hyrax/file_set/characterization.rb +8 -1
  73. data/app/models/concerns/hyrax/file_set/querying.rb +1 -1
  74. data/app/models/concerns/hyrax/file_set_behavior.rb +1 -1
  75. data/app/models/concerns/hyrax/human_readable_type.rb +2 -2
  76. data/app/models/concerns/hyrax/solr_document/characterization.rb +27 -23
  77. data/app/models/concerns/hyrax/solr_document/metadata.rb +37 -39
  78. data/app/models/concerns/hyrax/solr_document_behavior.rb +4 -8
  79. data/app/models/concerns/hyrax/virus_check.rb +20 -0
  80. data/app/models/concerns/hyrax/work_behavior.rb +3 -1
  81. data/app/models/file_download_stat.rb +2 -1
  82. data/app/models/hyrax/active_job_proxy.rb +43 -0
  83. data/app/models/hyrax/embargo.rb +21 -0
  84. data/app/models/hyrax/file_metadata.rb +109 -0
  85. data/app/models/hyrax/lease.rb +21 -0
  86. data/app/models/hyrax/permission_template.rb +8 -8
  87. data/app/models/hyrax/resource.rb +31 -0
  88. data/app/models/hyrax/statistic.rb +5 -1
  89. data/app/models/hyrax/uploaded_file.rb +0 -2
  90. data/app/models/hyrax/virus_scanner.rb +56 -0
  91. data/app/models/job_io_wrapper.rb +24 -9
  92. data/app/models/proxy_deposit_request.rb +1 -1
  93. data/app/models/solr_hit.rb +23 -0
  94. data/app/presenters/hyrax/admin_set_presenter.rb +1 -1
  95. data/app/presenters/hyrax/characterization_behavior.rb +2 -2
  96. data/app/presenters/hyrax/displays_image.rb +25 -7
  97. data/app/presenters/hyrax/file_set_presenter.rb +3 -3
  98. data/app/presenters/hyrax/member_presenter_factory.rb +9 -9
  99. data/app/presenters/hyrax/presenter_factory.rb +1 -4
  100. data/app/presenters/hyrax/trophy_presenter.rb +1 -1
  101. data/app/presenters/hyrax/work_show_presenter.rb +3 -3
  102. data/app/renderers/hyrax/renderers/faceted_attribute_renderer.rb +1 -1
  103. data/app/search_builders/hyrax/catalog_search_builder.rb +1 -1
  104. data/app/search_builders/hyrax/collection_search_builder.rb +1 -1
  105. data/app/search_builders/hyrax/dashboard/nested_collections_search_builder.rb +2 -2
  106. data/app/search_builders/hyrax/deposit_search_builder.rb +1 -1
  107. data/app/search_builders/hyrax/my/find_works_search_builder.rb +5 -9
  108. data/app/search_builders/hyrax/my/highlights_search_builder.rb +1 -3
  109. data/app/search_builders/hyrax/nested_collections_parent_search_builder.rb +1 -1
  110. data/app/search_builders/hyrax/parent_collection_search_builder.rb +1 -1
  111. data/app/services/hyrax/adapters/nesting_index_adapter.rb +6 -6
  112. data/app/services/hyrax/admin_set_service.rb +3 -11
  113. data/app/services/hyrax/analytics.rb +6 -6
  114. data/app/services/hyrax/collection_types/permissions_service.rb +5 -5
  115. data/app/services/hyrax/collections/permissions_service.rb +2 -2
  116. data/app/services/hyrax/custom_queries/navigators/child_collections_navigator.rb +39 -0
  117. data/app/services/hyrax/custom_queries/navigators/child_filesets_navigator.rb +39 -0
  118. data/app/services/hyrax/custom_queries/navigators/child_works_navigator.rb +39 -0
  119. data/app/services/hyrax/custom_queries/wings.rb +34 -0
  120. data/app/services/hyrax/database_migrator.rb +1 -0
  121. data/app/services/hyrax/derivative_path.rb +1 -1
  122. data/app/services/hyrax/embargo_manager.rb +100 -0
  123. data/app/services/hyrax/file_set_csv_service.rb +2 -0
  124. data/app/services/hyrax/file_set_visibility_propagator.rb +41 -0
  125. data/app/services/hyrax/graph_exporter.rb +1 -1
  126. data/app/services/hyrax/lease_manager.rb +71 -0
  127. data/app/services/hyrax/persist_directly_contained_output_file_service.rb +1 -1
  128. data/app/services/hyrax/query_service.rb +0 -0
  129. data/app/services/hyrax/resource_visibility_propagator.rb +50 -0
  130. data/app/services/hyrax/solr_query_builder_service.rb +71 -0
  131. data/app/services/hyrax/solr_service.rb +144 -0
  132. data/app/services/hyrax/statistics/file_sets/by_format.rb +1 -1
  133. data/app/services/hyrax/statistics/term_query.rb +7 -12
  134. data/app/services/hyrax/statistics/works/by_resource_type.rb +1 -1
  135. data/app/services/hyrax/thumbnail_path_service.rb +4 -3
  136. data/app/services/hyrax/versioning_service.rb +74 -19
  137. data/app/services/hyrax/virus_checker_service.rb +52 -0
  138. data/app/services/hyrax/visibility_intention_applicator.rb +43 -0
  139. data/app/services/hyrax/visibility_map.rb +65 -0
  140. data/app/services/hyrax/visibility_propagator.rb +19 -0
  141. data/app/services/hyrax/visibility_reader.rb +43 -0
  142. data/app/services/hyrax/visibility_writer.rb +43 -0
  143. data/app/services/hyrax/work_query_service.rb +3 -3
  144. data/app/services/hyrax/workflow/deposited_notification.rb +1 -1
  145. data/app/services/hyrax/works/migration_service.rb +33 -0
  146. data/app/views/hyrax/admin/admin_sets/_form.html.erb +6 -5
  147. data/app/views/hyrax/admin/admin_sets/_form_visibility.html.erb +2 -1
  148. data/app/views/hyrax/admin/admin_sets/_form_workflow.erb +1 -1
  149. data/app/views/hyrax/base/_attribute_rows.html.erb +2 -0
  150. data/app/views/hyrax/base/_attributes.html.erb +3 -3
  151. data/app/views/hyrax/base/_citations.html.erb +4 -4
  152. data/app/views/hyrax/base/_file_manager_actions.html.erb +2 -2
  153. data/app/views/hyrax/base/_file_manager_member_resource_options.html.erb +2 -2
  154. data/app/views/hyrax/base/_form_child_work_relationships.html.erb +1 -1
  155. data/app/views/hyrax/base/_form_files.html.erb +11 -9
  156. data/app/views/hyrax/base/_form_member_of_collections.html.erb +1 -1
  157. data/app/views/hyrax/base/_form_permission.html.erb +1 -2
  158. data/app/views/hyrax/base/_form_progress.html.erb +2 -2
  159. data/app/views/hyrax/base/_form_share.html.erb +8 -11
  160. data/app/views/hyrax/base/_show_actions.html.erb +3 -3
  161. data/app/views/hyrax/base/_social_media.html.erb +0 -13
  162. data/app/views/hyrax/base/_work_button_row.html.erb +7 -7
  163. data/app/views/hyrax/base/_workflow_actions.html.erb +4 -4
  164. data/app/views/hyrax/base/file_manager.html.erb +2 -2
  165. data/app/views/hyrax/base/iiif_viewers/_universal_viewer.html.erb +5 -2
  166. data/app/views/hyrax/base/inspect_work.html.erb +13 -13
  167. data/app/views/hyrax/base/unauthorized.html.erb +4 -4
  168. data/app/views/hyrax/batch_edits/_check_all.html.erb +1 -1
  169. data/app/views/hyrax/batch_edits/_delete_selected.html.erb +1 -1
  170. data/app/views/hyrax/batch_edits/edit.html.erb +11 -11
  171. data/app/views/hyrax/citations/work.html.erb +1 -1
  172. data/app/views/hyrax/collections/_show_document_list.html.erb +1 -1
  173. data/app/views/hyrax/collections/_sort_and_per_page.html.erb +4 -4
  174. data/app/views/hyrax/dashboard/collections/_form.html.erb +6 -5
  175. data/app/views/hyrax/dashboard/collections/_form_branding.html.erb +10 -10
  176. data/app/views/hyrax/dashboard/collections/_form_share.html.erb +5 -5
  177. data/app/views/hyrax/dashboard/collections/_show_descriptions.html.erb +1 -1
  178. data/app/views/hyrax/dashboard/collections/_show_document_list.html.erb +6 -6
  179. data/app/views/hyrax/dashboard/collections/_show_document_list_menu.html.erb +1 -1
  180. data/app/views/hyrax/dashboard/collections/_show_document_list_row.html.erb +3 -3
  181. data/app/views/hyrax/dashboard/collections/_sort_and_per_page.html.erb +2 -3
  182. data/app/views/hyrax/dashboard/collections/_work_action_menu.html.erb +8 -8
  183. data/app/views/hyrax/dashboard/collections/edit.html.erb +2 -2
  184. data/app/views/hyrax/dashboard/profiles/_edit_primary.html.erb +8 -8
  185. data/app/views/hyrax/dashboard/sidebar/_activity.html.erb +2 -0
  186. data/app/views/hyrax/dashboard/sidebar/_configuration.html.erb +4 -1
  187. data/app/views/hyrax/dashboard/sidebar/_menu_partials.html.erb +3 -0
  188. data/app/views/hyrax/dashboard/sidebar/_repository_content.html.erb +2 -0
  189. data/app/views/hyrax/dashboard/sidebar/_tasks.html.erb +2 -0
  190. data/app/views/hyrax/dashboard/works/_default_group.html.erb +4 -4
  191. data/app/views/hyrax/dashboard/works/_list_works.html.erb +1 -1
  192. data/app/views/hyrax/depositors/_modal_proxy_deny.html.erb +14 -0
  193. data/app/views/hyrax/depositors/index.html.erb +3 -0
  194. data/app/views/hyrax/embargoes/_list_expired_active_embargoes.html.erb +1 -1
  195. data/app/views/hyrax/file_sets/_actions.html.erb +1 -1
  196. data/app/views/hyrax/file_sets/_asset_deleted_flash.html.erb +1 -1
  197. data/app/views/hyrax/file_sets/_asset_saved_flash.html.erb +5 -6
  198. data/app/views/hyrax/file_sets/_asset_updated_flash.html.erb +2 -1
  199. data/app/views/hyrax/file_sets/_descriptions.html.erb +2 -2
  200. data/app/views/hyrax/file_sets/_extra_fields_modal.html.erb +3 -3
  201. data/app/views/hyrax/file_sets/_form.html.erb +1 -1
  202. data/app/views/hyrax/file_sets/_permission.html.erb +2 -1
  203. data/app/views/hyrax/file_sets/_permission_form.html.erb +9 -9
  204. data/app/views/hyrax/file_sets/_show_actions.html.erb +4 -4
  205. data/app/views/hyrax/file_sets/_show_details.html.erb +7 -7
  206. data/app/views/hyrax/file_sets/_versioning.html.erb +3 -3
  207. data/app/views/hyrax/file_sets/edit.html.erb +4 -3
  208. data/app/views/hyrax/file_sets/media_display/_audio.html.erb +2 -2
  209. data/app/views/hyrax/file_sets/media_display/_video.html.erb +2 -2
  210. data/app/views/hyrax/file_sets/proxy.html.erb +2 -2
  211. data/app/views/hyrax/my/_sort_and_per_page.html.erb +1 -1
  212. data/app/views/hyrax/my/collections/_modal_delete_selected_collections.html.erb +4 -1
  213. data/app/views/hyrax/my/collections/index.html.erb +1 -1
  214. data/app/views/hyrax/my/index.html.erb +1 -1
  215. data/app/views/hyrax/my/works/_default_group.html.erb +4 -4
  216. data/app/views/hyrax/my/works/_list_works.html.erb +3 -3
  217. data/app/views/hyrax/my/works/index.html.erb +1 -1
  218. data/app/views/hyrax/notifications/index.html.erb +1 -1
  219. data/app/views/hyrax/operations/index.html.erb +4 -4
  220. data/app/views/hyrax/pages/_form.html.erb +61 -60
  221. data/app/views/hyrax/permissions/confirm_access.html.erb +1 -1
  222. data/app/views/hyrax/single_use_links_viewer/single_use_error.html.erb +3 -7
  223. data/app/views/hyrax/static/mendeley.html.erb +2 -4
  224. data/app/views/hyrax/static/zotero.html.erb +2 -4
  225. data/app/views/hyrax/transfers/_received.html.erb +10 -10
  226. data/app/views/hyrax/transfers/_sent.html.erb +6 -6
  227. data/app/views/hyrax/uploads/_js_templates.html.erb +7 -7
  228. data/app/views/hyrax/uploads/_js_templates_branding.html.erb +8 -8
  229. data/app/views/hyrax/users/_activity_log.html.erb +25 -22
  230. data/app/views/hyrax/users/_left_sidebar.html.erb +1 -1
  231. data/app/views/hyrax/users/_proxies.html.erb +1 -1
  232. data/app/views/hyrax/users/_search_form.html.erb +3 -3
  233. data/app/views/hyrax/users/_vitals.html.erb +1 -1
  234. data/app/views/hyrax/users/index.html.erb +6 -6
  235. data/app/views/records/edit_fields/_abstract.html.erb +5 -0
  236. data/app/views/records/edit_fields/_access_right.html.erb +5 -0
  237. data/app/views/records/edit_fields/_alt_title.html.erb +3 -0
  238. data/app/views/records/edit_fields/_title.html.erb +1 -0
  239. data/app/views/records/show_fields/_based_near.html.erb +1 -1
  240. data/app/views/records/show_fields/_creator.html.erb +1 -1
  241. data/app/views/records/show_fields/_keyword.html.erb +1 -1
  242. data/app/views/records/show_fields/_language.html.erb +1 -1
  243. data/app/views/records/show_fields/_publisher.html.erb +1 -1
  244. data/app/views/records/show_fields/_resource_type.html.erb +1 -1
  245. data/app/views/records/show_fields/_subject.html.erb +1 -1
  246. data/config/initializers/indexing_adapter_initializer.rb +16 -0
  247. data/config/initializers/samvera-nesting_indexer_initializer.rb +3 -3
  248. data/config/locales/hyrax.de.yml +303 -24
  249. data/config/locales/hyrax.en.yml +279 -0
  250. data/config/locales/hyrax.es.yml +284 -5
  251. data/config/locales/hyrax.fr.yml +280 -1
  252. data/config/locales/hyrax.it.yml +279 -0
  253. data/config/locales/hyrax.pt-BR.yml +279 -0
  254. data/config/locales/hyrax.zh.yml +279 -0
  255. data/hyrax.gemspec +10 -11
  256. data/lib/generators/hyrax/config_generator.rb +6 -0
  257. data/lib/generators/hyrax/install_generator.rb +5 -0
  258. data/lib/generators/hyrax/riiif_generator.rb +2 -2
  259. data/lib/generators/hyrax/templates/catalog_controller.rb +71 -71
  260. data/lib/generators/hyrax/templates/config/analytics.yml +5 -5
  261. data/lib/generators/hyrax/templates/config/initializers/hyrax.rb +11 -1
  262. data/lib/generators/hyrax/templates/config/initializers/riiif.rb +3 -3
  263. data/lib/generators/hyrax/templates/config/solr_wrapper_valkyrie_test.yml +7 -0
  264. data/lib/generators/hyrax/templates/config/valkyrie_index.yml +12 -0
  265. data/lib/generators/hyrax/templates/package.json +17 -0
  266. data/lib/generators/hyrax/templates/uv-config.json +3 -0
  267. data/lib/generators/hyrax/templates/uv.html +87 -0
  268. data/lib/generators/hyrax/work/templates/feature_spec.rb.erb +0 -1
  269. data/lib/hyrax.rb +17 -1
  270. data/lib/hyrax/configuration.rb +34 -20
  271. data/lib/hyrax/engine.rb +12 -10
  272. data/lib/hyrax/errors.rb +4 -0
  273. data/lib/hyrax/transactions/container.rb +13 -0
  274. data/lib/hyrax/transactions/create_work.rb +11 -0
  275. data/lib/hyrax/transactions/steps/apply_collection_permission_template.rb +32 -0
  276. data/lib/hyrax/transactions/steps/apply_permission_template.rb +2 -1
  277. data/lib/hyrax/transactions/steps/apply_visibility.rb +39 -0
  278. data/lib/hyrax/version.rb +1 -1
  279. data/lib/tasks/migrate.rake +6 -0
  280. data/lib/tasks/universal_viewer.rake +15 -0
  281. data/lib/valkyrie/indexing/solr/indexing_adapter.rb +102 -0
  282. data/lib/valkyrie/indexing_adapter.rb +29 -0
  283. data/lib/wings.rb +13 -4
  284. data/lib/wings/active_fedora_converter.rb +129 -15
  285. data/lib/wings/converter_value_mapper.rb +111 -0
  286. data/lib/wings/hydra/pcdm/models/concerns/collection_valkyrie_behavior.rb +27 -0
  287. data/lib/wings/hydra/pcdm/models/concerns/object_valkyrie_behavior.rb +27 -0
  288. data/lib/wings/hydra/pcdm/models/concerns/pcdm_valkyrie_behavior.rb +172 -0
  289. data/lib/wings/hydra/works/models/concerns/collection_valkyrie_behavior.rb +30 -0
  290. data/lib/wings/hydra/works/models/concerns/file_set_valkyrie_behavior.rb +30 -0
  291. data/lib/wings/hydra/works/models/concerns/work_valkyrie_behavior.rb +59 -0
  292. data/lib/wings/hydra/works/services/add_file_metadata_to_file_set.rb +113 -0
  293. data/lib/wings/model_transformer.rb +172 -47
  294. data/lib/wings/models/concerns/collection_behavior.rb +38 -0
  295. data/lib/wings/models/multi_checksum.rb +18 -0
  296. data/lib/wings/services/file_metadata_builder.rb +81 -0
  297. data/lib/wings/services/id_converter_service.rb +14 -0
  298. data/lib/wings/{value_mapper.rb → transformer_value_mapper.rb} +24 -5
  299. data/lib/wings/valkyrie/persister.rb +47 -24
  300. data/lib/wings/valkyrie/query_service.rb +141 -6
  301. data/lib/wings/valkyrie/storage/active_fedora.rb +27 -0
  302. data/spec/abilities/proxies_and_transfer_abilities_spec.rb +50 -10
  303. data/spec/actors/hyrax/actors/active_fedora_to_valkyrie_spec.rb +70 -0
  304. data/spec/actors/hyrax/actors/attach_members_actor_spec.rb +55 -10
  305. data/spec/actors/hyrax/actors/create_with_remote_files_actor_spec.rb +14 -0
  306. data/spec/actors/hyrax/actors/create_with_remote_files_ordered_members_actor_spec.rb +22 -30
  307. data/spec/actors/hyrax/actors/file_actor_spec.rb +200 -84
  308. data/spec/actors/hyrax/actors/file_set_actor_spec.rb +1 -1
  309. data/spec/actors/hyrax/actors/generic_work_actor_spec.rb +2 -6
  310. data/spec/actors/hyrax/actors/interpret_visibility_actor_spec.rb +1 -1
  311. data/spec/actors/hyrax/actors/ordered_members_actor_spec.rb +1 -1
  312. data/spec/actors/hyrax/actors/valkyrie_to_active_fedora_spec.rb +70 -0
  313. data/spec/controllers/catalog_controller_spec.rb +2 -2
  314. data/spec/controllers/hyrax/api/items_controller_spec.rb +9 -15
  315. data/spec/controllers/hyrax/collections_controller_spec.rb +6 -2
  316. data/spec/controllers/hyrax/dashboard/collections_controller_spec.rb +53 -4
  317. data/spec/controllers/hyrax/depositors_controller_spec.rb +3 -3
  318. data/spec/controllers/hyrax/downloads_controller_spec.rb +11 -2
  319. data/spec/controllers/hyrax/file_sets_controller_spec.rb +40 -2
  320. data/spec/controllers/hyrax/generic_works_controller_spec.rb +13 -3
  321. data/spec/controllers/hyrax/homepage_controller_spec.rb +3 -3
  322. data/spec/controllers/hyrax/single_use_links_viewer_controller_spec.rb +1 -2
  323. data/spec/factories/admin_sets_lw.rb +1 -1
  324. data/spec/factories/collections.rb +1 -1
  325. data/spec/factories/hyrax_embargo.rb +16 -0
  326. data/spec/factories/hyrax_lease.rb +16 -0
  327. data/spec/factories/hyrax_resource.rb +16 -0
  328. data/spec/factory_tests/adminsets_factory_spec.rb +4 -4
  329. data/spec/factory_tests/collections_factory_spec.rb +3 -3
  330. data/spec/features/actor_stack_spec.rb +64 -0
  331. data/spec/features/batch_create_spec.rb +1 -2
  332. data/spec/features/collection_multi_membership_spec.rb +1 -0
  333. data/spec/features/collection_spec.rb +2 -2
  334. data/spec/features/collection_type_spec.rb +1 -0
  335. data/spec/features/create_work_spec.rb +15 -6
  336. data/spec/features/dashboard/collection_spec.rb +103 -14
  337. data/spec/features/edit_content_block_admin_spec.rb +3 -3
  338. data/spec/features/edit_pages_admin.spec.rb +62 -0
  339. data/spec/features/proxy_spec.rb +21 -0
  340. data/spec/features/static_pages_spec.rb +1 -1
  341. data/spec/features/work_show_spec.rb +7 -3
  342. data/spec/fixtures/sample-file.pdf +0 -0
  343. data/spec/fixtures/updated-file.txt +1 -0
  344. data/spec/forms/hyrax/forms/batch_upload_form_spec.rb +5 -2
  345. data/spec/forms/hyrax/forms/collection_form_spec.rb +5 -2
  346. data/spec/forms/hyrax/forms/work_form_spec.rb +18 -5
  347. data/spec/forms/hyrax/generic_work_form_spec.rb +4 -4
  348. data/spec/helpers/hyrax/collections_helper_spec.rb +8 -8
  349. data/spec/helpers/hyrax/dashboard_helper_behavior_spec.rb +7 -8
  350. data/spec/helpers/hyrax/iiif_helper_spec.rb +16 -0
  351. data/spec/helpers/hyrax_helper_spec.rb +4 -4
  352. data/spec/hyrax/transactions/create_work_spec.rb +68 -0
  353. data/spec/hyrax/transactions/steps/apply_collection_permission_template_spec.rb +59 -0
  354. data/spec/hyrax/transactions/steps/apply_visibility_spec.rb +82 -0
  355. data/spec/indexers/hyrax/admin_set_indexer_spec.rb +15 -0
  356. data/spec/indexers/hyrax/file_set_indexer_spec.rb +26 -1
  357. data/spec/indexers/hyrax/valkyrie_indexers/base_indexer_spec.rb +16 -0
  358. data/spec/jobs/import_url_job_spec.rb +49 -2
  359. data/spec/jobs/ingest_local_file_job_spec.rb +25 -1
  360. data/spec/jobs/visibility_copy_job_spec.rb +46 -0
  361. data/spec/lib/hyrax/configuration_spec.rb +17 -11
  362. data/spec/lib/hyrax/redis_event_store_spec.rb +1 -1
  363. data/spec/matcher_tests/match_valkyrie_ids_with_af_ids_spec.rb +40 -0
  364. data/spec/models/file_set_spec.rb +4 -3
  365. data/spec/models/hyrax/embargo_spec.rb +27 -0
  366. data/spec/models/hyrax/file_metadata_spec.rb +110 -0
  367. data/spec/models/hyrax/lease_spec.rb +25 -0
  368. data/spec/models/hyrax/permission_template_spec.rb +2 -2
  369. data/spec/models/hyrax/resource_spec.rb +60 -0
  370. data/spec/models/hyrax/virus_scanner_spec.rb +50 -0
  371. data/spec/models/job_io_wrapper_spec.rb +63 -0
  372. data/spec/models/solr_hit_spec.rb +9 -0
  373. data/spec/models/user_spec.rb +1 -1
  374. data/spec/presenters/hyrax/file_set_presenter_spec.rb +11 -7
  375. data/spec/presenters/hyrax/presenter_factory_spec.rb +2 -2
  376. data/spec/presenters/hyrax/work_show_presenter_spec.rb +1 -1
  377. data/spec/requests/riiif_spec.rb +2 -2
  378. data/spec/search_builders/hyrax/my/find_works_search_builder_spec.rb +3 -3
  379. data/spec/services/hyrax/adapters/nesting_index_adapter_spec.rb +5 -6
  380. data/spec/services/hyrax/admin_set_service_spec.rb +2 -2
  381. data/spec/services/hyrax/custom_queries/navigators/child_collections_navigator_spec.rb +41 -0
  382. data/spec/services/hyrax/custom_queries/navigators/child_filesets_navigator_spec.rb +41 -0
  383. data/spec/services/hyrax/custom_queries/navigators/child_works_navigator_spec.rb +79 -0
  384. data/spec/services/hyrax/custom_queries/wings.rb +52 -0
  385. data/spec/services/hyrax/embargo_manager_spec.rb +123 -0
  386. data/spec/services/hyrax/embargo_service_spec.rb +2 -2
  387. data/spec/services/hyrax/file_set_visibility_propagator_spec.rb +59 -0
  388. data/spec/services/hyrax/resource_visibility_propagator_spec.rb +71 -0
  389. data/spec/services/hyrax/solr_query_builder_service_spec.rb +17 -0
  390. data/spec/services/hyrax/solr_service_spec.rb +218 -0
  391. data/spec/services/hyrax/thumbnail_path_service_spec.rb +6 -0
  392. data/spec/services/hyrax/versioning_service_spec.rb +35 -15
  393. data/spec/services/hyrax/visibility_intention_applicator_spec.rb +69 -0
  394. data/spec/services/hyrax/visibility_reader_spec.rb +38 -0
  395. data/spec/services/hyrax/visibility_writer_spec.rb +47 -0
  396. data/spec/services/hyrax/workflow/status_list_service_spec.rb +1 -13
  397. data/spec/services/hyrax/works/migration_service_spec.rb +29 -0
  398. data/spec/spec_helper.rb +24 -23
  399. data/spec/support/clean_solr.rb +7 -0
  400. data/spec/support/create_for_repository.rb +25 -0
  401. data/spec/support/factory_helpers.rb +3 -1
  402. data/spec/support/fakes/fake_actor.rb +21 -0
  403. data/spec/support/matchers/embargo.rb +9 -0
  404. data/spec/support/matchers/lease.rb +9 -0
  405. data/spec/support/matchers/match_valkyrie_ids_with_af_ids.rb +11 -0
  406. data/spec/support/matchers/permission.rb +22 -0
  407. data/spec/support/valkyrie_indexing.rb +1 -0
  408. data/spec/test_app_templates/Gemfile.extra +0 -2
  409. data/spec/test_app_templates/lib/generators/test_app_generator.rb +5 -6
  410. data/spec/valkyrie/indexing/solr/indexing_adapter_spec.rb +41 -0
  411. data/spec/valkyrie/indexing_adapter_spec.rb +25 -0
  412. data/spec/views/hyrax/base/_attributes.html.erb_spec.rb +1 -1
  413. data/spec/views/hyrax/base/_social_media.html.erb_spec.rb +0 -1
  414. data/spec/views/hyrax/base/show.html.erb_spec.rb +2 -2
  415. data/spec/views/hyrax/collections/_sort_and_per_page.html.erb_spec.rb +1 -1
  416. data/spec/views/hyrax/dashboard/_sidebar.html.erb_spec.rb +39 -0
  417. data/spec/views/hyrax/dashboard/collections/_sort_and_per_page.html.erb_spec.rb +1 -1
  418. data/spec/views/hyrax/file_sets/_versioning.html.erb_spec.rb +1 -0
  419. data/spec/views/hyrax/my/collections/_list_collections.html.erb_spec.rb +2 -2
  420. data/spec/views/records/edit_fields/_alt_title.html.erb_spec.rb +26 -0
  421. data/spec/views/records/edit_fields/_title.html.erb_spec.rb +24 -0
  422. data/spec/wings/active_fedora_converter_spec.rb +136 -1
  423. data/spec/wings/converter_value_mapper_spec.rb +23 -0
  424. data/spec/wings/hydra/pcdm/models/concerns/collection_valkyrie_behavior_spec.rb +41 -0
  425. data/spec/wings/hydra/pcdm/models/concerns/object_valkyrie_behavior_spec.rb +19 -0
  426. data/spec/wings/hydra/pcdm/models/concerns/pcdm_valkyrie_behavior_spec.rb +442 -0
  427. data/spec/wings/hydra/works/models/concerns/collection_valkyrie_behavior_spec.rb +22 -0
  428. data/spec/wings/hydra/works/models/concerns/file_set_valkyrie_behavior_spec.rb +90 -0
  429. data/spec/wings/hydra/works/models/concerns/work_valkyrie_behavior_spec.rb +218 -0
  430. data/spec/wings/model_transformer_spec.rb +167 -112
  431. data/spec/wings/models/concerns/collection_behavior_spec.rb +120 -0
  432. data/spec/wings/services/file_metadata_builder_spec.rb +39 -0
  433. data/spec/wings/services/id_converter_service_spec.rb +24 -0
  434. data/spec/wings/{value_mapper_spec.rb → transformer_value_mapper_spec.rb} +2 -2
  435. data/spec/wings/valkyrie/persister_spec.rb +544 -53
  436. data/spec/wings/valkyrie/query_service_spec.rb +381 -4
  437. data/spec/wings_helper.rb +4 -0
  438. data/template.rb +1 -1
  439. metadata +205 -49
  440. data/.travis.yml +0 -36
  441. data/lib/wings/resource_factory.rb +0 -8
@@ -30,16 +30,16 @@ RSpec.describe Hyrax::Actors::AttachMembersActor do
30
30
 
31
31
  context "when the id already exists in the members" do
32
32
  it "does nothing" do
33
- expect { subject }.not_to change { work.ordered_members.to_a }
33
+ expect { subject }.not_to change { env.curation_concern.ordered_members.to_a }
34
34
  end
35
35
 
36
36
  context "and the _destroy flag is set" do
37
37
  let(:attributes) { HashWithIndifferentAccess.new(work_members_attributes: { '0' => { id: id, _destroy: 'true' } }) }
38
38
 
39
39
  it "removes from the member and the ordered members" do
40
- expect { subject }.to change { work.ordered_members.to_a }
41
- expect(work.ordered_member_ids).not_to include(existing_child_work.id)
42
- expect(work.member_ids).not_to include(existing_child_work.id)
40
+ expect { subject }.to change { env.curation_concern.ordered_members.to_a }
41
+ expect(env.curation_concern.ordered_member_ids).not_to include(existing_child_work.id)
42
+ expect(env.curation_concern.member_ids).not_to include(existing_child_work.id)
43
43
  end
44
44
  end
45
45
  end
@@ -49,18 +49,63 @@ RSpec.describe Hyrax::Actors::AttachMembersActor do
49
49
  let(:id) { another_work.id }
50
50
 
51
51
  context "and I can edit that object" do
52
- before do
53
- allow(ability).to receive(:can?).with(:edit, GenericWork).and_return(true)
54
- end
52
+ let(:another_work) { create(:work, user: depositor) }
53
+
55
54
  it "is added to the ordered members" do
56
- expect { subject }.to change { work.ordered_members.to_a }
57
- expect(work.ordered_member_ids).to include(existing_child_work.id, another_work.id)
55
+ expect { subject }.to change { env.curation_concern.ordered_members.to_a }
56
+ expect(env.curation_concern.ordered_member_ids).to include(existing_child_work.id, another_work.id)
58
57
  end
59
58
  end
60
59
 
61
60
  context "and I can not edit that object" do
62
61
  it "does nothing" do
63
- expect { subject }.not_to change { work.ordered_members.to_a }
62
+ expect { subject }.not_to change { env.curation_concern.ordered_members.to_a }
63
+ end
64
+ end
65
+ end
66
+
67
+ context 'when using a valkyrie resource' do
68
+ let(:work) { create(:work).valkyrie_resource }
69
+
70
+ before { work.member_ids << Valkyrie::ID.new(existing_child_work.id) }
71
+
72
+ context "when the _destroy flag is set" do
73
+ let(:attributes) { HashWithIndifferentAccess.new(work_members_attributes: { '0' => { id: id, _destroy: 'true' } }) }
74
+
75
+ it "removes from the members" do
76
+ expect { middleware.update(env) }
77
+ .to change { env.curation_concern.member_ids }
78
+ .from([Valkyrie::ID.new(existing_child_work.id)])
79
+ .to be_empty
80
+ end
81
+ end
82
+
83
+ context 'when adding a duplicate member' do
84
+ it "does nothing" do
85
+ expect { middleware.update(env) }
86
+ .not_to change { env.curation_concern.member_ids }
87
+ end
88
+ end
89
+
90
+ context 'when adding a new member' do
91
+ let(:another_work) { create(:work, user: depositor) }
92
+ let(:id) { another_work.id }
93
+
94
+ it 'adds successfully' do
95
+ expect { middleware.update(env) }
96
+ .to change { env.curation_concern.member_ids }
97
+ .from([Valkyrie::ID.new(existing_child_work.id)])
98
+ .to [Valkyrie::ID.new(existing_child_work.id),
99
+ Valkyrie::ID.new(another_work.id)]
100
+ end
101
+
102
+ context 'and the ability cannot edit' do
103
+ let(:another_work) { create(:work) }
104
+
105
+ it "does nothing" do
106
+ expect { middleware.update(env) }
107
+ .not_to change { env.curation_concern.member_ids }
108
+ end
64
109
  end
65
110
  end
66
111
  end
@@ -44,6 +44,20 @@ RSpec.describe Hyrax::Actors::CreateWithRemoteFilesActor do
44
44
  end
45
45
  end
46
46
 
47
+ context "with source URIs that are remote and contain encoded parameters" do
48
+ let(:url1) { "https://dl.dropbox.com/fake/file?param1=%28example%29&param2=%5Bexample2%5D" }
49
+
50
+ before do
51
+ allow(::FileSet).to receive(:new).and_call_original
52
+ end
53
+
54
+ it "preserves the encoded parameters in the URIs" do
55
+ expect(ImportUrlJob).to receive(:perform_later).with(FileSet, Hyrax::Operation, {}).twice
56
+ expect(actor.create(environment)).to be true
57
+ expect(::FileSet).to have_received(:new).with(import_url: "https://dl.dropbox.com/fake/file?param1=%28example%29&param2=%5Bexample2%5D", label: "filepicker-demo.txt.txt")
58
+ end
59
+ end
60
+
47
61
  context "with source uris that are remote bearing auth headers" do
48
62
  let(:remote_files) do
49
63
  [{ url: url1,
@@ -1,5 +1,4 @@
1
1
  RSpec.describe Hyrax::Actors::CreateWithRemoteFilesOrderedMembersActor do
2
- let(:null_operation) { class_double('Hyrax::Operation').as_null_object }
3
2
  let(:terminator) { Hyrax::Actors::Terminator.new }
4
3
  let(:actor) { stack.build(terminator) }
5
4
  let(:stack) do
@@ -10,48 +9,41 @@ RSpec.describe Hyrax::Actors::CreateWithRemoteFilesOrderedMembersActor do
10
9
  let(:user) { create(:user) }
11
10
  let(:ability) { Ability.new(user) }
12
11
  let(:work) { create(:generic_work, user: user) }
13
- let(:urls) { ["https://dl.dropbox.com/fake/blah-blah.filepicker-demo.txt.txt", "https://dl.dropbox.com/fake/blah-blah.Getting%20Started.pdf"] }
14
- let(:filenames) { ['filepicker-demo.txt.txt', 'Getting%20Started.pdf'] }
12
+ let(:url1) { "https://dl.dropbox.com/fake/blah-blah.filepicker-demo.txt.txt" }
13
+ let(:url2) { "https://dl.dropbox.com/fake/blah-blah.Getting%20Started.pdf" }
15
14
 
16
15
  let(:remote_files) do
17
- urls.collect.with_index do |url, index|
18
- { url: url, expires: "2014-03-31T20:37:36.214Z", file_name: filenames[index] }
19
- end
16
+ [{ url: url1,
17
+ expires: "2014-03-31T20:37:36.214Z",
18
+ file_name: "filepicker-demo.txt.txt" },
19
+ { url: url2,
20
+ expires: "2014-03-31T20:37:36.731Z",
21
+ file_name: "Getting+Started.pdf" }]
20
22
  end
21
-
22
23
  let(:attributes) { { remote_files: remote_files } }
23
24
  let(:environment) { Hyrax::Actors::Environment.new(work, ability, attributes) }
24
25
 
25
26
  before do
26
- allow(Hyrax::Operation).to receive(:create!).and_return(null_operation)
27
27
  allow(terminator).to receive(:create).and_return(true)
28
28
  end
29
29
 
30
30
  context "with two file_sets" do
31
- it "attaches files and passes ordered_members to OrderedMembersActor in correct order" do
32
- expect(ImportUrlJob).to receive(:perform_later).with(FileSet, null_operation, {}).twice
33
- expect(actor.create(environment)).to be true
34
- expect(work.ordered_members.to_a.collect(&:label)).to eq(filenames)
31
+ let(:remote_files) do
32
+ [{ url: url1,
33
+ expires: "2014-03-31T20:37:36.214Z",
34
+ file_name: "filepicker-demo.txt.txt" },
35
+ { url: url2,
36
+ expires: "2014-03-31T20:37:36.731Z",
37
+ file_name: "Getting+Started.pdf" }]
35
38
  end
36
- end
37
-
38
- context "with two environments processed by the same actor instance simultaneously" do
39
- let(:work2) { create(:generic_work, user: user) }
40
- let(:environments) { [environment, Hyrax::Actors::Environment.new(work2, ability, attributes)] }
41
39
 
42
- # rubocop:disable RSpec/ExampleLength
43
- it "attaches the correct FileSets to the correct works in the correct order" do
44
- expect(ImportUrlJob).to receive(:perform_later).with(FileSet, null_operation, {}).exactly(4).times
45
- threads = environments.collect do |env|
46
- Thread.new do
47
- Rails.application.reloader.wrap do
48
- expect(actor.create(env)).to be true
49
- expect(env.curation_concern.ordered_members.to_a.collect(&:label)).to eq(filenames)
50
- end
51
- end
52
- end
53
- threads.each(&:join)
40
+ it "attaches files and passes ordered_members to OrderedMembersActor in correct order" do
41
+ expect(Hyrax::Actors::OrderedMembersActor).to receive(:new).with([FileSet, FileSet], user).and_return(Hyrax::Actors::OrderedMembersActor)
42
+ expect(Hyrax::Actors::OrderedMembersActor).to receive(:attach_ordered_members_to_work).with(work)
43
+ expect(ImportUrlJob).to receive(:perform_later).with(FileSet, Hyrax::Operation, {}).twice
44
+ expect(actor.create(environment)).to be true
45
+ expect(actor.ordered_members.first.label).to eq('filepicker-demo.txt.txt')
46
+ expect(actor.ordered_members.last.label).to eq('Getting+Started.pdf')
54
47
  end
55
- # rubocop:enable RSpec/ExampleLength
56
48
  end
57
49
  end
@@ -1,12 +1,15 @@
1
+ require 'wings/services/file_metadata_builder'
2
+ require 'wings/valkyrie/query_service'
3
+
1
4
  RSpec.describe Hyrax::Actors::FileActor do
2
5
  include ActionDispatch::TestProcess
3
6
  include Hyrax::FactoryHelpers
4
7
 
5
- let(:user) { create(:user) }
6
- let(:file_set) { create(:file_set) }
7
- let(:relation) { :original_file }
8
- let(:actor) { described_class.new(file_set, relation, user) }
9
- let(:fixture) { fixture_file_upload('/world.png', 'image/png') }
8
+ let(:user) { create(:user) }
9
+ let(:file_set) { create(:file_set) }
10
+ let(:relation) { :original_file }
11
+ let(:actor) { described_class.new(file_set, relation, user) }
12
+ let(:fixture) { fixture_file_upload('/world.png', 'image/png') }
10
13
  let(:huf) { Hyrax::UploadedFile.new(user: user, file_set_uri: file_set.uri, file: fixture) }
11
14
  let(:io) { JobIoWrapper.new(file_set_id: file_set.id, user: user, uploaded_file: huf) }
12
15
  let(:pcdmfile) do
@@ -17,109 +20,222 @@ RSpec.describe Hyrax::Actors::FileActor do
17
20
  end
18
21
  end
19
22
 
20
- context 'relation' do
21
- let(:relation) { :remastered }
22
- let(:file_set) do
23
- FileSetWithExtras.create!(attributes_for(:file_set)) do |file|
24
- file.apply_depositor_metadata(user.user_key)
23
+ context 'when using active fedora directly' do
24
+ context 'relation' do
25
+ let(:relation) { :remastered }
26
+ let(:file_set) do
27
+ FileSetWithExtras.create!(attributes_for(:file_set)) do |file|
28
+ file.apply_depositor_metadata(user.user_key)
29
+ end
25
30
  end
26
- end
27
31
 
28
- before do
29
- class FileSetWithExtras < FileSet
30
- directly_contains_one :remastered, through: :files, type: ::RDF::URI('http://pcdm.org/use#IntermediateFile'), class_name: 'Hydra::PCDM::File'
32
+ before do
33
+ class FileSetWithExtras < FileSet
34
+ directly_contains_one :remastered, through: :files, type: ::RDF::URI('http://pcdm.org/use#IntermediateFile'), class_name: 'Hydra::PCDM::File'
35
+ end
36
+ end
37
+ after do
38
+ Object.send(:remove_const, :FileSetWithExtras)
39
+ end
40
+ it 'uses the relation from the actor' do
41
+ expect(CharacterizeJob).to receive(:perform_later).with(FileSetWithExtras, String, huf.uploader.path)
42
+ actor.ingest_file(io)
43
+ expect(file_set.reload.remastered.mime_type).to eq 'image/png'
31
44
  end
32
45
  end
33
- after do
34
- Object.send(:remove_const, :FileSetWithExtras)
35
- end
36
- it 'uses the relation from the actor' do
37
- expect(CharacterizeJob).to receive(:perform_later).with(FileSetWithExtras, String, huf.uploader.path)
46
+
47
+ it 'uses the provided mime_type' do
48
+ allow(fixture).to receive(:content_type).and_return('image/gif')
49
+ expect(CharacterizeJob).to receive(:perform_later).with(FileSet, String, huf.uploader.path)
38
50
  actor.ingest_file(io)
39
- expect(file_set.reload.remastered.mime_type).to eq 'image/png'
51
+ expect(file_set.reload.original_file.mime_type).to eq 'image/gif'
40
52
  end
41
- end
42
53
 
43
- it 'uses the provided mime_type' do
44
- allow(fixture).to receive(:content_type).and_return('image/gif')
45
- expect(CharacterizeJob).to receive(:perform_later).with(FileSet, String, huf.uploader.path)
46
- actor.ingest_file(io)
47
- expect(file_set.reload.original_file.mime_type).to eq 'image/gif'
48
- end
54
+ context 'with two existing versions from different users' do
55
+ let(:fixture2) { fixture_file_upload('/small_file.txt', 'text/plain') }
56
+ let(:huf2) { Hyrax::UploadedFile.new(user: user2, file_set_uri: file_set.uri, file: fixture2) }
57
+ let(:io2) { JobIoWrapper.new(file_set_id: file_set.id, user: user2, uploaded_file: huf2) }
58
+ let(:user2) { create(:user) }
59
+ let(:actor2) { described_class.new(file_set, relation, user2) }
60
+ let(:versions) { file_set.reload.original_file.versions }
49
61
 
50
- context 'with two existing versions from different users' do
51
- let(:fixture2) { fixture_file_upload('/small_file.txt', 'text/plain') }
52
- let(:huf2) { Hyrax::UploadedFile.new(user: user2, file_set_uri: file_set.uri, file: fixture2) }
53
- let(:io2) { JobIoWrapper.new(file_set_id: file_set.id, user: user2, uploaded_file: huf2) }
54
- let(:user2) { create(:user) }
55
- let(:actor2) { described_class.new(file_set, relation, user2) }
56
- let(:versions) { file_set.reload.original_file.versions }
62
+ before do
63
+ allow(Hydra::Works::CharacterizationService).to receive(:run).with(any_args)
64
+ actor.ingest_file(io)
65
+ actor2.ingest_file(io2)
66
+ end
57
67
 
58
- before do
59
- allow(Hydra::Works::CharacterizationService).to receive(:run).with(any_args)
60
- actor.ingest_file(io)
61
- actor2.ingest_file(io2)
68
+ it 'has two versions' do
69
+ expect(versions.all.count).to eq 2
70
+ # the current version
71
+ expect(Hyrax::VersioningService.latest_version_of(file_set.reload.original_file).label).to eq 'version2'
72
+ expect(file_set.original_file.mime_type).to eq 'text/plain'
73
+ expect(file_set.original_file.original_name).to eq 'small_file.txt'
74
+ expect(file_set.original_file.content).to eq fixture2.open.read
75
+ # the user for each version
76
+ expect(Hyrax::VersionCommitter.where(version_id: versions.first.uri).pluck(:committer_login)).to eq [user.user_key]
77
+ expect(Hyrax::VersionCommitter.where(version_id: versions.last.uri).pluck(:committer_login)).to eq [user2.user_key]
78
+ end
62
79
  end
63
80
 
64
- it 'has two versions' do
65
- expect(versions.all.count).to eq 2
66
- # the current version
67
- expect(Hyrax::VersioningService.latest_version_of(file_set.reload.original_file).label).to eq 'version2'
68
- expect(file_set.original_file.mime_type).to eq 'text/plain'
69
- expect(file_set.original_file.original_name).to eq 'small_file.txt'
70
- expect(file_set.original_file.content).to eq fixture2.open.read
71
- # the user for each version
72
- expect(Hyrax::VersionCommitter.where(version_id: versions.first.uri).pluck(:committer_login)).to eq [user.user_key]
73
- expect(Hyrax::VersionCommitter.where(version_id: versions.last.uri).pluck(:committer_login)).to eq [user2.user_key]
81
+ describe '#ingest_file' do
82
+ before do
83
+ expect(Hydra::Works::AddFileToFileSet).to receive(:call).with(file_set, io, relation, versioning: false)
84
+ end
85
+ it 'when the file is available' do
86
+ allow(file_set).to receive(:save).and_return(true)
87
+ allow(file_set).to receive(relation).and_return(pcdmfile)
88
+ expect(Hyrax::VersioningService).to receive(:create).with(pcdmfile, user)
89
+ expect(CharacterizeJob).to receive(:perform_later).with(FileSet, pcdmfile.id, huf.uploader.path)
90
+ actor.ingest_file(io)
91
+ end
92
+ it 'returns false when save fails' do
93
+ allow(file_set).to receive(:save).and_return(false)
94
+ expect(actor.ingest_file(io)).to be_falsey
95
+ end
74
96
  end
75
- end
76
97
 
77
- describe '#ingest_file' do
78
- before do
79
- expect(Hydra::Works::AddFileToFileSet).to receive(:call).with(file_set, io, relation, versioning: false)
80
- end
81
- it 'when the file is available' do
82
- allow(file_set).to receive(:save).and_return(true)
83
- allow(file_set).to receive(relation).and_return(pcdmfile)
84
- expect(Hyrax::VersioningService).to receive(:create).with(pcdmfile, user)
85
- expect(CharacterizeJob).to receive(:perform_later).with(FileSet, pcdmfile.id, huf.uploader.path)
86
- actor.ingest_file(io)
87
- end
88
- it 'returns false when save fails' do
89
- allow(file_set).to receive(:save).and_return(false)
90
- expect(actor.ingest_file(io)).to be_falsey
98
+ describe '#revert_to' do
99
+ let(:revision_id) { 'asdf1234' }
100
+
101
+ before do
102
+ allow(pcdmfile).to receive(:restore_version).with(revision_id)
103
+ allow(file_set).to receive(relation).and_return(pcdmfile)
104
+ expect(Hyrax::VersioningService).to receive(:create).with(pcdmfile, user)
105
+ expect(CharacterizeJob).to receive(:perform_later).with(file_set, pcdmfile.id)
106
+ end
107
+
108
+ it 'reverts to a previous version of a file' do
109
+ expect(file_set).not_to receive(:remastered)
110
+ expect(actor.relation).to eq(:original_file)
111
+ actor.revert_to(revision_id)
112
+ end
113
+
114
+ describe 'for a different relation' do
115
+ let(:relation) { :remastered }
116
+
117
+ it 'reverts to a previous version of a file' do
118
+ expect(actor.relation).to eq(:remastered)
119
+ actor.revert_to(revision_id)
120
+ end
121
+ it 'does not rely on the default relation' do
122
+ pending "Hydra::Works::VirusCheck must support other relations: https://github.com/samvera/hyrax/issues/1187"
123
+ expect(actor.relation).to eq(:remastered)
124
+ expect(file_set).not_to receive(:original_file)
125
+ actor.revert_to(revision_id)
126
+ end
127
+ end
91
128
  end
92
129
  end
93
130
 
94
- describe '#revert_to' do
95
- let(:revision_id) { 'asdf1234' }
131
+ context 'when using valkyrie' do
132
+ let(:user) { create(:user) }
133
+ let(:file_set) { create(:file_set) }
134
+ let(:relation) { Valkyrie::Vocab::PCDMUse.OriginalFile }
135
+ let(:actor) { described_class.new(file_set, relation, user, use_valkyrie: true) }
136
+ let(:fixture) { fixture_file_upload('/world.png', 'image/png') }
137
+ let(:huf) { Hyrax::UploadedFile.new(user: user, file: fixture) }
138
+ let(:io) { JobIoWrapper.new(file_set_id: file_set.id, user: user, uploaded_file: huf, path: huf.uploader.path) }
139
+ let(:storage_adapter) { Hyrax.storage_adapter }
140
+ let(:metadata_adapter) { Hyrax.metadata_adapter }
141
+ let(:persister) { metadata_adapter.persister }
142
+ let(:query_service) { Wings::Valkyrie::QueryService.new(adapter: metadata_adapter) }
143
+ let(:file_metadata) do
144
+ metadata_builder = Wings::FileMetadataBuilder.new(storage_adapter: storage_adapter, persister: persister)
145
+ file_metadata = Hyrax::FileMetadata.for(file: fixture)
146
+ metadata_builder.create(file: fixture, file_metadata: file_metadata, file_set: file_set)
147
+ end
148
+
149
+ context 'relation' do
150
+ let(:relation) { RDF::URI.new("http://pcdm.org/use#remastered") }
151
+
152
+ it 'uses the relation from the actor' do
153
+ pending 'implementation of Wings::Valkyrie::Persister #save_file_metadata'
154
+ expect(Hyrax::VersioningService).to receive(:create).with(Hyrax::FileMetadata, user)
155
+ expect(CharacterizeJob).to receive(:perform_later)
156
+ saved_metadata = actor.ingest_file(io)
157
+ reloaded = query_service.find_by(id: file_set.id)
158
+ expect(reloaded.member_by(use: relation).id).to eq saved_metadata.id
159
+ end
160
+
161
+ context 'when relation is a string' do
162
+ let(:relation) { 'thumbnail_file' }
96
163
 
97
- before do
98
- allow(pcdmfile).to receive(:restore_version).with(revision_id)
99
- allow(file_set).to receive(relation).and_return(pcdmfile)
100
- expect(Hyrax::VersioningService).to receive(:create).with(pcdmfile, user)
101
- expect(CharacterizeJob).to receive(:perform_later).with(file_set, pcdmfile.id)
164
+ it 'converts relation to URI before using the relation from the actor' do
165
+ pending 'implementation of Wings::Valkyrie::Persister #save_file_metadata'
166
+ expect(Hyrax::VersioningService).to receive(:create).with(Hyrax::FileMetadata, user)
167
+ expect(CharacterizeJob).to receive(:perform_later)
168
+ saved_metadata = actor.ingest_file(io)
169
+ reloaded = query_service.find_by(id: file_set.id)
170
+ expect(reloaded.member_by(use: relation).id).to eq saved_metadata.id
171
+ end
172
+ end
102
173
  end
103
174
 
104
- it 'reverts to a previous version of a file' do
105
- expect(file_set).not_to receive(:remastered)
106
- expect(actor.relation).to eq(:original_file)
107
- actor.revert_to(revision_id)
175
+ xit 'uses the provided mime_type' do
176
+ pending 'implementation of Wings::Valkyrie::Persister #save_file_metadata'
177
+ allow(fixture).to receive(:content_type).and_return('image/gif')
178
+ expect(Hyrax::VersioningService).to receive(:create).with(Hyrax::FileMetadata, user)
179
+ expect(CharacterizeJob).to receive(:perform_later)
180
+ saved_metadata = actor.ingest_file(io)
181
+ expect(saved_metadata.mime_type).to eq ['image/gif']
108
182
  end
109
183
 
110
- describe 'for a different relation' do
111
- let(:relation) { :remastered }
184
+ context 'with two existing versions from different users' do
185
+ let(:fixture2) { fixture_file_upload('/small_file.txt', 'text/plain') }
186
+ let(:huf2) { Hyrax::UploadedFile.new(user: user2, file: fixture2) }
187
+ let(:io2) { JobIoWrapper.new(file_set_id: file_set.id, user: user2, uploaded_file: huf2, path: huf2.uploader.path) }
188
+ let(:user2) { create(:user) }
189
+ let(:actor2) { described_class.new(file_set, relation, user2) }
190
+ let(:adapter) { Hyrax.metadata_adapter }
191
+ let(:query_service) { Wings::Valkyrie::QueryService.new(adapter: adapter) }
192
+ let(:versions) do
193
+ reloaded = query_service.find_by(id: file_set.id)
194
+ reloaded.original_file.versions
195
+ end
112
196
 
113
- it 'reverts to a previous version of a file' do
114
- expect(actor.relation).to eq(:remastered)
115
- actor.revert_to(revision_id)
197
+ before do
198
+ # TODO: WINGS - When #ingest_file works, these should be uncommented.
199
+ # expect(Hyrax::VersioningService).to receive(:create).with(Hyrax::FileMetadata, user)
200
+ # expect(Hyrax::VersioningService).to receive(:create).with(Hyrax::FileMetadata, user2)
201
+ # expect(CharacterizeJob).to receive(:perform_later)
202
+ allow(CharacterizeJob).to receive(:perform_later)
203
+ actor.ingest_file(io)
204
+ actor2.ingest_file(io2)
116
205
  end
117
- it 'does not rely on the default relation' do
118
- pending "Hydra::Works::VirusCheck must support other relations: https://github.com/samvera/hyrax/issues/1187"
119
- expect(actor.relation).to eq(:remastered)
120
- expect(file_set).not_to receive(:original_file)
121
- actor.revert_to(revision_id)
206
+
207
+ it 'has two versions' do
208
+ pending 'implementation of Wings::Valkyrie::Persister #save_file_metadata'
209
+ expect(versions.count).to eq 2
210
+ # the current version
211
+ reloaded = query_service.find_by(id: file_set.id)
212
+ expect(Hyrax::VersioningService.latest_version_of(reloaded.original_file).label).to eq ['version2']
213
+ expect(file_set.original_file.mime_type).to eq ['text/plain']
214
+ expect(file_set.original_file.original_filename).to eq ['small_file.txt']
215
+ expect(file_set.original_file.file.read).to eq fixture2.open.read
216
+ # the user for each versioe
217
+ expect(Hyrax::VersionCommitter.where(version_id: versions.first.id.to_s).pluck(:committer_login)).to eq [user.user_key]
218
+ expect(Hyrax::VersionCommitter.where(version_id: versions.last.id.to_s).pluck(:committer_login)).to eq [user2.user_key]
219
+ end
220
+ end
221
+
222
+ describe '#ingest_file' do
223
+ it 'when the file is available' do
224
+ pending 'implementation of Wings::Valkyrie::Persister #save_file_metadata'
225
+ expect(Hyrax::VersioningService).to receive(:create).with(Hyrax::FileMetadata, user)
226
+ expect(CharacterizeJob).to receive(:perform_later)
227
+ actor.ingest_file(io)
228
+ reloaded = query_service.find_by(id: file_set.id)
229
+ expect(reloaded.member_by(use: relation)).not_to be_nil
230
+ end
231
+ # rubocop:disable RSpec/AnyInstance
232
+ it 'returns false when save fails' do
233
+ expect(Hyrax::VersioningService).not_to receive(:create).with(Hyrax::FileMetadata, user)
234
+ expect(CharacterizeJob).not_to receive(:perform_later)
235
+ allow_any_instance_of(Wings::FileMetadataBuilder).to receive(:create).and_raise(StandardError)
236
+ expect(actor.ingest_file(io)).to be_falsey
122
237
  end
238
+ # rubocop:enable RSpec/AnyInstance
123
239
  end
124
240
  end
125
241
  end