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
@@ -293,7 +293,7 @@ RSpec.describe Hyrax::Actors::FileSetActor do
293
293
  let(:work_v1) { create(:generic_work) } # this version of the work has no members
294
294
 
295
295
  before do # another version of the same work is saved with a member
296
- work_v2 = ActiveFedora::Base.find(work_v1.id)
296
+ work_v2 = Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: work_v1.id, use_valkyrie: false)
297
297
  work_v2.ordered_members << create(:file_set)
298
298
  work_v2.save!
299
299
  end
@@ -39,13 +39,9 @@ RSpec.describe Hyrax::Actors::GenericWorkActor do
39
39
  end
40
40
 
41
41
  context 'failure' do
42
- before do
43
- allow(middleware).to receive(:attach_files).and_return(true)
44
- end
42
+ before { allow_any_instance_of(described_class).to receive(:save).and_return(false) }
45
43
 
46
- # The clean is here because this test depends on the repo not having an AdminSet/PermissionTemplate created yet
47
- it 'returns false', :clean_repo do
48
- expect(curation_concern).to receive(:save).and_return(false)
44
+ it 'returns false' do
49
45
  expect(middleware.create(env)).to be false
50
46
  end
51
47
  end
@@ -439,7 +439,7 @@ RSpec.describe Hyrax::Actors::InterpretVisibilityActor do
439
439
 
440
440
  it 'sets error on curation_concern and return false' do
441
441
  expect(subject.create(env)).to be false
442
- expect(curation_concern.errors[:lease_expiration_date].first).to eq 'Must be a future date'
442
+ expect(env.curation_concern.errors[:lease_expiration_date].first).to eq 'Must be a future date'
443
443
  end
444
444
  end
445
445
  end
@@ -38,7 +38,7 @@ RSpec.describe Hyrax::Actors::OrderedMembersActor do
38
38
  let(:work_v1) { create(:generic_work) } # this version of the work has no members
39
39
 
40
40
  before do # another version of the same work is saved with a member
41
- work_v2 = ActiveFedora::Base.find(work_v1.id)
41
+ work_v2 = Hyrax.query_service.find_by_alternate_identifier(alternate_identifier: work_v1.id, use_valkyrie: false)
42
42
  work_v2.ordered_members << create(:file_set)
43
43
  work_v2.save!
44
44
  end
@@ -0,0 +1,70 @@
1
+ # frozen_string_literal: true
2
+
3
+ RSpec.describe Hyrax::Actors::ValkyrieToActiveFedora do
4
+ let(:ability) { :FAKE_ABILITY }
5
+ let(:attrs) { {} }
6
+ let(:env) { Hyrax::Actors::Environment.new(work, ability, attrs) }
7
+ let(:spy) { middleware.next_actor }
8
+ let(:terminator) { Hyrax::Actors::Terminator.new }
9
+ let(:work) { FactoryBot.build(:work).valkyrie_resource }
10
+
11
+ subject(:middleware) do
12
+ stack = ActionDispatch::MiddlewareStack.new.tap do |middleware|
13
+ middleware.use described_class
14
+ middleware.use FakeActor
15
+ end
16
+
17
+ stack.build(terminator)
18
+ end
19
+
20
+ shared_examples 'casts to ActiveFedora' do |method|
21
+ it 'returns true' do
22
+ expect(middleware.public_send(method, env)).to be true
23
+ end
24
+
25
+ it 'casts to ActiveFedora' do
26
+ expect { middleware.public_send(method, env) }
27
+ .to change { env.curation_concern }
28
+ .to be_a GenericWork
29
+ end
30
+
31
+ context 'when concern is not a valkyrie resource' do
32
+ let(:work) { :FAKE_WORK }
33
+
34
+ it 'is a no-op' do
35
+ expect { middleware.public_send(method, env) }
36
+ .not_to change { env.curation_concern }
37
+ end
38
+ end
39
+ end
40
+
41
+ describe '#create' do
42
+ include_examples 'casts to ActiveFedora', :create
43
+
44
+ it 'calls create on next actor' do
45
+ expect { middleware.create(env) }
46
+ .to change { spy.created }
47
+ .from be_falsey
48
+ end
49
+ end
50
+
51
+ describe '#update' do
52
+ include_examples 'casts to ActiveFedora', :update
53
+
54
+ it 'calls update on next actor' do
55
+ expect { middleware.update(env) }
56
+ .to change { spy.updated }
57
+ .from be_falsey
58
+ end
59
+ end
60
+
61
+ describe '#destroy' do
62
+ include_examples 'casts to ActiveFedora', :destroy
63
+
64
+ it 'calls update on next actor' do
65
+ expect { middleware.destroy(env) }
66
+ .to change { spy.destroyed }
67
+ .from be_falsey
68
+ end
69
+ end
70
+ end
@@ -18,8 +18,8 @@ RSpec.describe CatalogController, type: :controller do
18
18
  end
