blacklight-spotlight 3.0.0.rc1 → 3.0.0.rc6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (338) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +1 -1
  3. data/app/assets/images/blacklight/arrow-alt-circle-left.svg +1 -0
  4. data/app/assets/images/blacklight/arrow-alt-circle-right.svg +1 -0
  5. data/app/assets/images/blacklight/close.svg +1 -0
  6. data/app/assets/images/blacklight/zoom_in.svg +1 -0
  7. data/app/assets/images/blacklight/zoom_out.svg +1 -0
  8. data/app/assets/javascripts/spotlight/admin/{add_new_page_button.js → add_new_button.js} +7 -0
  9. data/app/assets/javascripts/spotlight/admin/block_mixins/autocompleteable.js +4 -4
  10. data/app/assets/javascripts/spotlight/admin/blocks/browse_group_categories_block.js +88 -0
  11. data/app/assets/javascripts/spotlight/admin/blocks/pages_block.js +1 -1
  12. data/app/assets/javascripts/spotlight/admin/blocks/solr_documents_base_block.js +1 -1
  13. data/app/assets/javascripts/spotlight/admin/blocks/uploaded_items_block.js +8 -1
  14. data/app/assets/javascripts/spotlight/admin/catalog_edit.js +13 -47
  15. data/app/assets/javascripts/spotlight/admin/croppable.js +1 -1
  16. data/app/assets/javascripts/spotlight/admin/exhibit_tag_autocomplete.js +37 -0
  17. data/app/assets/javascripts/spotlight/admin/index.js +0 -2
  18. data/app/assets/javascripts/spotlight/admin/{reindex_monitor.js → progress_monitor.js} +26 -4
  19. data/app/assets/javascripts/spotlight/admin/search_typeahead.js +2 -2
  20. data/app/assets/javascripts/spotlight/admin/sir-trevor/locales.js +9 -2
  21. data/app/assets/javascripts/spotlight/user/browse_group_categories.js +59 -0
  22. data/app/assets/javascripts/spotlight/user/index.js +1 -0
  23. data/app/assets/javascripts/spotlight/user/zpr_links.js.erb +29 -14
  24. data/app/assets/stylesheets/spotlight/_breadcrumbs.scss +8 -0
  25. data/app/assets/stylesheets/spotlight/_browse.scss +8 -0
  26. data/app/assets/stylesheets/spotlight/_catalog.scss +34 -8
  27. data/app/assets/stylesheets/spotlight/_exhibit_admin.scss +9 -0
  28. data/app/assets/stylesheets/spotlight/_featured_browse_categories_block.scss +212 -84
  29. data/app/assets/stylesheets/spotlight/_item_text_block.scss +1 -1
  30. data/app/assets/stylesheets/spotlight/_modals.scss +3 -0
  31. data/app/assets/stylesheets/spotlight/_nestable.scss +8 -0
  32. data/app/assets/stylesheets/spotlight/_pages.scss +9 -4
  33. data/app/assets/stylesheets/spotlight/_spotlight.scss +4 -0
  34. data/app/assets/stylesheets/spotlight/_translations.scss +6 -0
  35. data/app/assets/stylesheets/spotlight/_view_larger.scss +22 -0
  36. data/app/assets/stylesheets/spotlight/browse_group_categories_block.scss +92 -0
  37. data/app/assets/stylesheets/spotlight/typeahead.css +23 -23
  38. data/app/builders/spotlight/bootstrap_breadcrumbs_builder.rb +5 -4
  39. data/app/controllers/concerns/spotlight/base.rb +1 -1
  40. data/app/controllers/concerns/spotlight/catalog.rb +7 -1
  41. data/app/controllers/concerns/spotlight/search_helper.rb +2 -8
  42. data/app/controllers/spotlight/appearances_controller.rb +0 -13
  43. data/app/controllers/spotlight/browse_controller.rb +15 -17
  44. data/app/controllers/spotlight/bulk_actions_controller.rb +62 -0
  45. data/app/controllers/spotlight/bulk_updates_controller.rb +67 -0
  46. data/app/controllers/spotlight/catalog_controller.rb +17 -14
  47. data/app/controllers/spotlight/concerns/application_controller.rb +13 -2
  48. data/app/controllers/spotlight/dashboards_controller.rb +5 -4
  49. data/app/controllers/spotlight/exhibits_controller.rb +1 -1
  50. data/app/controllers/spotlight/featured_images_controller.rb +1 -1
  51. data/app/controllers/spotlight/groups_controller.rb +80 -0
  52. data/app/controllers/spotlight/job_trackers_controller.rb +17 -0
  53. data/app/controllers/spotlight/pages_controller.rb +8 -13
  54. data/app/controllers/spotlight/searches_controller.rb +4 -17
  55. data/app/controllers/spotlight/tags_controller.rb +39 -5
  56. data/app/helpers/spotlight/application_helper.rb +21 -2
  57. data/app/helpers/spotlight/crud_link_helpers.rb +1 -1
  58. data/app/helpers/spotlight/job_trackers_helper.rb +31 -0
  59. data/app/helpers/spotlight/main_app_helpers.rb +4 -5
  60. data/app/helpers/spotlight/meta_helper.rb +2 -2
  61. data/app/helpers/spotlight/pages_helper.rb +1 -8
  62. data/app/helpers/spotlight/roles_helper.rb +1 -1
  63. data/app/helpers/spotlight/searches_helper.rb +1 -1
  64. data/app/jobs/concerns/spotlight/gather_documents.rb +35 -0
  65. data/app/jobs/concerns/spotlight/job_tracking.rb +64 -0
  66. data/app/jobs/concerns/spotlight/limit_concurrency.rb +33 -0
  67. data/app/jobs/spotlight/add_tags_job.rb +31 -0
  68. data/app/jobs/spotlight/add_uploads_from_csv.rb +4 -3
  69. data/app/jobs/spotlight/application_job.rb +8 -0
  70. data/app/jobs/spotlight/change_visibility_job.rb +33 -0
  71. data/app/jobs/spotlight/cleanup_job_trackers_job.rb +13 -0
  72. data/app/jobs/spotlight/default_thumbnail_job.rb +1 -3
  73. data/app/jobs/spotlight/process_bulk_updates_csv_job.rb +82 -0
  74. data/app/jobs/spotlight/reindex_exhibit_job.rb +39 -0
  75. data/app/jobs/spotlight/reindex_job.rb +64 -44
  76. data/app/jobs/spotlight/remove_tags_job.rb +31 -0
  77. data/app/jobs/spotlight/rename_sidecar_field_job.rb +3 -2
  78. data/app/jobs/spotlight/rename_tags_job.rb +33 -0
  79. data/app/jobs/spotlight/update_job_trackers_job.rb +20 -0
  80. data/app/models/concerns/spotlight/browse_category_search_builder.rb +59 -0
  81. data/app/models/concerns/spotlight/exhibit_analytics.rb +2 -6
  82. data/app/models/concerns/spotlight/exhibit_defaults.rb +1 -1
  83. data/app/models/concerns/spotlight/exhibit_documents.rb +2 -2
  84. data/app/models/concerns/spotlight/resources/web.rb +1 -1
  85. data/app/models/concerns/spotlight/search_builder.rb +11 -0
  86. data/app/models/concerns/spotlight/solr_document.rb +1 -1
  87. data/app/models/concerns/spotlight/solr_document/atomic_updates.rb +2 -2
  88. data/app/models/concerns/spotlight/user.rb +7 -2
  89. data/app/models/sir_trevor_rails/blocks/browse_group_categories_block.rb +25 -0
  90. data/app/models/sir_trevor_rails/blocks/solr_documents_block.rb +9 -0
  91. data/app/models/sir_trevor_rails/blocks/uploaded_items_block.rb +4 -0
  92. data/app/models/spotlight/ability.rb +8 -2
  93. data/app/models/spotlight/about_page.rb +1 -1
  94. data/app/models/spotlight/attachment.rb +1 -1
  95. data/app/models/spotlight/background_job_progress.rb +96 -0
  96. data/app/models/spotlight/blacklight_configuration.rb +28 -7
  97. data/app/models/spotlight/bulk_update.rb +8 -0
  98. data/app/models/spotlight/event.rb +13 -0
  99. data/app/models/spotlight/exhibit.rb +15 -12
  100. data/app/models/spotlight/feature_page.rb +1 -3
  101. data/app/models/spotlight/featured_image.rb +8 -2
  102. data/app/models/spotlight/field_metadata.rb +4 -8
  103. data/app/models/spotlight/group.rb +22 -0
  104. data/app/models/spotlight/group_member.rb +11 -0
  105. data/app/models/spotlight/home_page.rb +1 -1
  106. data/app/models/spotlight/job_tracker.rb +114 -0
  107. data/app/models/spotlight/page.rb +3 -5
  108. data/app/models/spotlight/page_configurations.rb +15 -9
  109. data/app/models/spotlight/resource.rb +28 -62
  110. data/app/models/spotlight/resources/iiif_harvester.rb +12 -3
  111. data/app/models/spotlight/resources/iiif_manifest.rb +9 -7
  112. data/app/models/spotlight/resources/iiif_service.rb +9 -2
  113. data/app/models/spotlight/resources/json_upload.rb +12 -0
  114. data/app/models/spotlight/resources/upload.rb +25 -2
  115. data/app/models/spotlight/role.rb +1 -2
  116. data/app/models/spotlight/search.rb +5 -0
  117. data/app/models/spotlight/solr_document_sidecar.rb +2 -1
  118. data/app/presenters/spotlight/iiif_manifest_presenter.rb +2 -2
  119. data/app/services/spotlight/bulk_updates_csv_template_service.rb +93 -0
  120. data/app/services/spotlight/etl.rb +7 -0
  121. data/app/services/spotlight/etl/context.rb +52 -0
  122. data/app/services/spotlight/etl/executor.rb +192 -0
  123. data/app/services/spotlight/etl/loaders.rb +12 -0
  124. data/app/services/spotlight/etl/pipeline.rb +81 -0
  125. data/app/services/spotlight/etl/solr_loader.rb +96 -0
  126. data/app/services/spotlight/etl/sources.rb +25 -0
  127. data/app/services/spotlight/etl/step.rb +82 -0
  128. data/app/services/spotlight/etl/transforms.rb +64 -0
  129. data/app/services/spotlight/exhibit_import_export_service.rb +50 -22
  130. data/app/services/spotlight/iiif_resource_resolver.rb +1 -1
  131. data/app/services/spotlight/validity_checker.rb +5 -5
  132. data/app/uploaders/spotlight/bulk_updates_uploader.rb +7 -0
  133. data/app/uploaders/spotlight/featured_image_uploader.rb +1 -1
  134. data/app/views/catalog/_add_tags.html.erb +28 -0
  135. data/app/views/catalog/_bulk_actions.html.erb +12 -0
  136. data/app/views/catalog/_change_visibility.html.erb +35 -0
  137. data/app/views/catalog/_curator_actions.html.erb +3 -0
  138. data/app/views/catalog/_remove_tags.html.erb +37 -0
  139. data/app/views/catalog/_save_search.html.erb +1 -1
  140. data/app/views/spotlight/about_pages/_empty.html.erb +5 -5
  141. data/app/views/spotlight/browse/_search.html.erb +2 -1
  142. data/app/views/spotlight/browse/_search_box.html.erb +9 -9
  143. data/app/views/spotlight/browse/index.html.erb +13 -0
  144. data/app/views/spotlight/bulk_updates/_download.html.erb +23 -0
  145. data/app/views/spotlight/bulk_updates/_overview.html.erb +1 -0
  146. data/app/views/spotlight/bulk_updates/_progress_panel.html.erb +19 -0
  147. data/app/views/spotlight/bulk_updates/_upload.html.erb +12 -0
  148. data/app/views/spotlight/bulk_updates/edit.html.erb +37 -0
  149. data/app/views/spotlight/catalog/_admin_header.html.erb +1 -1
  150. data/app/views/spotlight/catalog/_admin_index_header_default.html.erb +1 -1
  151. data/app/views/spotlight/catalog/_admin_thumbnail_default.html.erb +3 -2
  152. data/app/views/spotlight/catalog/_document.html.erb +2 -4
  153. data/app/views/spotlight/catalog/_edit_default.html.erb +2 -2
  154. data/app/views/spotlight/catalog/_reindex_progress_panel.html.erb +1 -1
  155. data/app/views/spotlight/catalog/index.iiif_json.jbuilder +22 -0
  156. data/app/views/spotlight/contacts/_form.html.erb +1 -1
  157. data/app/views/spotlight/custom_fields/_form.html.erb +1 -1
  158. data/app/views/spotlight/custom_search_fields/_form.html.erb +1 -1
  159. data/app/views/spotlight/dashboards/_reindexing_activity.html.erb +6 -6
  160. data/app/views/spotlight/exhibits/_exhibit_card.html.erb +1 -1
  161. data/app/views/spotlight/feature_pages/_empty.html.erb +5 -5
  162. data/app/views/spotlight/featured_images/_form.html.erb +2 -2
  163. data/app/views/spotlight/featured_images/_upload_form.html.erb +1 -1
  164. data/app/views/spotlight/home_pages/_empty.html.erb +3 -3
  165. data/app/views/spotlight/job_trackers/show.html.erb +79 -0
  166. data/app/views/spotlight/metadata_configurations/_metadata_field.html.erb +2 -2
  167. data/app/views/spotlight/pages/_form.html.erb +2 -2
  168. data/app/views/spotlight/pages/_view_type_group.html.erb +3 -3
  169. data/app/views/spotlight/resources/_form.html.erb +1 -1
  170. data/app/views/spotlight/resources/csv_upload/_form.html.erb +1 -1
  171. data/app/views/spotlight/resources/iiif/_form.html.erb +1 -1
  172. data/app/views/spotlight/resources/json_upload/_form.html.erb +2 -2
  173. data/app/views/spotlight/resources/upload/_form.html.erb +1 -1
  174. data/app/views/spotlight/search_configurations/_document_index_view_types.html.erb +2 -2
  175. data/app/views/spotlight/searches/_form.html.erb +14 -2
  176. data/app/views/spotlight/searches/_group.html.erb +27 -0
  177. data/app/views/spotlight/searches/index.html.erb +58 -17
  178. data/app/views/spotlight/shared/_curation_sidebar.html.erb +3 -0
  179. data/app/views/spotlight/shared/_locale_picker.html.erb +1 -1
  180. data/app/views/spotlight/sir_trevor/blocks/_browse_group_categories_block.html.erb +45 -0
  181. data/app/views/spotlight/sir_trevor/blocks/_solr_documents_block.html.erb +8 -8
  182. data/app/views/spotlight/sir_trevor/blocks/_solr_documents_carousel_block.html.erb +7 -7
  183. data/app/views/spotlight/sir_trevor/blocks/_solr_documents_features_block.html.erb +9 -7
  184. data/app/views/spotlight/sir_trevor/blocks/_solr_documents_grid_block.html.erb +5 -5
  185. data/app/views/spotlight/sir_trevor/blocks/_uploaded_items_block.html.erb +4 -0
  186. data/app/views/spotlight/tags/_tag.html.erb +24 -0
  187. data/app/views/spotlight/tags/index.html.erb +12 -16
  188. data/app/views/spotlight/translations/_groups.html.erb +34 -0
  189. data/app/views/spotlight/translations/_import.html.erb +5 -5
  190. data/app/views/spotlight/translations/edit.html.erb +6 -0
  191. data/app/views/spotlight/translations/show.yaml.yamlbuilder +6 -0
  192. data/config/i18n-tasks.yml +6 -0
  193. data/config/locales/spotlight.ar.yml +11 -1
  194. data/config/locales/spotlight.en.yml +283 -87
  195. data/config/routes.rb +39 -1
  196. data/db/migrate/20210113092223_create_spotlight_groups.rb +23 -0
  197. data/db/migrate/20210122082032_create_job_trackers.rb +22 -0
  198. data/db/migrate/20210126123041_create_events.rb +15 -0
  199. data/db/migrate/20210305070001_remove_class_from_sirtrevor_image_blocks.rb +20 -0
  200. data/db/migrate/20210305171150_create_bulk_updates.rb +9 -0
  201. data/db/migrate/20210308090000_migrate_caption_values_for_title_key.rb +29 -0
  202. data/lib/generators/spotlight/install_generator.rb +5 -5
  203. data/lib/generators/spotlight/scaffold_resource_generator.rb +5 -13
  204. data/lib/generators/spotlight/templates/config/initializers/riiif.rb +7 -5
  205. data/lib/generators/spotlight/templates/config/initializers/spotlight_initializer.rb +1 -1
  206. data/lib/generators/spotlight/templates/solr/config/schema.xml +1 -1
  207. data/lib/migration/iiif.rb +3 -3
  208. data/lib/spotlight/engine.rb +26 -4
  209. data/lib/spotlight/version.rb +1 -1
  210. data/spec/controllers/spotlight/about_pages_controller_spec.rb +3 -3
  211. data/spec/controllers/spotlight/browse_controller_spec.rb +23 -6
  212. data/spec/controllers/spotlight/bulk_actions_controller_spec.rb +124 -0
  213. data/spec/controllers/spotlight/bulk_updates_controller_spec.rb +77 -0
  214. data/spec/controllers/spotlight/catalog_controller_spec.rb +15 -13
  215. data/spec/controllers/spotlight/contacts_controller_spec.rb +2 -2
  216. data/spec/controllers/spotlight/feature_pages_controller_spec.rb +11 -0
  217. data/spec/controllers/spotlight/featured_images_controller_spec.rb +3 -3
  218. data/spec/controllers/spotlight/groups_controller_spec.rb +103 -0
  219. data/spec/controllers/spotlight/home_pages_controller_spec.rb +1 -1
  220. data/spec/controllers/spotlight/job_trackers_controller_spec.rb +37 -0
  221. data/spec/controllers/spotlight/searches_controller_spec.rb +10 -3
  222. data/spec/controllers/spotlight/tags_controller_spec.rb +5 -1
  223. data/spec/controllers/spotlight/view_configurations_controller_spec.rb +1 -1
  224. data/spec/examples.txt +1501 -1410
  225. data/spec/factories/bulk_updates.rb +15 -0
  226. data/spec/factories/exhibits.rb +4 -0
  227. data/spec/factories/group.rb +17 -0
  228. data/spec/factories/job_trackers.rb +11 -0
  229. data/spec/factories/searches.rb +11 -1
  230. data/spec/factories/users.rb +27 -8
  231. data/spec/features/add_items_spec.rb +10 -5
  232. data/spec/features/browse_category_admin_spec.rb +37 -5
  233. data/spec/features/browse_category_navigation_spec.rb +44 -0
  234. data/spec/features/browse_category_spec.rb +2 -2
  235. data/spec/features/bulk_actions_spec.rb +72 -0
  236. data/spec/features/catalog_spec.rb +3 -2
  237. data/spec/features/dashboard_spec.rb +2 -2
  238. data/spec/features/edit_search_fields_spec.rb +2 -2
  239. data/spec/features/exhibits/edit_metadata_fields_spec.rb +1 -1
  240. data/spec/features/exhibits/translation_editing_spec.rb +55 -6
  241. data/spec/features/home_page_spec.rb +5 -5
  242. data/spec/features/import_exhibit_spec.rb +5 -1
  243. data/spec/features/item_admin_spec.rb +4 -4
  244. data/spec/features/javascript/about_page_admin_spec.rb +1 -1
  245. data/spec/features/javascript/block_controls_spec.rb +1 -1
  246. data/spec/features/javascript/blocks/browse_group_categories_block_spec.rb +64 -0
  247. data/spec/features/javascript/blocks/solr_documents_block_spec.rb +4 -4
  248. data/spec/features/javascript/blocks/uploaded_items_block_spec.rb +27 -1
  249. data/spec/features/javascript/browse_group_admin_spec.rb +45 -0
  250. data/spec/features/javascript/edit_in_place_spec.rb +3 -3
  251. data/spec/features/javascript/feature_page_admin_spec.rb +1 -1
  252. data/spec/features/javascript/reindex_monitor_spec.rb +1 -1
  253. data/spec/features/javascript/search_config_admin_spec.rb +1 -1
  254. data/spec/features/report_a_problem_spec.rb +1 -1
  255. data/spec/features/site_users_management_spec.rb +5 -5
  256. data/spec/fixtures/bulk-update-template.csv +57 -0
  257. data/spec/fixtures/updated-bulk-update-template-w-tags.csv +4 -0
  258. data/spec/fixtures/updated-bulk-update-template.csv +4 -0
  259. data/spec/helpers/spotlight/application_helper_spec.rb +5 -6
  260. data/spec/helpers/spotlight/crud_link_helpers_spec.rb +3 -3
  261. data/spec/helpers/spotlight/pages_helper_spec.rb +8 -15
  262. data/spec/helpers/spotlight/roles_helper_spec.rb +1 -1
  263. data/spec/i18n_spec.rb +1 -0
  264. data/spec/jobs/spotlight/add_tags_job_spec.rb +34 -0
  265. data/spec/jobs/spotlight/add_uploads_from_csv_spec.rb +4 -1
  266. data/spec/jobs/spotlight/change_visibility_job_spec.rb +30 -0
  267. data/spec/jobs/spotlight/process_bulk_updates_csv_job_spec.rb +78 -0
  268. data/spec/jobs/spotlight/reindex_exhibit_job_spec.rb +43 -0
  269. data/spec/jobs/spotlight/reindex_job_spec.rb +34 -60
  270. data/spec/jobs/spotlight/remove_tags_job_spec.rb +39 -0
  271. data/spec/lib/migration/iiif_spec.rb +1 -1
  272. data/spec/models/sir_trevor_rails/blocks/browse_group_categories_block_spec.rb +41 -0
  273. data/spec/models/spotlight/ability_spec.rb +27 -0
  274. data/spec/models/spotlight/background_job_progress_spec.rb +137 -0
  275. data/spec/models/spotlight/blacklight_configuration_spec.rb +22 -17
  276. data/spec/models/spotlight/browse_category_search_builder_spec.rb +49 -0
  277. data/spec/models/spotlight/exhibit_spec.rb +13 -59
  278. data/spec/models/spotlight/featured_image_spec.rb +1 -1
  279. data/spec/models/spotlight/group_spec.rb +19 -0
  280. data/spec/models/spotlight/main_navigation_spec.rb +1 -1
  281. data/spec/models/spotlight/resource_spec.rb +89 -87
  282. data/spec/models/spotlight/resources/iiif_harvester_spec.rb +9 -10
  283. data/spec/models/spotlight/role_spec.rb +1 -1
  284. data/spec/models/spotlight/search_spec.rb +30 -3
  285. data/spec/models/spotlight/solr_document/atomic_updates_spec.rb +10 -0
  286. data/spec/models/spotlight/solr_document_sidecar_spec.rb +1 -0
  287. data/spec/presenters/spotlight/iiif_manifest_presenter_spec.rb +1 -1
  288. data/spec/services/spotlight/bulk_updates_csv_template_service_spec.rb +26 -0
  289. data/spec/services/spotlight/etl/context_spec.rb +66 -0
  290. data/spec/services/spotlight/etl/executor_spec.rb +149 -0
  291. data/spec/services/spotlight/etl/pipeline_spec.rb +22 -0
  292. data/spec/services/spotlight/etl/solr_loader_spec.rb +76 -0
  293. data/spec/services/spotlight/etl/step_spec.rb +70 -0
  294. data/spec/services/spotlight/exhibit_import_export_service_spec.rb +48 -1
  295. data/spec/spec_helper.rb +3 -6
  296. data/spec/support/features/test_features_helpers.rb +15 -0
  297. data/spec/test_app_templates/Gemfile.extra +2 -0
  298. data/spec/test_app_templates/catalog_controller.rb +6 -3
  299. data/spec/test_app_templates/lib/generators/test_app_generator.rb +2 -2
  300. data/spec/uploaders/spotlight/featured_image_uploader_spec.rb +2 -2
  301. data/spec/views/shared/_exhibit_navbar.html.erb_spec.rb +1 -1
  302. data/spec/views/spotlight/browse/index.html.erb_spec.rb +2 -0
  303. data/spec/views/spotlight/catalog/_edit_default.html.erb_spec.rb +1 -1
  304. data/spec/views/spotlight/dashboards/_analytics.html.erb_spec.rb +1 -1
  305. data/spec/views/spotlight/dashboards/_reindexing_activity.html.erb_spec.rb +30 -25
  306. data/spec/views/spotlight/job_trackers/show.html.erb_spec.rb +65 -0
  307. data/spec/views/spotlight/metadata_configurations/_metadata_field.html.erb_spec.rb +3 -4
  308. data/spec/views/spotlight/pages/show.html.erb_spec.rb +1 -0
  309. data/spec/views/spotlight/search_configurations/_facets.html.erb_spec.rb +1 -1
  310. data/spec/views/spotlight/sir_trevor/blocks/_browse_block.html.erb_spec.rb +1 -1
  311. data/spec/views/spotlight/sir_trevor/blocks/_iframe_block.html.erb_spec.rb +1 -1
  312. data/spec/views/spotlight/sir_trevor/blocks/_link_to_search_block.html.erb_spec.rb +1 -1
  313. data/spec/views/spotlight/sir_trevor/blocks/_rule_block.html.erb_spec.rb +1 -1
  314. data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_block.html.erb_spec.rb +8 -4
  315. data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_carousel_block.html.erb_spec.rb +7 -2
  316. data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_embed_block.html.erb_spec.rb +8 -5
  317. data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_features_block.html.erb_spec.rb +3 -2
  318. data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_grid_block.html.erb_spec.rb +9 -4
  319. data/spec/views/spotlight/tags/index.html.erb_spec.rb +5 -2
  320. data/vendor/assets/javascripts/tiny-slider.js +3218 -0
  321. data/vendor/assets/stylesheets/tiny-slider.css +1 -0
  322. metadata +471 -281
  323. data/app/assets/images/blacklight/add_circle.svg +0 -1
  324. data/app/assets/images/blacklight/custom_fullscreen.svg +0 -1
  325. data/app/assets/images/blacklight/remove_circle.svg +0 -1
  326. data/app/assets/images/blacklight/resize_small.svg +0 -1
  327. data/app/models/concerns/spotlight/resources/open_graph.rb +0 -36
  328. data/app/models/spotlight/reindex_progress.rb +0 -78
  329. data/app/models/spotlight/reindexing_log_entry.rb +0 -42
  330. data/app/services/spotlight/resources/iiif_builder.rb +0 -19
  331. data/app/services/spotlight/solr_document_builder.rb +0 -77
  332. data/app/services/spotlight/upload_solr_document_builder.rb +0 -57
  333. data/spec/factories/reindexing_log_entries.rb +0 -54
  334. data/spec/models/spotlight/reindex_progress_spec.rb +0 -122
  335. data/spec/models/spotlight/reindexing_log_entry_spec.rb +0 -129
  336. data/spec/models/spotlight/resources/open_graph_spec.rb +0 -65
  337. data/spec/services/spotlight/solr_document_builder_spec.rb +0 -66
  338. data/vendor/assets/javascripts/handlebars-v1.3.0.js +0 -2746
