hyrax 2.1.0.beta1 → 2.1.0.beta2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (348) hide show
  1. checksums.yaml +4 -4
  2. data/.rubocop.yml +9 -49
  3. data/.rubocop_fixme.yml +1 -0
  4. data/.travis.yml +1 -1
  5. data/Gemfile +3 -3
  6. data/README.md +4 -2
  7. data/app/actors/hyrax/actors/file_set_actor.rb +0 -1
  8. data/app/actors/hyrax/actors/interpret_visibility_actor.rb +1 -3
  9. data/app/actors/hyrax/actors/model_actor.rb +4 -0
  10. data/app/assets/javascripts/hyrax.js +1 -1
  11. data/app/assets/javascripts/hyrax/app.js.erb +1 -1
  12. data/app/assets/javascripts/hyrax/authority_select.es6 +15 -7
  13. data/app/assets/javascripts/hyrax/collections.js +188 -9
  14. data/app/assets/javascripts/hyrax/content_blocks.js +13 -1
  15. data/app/assets/javascripts/hyrax/editor.es6 +2 -1
  16. data/app/assets/javascripts/hyrax/proxy_rights.js +2 -2
  17. data/app/assets/javascripts/hyrax/turbolinks_events.js +5 -0
  18. data/app/assets/stylesheets/hyrax/_accessibility.scss +21 -0
  19. data/app/assets/stylesheets/hyrax/_catalog.scss +21 -16
  20. data/app/assets/stylesheets/hyrax/_collections.scss +48 -7
  21. data/app/assets/stylesheets/hyrax/_modal.scss +4 -0
  22. data/app/assets/stylesheets/hyrax/_settings.scss +1 -1
  23. data/app/assets/stylesheets/hyrax/dashboard.scss +0 -1
  24. data/app/controllers/concerns/hyrax/breadcrumbs.rb +3 -1
  25. data/app/controllers/concerns/hyrax/embargoes_controller_behavior.rb +17 -1
  26. data/app/controllers/concerns/hyrax/leases_controller_behavior.rb +10 -0
  27. data/app/controllers/concerns/hyrax/local_file_downloads_controller_behavior.rb +86 -0
  28. data/app/controllers/concerns/hyrax/works_controller_behavior.rb +14 -11
  29. data/app/controllers/hyrax/admin/collection_types_controller.rb +11 -1
  30. data/app/controllers/hyrax/api/items_controller.rb +2 -6
  31. data/app/controllers/hyrax/batch_edits_controller.rb +6 -0
  32. data/app/controllers/hyrax/batch_uploads_controller.rb +1 -1
  33. data/app/controllers/hyrax/dashboard/collections_controller.rb +4 -7
  34. data/app/controllers/hyrax/dashboard/profiles_controller.rb +2 -0
  35. data/app/controllers/hyrax/dashboard_controller.rb +2 -2
  36. data/app/controllers/hyrax/depositors_controller.rb +19 -0
  37. data/app/controllers/hyrax/downloads_controller.rb +3 -4
  38. data/app/controllers/hyrax/embargoes_controller.rb +2 -0
  39. data/app/controllers/hyrax/file_sets_controller.rb +12 -0
  40. data/app/controllers/hyrax/leases_controller.rb +2 -0
  41. data/app/controllers/hyrax/my/works_controller.rb +9 -0
  42. data/app/controllers/hyrax/my_controller.rb +0 -1
  43. data/app/controllers/hyrax/transfers_controller.rb +1 -3
  44. data/app/controllers/hyrax/users_controller.rb +1 -3
  45. data/app/forms/hyrax/forms/admin/collection_type_form.rb +1 -1
  46. data/app/forms/hyrax/forms/permission_template_form.rb +1 -4
  47. data/app/forms/hyrax/forms/work_form.rb +1 -3
  48. data/app/helpers/hyrax/citations_behaviors/common_behavior.rb +1 -3
  49. data/app/helpers/hyrax/citations_behaviors/formatters/chicago_formatter.rb +1 -5
  50. data/app/helpers/hyrax/collections_helper.rb +7 -4
  51. data/app/helpers/hyrax/file_set_helper.rb +0 -1
  52. data/app/helpers/hyrax/hyrax_helper_behavior.rb +0 -1
  53. data/app/helpers/hyrax/trophy_helper.rb +0 -1
  54. data/app/indexers/hyrax/admin_set_indexer.rb +2 -0
  55. data/app/inputs/multi_value_select_input.rb +1 -3
  56. data/app/jobs/attach_files_to_work_job.rb +5 -1
  57. data/app/jobs/import_url_job.rb +9 -8
  58. data/app/models/admin_set.rb +1 -5
  59. data/app/models/concerns/hyrax/ability.rb +3 -4
  60. data/app/models/concerns/hyrax/collection_behavior.rb +0 -4
  61. data/app/models/concerns/hyrax/collection_nesting.rb +12 -0
  62. data/app/models/concerns/hyrax/suppressible.rb +1 -5
  63. data/app/models/featured_work_list.rb +1 -3
  64. data/app/models/hyrax/collection_type.rb +3 -2
  65. data/app/models/hyrax/permission_template_access.rb +6 -4
  66. data/app/models/proxy_deposit_request.rb +1 -1
  67. data/app/presenters/hyrax/collection_presenter.rb +0 -24
  68. data/app/presenters/hyrax/displays_image.rb +1 -1
  69. data/app/presenters/hyrax/file_set_presenter.rb +1 -1
  70. data/app/presenters/hyrax/menu_presenter.rb +1 -1
  71. data/app/presenters/hyrax/work_show_presenter.rb +15 -10
  72. data/app/search_builders/hyrax/abstract_type_relation.rb +2 -1
  73. data/app/search_builders/hyrax/collection_member_search_builder.rb +1 -1
  74. data/app/search_builders/hyrax/dashboard/collections_search_builder.rb +3 -1
  75. data/app/search_builders/hyrax/parent_collection_search_builder.rb +2 -2
  76. data/app/services/hyrax/admin_set_create_service.rb +1 -3
  77. data/app/services/hyrax/analytics.rb +1 -3
  78. data/app/services/hyrax/collection_member_service.rb +6 -5
  79. data/app/services/hyrax/collection_types/create_service.rb +37 -10
  80. data/app/services/hyrax/collections/permissions_create_service.rb +1 -3
  81. data/app/services/hyrax/collections/permissions_service.rb +6 -4
  82. data/app/views/catalog/_index_header_list_collection.html.erb +1 -1
  83. data/app/views/catalog/_index_header_list_default.html.erb +1 -1
  84. data/app/views/catalog/_index_list_default.html.erb +6 -10
  85. data/app/views/catalog/_search_form.html.erb +10 -11
  86. data/app/views/catalog/_thumbnail_list_collection.html.erb +1 -1
  87. data/app/views/catalog/_thumbnail_list_default.html.erb +1 -1
  88. data/app/views/hyrax/admin/admin_sets/_form.html.erb +1 -1
  89. data/app/views/hyrax/admin/admin_sets/_form_participant_table.html.erb +1 -1
  90. data/app/views/hyrax/admin/admin_sets/_form_participants.html.erb +1 -1
  91. data/app/views/hyrax/admin/admin_sets/_form_visibility.html.erb +3 -3
  92. data/app/views/hyrax/admin/admin_sets/_show_document_list_row.html.erb +2 -2
  93. data/app/views/hyrax/admin/admin_sets/index.html.erb +1 -1
  94. data/app/views/hyrax/admin/appearances/show.html.erb +4 -4
  95. data/app/views/hyrax/admin/collection_types/_form_settings.html.erb +3 -2
  96. data/app/views/hyrax/admin/collection_types/index.html.erb +2 -2
  97. data/app/views/hyrax/admin/features/index.html.erb +2 -4
  98. data/app/views/hyrax/admin/stats/_date_form.html.erb +3 -3
  99. data/app/views/hyrax/admin/stats/_top_data.html.erb +1 -1
  100. data/app/views/hyrax/admin/stats/show.html.erb +1 -1
  101. data/app/views/hyrax/admin/workflows/index.html.erb +0 -1
  102. data/app/views/hyrax/base/_file_manager_actions.html.erb +2 -2
  103. data/app/views/hyrax/base/_file_manager_member.html.erb +1 -1
  104. data/app/views/hyrax/base/_form_child_work_relationships.html.erb +1 -2
  105. data/app/views/hyrax/base/_form_files.html.erb +3 -3
  106. data/app/views/hyrax/base/_form_member_of_collections.html.erb +1 -2
  107. data/app/views/hyrax/base/_form_progress.html.erb +3 -3
  108. data/app/views/hyrax/base/_form_relationships.html.erb +2 -3
  109. data/app/views/hyrax/base/_form_representative.html.erb +0 -1
  110. data/app/views/hyrax/base/_form_share.html.erb +1 -3
  111. data/app/views/hyrax/base/_form_thumbnail.html.erb +0 -1
  112. data/app/views/hyrax/base/_form_visibility_component.html.erb +6 -6
  113. data/app/views/hyrax/base/_relationships_parent_rows.html.erb +3 -1
  114. data/app/views/hyrax/base/_representative_media.html.erb +1 -1
  115. data/app/views/hyrax/base/_share_with.html.erb +3 -3
  116. data/app/views/hyrax/base/_show_actions.html.erb +14 -1
  117. data/app/views/hyrax/base/_social_media.html.erb +5 -5
  118. data/app/views/hyrax/base/_work_title.erb +3 -1
  119. data/app/views/hyrax/base/_workflow_actions.html.erb +1 -1
  120. data/app/views/hyrax/base/inspect_work.html.erb +1 -1
  121. data/app/views/hyrax/base/show.html.erb +2 -2
  122. data/app/views/hyrax/batch_edits/_check_all.html.erb +2 -2
  123. data/app/views/hyrax/batch_edits/edit.html.erb +47 -44
  124. data/app/views/hyrax/batch_select/_add_button.html.erb +2 -2
  125. data/app/views/hyrax/citations/work.html.erb +3 -3
  126. data/app/views/hyrax/collections/_collection.html.erb +1 -1
  127. data/app/views/hyrax/collections/_default_group.html.erb +1 -1
  128. data/app/views/hyrax/collections/_list_collections.html.erb +2 -2
  129. data/app/views/hyrax/collections/_list_works.html.erb +1 -1
  130. data/app/views/hyrax/collections/_show_descriptions.html.erb +6 -6
  131. data/app/views/hyrax/collections/_show_document_list_row.html.erb +2 -2
  132. data/app/views/hyrax/collections/_show_parent_collections.html.erb +11 -38
  133. data/app/views/hyrax/collections/_sort_and_per_page.html.erb +13 -13
  134. data/app/views/hyrax/collections/_subcollection_list.html.erb +1 -1
  135. data/app/views/hyrax/collections/_view_type_group.html.erb +1 -1
  136. data/app/views/hyrax/collections/show.html.erb +122 -122
  137. data/app/views/hyrax/content_blocks/_form.html.erb +13 -12
  138. data/app/views/hyrax/content_blocks/_modal_content_block.html.erb +15 -0
  139. data/app/views/hyrax/dashboard/_index_partials/_proxy_rights.html.erb +25 -19
  140. data/app/views/hyrax/dashboard/_sidebar.html.erb +1 -1
  141. data/app/views/hyrax/dashboard/collections/_button_for_remove_selected_from_collection.html.erb +1 -1
  142. data/app/views/hyrax/dashboard/collections/_collection_title.html.erb +16 -16
  143. data/app/views/hyrax/dashboard/collections/_form.html.erb +3 -1
  144. data/app/views/hyrax/dashboard/collections/_form_branding.html.erb +11 -11
  145. data/app/views/hyrax/dashboard/collections/_form_default_group_delt.html.erb +1 -1
  146. data/app/views/hyrax/dashboard/collections/_form_discovery.html.erb +2 -2
  147. data/app/views/hyrax/dashboard/collections/_form_for_select_collection.html.erb +4 -4
  148. data/app/views/hyrax/dashboard/collections/_form_share.html.erb +51 -44
  149. data/app/views/hyrax/dashboard/collections/_form_share_table.html.erb +2 -2
  150. data/app/views/hyrax/dashboard/collections/_list_collections.html.erb +4 -4
  151. data/app/views/hyrax/dashboard/collections/_list_works.html.erb +1 -1
  152. data/app/views/hyrax/dashboard/collections/_modal_remove_from_collection.html.erb +10 -5
  153. data/app/views/hyrax/dashboard/collections/_modal_remove_sub_collection.html.erb +10 -5
  154. data/app/views/hyrax/dashboard/collections/_show_actions.html.erb +1 -1
  155. data/app/views/hyrax/dashboard/collections/_show_add_items_actions.html.erb +2 -2
  156. data/app/views/hyrax/dashboard/collections/_show_document_list_row.html.erb +2 -2
  157. data/app/views/hyrax/dashboard/collections/_show_parent_collection_row.html.erb +10 -5
  158. data/app/views/hyrax/dashboard/collections/_show_parent_collections.html.erb +11 -34
  159. data/app/views/hyrax/dashboard/collections/_sort_and_per_page.html.erb +1 -1
  160. data/app/views/hyrax/dashboard/collections/_subcollection_list.html.erb +23 -17
  161. data/app/views/hyrax/dashboard/collections/show.html.erb +6 -6
  162. data/app/views/hyrax/dashboard/profiles/_edit_primary.html.erb +0 -4
  163. data/app/views/hyrax/dashboard/profiles/_trophy_edit.html.erb +16 -14
  164. data/app/views/hyrax/dashboard/profiles/show.html.erb +6 -0
  165. data/app/views/hyrax/dashboard/show_admin.html.erb +19 -3
  166. data/app/views/hyrax/dashboard/sidebar/_activity.html.erb +6 -0
  167. data/app/views/hyrax/dashboard/works/_list_works.html.erb +1 -1
  168. data/app/views/hyrax/depositors/index.html.erb +13 -0
  169. data/app/views/hyrax/embargoes/_list_expired_active_embargoes.html.erb +1 -1
  170. data/app/views/hyrax/embargoes/edit.html.erb +47 -35
  171. data/app/views/hyrax/embargoes/index.html.erb +6 -7
  172. data/app/views/hyrax/file_sets/_actions.html.erb +6 -2
  173. data/app/views/hyrax/file_sets/_extra_fields_modal.html.erb +3 -3
  174. data/app/views/hyrax/file_sets/_groups_description.html.erb +0 -1
  175. data/app/views/hyrax/file_sets/_permission_form.html.erb +3 -3
  176. data/app/views/hyrax/file_sets/edit.html.erb +24 -20
  177. data/app/views/hyrax/file_sets/media_display/_audio.html.erb +23 -6
  178. data/app/views/hyrax/file_sets/media_display/_default.html.erb +1 -1
  179. data/app/views/hyrax/file_sets/media_display/_video.html.erb +23 -6
  180. data/app/views/hyrax/leases/_list_expired_active_leases.html.erb +1 -1
  181. data/app/views/hyrax/leases/edit.html.erb +47 -35
  182. data/app/views/hyrax/leases/index.html.erb +6 -6
  183. data/app/views/hyrax/my/_collection_action_menu.html.erb +1 -1
  184. data/app/views/hyrax/my/_facet_limit.html.erb +1 -2
  185. data/app/views/hyrax/my/_facet_pagination.html.erb +6 -6
  186. data/app/views/hyrax/my/_facet_pivot.html.erb +1 -1
  187. data/app/views/hyrax/my/_results_pagination.html.erb +1 -1
  188. data/app/views/hyrax/my/collections/_facets.html.erb +1 -1
  189. data/app/views/hyrax/my/collections/_list_collections.html.erb +5 -5
  190. data/app/views/hyrax/my/collections/_modal_add_subcollection.html.erb +3 -2
  191. data/app/views/hyrax/my/collections/_modal_add_to_collection.html.erb +3 -1
  192. data/app/views/hyrax/my/collections/_modal_add_to_collection_permission_deny.html.erb +1 -1
  193. data/app/views/hyrax/my/collections/_modal_collection_types_to_create.html.erb +2 -2
  194. data/app/views/hyrax/my/collections/_modal_delete_collection.html.erb +1 -2
  195. data/app/views/hyrax/my/collections/_modal_delete_deny.html.erb +1 -1
  196. data/app/views/hyrax/my/collections/_modal_delete_selected_collections.html.erb +2 -2
  197. data/app/views/hyrax/my/collections/_tabs.html.erb +2 -2
  198. data/app/views/hyrax/my/collections/index.html.erb +7 -3
  199. data/app/views/hyrax/my/facet.html.erb +1 -1
  200. data/app/views/hyrax/my/index.html.erb +6 -2
  201. data/app/views/hyrax/my/works/_facets.html.erb +1 -1
  202. data/app/views/hyrax/my/works/_list_works.html.erb +1 -1
  203. data/app/views/hyrax/my/works/_tabs.html.erb +2 -2
  204. data/app/views/hyrax/my/works/index.html.erb +6 -2
  205. data/app/views/hyrax/notifications/_notifications.html.erb +1 -1
  206. data/app/views/hyrax/pages/_form.html.erb +12 -12
  207. data/app/views/hyrax/pages/show.html.erb +1 -1
  208. data/app/views/hyrax/single_use_links_viewer/show.html.erb +1 -1
  209. data/app/views/hyrax/stats/file.html.erb +6 -2
  210. data/app/views/hyrax/stats/work.html.erb +6 -2
  211. data/app/views/hyrax/transfers/_received.html.erb +6 -6
  212. data/app/views/hyrax/transfers/_sent.html.erb +2 -2
  213. data/app/views/hyrax/transfers/new.html.erb +0 -1
  214. data/app/views/hyrax/users/_activity_log.html.erb +2 -2
  215. data/app/views/hyrax/users/_profile_tabs.html.erb +1 -1
  216. data/app/views/hyrax/users/_search_form.html.erb +1 -1
  217. data/app/views/hyrax/users/_user.html.erb +0 -1
  218. data/app/views/hyrax/users/index.html.erb +1 -1
  219. data/app/views/kaminari/blacklight_compact/_paginator.html.erb +1 -2
  220. data/app/views/layouts/_head_tag_content.html.erb +2 -2
  221. data/app/views/layouts/error.html.erb +1 -1
  222. data/app/views/layouts/hyrax.html.erb +6 -3
  223. data/app/views/layouts/hyrax/dashboard.html.erb +6 -3
  224. data/app/views/records/show_fields/_based_near.html.erb +0 -1
  225. data/app/views/records/show_fields/_contributor.html.erb +0 -1
  226. data/app/views/records/show_fields/_date_created.html.erb +0 -1
  227. data/app/views/records/show_fields/_description.html.erb +1 -1
  228. data/app/views/records/show_fields/_identifier.html.erb +0 -1
  229. data/app/views/records/show_fields/_language.html.erb +0 -1
  230. data/app/views/records/show_fields/_publisher.html.erb +0 -1
  231. data/app/views/records/show_fields/_related_url.html.erb +0 -1
  232. data/app/views/records/show_fields/_resource_type.html.erb +0 -1
  233. data/app/views/records/show_fields/_subject.html.erb +0 -1
  234. data/app/views/shared/_citations.html.erb +17 -17
  235. data/app/views/shared/_select_work_type_modal.html.erb +2 -2
  236. data/config/locales/hyrax.de.yml +198 -189
  237. data/config/locales/hyrax.en.yml +21 -14
  238. data/config/locales/hyrax.es.yml +9 -0
  239. data/config/locales/hyrax.fr.yml +9 -0
  240. data/config/locales/hyrax.it.yml +9 -0
  241. data/config/locales/hyrax.pt-BR.yml +9 -0
  242. data/config/locales/hyrax.zh.yml +9 -0
  243. data/config/routes.rb +1 -0
  244. data/hyrax.gemspec +7 -18
  245. data/lib/generators/hyrax/models_generator.rb +0 -1
  246. data/lib/generators/hyrax/templates/db/migrate/20180302200051_add_branding_to_collection_type.rb.erb +5 -0
  247. data/lib/generators/hyrax/work/templates/feature_spec.rb.erb +1 -1
  248. data/lib/hyrax/configuration.rb +2 -4
  249. data/lib/hyrax/engine.rb +22 -4
  250. data/lib/hyrax/version.rb +1 -1
  251. data/spec/actors/hyrax/actors/lease_actor_spec.rb +16 -0
  252. data/spec/controllers/hyrax/admin/appearances_controller_spec.rb +1 -1
  253. data/spec/controllers/hyrax/admin/collection_types_controller_spec.rb +2 -0
  254. data/spec/controllers/hyrax/admin/features_controller_spec.rb +1 -1
  255. data/spec/controllers/hyrax/admin/workflow_roles_controller_spec.rb +1 -1
  256. data/spec/controllers/hyrax/admin/workflows_controller_spec.rb +1 -1
  257. data/spec/controllers/hyrax/batch_edits_controller_spec.rb +14 -1
  258. data/spec/controllers/hyrax/batch_uploads_controller_spec.rb +2 -2
  259. data/spec/controllers/hyrax/citations_controller_spec.rb +4 -2
  260. data/spec/controllers/hyrax/collections_controller_spec.rb +32 -4
  261. data/spec/controllers/hyrax/content_blocks_controller_spec.rb +1 -1
  262. data/spec/controllers/hyrax/dashboard/collections_controller_spec.rb +11 -6
  263. data/spec/controllers/hyrax/depositors_controller_spec.rb +11 -0
  264. data/spec/controllers/hyrax/downloads_controller_spec.rb +42 -0
  265. data/spec/controllers/hyrax/embargoes_controller_spec.rb +40 -1
  266. data/spec/controllers/hyrax/file_sets_controller_spec.rb +10 -2
  267. data/spec/controllers/hyrax/generic_works_controller_spec.rb +38 -6
  268. data/spec/controllers/hyrax/leases_controller_spec.rb +11 -0
  269. data/spec/controllers/hyrax/my/collections_controller_spec.rb +1 -1
  270. data/spec/controllers/hyrax/my/works_controller_spec.rb +1 -1
  271. data/spec/controllers/hyrax/pages_controller_spec.rb +1 -1
  272. data/spec/controllers/hyrax/stats_controller_spec.rb +2 -0
  273. data/spec/controllers/hyrax/transfers_controller_spec.rb +1 -1
  274. data/spec/factories/collection_types.rb +10 -1
  275. data/spec/factories/collections.rb +5 -3
  276. data/spec/factories/collections_factory.rb +3 -3
  277. data/spec/factories/file_sets.rb +2 -6
  278. data/spec/factories/generic_works.rb +68 -4
  279. data/spec/factory_tests/collections_factory_spec.rb +2 -1
  280. data/spec/features/batch_create_spec.rb +60 -0
  281. data/spec/features/batch_edit_spec.rb +1 -0
  282. data/spec/features/browse_dashboard_works_spec.rb +1 -0
  283. data/spec/features/collection_multi_membership_spec.rb +9 -6
  284. data/spec/features/collection_spec.rb +1 -1
  285. data/spec/features/collection_type_spec.rb +49 -1
  286. data/spec/features/create_work_admin_spec.rb +2 -2
  287. data/spec/features/create_work_spec.rb +1 -0
  288. data/spec/features/dashboard/all_works.rb +10 -2
  289. data/spec/features/dashboard/collection_spec.rb +38 -17
  290. data/spec/features/dashboard/display_admin_dashboard_spec.rb +29 -0
  291. data/spec/features/dashboard/display_dashboard_spec.rb +1 -1
  292. data/spec/features/edit_content_block_admin_spec.rb +45 -0
  293. data/spec/features/edit_work_spec.rb +40 -2
  294. data/spec/features/ownership_transfer_spec.rb +1 -0
  295. data/spec/features/proxy_spec.rb +2 -2
  296. data/spec/features/search_spec.rb +2 -5
  297. data/spec/features/work_show_spec.rb +14 -4
  298. data/spec/forms/hyrax/forms/admin/collection_type_form_spec.rb +1 -0
  299. data/spec/forms/hyrax/forms/collection_form_spec.rb +1 -1
  300. data/spec/helpers/hyrax/ability_helper_spec.rb +2 -2
  301. data/spec/helpers/hyrax/collections_helper_spec.rb +12 -4
  302. data/spec/javascripts/authority_select_spec.js +1 -1
  303. data/spec/javascripts/settings_spec.js +1 -0
  304. data/spec/jobs/attach_files_to_work_job_spec.rb +13 -0
  305. data/spec/jobs/import_url_job_spec.rb +14 -0
  306. data/spec/models/collection_spec.rb +1 -0
  307. data/spec/models/concerns/hyrax/collection_nesting_spec.rb +16 -0
  308. data/spec/models/hyrax/collection_type_spec.rb +1 -0
  309. data/spec/presenters/hyrax/collection_presenter_spec.rb +1 -100
  310. data/spec/presenters/hyrax/file_set_presenter_spec.rb +17 -2
  311. data/spec/presenters/hyrax/menu_presenter_spec.rb +6 -0
  312. data/spec/presenters/hyrax/work_show_presenter_spec.rb +15 -3
  313. data/spec/search_builders/hyrax/abstract_type_relation_spec.rb +18 -0
  314. data/spec/search_builders/hyrax/dashboard/collections_search_builder_spec.rb +30 -19
  315. data/spec/search_builders/hyrax/parent_collection_search_builder_spec.rb +15 -0
  316. data/spec/services/hyrax/collection_member_service_spec.rb +10 -19
  317. data/spec/services/hyrax/collection_types/create_service_spec.rb +35 -2
  318. data/spec/services/hyrax/collections/collection_member_service_spec.rb +1 -1
  319. data/spec/services/hyrax/qa_select_service_spec.rb +0 -1
  320. data/spec/support/selectors.rb +15 -0
  321. data/spec/views/hyrax/admin/admin_sets/_show_document_list_row.html.erb_spec.rb +2 -0
  322. data/spec/views/hyrax/admin/collection_types/_form_settings.html.erb_spec.rb +1 -0
  323. data/spec/views/hyrax/admin/stats/show.html.erb_spec.rb +9 -0
  324. data/spec/views/hyrax/base/_attributes.html.erb_spec.rb +1 -1
  325. data/spec/views/hyrax/base/_relationships.html.erb_spec.rb +13 -1
  326. data/spec/views/hyrax/base/_show_actions.html.erb_spec.rb +10 -0
  327. data/spec/views/hyrax/base/show.html.erb_spec.rb +8 -0
  328. data/spec/views/hyrax/collections/_show_parent_collections.html.erb_spec.rb +3 -53
  329. data/spec/views/hyrax/dashboard/_sidebar.html.erb_spec.rb +22 -0
  330. data/spec/views/hyrax/dashboard/collections/_form_share.erb_spec.rb +2 -1
  331. data/spec/views/hyrax/dashboard/collections/_show_actions.html.erb_spec.rb +13 -0
  332. data/spec/views/hyrax/dashboard/collections/_show_parent_collection_row.html.erb_spec.rb +26 -8
  333. data/spec/views/hyrax/dashboard/collections/_show_parent_collections.html.erb_spec.rb +7 -43
  334. data/spec/views/hyrax/dashboard/collections/_subcollection_list.html.erb_spec.rb +13 -1
  335. data/spec/views/hyrax/dashboard/collections/show.html.erb_spec.rb +1 -0
  336. data/spec/views/hyrax/dashboard/profiles/_trophy_edit.html.erb_spec.rb +36 -0
  337. data/spec/views/hyrax/dashboard/profiles/edit.html.erb_spec.rb +0 -38
  338. data/spec/views/hyrax/dashboard/profiles/show.html.erb_spec.rb +37 -0
  339. data/spec/views/hyrax/depositors/index.html.erb_spec.rb +13 -0
  340. data/spec/views/hyrax/file_sets/_actions.html.erb_spec.rb +15 -0
  341. data/spec/views/hyrax/file_sets/media_display/_audio.html.erb_spec.rb +29 -0
  342. data/spec/views/hyrax/file_sets/media_display/_default.html.erb_spec.rb +1 -1
  343. data/spec/views/hyrax/file_sets/media_display/_video.html.erb_spec.rb +29 -0
  344. data/spec/views/hyrax/my/collections/_list_collections.html.erb_spec.rb +6 -2
  345. data/tasks/hyrax_dev.rake +1 -3
  346. data/template.rb +1 -1
  347. metadata +49 -41
  348. data/app/assets/javascripts/hyrax/collections_forms.js +0 -108