19
19
 
20
20
  before do
21
- objects.each { |obj| ActiveFedora::SolrService.add(obj.to_solr) }
22
- ActiveFedora::SolrService.commit
21
+ objects.each { |obj| Hyrax::SolrService.add(obj.to_solr) }
22
+ Hyrax::SolrService.commit
23
23
  end
24
24
 
25
25
  context 'with a non-work file' do
@@ -71,7 +71,7 @@ RSpec.describe Hyrax::API::ItemsController, type: :controller do
71
71
 
72
72
  before do
73
73
  allow(Hyrax::WorkRelation).to receive(:new).and_return(relation)
74
- allow(relation).to receive(:find).with(default_work.id).and_raise(ActiveFedora::ObjectNotFoundError)
74
+ allow(relation).to receive(:find).with(default_work.id).and_raise(Hyrax::ObjectNotFoundError)
75
75
  get :show, params: { format: :json, id: default_work.id, token: token }
76
76
  end
77
77
 
@@ -198,8 +198,7 @@ RSpec.describe Hyrax::API::ItemsController, type: :controller do
198
198
 
199
199
  it 'calls the arkivo actor to update the work' do
200
200
  expect(arkivo_actor).to receive(:update_work_from_item)
201
- request.env['RAW_POST_DATA'] = put_item
202
- put :update, params: { id: gw.id, format: :json }
201
+ put :update, params: { id: gw.id, format: :json }, body: put_item
203
202
  end
204
203
  end
205
204
 
@@ -216,8 +215,7 @@ RSpec.describe Hyrax::API::ItemsController, type: :controller do
216
215
  allow(relation).to receive(:find).with(non_arkivo_gw.id).and_return(non_arkivo_gw)
217
216
 
218
217
  # Post an update to a work with a nil arkivo_checksum
219
- request.env['RAW_POST_DATA'] = put_item
220
- put :update, params: { id: non_arkivo_gw.id, format: :json }
218
+ put :update, params: { id: non_arkivo_gw.id, format: :json }, body: put_item
221
219
  end
222
220
 
223
221
  it "is forbidden" do
@@ -233,10 +231,9 @@ RSpec.describe Hyrax::API::ItemsController, type: :controller do
233
231
  before do
234
232
  allow(Hyrax::WorkRelation).to receive(:new).and_return(relation)
235
233
  allow(relation).to receive(:find).with(gw.id) do
236
- raise(ActiveFedora::ObjectNotFoundError)
234
+ raise(Hyrax::ObjectNotFoundError)
237
235
  end
238
- request.env['RAW_POST_DATA'] = put_item
239
- put :update, params: { id: gw.id, format: :json }
236
+ put :update, params: { id: gw.id, format: :json }, body: put_item
240
237
  end
241
238
 
242
239
  it "is not found" do
@@ -251,8 +248,7 @@ RSpec.describe Hyrax::API::ItemsController, type: :controller do
251
248
  allow(controller).to receive(:user).and_return(user)
252
249
  allow(user).to receive(:can?).and_return(false)