@@ -0,0 +1,149 @@
1
+ # frozen_string_literal: true
2
+
3
+ describe Spotlight::Etl::Executor do
4
+ subject(:executor) { described_class.new(pipeline, context) }
5
+
6
+ let(:pipeline) do
7
+ Spotlight::Etl::Pipeline.new do |pipeline|
8
+ pipeline.sources = [Spotlight::Etl::Sources::IdentitySource]
9
+ pipeline.transforms = [Spotlight::Etl::Transforms::IdentityTransform]
10
+ pipeline.loaders = [->(result, *) { arr << result }]
11
+ end
12
+ end
13
+ let(:context) { Spotlight::Etl::Context.new(resource) }
14
+ let(:resource) { Spotlight::Resource.new }
15
+ let(:arr) { [] }
16
+
17
+ describe '#call' do
18
+ it 'provides the context to the sources' do
19
+ pipeline.sources = [->(context, *) { [{ context: context }] }]
20
+
21
+ executor.call
22
+
23
+ expect(arr).to eq [{ context: context }]
24
+ end
25
+
26
+ it 'makes the current source available to transforms' do
27
+ pipeline.transforms = [->(_data, pipeline) { pipeline.source }]
28
+
29
+ executor.call
30
+
31
+ expect(arr).to eq [resource]
32
+ end
33
+
34
+ it 'chains the calls to the transforms' do
35
+ pipeline.transforms = [
36
+ ->(data, *) { data.merge(a: 1) },
37
+ ->(data, *) { data.merge(b: 2) },
38
+ ->(data, *) { data.merge(c: 3) }
39
+ ]
40
+
41
+ executor.call
42
+
43
+ expect(arr).to eq [{ a: 1, b: 2, c: 3 }]
44
+ end
45
+
46
+ it 'caches the step instances across sources' do
47
+ pipeline.sources = [->(*) { [1, 2, 3] }]
48
+
49
+ pipeline.transforms = [
50
+ Class.new do
51
+ def initialize
52
+ @sum = 0
53
+ end
54
+
55
+ def call(data, pipeline)
56
+ @sum += pipeline.source
57
+
58
+ data.merge(sum: @sum)
59
+ end
60
+ end
61
+ ]
62
+
63
+ executor.call
64
+
65
+ expect(arr).to eq [{ sum: 1 }, { sum: 3 }, { sum: 6 }]
66
+ end
67
+
68
+ it 'loads resulting documents' do
69
+ loader = Spotlight::Etl::SolrLoader.new
70
+ pipeline.sources = [->(*) { [{}, {}, {}] }]
71
+ pipeline.loaders = [loader]
72
+
73
+ allow(loader).to receive(:call)
74
+
75
+ executor.call
76
+
77
+ expect(loader).to have_received(:call).exactly(3).times
78
+ end
79
+
80
+ it 'allows steps to throw :skip to skip the current source' do
81
+ pipeline.pre_processes = [
82
+ ->(*) { throw(:skip) }
83
+ ]
84
+
85
+ executor.call
86
+
87
+ expect(arr).to be_blank
88
+ end
89
+
90
+ it 'forwards errors to the context error handler' do
91
+ e = StandardError.new
92
+ pipeline.transforms = [->(*) { raise e }]
93
+
94
+ allow(context).to receive(:on_error)
95
+ executor.call
96
+
97
+ expect(context).to have_received(:on_error).with(executor, e, {})
98
+ end
99
+
100
+ context 'after processing the data' do
101
+ it 'calls finalize on the loaders' do
102
+ loader = Spotlight::Etl::SolrLoader.new
103
+ pipeline.sources = [->(*) { [{}, {}, {}] }]
104
+ pipeline.loaders = [loader]
105
+
106
+ allow(loader).to receive(:call)
107
+ allow(loader).to receive(:finalize)
108
+
109
+ executor.call
110
+
111
+ expect(loader).to have_received(:call).exactly(3).times
112
+ expect(loader).to have_received(:finalize).once
113
+ end
114
+
115
+ it 'resets the step cache' do
116
+ pipeline.transforms = [
117
+ Class.new do
118
+ def initialize
119
+ @count = 0
120
+ end
121
+
122
+ def call(data, *)
123
+ @count += 1
124
+
125
+ data.merge(count: @count)
126
+ end
127
+ end
128
+ ]
129
+
130
+ executor.call
131
+ executor.call
132
+
133
+ expect(arr).to eq [{ count: 1 }, { count: 1 }]
134
+ end
135
+ end
136
+ end
137
+
138
+ describe '#estimated_size' do
139
+ let(:source) { ->(*) { [1, 2, 3, 4] } }
140
+
141
+ before do
142
+ pipeline.sources = [source]
143
+ end
144
+
145
+ it 'estimates the final size from the sources' do
146
+ expect(executor.estimated_size).to eq 4
147
+ end
148
+ end
149
+ end
@@ -0,0 +1,22 @@
1
+ # frozen_string_literal: true
2
+
3
+ describe Spotlight::Etl::Pipeline do
4
+ let(:mock_executor) { instance_double(Spotlight::Etl::Executor, call: 'result', estimated_size: 10) }
5
+ let(:context) { instance_double(Spotlight::Etl::Context) }
6
+
7
+ describe '#call' do
8
+ it 'forwards the call to the executor' do
9
+ allow(Spotlight::Etl::Executor).to receive(:new).with(subject, context, cache: nil).and_return(mock_executor)
10
+
11
+ expect(subject.call(context)).to eq 'result'
12
+ end
13
+ end
14
+
15
+ describe '#estimated_size' do
16
+ it 'forwards the call to the executor' do
17
+ allow(Spotlight::Etl::Executor).to receive(:new).with(subject, context).and_return(mock_executor)
18
+
19
+ expect(subject.estimated_size(context)).to eq 10
20
+ end
21
+ end
22
+ end
@@ -0,0 +1,76 @@
1
+ # frozen_string_literal: true
2
+
3
+ describe Spotlight::Etl::SolrLoader do
4
+ subject(:loader) { described_class.new(batch_size: 5, solr_connection: mock_connection) }
5
+
6
+ let(:mock_connection) { instance_double(RSolr::Client, commit: nil, update: nil) }
7
+
8
+ describe '#call' do
9
+ it 'queues data' do
10
+ loader.call({})
11
+ loader.call({})
12
+ loader.call({})
13
+
14
+ expect(loader.size).to eq 3
15
+ end
16
+
17
+ it 'writes data to the index when the queue is long enough' do
18
+ 5.times { loader.call({}) }
19
+
20
+ expect(mock_connection).to have_received(:update) do |data:, **|
21
+ expect(JSON.parse(data).length).to eq 5
22
+ end
23
+ end
24
+ end
25
+
26
+ describe '#finalize' do
27
+ let(:pipeline) do
28
+ Spotlight::Etl::Executor.new(nil, Spotlight::Etl::Context.new(commit: false))
29
+ end
30
+
31
+ it 'flushes the remaining queue to the index' do
32
+ 3.times { loader.call({}) }
33
+
34
+ loader.finalize
35
+
36
+ expect(mock_connection).to have_received(:update) do |data:, **|
37
+ expect(JSON.parse(data).length).to eq 3
38
+ end
39
+
40
+ expect(mock_connection).to have_received(:commit)
41
+ end
42
+
43
+ it 'uses the pipeline configuration to determine whether to send a commit' do
44
+ loader.finalize(pipeline)
45
+
46
+ expect(mock_connection).not_to have_received(:commit)
47
+ end
48
+
49
+ context 'error handling' do
50
+ it 'tries documents individually if the whole batch fails' do
51
+ allow(mock_connection).to receive(:update) do |data:, **|
52
+ raise '???' if JSON.parse(data).length > 1
53
+ end
54
+
55
+ 3.times { loader.call({}) }
56
+ loader.finalize
57
+
58
+ expect(mock_connection).to have_received(:update).exactly(4).times
59
+ end
60
+
61
+ it 'logs errors from trying individual documents' do
62
+ allow(pipeline).to receive(:on_error)
63
+
64
+ allow(mock_connection).to receive(:update) do |**|
65
+ raise '???'
66
+ end
67
+
68
+ loader.call({})
69
+
70
+ loader.finalize(pipeline)
71
+
72
+ expect(pipeline).to have_received(:on_error).once
73
+ end
74
+ end
75
+ end
76
+ end
@@ -0,0 +1,70 @@
1
+ # frozen_string_literal: true
2
+
3
+ describe Spotlight::Etl::Step do
4
+ subject(:step) { described_class.new(definition, **step_args) }
5
+
6
+ let(:definition) { ->(a = nil) { a || 'value' } }
7
+ let(:step_args) { {} }
8
+
9
+ describe '#call' do
10
+ it 'returns the value from the defined step' do
11
+ expect(step.call).to eq('value')
12
+ end
13
+
14
+ it 'passes through arguments' do
15
+ expect(step.call('a')).to eq('a')
16
+ end
17
+
18
+ context 'with a class instance' do
19
+ let(:definition) { Spotlight::Etl::SolrLoader.new }
20
+
21
+ it 'runs the call method' do
22
+ allow(definition).to receive(:call)
23
+
24
+ step.call('a')
25
+
26
+ expect(definition).to have_received(:call).with('a')
27
+ end
28
+ end
29
+
30
+ context 'with a class' do
31
+ let(:definition) { Spotlight::Etl::SolrLoader }
32
+ let(:mock) { instance_double(definition, call: nil) }
33
+
34
+ it 'runs the call method' do
35
+ allow(definition).to receive(:new).and_return(mock)
36
+
37
+ step.call('a', 'b')
38
+
39
+ expect(mock).to have_received(:call).with('a', 'b')
40
+ end
41
+
42
+ it 'uses the same instance for the lifetime of the step' do
43
+ allow(definition).to receive(:new).once.and_return(mock)
44
+
45
+ step.call('a', 'b')
46
+ step.call('a', 'b')
47
+
48
+ expect(mock).to have_received(:call).twice.with('a', 'b')
49
+ end
50
+ end
51
+ end
52
+
53
+ describe '#finalize' do
54
+ it 'does nothing if the definition does not have a #finalize method' do
55
+ expect { step.finalize }.not_to raise_exception
56
+ end
57
+
58
+ context 'with a loader' do
59
+ let(:definition) { Spotlight::Etl::SolrLoader.new }
60
+
61
+ it 'runs the finalize method' do
62
+ allow(definition).to receive(:finalize)
63
+
64
+ step.finalize
65
+
66
+ expect(definition).to have_received(:finalize)
67
+ end
68
+ end
69
+ end
70
+ end
@@ -24,6 +24,10 @@ describe Spotlight::ExhibitImportExportService do
24
24
  expect(subject['searches']).to have(source_exhibit.searches.count).searches