@@ -43,6 +43,7 @@ RSpec.describe 'hyrax/dashboard/collections/show.html.erb', type: :view do
43
43
  stub_template '_show_subcollection_actions.html.erb' => '<div class="stubbed-actions">THE SUBCOLLECTION ACTIONS</div>'
44
44
  stub_template '_show_add_items_actions.html.erb' => '<div class="stubbed-actions">THE ADD ITEMS ACTIONS</div>'
45
45
  stub_template '_show_parent_collections.html.erb' => '<div class="stubbed-actions">THE PARENT COLLECTIONS LIST</div>'
46
+ stub_template '_subcollection_list.html.erb' => '<div class="stubbed-actions">THE SUB-COLLECTIONS LIST</div>'
46
47
  stub_template 'hyrax/collections/_paginate.html.erb' => 'paginate'
47
48
  stub_template 'hyrax/collections/_media_display.html.erb' => '<span class="fa fa-cubes collection-icon-search"></span>'
48
49
  stub_template 'hyrax/my/collections/_modal_add_to_collection.html.erb' => 'modal add as subcollection'
@@ -0,0 +1,36 @@
1
+ RSpec.describe 'hyrax/dashboard/profiles/_trophy_edit.html.erb', type: :view do
2
+ let(:user) { stub_model(User, user_key: 'mjg') }
3
+ let(:page) { Capybara::Node::Simple.new(rendered) }
4
+
5
+ before do
6
+ allow(view).to receive(:signed_in?).and_return(true)
7
+ allow(view).to receive(:current_user).and_return(user)
8
+ assign(:user, user)
9
+ end
10
+
11
+ context "when there are no highlighted works" do
12
+ before do
13
+ assign(:trophies, [])
14
+ render 'edit_primary'
15
+ end
16
+
17
+ it "has no trophy" do
18
+ expect(page).not_to have_css('a#remove_trophy_help')
19
+ expect(page).not_to have_content('Remove Highlight Designation')
20
+ end
21
+ end
22
+
23
+ context "when there are highlighted works" do
24
+ let(:solr_document) { SolrDocument.new(id: 'abc123', has_model_ssim: 'GenericWork', title_tesim: ['Title']) }
25
+
26
+ before do
27
+ assign(:trophies, [Hyrax::TrophyPresenter.new(solr_document)])
28
+ render 'edit_primary'
29
+ end
30
+
31
+ it "has trophy" do
32
+ expect(page).to have_css('a#remove_trophy_help')
33
+ expect(page).to have_selector("#remove_trophy_abc123")
34
+ end
35
+ end
36
+ end
@@ -13,44 +13,6 @@ RSpec.describe 'hyrax/dashboard/profiles/edit.html.erb', type: :view do
13
13
  expect(rendered).to match(/ORCID Profile/)