253
250
  # Post an update with an resource unauthorized for the user
254
- request.env['RAW_POST_DATA'] = put_item
255
- put :update, params: { id: gw.id, format: :json }
251
+ put :update, params: { id: gw.id, format: :json }, body: put_item
256
252
  end
257
253
 
258
254
  it "is unauthorized" do
@@ -268,8 +264,7 @@ RSpec.describe Hyrax::API::ItemsController, type: :controller do
268
264
  let(:bad_token_item) { FactoryBot.json(:put_item, token: bad_token) }
269
265
 
270
266
  before do
271
- request.env['RAW_POST_DATA'] = bad_token_item
272
- put :update, params: { id: gw.id, format: :json }
267
+ put :update, params: { id: gw.id, format: :json }, body: bad_token_item
273
268
  end
274
269
 
275
270
  it "is unauthorized" do
@@ -283,8 +278,7 @@ RSpec.describe Hyrax::API::ItemsController, type: :controller do
283
278
  let(:invalid_item) { { foo: 'bar' }.to_json }
284
279
 
285
280
  before do
286
- request.env['RAW_POST_DATA'] = invalid_item
287
- put :update, params: { id: gw.id, format: :json }
281
+ put :update, params: { id: gw.id, format: :json }, body: invalid_item
288
282
  end
289
283
 
290
284
  it "is a bad request" do
@@ -374,7 +368,7 @@ RSpec.describe Hyrax::API::ItemsController, type: :controller do
374
368
  before do
375
369
  # Mock ActiveFedora
376
370
  allow(Hyrax::WorkRelation).to receive(:new).and_return(relation)
377
- allow(relation).to receive(:find).with(not_found_id).and_raise(ActiveFedora::ObjectNotFoundError)
371
+ allow(relation).to receive(:find).with(not_found_id).and_raise(Hyrax::ObjectNotFoundError)
378
372
  delete :destroy, params: { format: :json, id: not_found_id, token: token }
379
373
  end
380
374
 
@@ -32,7 +32,9 @@ RSpec.describe Hyrax::CollectionsController do
32
32
 
33
33
  it "returns the collection and its members" do # rubocop:disable RSpec/ExampleLength
34
34
  expect(controller).to receive(:add_breadcrumb).with('Home', Hyrax::Engine.routes.url_helpers.root_path(locale: 'en'))
35
- expect(controller).to receive(:add_breadcrumb).with(I18n.t('hyrax.dashboard.title'), Hyrax::Engine.routes.url_helpers.dashboard_path(locale: 'en'))
35
+ expect(controller).to receive(:add_breadcrumb).with('Dashboard', Hyrax::Engine.routes.url_helpers.dashboard_path(locale: 'en'))
36
+ expect(controller).to receive(:add_breadcrumb).with('Collections', Hyrax::Engine.routes.url_helpers.my_collections_path(locale: 'en'))
37
+ expect(controller).to receive(:add_breadcrumb).with('My collection', collection_path(collection.id, locale: 'en'), "aria-current" => "page")
36
38
  get :show, params: { id: collection }
37
39
  expect(response).to be_successful
38
40
  expect(response).to render_template("layouts/hyrax/1_column")
@@ -68,7 +70,9 @@ RSpec.describe Hyrax::CollectionsController do
68
70
  context "without a referer" do
69
71
  it "sets breadcrumbs" do
70
72
  expect(controller).to receive(:add_breadcrumb).with('Home', Hyrax::Engine.routes.url_helpers.root_path(locale: 'en'))
71
- expect(controller).to receive(:add_breadcrumb).with(I18n.t('hyrax.dashboard.title'), Hyrax::Engine.routes.url_helpers.dashboard_path(locale: 'en'))
73
+ expect(controller).to receive(:add_breadcrumb).with('Dashboard', Hyrax::Engine.routes.url_helpers.dashboard_path(locale: 'en'))
74
+ expect(controller).to receive(:add_breadcrumb).with('Collections', Hyrax::Engine.routes.url_helpers.my_collections_path(locale: 'en'))
75
+ expect(controller).to receive(:add_breadcrumb).with('My collection', collection_path(collection.id, locale: 'en'), "aria-current" => "page")
72
76
  get :show, params: { id: collection }