25
25
  end
26
26
 
27
+ it 'has group attributes' do
28
+ expect(subject['groups']).to have(source_exhibit.groups.count).groups
29
+ end
30
+
27
31
  it 'has home page attributes' do
28
32
  expect(subject).to have_key 'home_page'
29
33
  expect(subject['home_page']).not_to have_key 'id'
@@ -329,10 +333,26 @@ describe Spotlight::ExhibitImportExportService do
329
333
  end
330
334
  end
331
335
 
336
+ context 'remote thumbnail with existing tilesource' do
337
+ it do
338
+ search.thumbnail.iiif_tilesource
339
+ search.thumbnail.save
340
+ source_exhibit.reload
341
+ end
342
+
343
+ it 'unsets the iiif_tilesource' do
344
+ subject
345
+ existing_search.reload
346
+ expect(existing_search.thumbnail.iiif_tilesource).not_to eq search.thumbnail.iiif_tilesource
347
+ end
348
+ end
349
+
332
350
  context 'with a thumbnail from an uploaded resource' do
333
351
  before do
334
352
  search.masthead.document_global_id = SolrDocument.new(id: 'xyz').to_global_id
335
353
  search.masthead.source = 'exhibit'
354
+ search.masthead.iiif_tilesource = 'foo'
355
+ search.masthead.image = nil # Setting to nil to mimick an exhibit source
336
356
  search.masthead.save