14
14
  end
15
15
 
16
- describe 'proxy deposit' do
17
- context 'when enabled' do
18
- before do
19
- allow(Flipflop).to receive(:proxy_deposit?).and_return(true)
20
- end
21
-
22
- it 'renders proxy partial' do
23
- render
24
- expect(rendered).to match(/Authorize Proxies/)
25
- end
26
- end
27
-
28
- context 'when disabled' do
29
- before do
30
- allow(Flipflop).to receive(:proxy_deposit?).and_return(false)
31
- end
32
-
33
- it 'does not render proxy partial' do
34
- render
35
- expect(rendered).not_to match(/Authorize Proxies/)
36
- end
37
- end
38
- end
39
-
40
- context "with trophy" do
41
- let(:solr_document) { SolrDocument.new(id: 'abc123', has_model_ssim: 'GenericWork', title_tesim: ['Title']) }
42
- let(:page) { Capybara::Node::Simple.new(rendered) }
43
-
44
- before do
45
- assign(:trophies, [Hyrax::TrophyPresenter.new(solr_document)])
46
- render
47
- end
48
-
49
- it "has trophy" do
50
- expect(page).to have_selector("#remove_trophy_abc123")
51
- end
52
- end
53
-
54
16
  context 'with Zotero integration enabled' do