73
77
  expect(response).to be_successful
74
78
  end
@@ -82,7 +82,7 @@ RSpec.describe Hyrax::Dashboard::CollectionsController, :clean_repo do
82
82
  }
83
83
 
84
84
  expect(assigns[:collection].member_objects).to eq [asset1]
85
- asset_results = ActiveFedora::SolrService.instance.conn.get "select", params: { fq: ["id:\"#{asset1.id}\""], fl: ['id', ActiveFedora.index_field_mapper.solr_name(:collection)] }
85
+ asset_results = Hyrax::SolrService.get(fq: ["id:\"#{asset1.id}\""], fl: ['id', "collection_tesim"])
86
86
  expect(asset_results["response"]["numFound"]).to eq 1
87
87
  doc = asset_results["response"]["docs"].first
88
88
  expect(doc["id"]).to eq asset1.id
@@ -294,6 +294,49 @@ RSpec.describe Hyrax::Dashboard::CollectionsController, :clean_repo do
294
294
 
295
295
  expect(CollectionBrandingInfo.where(collection_id: collection.id, role: "logo", alt_text: "Logo alt Text", target_url: "http://abc.com").where("local_path LIKE '%logo.gif'")).to exist
296
296
  end
297
+
298
+ context 'where the linkurl is not a valid http|http link' do
299
+ it "does not save linkurl containing html; target_url is empty" do
300
+ val = double(["/public/logo.gif"])
301
+ allow(val).to receive(:file_url).and_return("/public/logo.gif")
302
+ allow(Hyrax::UploadedFile).to receive(:find).with("1").and_return(val)
303
+
304
+ allow(File).to receive(:split).with(any_args).and_return(["logo.gif"])
305
+ allow(FileUtils).to receive(:cp).with(any_args).and_return(nil)
306
+
307
+ put :update, params: { id: collection, logo_files: [1], alttext: ["Logo alt Text"], linkurl: ["<script>remove_me</script>"], collection: { creator: ['Emily'] }, update_collection: true }
308
+ collection.reload
309
+
310
+ expect(
311
+ CollectionBrandingInfo.where(
312
+ collection_id: collection.id,
313
+ role: "logo",
314
+ alt_text: "Logo alt Text",
315
+ target_url: "<script>remove_me</script>"
316
+ ).where("target_url LIKE '%remove_me%)'")
317
+ ).not_to exist
318
+ end
319
+
320
+ it "does not save linkurl containing dodgy protocol; target_url is empty" do
321
+ val = double(["/public/logo.gif"])
322
+ allow(val).to receive(:file_url).and_return("/public/logo.gif")
323
+ allow(Hyrax::UploadedFile).to receive(:find).with("1").and_return(val)
324
+
325
+ allow(File).to receive(:split).with(any_args).and_return(["logo.gif"])
326
+ allow(FileUtils).to receive(:cp).with(any_args).and_return(nil)
327
+
328
+ put :update, params: { id: collection, logo_files: [1], alttext: ["Logo alt Text"], linkurl: ['javascript:alert("remove_me")'], collection: { creator: ['Emily'] }, update_collection: true }
329
+ collection.reload
330
+ expect(
331
+ CollectionBrandingInfo.where(
332
+ collection_id: collection.id,
333
+ role: "logo",
334
+ alt_text: "Logo alt Text",
335
+ target_url: 'javascript:alert("remove_me")'
336
+ ).where("target_url LIKE '%remove_me%)'")
337
+ ).not_to exist
338
+ end
339
+ end
297
340
  end
298
341
  end
299
342
 
@@ -309,7 +352,9 @@ RSpec.describe Hyrax::Dashboard::CollectionsController, :clean_repo do
309
352
 
310
353
  it "returns the collection and its members" do