337
357
 
338
358
  source_exhibit.reload
@@ -343,6 +363,33 @@ describe Spotlight::ExhibitImportExportService do
343
363
  existing_search.reload
344
364
  expect(existing_search.masthead).not_to be_blank
345
365
  end
366
+
367
+ it 'does not unset the iiif_tilesource' do
368
+ subject
369
+ existing_search.reload
370
+ expect(existing_search.masthead.iiif_tilesource).to eq search.masthead.iiif_tilesource
371
+ end
372
+ end
373
+
374
+ context 'in a group' do
375
+ let!(:group) { FactoryBot.create(:group, title: 'blah', exhibit: source_exhibit) }
376
+
377
+ before do
378
+ search.groups << group
379
+ search.save!
380
+ end
381
+
382
+ it 'copies the group' do
383
+ subject
384
+ expect(destination_exhibit.groups.length).to eq 1
385
+ expect(destination_exhibit.groups.first.as_json).to include(group.as_json.slice('slug', 'title', 'weight', 'published'))
386
+ end
387
+
388
+ it 'copies the group membership' do
389
+ subject
390
+ expect(existing_search.reload.groups.length).to eq 1
391
+ expect(existing_search.groups.pluck(:slug)).to match_array [group.slug]
392
+ end
346
393
  end