55
17
  before do
56
18
  allow(Hyrax.config).to receive(:arkivo_api?) { true }
@@ -0,0 +1,37 @@
1
+ RSpec.describe 'hyrax/dashboard/profiles/show.html.erb', type: :view do
2
+ let(:join_date) { 1.day.ago }
3
+ let(:user) { stub_model(User, user_key: 'mjg', created_at: join_date) }
4
+ let(:ability) { double(current_user: stub_model(User, user_key: 'mjg')) }
5
+ let(:presenter) { Hyrax::UserProfilePresenter.new(user, ability) }
6
+
7
+ before do
8
+ allow(view).to receive(:signed_in?).and_return(true)
9
+ allow(view).to receive(:current_user).and_return(user)
10
+ allow(view).to receive(:can?).and_return(true)
11
+ assign(:user, user)
12
+ assign(:presenter, presenter)
13
+ end
14
+
15
+ context "with trophy" do
16
+ let(:trophy_presenter) { Hyrax::TrophyPresenter.new(solr_document) }
17
+ let(:solr_document) do
18
+ SolrDocument.new(id: 'trophy_abc123',
19
+ has_model_ssim: 'GenericWork',
20
+ thumbnail_path_ss: '/foo/bar.png')
21
+ end
22
+
23
+ before do
24
+ allow(view).to receive(:search_session).and_return({})
25
+ allow(view).to receive(:blacklight_config).and_return(CatalogController.blacklight_config)
26
+ allow(view).to receive(:current_search_session).and_return(nil)
27
+ allow(presenter).to receive(:trophies).and_return([trophy_presenter])
28
+ end
29
+
30
+ it "has trophy" do
31
+ render
32
+ page = Capybara::Node::Simple.new(rendered)
33
+ expect(page).to have_selector(".list-group-item > div#contributions.tab-pane")
34
+ expect(page).to have_selector("#trophyrow_#{solr_document.id}")
35
+ end
36
+ end
37
+ end
@@ -0,0 +1,13 @@
1
+ RSpec.describe "hyrax/depositors/index.html.erb", type: :view do
2
+ before do
3
+ allow(controller).to receive(:current_user).and_return(some_user)
4
+ assign :user, some_user
5
+ end
6
+
7
+ let(:some_user) { build(:user) }
8
+
9
+ it 'renders proxy partial' do
10
+ render
11
+ expect(rendered).to match(/Authorize Proxies/)
12
+ end
13
+ end
@@ -0,0 +1,15 @@
1
+ RSpec.describe 'hyrax/file_sets/_actions.html.erb', type: :view do
2
+ let(:file_set) { stub_model(FileSet) }
3
+
4
+ before do
5
+ allow(view).to receive(:can?).with(:edit, file_set.id).and_return(false)
6
+ allow(view).to receive(:can?).with(:destroy, file_set.id).and_return(false)
7
+ allow(view).to receive(:can?).with(:download, file_set.id).and_return(true)
8
+ render 'hyrax/file_sets/actions', file_set: file_set
9
+ end
10
+
11
+ it "includes google analytics data in the download link" do
12
+ expect(rendered).to have_css('a#file_download')
13
+ expect(rendered).to have_selector("a[data-label=\"#{file_set.id}\"]")
14
+ end
15
+ end
@@ -0,0 +1,29 @@
1
+ RSpec.describe 'hyrax/file_sets/media_display/_audio.html.erb', type: :view do
2
+ let(:file_set) { stub_model(FileSet) }
3
+ let(:config) { double }
4
+ let(:link) { true }
5
+
6
+ before do
7
+ allow(Hyrax.config).to receive(:display_media_download_link?).and_return(link)
8
+ render 'hyrax/file_sets/media_display/audio', file_set: file_set
9
+ end
10
+
11
+ it "draws the view with the link" do
12
+ expect(rendered).to have_selector("audio")
13
+ expect(rendered).to have_css('a', text: 'Download audio')
14
+ end
15
+
16
+ it "includes google analytics data in the download link" do
17
+ expect(rendered).to have_css('a#file_download')
18
+ expect(rendered).to have_selector("a[data-label=\"#{file_set.id}\"]")
19
+ end
20
+
21
+ context "no download links" do
22
+ let(:link) { false }
23
+
24
+ it "draws the view without the link" do
25
+ expect(rendered).to have_selector("audio")
26
+ expect(rendered).not_to have_css('a', text: 'Download audio')
27
+ end
28
+ end
29
+ end
@@ -1,4 +1,4 @@
1
- RSpec.describe 'hyrax/file_sets/mdeia_display/_default.html.erb', type: :view do
1
+ RSpec.describe 'hyrax/file_sets/media_display/_default.html.erb', type: :view do
2
2
  let(:file_set) { stub_model(FileSet) }