311
354
  expect(controller).to receive(:add_breadcrumb).with('Home', Hyrax::Engine.routes.url_helpers.root_path(locale: 'en'))
312
- expect(controller).to receive(:add_breadcrumb).with(I18n.t('hyrax.dashboard.title'), Hyrax::Engine.routes.url_helpers.dashboard_path(locale: 'en'))
355
+ expect(controller).to receive(:add_breadcrumb).with('Dashboard', Hyrax::Engine.routes.url_helpers.dashboard_path(locale: 'en'))
356
+ expect(controller).to receive(:add_breadcrumb).with('Collections', Hyrax::Engine.routes.url_helpers.my_collections_path(locale: 'en'))
357
+ expect(controller).to receive(:add_breadcrumb).with('My collection', collection_path(collection.id, locale: 'en'), "aria-current" => "page")
313
358
  get :show, params: { id: collection }
314
359
  expect(response).to be_successful
315
360
  expect(assigns[:presenter]).to be_kind_of Hyrax::CollectionPresenter
@@ -344,7 +389,9 @@ RSpec.describe Hyrax::Dashboard::CollectionsController, :clean_repo do
344
389
  context "without a referer" do
345
390
  it "sets breadcrumbs" do
346
391
  expect(controller).to receive(:add_breadcrumb).with('Home', Hyrax::Engine.routes.url_helpers.root_path(locale: 'en'))
347
- expect(controller).to receive(:add_breadcrumb).with(I18n.t('hyrax.dashboard.title'), Hyrax::Engine.routes.url_helpers.dashboard_path(locale: 'en'))
392
+ expect(controller).to receive(:add_breadcrumb).with('Dashboard', Hyrax::Engine.routes.url_helpers.dashboard_path(locale: 'en'))
393
+ expect(controller).to receive(:add_breadcrumb).with('Collections', Hyrax::Engine.routes.url_helpers.my_collections_path(locale: 'en'))
394
+ expect(controller).to receive(:add_breadcrumb).with('My collection', collection_path(collection.id, locale: 'en'), "aria-current" => "page")
348
395
  get :show, params: { id: collection }
349
396
  expect(response).to be_successful
350
397
  end
@@ -442,7 +489,9 @@ RSpec.describe Hyrax::Dashboard::CollectionsController, :clean_repo do
442
489
  context "without a referer" do
443
490
  it "sets breadcrumbs" do
444
491
  expect(controller).to receive(:add_breadcrumb).with('Home', Hyrax::Engine.routes.url_helpers.root_path(locale: 'en'))
445
- expect(controller).to receive(:add_breadcrumb).with(I18n.t('hyrax.dashboard.title'), Hyrax::Engine.routes.url_helpers.dashboard_path(locale: 'en'))
492
+ expect(controller).to receive(:add_breadcrumb).with('Dashboard', Hyrax::Engine.routes.url_helpers.dashboard_path(locale: 'en'))
493
+ expect(controller).to receive(:add_breadcrumb).with('Collections', Hyrax::Engine.routes.url_helpers.my_collections_path(locale: 'en'))
494
+ expect(controller).to receive(:add_breadcrumb).with(I18n.t("hyrax.collection.browse_view"), collection_path(collection.id, locale: 'en'), "aria-current" => "page")
446
495
  get :edit, params: { id: collection }
447
496
  expect(response).to be_successful
448
497
  end
@@ -51,10 +51,10 @@ RSpec.describe Hyrax::DepositorsController do
51
51
  post :create, params: grant_proxy_params.merge(grantee_id: user.user_key)
52
52
  end
53
53
 
54
- it 'does not add the user, and returns a 200, with empty response body' do
54
+ it 'does not add the user, and returns an unsuccessful response, with an error message' do
55
55
  expect { redundant_request_to_grant_proxy }.to change { ProxyDepositRights.count }.by(0)
56
- expect(response).to be_success
57
- expect(response.body).to be_blank
56
+ expect(response).not_to be_success
57
+ expect(response.body).to have_content "You cannot make yourself a proxy"
58
58
  end