347
394
  end
348
395
 
@@ -516,7 +563,7 @@ describe Spotlight::ExhibitImportExportService do
516
563
  end
517
564
 
518
565
  it 'includes only the page-related data' do
519
- expect(subject.keys).to match_array %w[searches about_pages feature_pages home_page contacts]
566
+ expect(subject.keys).to match_array %w[searches groups about_pages feature_pages home_page contacts]
520
567
  end
521
568
  end
522
569
  end
data/spec/spec_helper.rb CHANGED
@@ -48,6 +48,8 @@ require 'spotlight'
48
48
 
49
49
  # configure spotlight with all the settings necessary to test functionality
50
50
  Spotlight::Engine.config.exhibit_themes = %w[default modern]
51
+ Spotlight::Engine.config.reindexing_batch_count = 1
52
+ Spotlight::Engine.config.assign_default_roles_to_first_user = false
51
53
 
52
54
  Dir['./spec/support/**/*.rb'].sort.each { |f| require f }
53
55
 
@@ -62,11 +64,6 @@ RSpec.configure do |config|
62
64
 
63
65
  config.use_transactional_fixtures = true
64
66
 
65
- config.before do
66
- # The first user is automatically granted admin privileges; we don't want that behavior for many of our tests
67
- Spotlight::Engine.user_class.create email: 'initial+admin@example.com', password: 'password', password_confirmation: 'password'
68
- end
69
-
70
67
  if defined? Devise::Test::ControllerHelpers