3
3
  let(:config) { double }
4
4
  let(:link) { true }
@@ -0,0 +1,29 @@
1
+ RSpec.describe 'hyrax/file_sets/media_display/_video.html.erb', type: :view do
2
+ let(:file_set) { stub_model(FileSet) }
3
+ let(:config) { double }
4
+ let(:link) { true }
5
+
6
+ before do
7
+ allow(Hyrax.config).to receive(:display_media_download_link?).and_return(link)
8
+ render 'hyrax/file_sets/media_display/video', file_set: file_set
9
+ end
10
+
11
+ it "draws the view with the link" do
12
+ expect(rendered).to have_selector("video")
13
+ expect(rendered).to have_css('a', text: 'Download video')
14
+ end
15
+
16
+ it "includes google analytics data in the download link" do
17
+ expect(rendered).to have_css('a#file_download')
18
+ expect(rendered).to have_selector("a[data-label=\"#{file_set.id}\"]")
19
+ end
20
+
21
+ context "no download links" do
22
+ let(:link) { false }
23
+
24
+ it "draws the view without the link" do
25
+ expect(rendered).to have_selector("video")
26
+ expect(rendered).not_to have_css('a', text: 'Download video')
27
+ end
28
+ end
29
+ end
@@ -16,6 +16,7 @@ RSpec.describe 'hyrax/my/collections/_list_collections.html.erb', type: :view do
16
16
  "has_model_ssim" => ["Collection"],