59
59
 
60
60
  it 'does not send a message to the user' do
@@ -74,6 +74,15 @@ RSpec.describe Hyrax::DownloadsController do
74
74
  get :show, params: { id: file_set, file: 'thumbnail' }
75
75
  end
76
76
 
77
+ it 'sends 304 response when client has valid cached data' do
78
+ get :show, params: { id: file_set, file: 'thumbnail' }
79
+ expect(response).to have_http_status :success
80
+ request.env['HTTP_IF_MODIFIED_SINCE'] = response.headers['Last-Modified']
81
+ request.env['HTTP_IF_NONE_MATCH'] = response.headers['ETag']
82
+ get :show, params: { id: file_set, file: 'thumbnail' }
83
+ expect(response).to have_http_status :not_modified
84
+ end
85
+
77
86
  context "stream" do
78
87
  it "head request" do
79
88
  request.env["HTTP_RANGE"] = 'bytes=0-15'
@@ -121,7 +130,7 @@ RSpec.describe Hyrax::DownloadsController do
121
130
  it "raises an error if the requested file does not exist" do
122
131
  expect do
123
132
  get :show, params: { id: file_set, file: 'thumbnail' }
124
- end.to raise_error ActiveFedora::ObjectNotFoundError
133
+ end.to raise_error Hyrax::ObjectNotFoundError
125
134
  end
126
135
  end
127
136
  end
@@ -129,7 +138,7 @@ RSpec.describe Hyrax::DownloadsController do
129
138
  it "raises an error if the requested association does not exist" do
130
139
  expect do
131
140
  get :show, params: { id: file_set, file: 'non-existant' }
132
- end.to raise_error ActiveFedora::ObjectNotFoundError
141
+ end.to raise_error Hyrax::ObjectNotFoundError
133
142
  end
134
143
  end
135
144
  end
@@ -232,9 +232,24 @@ RSpec.describe Hyrax::FileSetsController do
232
232
  end
233
233
 
234
234
  context "without a referer" do
235
+ let(:work) do
236
+ create(:generic_work, :public,
237
+ title: ['test title'],
238
+ user: user)
239
+ end
240
+
241
+ before do
242
+ work.ordered_members << file_set
243
+ work.save!
244
+ file_set.save!
245
+ end
246
+
235
247
  it "shows me the file and set breadcrumbs" do
236
248
  expect(controller).to receive(:add_breadcrumb).with('Home', Hyrax::Engine.routes.url_helpers.root_path(locale: 'en'))
237
- expect(controller).to receive(:add_breadcrumb).with(I18n.t('hyrax.dashboard.title'), Hyrax::Engine.routes.url_helpers.dashboard_path(locale: 'en'))
249
+ expect(controller).to receive(:add_breadcrumb).with('Dashboard', Hyrax::Engine.routes.url_helpers.dashboard_path(locale: 'en'))
250
+ expect(controller).to receive(:add_breadcrumb).with('Works', Hyrax::Engine.routes.url_helpers.my_works_path(locale: 'en'))
251
+ expect(controller).to receive(:add_breadcrumb).with('test title', main_app.hyrax_generic_work_path(work.id, locale: 'en'))
252
+ expect(controller).to receive(:add_breadcrumb).with('test file', main_app.hyrax_file_set_path(file_set, locale: 'en'))
238
253
  get :show, params: { id: file_set }
239
254
  expect(response).to be_successful
240
255
  expect(flash).to be_empty
@@ -275,7 +290,18 @@ RSpec.describe Hyrax::FileSetsController do
275
290
  let(:creator) { create(:user, email: 'archivist1@example.com') }
276
291
  let(:public_file_set) { create(:file_set, user: creator, read_groups: ['public']) }
277
292
 
278
- before { sign_in user }
293
+ let(:work) do
294
+ create(:generic_work, :public,
295
+ title: ['test title'],
296
+ user: user)
297
+ end
298
+
299
+ before do
300
+ sign_in user
301
+ work.ordered_members << public_file_set
302
+ work.save!
303
+ public_file_set.save!
304
+ end
279
305
 