71
68
  config.include Devise::Test::ControllerHelpers, type: :controller
72
69
  config.include Devise::Test::ControllerHelpers, type: :view
@@ -136,7 +133,7 @@ RSpec.configure do |config|
136
133
  Kernel.srand config.seed
137
134
  end
138
135
 
139
- def add_new_page_via_button(title = 'New Page')
136
+ def add_new_via_button(title = 'New Page')
140
137
  add_link = find('[data-expanded-add-button]')
141
138
  within(add_link) do
142
139
  expect(page).to have_css("input[type='text']", visible: false)
@@ -15,6 +15,21 @@ module Spotlight
15
15
  find('.tt-suggestion', text: opts[:with], match: :first).click
16
16
  end
17
17
 
18
+ ##
19
+ # For typeahead "prefetched" fields, we need to wait for a resolved selector
20
+ # before proceeding.
21
+ def fill_in_prefetched_typeahead_field(opts)
22
+ type = opts[:type] || 'twitter'
23
+ # Poltergeist / Capybara doesn't fire the events typeahead.js
24
+ # is listening for, so we help it out a little:
25
+ find(opts[:wait_for]) if opts[:wait_for]
26
+ page.execute_script <<-EOF
27
+ $("[data-#{type}-typeahead]:visible").val("#{opts[:with]}").trigger("input");
28
+ $("[data-#{type}-typeahead]:visible").typeahead("open");
29
+ $(".tt-suggestion").click();
30
+ EOF
31
+ end
32
+
18
33
  # just like #fill_in_typeahead_field, but wait for the
19
34
  # form fields to show up on the page too
20
35
  def fill_in_solr_document_block_typeahead_field(opts)