17
17
  "title_tesim" => ["Collection Title"],
18
18
  "description_tesim" => ["Collection Description"],
19
+ "thumbnail_path_ss" => Hyrax::CollectionIndexer.thumbnail_path_service.default_image,
19
20
  "collection_type_gid_ssim" => [collection_type.gid],
20
21
  "system_modified_dtsi" => modified_date
21
22
  }
@@ -49,7 +50,8 @@ RSpec.describe 'hyrax/my/collections/_list_collections.html.erb', type: :view do
49
50
  expect(rendered).to have_link 'Add to collection'
50
51
  expect(rendered).to have_css '.collection_type', text: 'User Collection'
51
52
  expect(rendered).to have_selector '.expanded-details', text: 'Collection Description'
52
- expect(rendered).not_to include '<span class="fa fa-cubes collection-icon-small"></span></a>'
53
+ expect(rendered).not_to have_selector 'span.fa-cubes'
54
+ expect(rendered).to have_selector '.thumbnail-wrapper > img[alt="Collection"]'
53
55
  expect(rendered).to include Date.parse(modified_date).to_formatted_s(:standard)
54
56
  end
55
57
  end
@@ -61,6 +63,7 @@ RSpec.describe 'hyrax/my/collections/_list_collections.html.erb', type: :view do
61
63
  "has_model_ssim" => ["AdminSet"],
62
64
  "title_tesim" => ["AdminSet Title"],
63
65
  "description_tesim" => ["Admin Description"],
66
+ "thumbnail_path_ss" => Hyrax::AdminSetIndexer.thumbnail_path_service.default_image,
64
67
  "collection_type_gid_ssim" => [collection_type.gid],
65
68
  "system_modified_dtsi" => modified_date
66
69
  }
@@ -93,7 +96,8 @@ RSpec.describe 'hyrax/my/collections/_list_collections.html.erb', type: :view do
93
96
  expect(rendered).to have_link 'Add to collection' if Hyrax::CollectionType.any_nestable?
94
97
  expect(rendered).to have_css '.collection_type', text: 'Admin Set'
95
98
  expect(rendered).to have_selector '.expanded-details', text: 'Admin Description'
96
- expect(rendered).not_to include '<span class="fa fa-cubes collection-icon-small"></span></a>'
99
+ expect(rendered).not_to have_selector 'span.fa-cubes'
100
+ expect(rendered).to have_selector '.thumbnail-wrapper > img[alt="Collection"]'
97
101
  expect(rendered).to include Date.parse(modified_date).to_formatted_s(:standard)
98
102
  end
99
103
  end
data/tasks/hyrax_dev.rake CHANGED
@@ -45,9 +45,7 @@ if Gem.loaded_specs.key? 'engine_cart'
45
45
  task :after_generate do
46
46
  puts 'Creating default collection type...'
47
47
  EngineCart.within_test_app do
48
- unless system "bundle exec rake hyrax:default_collection_types:create"
49
- raise "EngineCart failed on with: #{$?}"
50
- end
48
+ raise "EngineCart failed on with: #{$?}" unless system "bundle exec rake hyrax:default_collection_types:create"
51
49
  end
52
50
  end
53
51
  end
data/template.rb CHANGED
@@ -1,4 +1,4 @@
1
- gem 'hyrax', '2.1.0.beta1'
1
+ gem 'hyrax', '2.1.0.beta2'
2
2
  run 'bundle install'
3
3
  generate 'hyrax:install', '-f'
4
4
  rails_command 'db:migrate'
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: hyrax
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.0.beta1
4
+ version: 2.1.0.beta2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Justin Coyne
@@ -14,7 +14,7 @@ authors:
14
14
  autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
- date: 2018-02-28 00:00:00.000000000 Z
17
+ date: 2018-04-04 00:00:00.000000000 Z
18
18
  dependencies:
19
19
  - !ruby/object:Gem::Dependency
20
20
  name: rails
@@ -306,16 +306,22 @@ dependencies:
306
306
  name: iiif_manifest
307
307
  requirement: !ruby/object:Gem::Requirement
308
308
  requirements:
309
- - - "~>"
309
+ - - ">="
310
+ - !ruby/object:Gem::Version
311
+ version: '0.3'
312
+ - - "<"
310
313
  - !ruby/object:Gem::Version
311
- version: 0.3.0
314
+ version: '0.5'
312
315
  type: :runtime
313
316
  prerelease: false
314
317
  version_requirements: !ruby/object:Gem::Requirement
315
318
  requirements:
316
- - - "~>"
319
+ - - ">="
317
320
  - !ruby/object:Gem::Version
318
- version: 0.3.0
321
+ version: '0.3'
322
+ - - "<"
323
+ - !ruby/object:Gem::Version
324
+ version: '0.5'
319
325
  - !ruby/object:Gem::Dependency
320
326
  name: jquery-datatables-rails
321
327
  requirement: !ruby/object:Gem::Requirement
@@ -761,7 +767,7 @@ dependencies:
761
767
  - !ruby/object:Gem::Version
762
768
  version: '0.5'
763
769
  - !ruby/object:Gem::Dependency
764
- name: factory_bot_rails
770
+ name: factory_bot
765
771
  requirement: !ruby/object:Gem::Requirement
766
772
  requirements:
767
773
  - - "~>"
@@ -947,33 +953,19 @@ dependencies:
947
953
  - !ruby/object:Gem::Version
948
954
  version: '1'
949
955
  - !ruby/object:Gem::Dependency