280
306
  describe '#edit' do
281
307
  it 'gives me the unauthorized page' do
@@ -299,6 +325,18 @@ RSpec.describe Hyrax::FileSetsController do
299
325
  let(:private_file_set) { create(:file_set) }
300
326
  let(:public_file_set) { create(:file_set, read_groups: ['public']) }
301
327
 
328
+ let(:work) do
329
+ create(:generic_work, :public,
330
+ title: ['test title'],
331
+ user: user)
332
+ end
333
+
334
+ before do
335
+ work.ordered_members << public_file_set
336
+ work.save!
337
+ public_file_set.save!
338
+ end
339
+
302
340
  describe '#edit' do
303
341
  it 'requires login' do
304
342
  get :edit, params: { id: public_file_set }
@@ -55,10 +55,14 @@ RSpec.describe Hyrax::GenericWorksController do
55
55
  before { sign_out user }
56
56
 
57
57
  context "without a referer" do
58
- it "sets the default breadcrumbs" do
59
- expect(controller).to receive(:add_breadcrumb).with('Home', Hyrax::Engine.routes.url_helpers.root_path(locale: 'en'))
58
+ it "sets breadcrumbs with complete path" do
59
+ expect(controller).to receive(:add_breadcrumb).with('Home', main_app.root_path(locale: 'en'))
60
+ expect(controller).not_to receive(:add_breadcrumb).with('Dashboard', hyrax.dashboard_path(locale: 'en'))
61
+ expect(controller).not_to receive(:add_breadcrumb).with('Your Works', hyrax.my_works_path(locale: 'en'))
62
+ expect(controller).to receive(:add_breadcrumb).with('public thing', main_app.hyrax_generic_work_path(work.id, locale: 'en'))
60
63
  get :show, params: { id: work }
61
64
  expect(response).to be_successful
65
+ expect(response).to render_template("layouts/hyrax/1_column")
62
66
  end
63
67
  end
64
68
 
@@ -91,7 +95,9 @@ RSpec.describe Hyrax::GenericWorksController do
91
95
  context "without a referer" do
92
96
  it "sets breadcrumbs" do
93
97
  expect(controller).to receive(:add_breadcrumb).with('Home', Hyrax::Engine.routes.url_helpers.root_path(locale: 'en'))
94
- expect(controller).to receive(:add_breadcrumb).with("Dashboard", hyrax.dashboard_path(locale: 'en'))
98
+ expect(controller).to receive(:add_breadcrumb).with('Dashboard', hyrax.dashboard_path(locale: 'en'))
99
+ expect(controller).to receive(:add_breadcrumb).with('Works', hyrax.my_works_path(locale: 'en'))
100
+ expect(controller).to receive(:add_breadcrumb).with('test title', main_app.hyrax_generic_work_path(work.id, locale: 'en'))
95
101
  get :show, params: { id: work }
96
102
  expect(response).to be_successful
97
103
  end
@@ -171,6 +177,7 @@ RSpec.describe Hyrax::GenericWorksController do
171
177
  allow(controller).to receive(:presenter).and_return(presenter)
172
178
  allow(presenter).to receive(:export_as_ttl).and_return("ttl graph")
173
179
  allow(presenter).to receive(:editor?).and_return(true)
180
+ allow(presenter).to receive(:to_model).and_return(stub_model(GenericWork))
174
181
  end
175
182
 
176
183
  it 'renders a turtle file' do
@@ -231,6 +238,9 @@ RSpec.describe Hyrax::GenericWorksController do
231
238
  end
232
239
 
233
240
  context 'with a user granted workflow permission' do
241
+ before do
242
+ allow(document).to receive(:hydra_model).and_return(GenericWork)
243
+ end
234
244
  let(:document_list) { [document] }
235
245
  let(:document) { instance_double(SolrDocument) }
236
246