950
- name: rubocop
951
- requirement: !ruby/object:Gem::Requirement
952
- requirements:
953
- - - "~>"
954
- - !ruby/object:Gem::Version
955
- version: 0.51.0
956
- type: :development
957
- prerelease: false
958
- version_requirements: !ruby/object:Gem::Requirement
959
- requirements:
960
- - - "~>"
961
- - !ruby/object:Gem::Version
962
- version: 0.51.0
963
- - !ruby/object:Gem::Dependency
964
- name: rubocop-rspec
956
+ name: bixby
965
957
  requirement: !ruby/object:Gem::Requirement
966
958
  requirements:
967
959
  - - "~>"
968
960
  - !ruby/object:Gem::Version
969
- version: 1.20.1
961
+ version: 1.0.0
970
962
  type: :development
971
963
  prerelease: false
972
964
  version_requirements: !ruby/object:Gem::Requirement
973
965
  requirements:
974
966
  - - "~>"
975
967
  - !ruby/object:Gem::Version
976
- version: 1.20.1
968
+ version: 1.0.0
977
969
  - !ruby/object:Gem::Dependency
978
970
  name: shoulda-callback-matchers
979
971
  requirement: !ruby/object:Gem::Requirement
@@ -1020,30 +1012,22 @@ dependencies:
1020
1012
  name: simple_form
1021
1013
  requirement: !ruby/object:Gem::Requirement
1022
1014
  requirements:
1023
- - - '='
1015
+ - - "~>"
1016
+ - !ruby/object:Gem::Version
1017
+ version: '3.2'
1018
+ - - "<="
1024
1019
  - !ruby/object:Gem::Version
1025
1020
  version: 3.5.0
1026
1021
  type: :runtime
1027
1022
  prerelease: false
1028
1023
  version_requirements: !ruby/object:Gem::Requirement
1029
1024
  requirements:
1030
- - - '='
1031
- - !ruby/object:Gem::Version
1032
- version: 3.5.0
1033
- - !ruby/object:Gem::Dependency
1034
- name: parser
1035
- requirement: !ruby/object:Gem::Requirement
1036
- requirements:
1037
- - - "<"
1025
+ - - "~>"
1038
1026
  - !ruby/object:Gem::Version
1039
- version: '2.5'
1040
- type: :development
1041
- prerelease: false
1042
- version_requirements: !ruby/object:Gem::Requirement
1043
- requirements:
1044
- - - "<"
1027
+ version: '3.2'
1028
+ - - "<="
1045
1029
  - !ruby/object:Gem::Version
1046
- version: '2.5'
1030
+ version: 3.5.0
1047
1031
  description: Hyrax is a featureful Samvera front-end based on the latest and greatest
1048
1032
  Samvera software components.
1049
1033
  email:
@@ -1138,7 +1122,6 @@ files:
1138
1122
  - app/assets/javascripts/hyrax/collection_types.es6
1139
1123
  - app/assets/javascripts/hyrax/collections.js
1140
1124
  - app/assets/javascripts/hyrax/collections/editor.es6
1141
- - app/assets/javascripts/hyrax/collections_forms.js
1142
1125
  - app/assets/javascripts/hyrax/config.js.erb
1143
1126
  - app/assets/javascripts/hyrax/content_blocks.js
1144
1127
  - app/assets/javascripts/hyrax/dashboard_actions.js
@@ -1191,6 +1174,7 @@ files:
1191
1174
  - app/assets/javascripts/hyrax/tabs.js
1192
1175
  - app/assets/javascripts/hyrax/thumbnail_select.es6
1193
1176
  - app/assets/javascripts/hyrax/trophy.js
1177
+ - app/assets/javascripts/hyrax/turbolinks_events.js
1194
1178
  - app/assets/javascripts/hyrax/uploader.js
1195
1179
  - app/assets/javascripts/hyrax/user_search.js
1196
1180
  - app/assets/stylesheets/_bootstrap-default-overrides.scss
@@ -1259,6 +1243,7 @@ files:
1259
1243
  - app/controllers/concerns/hyrax/deny_access_override_behavior.rb
1260
1244
  - app/controllers/concerns/hyrax/embargoes_controller_behavior.rb
1261
1245
  - app/controllers/concerns/hyrax/leases_controller_behavior.rb
1246
+ - app/controllers/concerns/hyrax/local_file_downloads_controller_behavior.rb
1262
1247
  - app/controllers/concerns/hyrax/manages_embargoes.rb
1263
1248
  - app/controllers/concerns/hyrax/singular_subresource_controller.rb
1264
1249
  - app/controllers/concerns/hyrax/themed_layout_controller.rb
@@ -1861,6 +1846,7 @@ files:
1861
1846
  - app/views/hyrax/contact_form/new.html.erb
1862
1847
  - app/views/hyrax/contact_mailer/contact.html.erb
1863
1848
  - app/views/hyrax/content_blocks/_form.html.erb
1849
+ - app/views/hyrax/content_blocks/_modal_content_block.html.erb
1864
1850
  - app/views/hyrax/content_blocks/edit.html.erb
1865
1851
  - app/views/hyrax/content_blocks/templates/agreement.html.erb
1866
1852
  - app/views/hyrax/content_blocks/templates/terms.html.erb
@@ -1922,6 +1908,7 @@ files:
1922
1908
  - app/views/hyrax/dashboard/sidebar/_tasks.html.erb
1923
1909
  - app/views/hyrax/dashboard/works/_default_group.html.erb
1924
1910
  - app/views/hyrax/dashboard/works/_list_works.html.erb
1911
+ - app/views/hyrax/depositors/index.html.erb
1925
1912
  - app/views/hyrax/embargoes/_embargo_history.html.erb
1926
1913
  - app/views/hyrax/embargoes/_list_active_embargoes.html.erb
1927
1914
  - app/views/hyrax/embargoes/_list_deactivated_embargoes.html.erb
@@ -2202,6 +2189,7 @@ files:
2202
2189
  - lib/generators/hyrax/templates/db/migrate/20170905135339_add_preferred_locale_to_users.rb.erb
2203
2190
  - lib/generators/hyrax/templates/db/migrate/20171103080032_add_collection_type_sharing_options.rb.erb
2204
2191
  - lib/generators/hyrax/templates/db/migrate/20171117153051_add_unique_constraint_to_permission_template_accesses.rb.erb
2192
+ - lib/generators/hyrax/templates/db/migrate/20180302200051_add_branding_to_collection_type.rb.erb
2205
2193
  - lib/generators/hyrax/templates/db/seeds.rb
2206
2194
  - lib/generators/hyrax/templates/hyrax.scss
2207
2195
  - lib/generators/hyrax/templates/hyrax_helper.rb
@@ -2420,8 +2408,10 @@ files:
2420
2408
  - spec/features/create_work_spec.rb
2421
2409
  - spec/features/dashboard/all_works.rb
2422
2410
  - spec/features/dashboard/collection_spec.rb
2411
+ - spec/features/dashboard/display_admin_dashboard_spec.rb
2423
2412
  - spec/features/dashboard/display_dashboard_spec.rb
2424
2413
  - spec/features/delete_work_spec.rb
2414
+ - spec/features/edit_content_block_admin_spec.rb
2425
2415
  - spec/features/edit_file_spec.rb
2426
2416
  - spec/features/edit_work_spec.rb
2427
2417
  - spec/features/embargo_spec.rb
@@ -2689,6 +2679,7 @@ files:
2689
2679
  - spec/routing/route_spec.rb
2690
2680
  - spec/routing/single_use_link_spec.rb
2691
2681
  - spec/routing/stats_route_spec.rb
2682
+ - spec/search_builders/hyrax/abstract_type_relation_spec.rb
2692
2683
  - spec/search_builders/hyrax/admin_admin_set_member_search_builder_spec.rb
2693
2684
  - spec/search_builders/hyrax/admin_set_search_builder_spec.rb
2694
2685
  - spec/search_builders/hyrax/catalog_search_builder_spec.rb
@@ -2704,6 +2695,7 @@ files:
2704
2695
  - spec/search_builders/hyrax/my/find_works_search_builder_spec.rb
2705
2696
  - spec/search_builders/hyrax/my/shares_search_builder_spec.rb
2706
2697
  - spec/search_builders/hyrax/my/works_search_builder_spec.rb
2698
+ - spec/search_builders/hyrax/parent_collection_search_builder_spec.rb
2707
2699
  - spec/search_builders/hyrax/single_admin_set_search_builder_spec.rb
2708
2700
  - spec/search_builders/hyrax/stats/work_status_search_builder_spec.rb
2709
2701
  - spec/search_builders/hyrax/work_relation_spec.rb
@@ -2897,16 +2889,22 @@ files:
2897
2889
  - spec/views/hyrax/dashboard/collections/_work_action_menu.html.erb_spec.rb
2898
2890
  - spec/views/hyrax/dashboard/collections/edit.html.erb_spec.rb
2899
2891
  - spec/views/hyrax/dashboard/collections/show.html.erb_spec.rb
2892
+ - spec/views/hyrax/dashboard/profiles/_trophy_edit.html.erb_spec.rb
2900
2893
  - spec/views/hyrax/dashboard/profiles/edit.html.erb_spec.rb
2894
+ - spec/views/hyrax/dashboard/profiles/show.html.erb_spec.rb
2901
2895
  - spec/views/hyrax/dashboard/show_user_spec.rb
2896
+ - spec/views/hyrax/depositors/index.html.erb_spec.rb
2902
2897
  - spec/views/hyrax/embargoes/index.html.erb_spec.rb
2898
+ - spec/views/hyrax/file_sets/_actions.html.erb_spec.rb
2903
2899
  - spec/views/hyrax/file_sets/_permission.html.erb_spec.rb
2904
2900
  - spec/views/hyrax/file_sets/_permission_form.html.erb_spec.rb
2905
2901
  - spec/views/hyrax/file_sets/_show_actions.html.erb_spec.rb
2906
2902
  - spec/views/hyrax/file_sets/_show_characterization_details.html.erb_spec.rb
2907
2903
  - spec/views/hyrax/file_sets/_single_use_links.html.erb_spec.rb
2908
2904
  - spec/views/hyrax/file_sets/_versioning.html.erb_spec.rb
2905
+ - spec/views/hyrax/file_sets/media_display/_audio.html.erb_spec.rb
2909
2906
  - spec/views/hyrax/file_sets/media_display/_default.html.erb_spec.rb
2907
+ - spec/views/hyrax/file_sets/media_display/_video.html.erb_spec.rb
2910
2908
  - spec/views/hyrax/file_sets/show.html.erb_spec.rb
2911
2909
  - spec/views/hyrax/file_sets/show.json.jbuilder_spec.rb
2912
2910
  - spec/views/hyrax/homepage/_announcement.html.erb_spec.rb
@@ -3130,8 +3128,10 @@ test_files:
3130
3128
  - spec/features/create_work_spec.rb
3131
3129
  - spec/features/dashboard/all_works.rb
3132
3130
  - spec/features/dashboard/collection_spec.rb
3131
+ - spec/features/dashboard/display_admin_dashboard_spec.rb
3133
3132
  - spec/features/dashboard/display_dashboard_spec.rb
3134
3133
  - spec/features/delete_work_spec.rb
3134
+ - spec/features/edit_content_block_admin_spec.rb
3135
3135
  - spec/features/edit_file_spec.rb
3136
3136
  - spec/features/edit_work_spec.rb
3137
3137
  - spec/features/embargo_spec.rb
@@ -3399,6 +3399,7 @@ test_files:
3399
3399
  - spec/routing/route_spec.rb
3400
3400
  - spec/routing/single_use_link_spec.rb
3401
3401
  - spec/routing/stats_route_spec.rb
3402
+ - spec/search_builders/hyrax/abstract_type_relation_spec.rb
3402
3403
  - spec/search_builders/hyrax/admin_admin_set_member_search_builder_spec.rb
3403
3404
  - spec/search_builders/hyrax/admin_set_search_builder_spec.rb
3404
3405
  - spec/search_builders/hyrax/catalog_search_builder_spec.rb
@@ -3414,6 +3415,7 @@ test_files:
3414
3415
  - spec/search_builders/hyrax/my/find_works_search_builder_spec.rb
3415
3416
  - spec/search_builders/hyrax/my/shares_search_builder_spec.rb
3416
3417
  - spec/search_builders/hyrax/my/works_search_builder_spec.rb
3418
+ - spec/search_builders/hyrax/parent_collection_search_builder_spec.rb
3417
3419
  - spec/search_builders/hyrax/single_admin_set_search_builder_spec.rb
3418
3420
  - spec/search_builders/hyrax/stats/work_status_search_builder_spec.rb
3419
3421
  - spec/search_builders/hyrax/work_relation_spec.rb
@@ -3607,16 +3609,22 @@ test_files:
3607
3609
  - spec/views/hyrax/dashboard/collections/_work_action_menu.html.erb_spec.rb
3608
3610
  - spec/views/hyrax/dashboard/collections/edit.html.erb_spec.rb
3609
3611
  - spec/views/hyrax/dashboard/collections/show.html.erb_spec.rb
3612
+ - spec/views/hyrax/dashboard/profiles/_trophy_edit.html.erb_spec.rb
3610
3613
  - spec/views/hyrax/dashboard/profiles/edit.html.erb_spec.rb
3614
+ - spec/views/hyrax/dashboard/profiles/show.html.erb_spec.rb
3611
3615
  - spec/views/hyrax/dashboard/show_user_spec.rb
3616
+ - spec/views/hyrax/depositors/index.html.erb_spec.rb
3612
3617
  - spec/views/hyrax/embargoes/index.html.erb_spec.rb
3618
+ - spec/views/hyrax/file_sets/_actions.html.erb_spec.rb
3613
3619
  - spec/views/hyrax/file_sets/_permission.html.erb_spec.rb
3614
3620
  - spec/views/hyrax/file_sets/_permission_form.html.erb_spec.rb
3615
3621
  - spec/views/hyrax/file_sets/_show_actions.html.erb_spec.rb
3616
3622
  - spec/views/hyrax/file_sets/_show_characterization_details.html.erb_spec.rb
3617
3623
  - spec/views/hyrax/file_sets/_single_use_links.html.erb_spec.rb
3618
3624
  - spec/views/hyrax/file_sets/_versioning.html.erb_spec.rb
3625
+ - spec/views/hyrax/file_sets/media_display/_audio.html.erb_spec.rb
3619
3626
  - spec/views/hyrax/file_sets/media_display/_default.html.erb_spec.rb
3627
+ - spec/views/hyrax/file_sets/media_display/_video.html.erb_spec.rb
3620
3628
  - spec/views/hyrax/file_sets/show.html.erb_spec.rb
3621
3629
  - spec/views/hyrax/file_sets/show.json.jbuilder_spec.rb
3622
3630
  - spec/views/hyrax/homepage/_announcement.html.erb_spec.rb