blacklight-spotlight 3.0.0.rc2 → 3.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (321) 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 +8 -1
  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 +30 -4
  27. data/app/assets/stylesheets/spotlight/_exhibit_admin.scss +9 -0
  28. data/app/assets/stylesheets/spotlight/_featured_browse_categories_block.scss +34 -1
  29. data/app/assets/stylesheets/spotlight/_modals.scss +3 -0
  30. data/app/assets/stylesheets/spotlight/_nestable.scss +8 -0
  31. data/app/assets/stylesheets/spotlight/_spotlight.scss +4 -0
  32. data/app/assets/stylesheets/spotlight/_view_larger.scss +22 -0
  33. data/app/assets/stylesheets/spotlight/browse_group_categories_block.scss +92 -0
  34. data/app/assets/stylesheets/spotlight/typeahead.css +23 -23
  35. data/app/builders/spotlight/bootstrap_breadcrumbs_builder.rb +5 -4
  36. data/app/controllers/concerns/spotlight/base.rb +1 -1
  37. data/app/controllers/concerns/spotlight/catalog.rb +7 -1
  38. data/app/controllers/concerns/spotlight/search_helper.rb +2 -8
  39. data/app/controllers/spotlight/appearances_controller.rb +0 -13
  40. data/app/controllers/spotlight/browse_controller.rb +15 -17
  41. data/app/controllers/spotlight/bulk_actions_controller.rb +62 -0
  42. data/app/controllers/spotlight/bulk_updates_controller.rb +67 -0
  43. data/app/controllers/spotlight/catalog_controller.rb +17 -14
  44. data/app/controllers/spotlight/concerns/application_controller.rb +13 -2
  45. data/app/controllers/spotlight/dashboards_controller.rb +5 -4
  46. data/app/controllers/spotlight/exhibits_controller.rb +1 -1
  47. data/app/controllers/spotlight/featured_images_controller.rb +1 -1
  48. data/app/controllers/spotlight/groups_controller.rb +80 -0
  49. data/app/controllers/spotlight/job_trackers_controller.rb +17 -0
  50. data/app/controllers/spotlight/pages_controller.rb +8 -13
  51. data/app/controllers/spotlight/searches_controller.rb +4 -17
  52. data/app/controllers/spotlight/tags_controller.rb +39 -5
  53. data/app/helpers/spotlight/application_helper.rb +21 -2
  54. data/app/helpers/spotlight/crud_link_helpers.rb +1 -1
  55. data/app/helpers/spotlight/job_trackers_helper.rb +31 -0
  56. data/app/helpers/spotlight/main_app_helpers.rb +4 -5
  57. data/app/helpers/spotlight/meta_helper.rb +2 -2
  58. data/app/helpers/spotlight/pages_helper.rb +1 -8
  59. data/app/helpers/spotlight/roles_helper.rb +1 -1
  60. data/app/helpers/spotlight/searches_helper.rb +1 -1
  61. data/app/jobs/concerns/spotlight/gather_documents.rb +35 -0
  62. data/app/jobs/concerns/spotlight/job_tracking.rb +64 -0
  63. data/app/jobs/concerns/spotlight/limit_concurrency.rb +33 -0
  64. data/app/jobs/spotlight/add_tags_job.rb +31 -0
  65. data/app/jobs/spotlight/add_uploads_from_csv.rb +4 -3
  66. data/app/jobs/spotlight/application_job.rb +8 -0
  67. data/app/jobs/spotlight/change_visibility_job.rb +33 -0
  68. data/app/jobs/spotlight/cleanup_job_trackers_job.rb +13 -0
  69. data/app/jobs/spotlight/default_thumbnail_job.rb +1 -3
  70. data/app/jobs/spotlight/process_bulk_updates_csv_job.rb +82 -0
  71. data/app/jobs/spotlight/reindex_exhibit_job.rb +39 -0
  72. data/app/jobs/spotlight/reindex_job.rb +64 -44
  73. data/app/jobs/spotlight/remove_tags_job.rb +31 -0
  74. data/app/jobs/spotlight/rename_sidecar_field_job.rb +3 -2
  75. data/app/jobs/spotlight/rename_tags_job.rb +33 -0
  76. data/app/jobs/spotlight/update_job_trackers_job.rb +20 -0
  77. data/app/models/concerns/spotlight/browse_category_search_builder.rb +59 -0
  78. data/app/models/concerns/spotlight/exhibit_analytics.rb +2 -6
  79. data/app/models/concerns/spotlight/exhibit_documents.rb +2 -2
  80. data/app/models/concerns/spotlight/resources/web.rb +1 -1
  81. data/app/models/concerns/spotlight/search_builder.rb +11 -0
  82. data/app/models/concerns/spotlight/solr_document.rb +1 -1
  83. data/app/models/concerns/spotlight/solr_document/atomic_updates.rb +2 -2
  84. data/app/models/concerns/spotlight/user.rb +7 -2
  85. data/app/models/sir_trevor_rails/blocks/browse_group_categories_block.rb +25 -0
  86. data/app/models/sir_trevor_rails/blocks/solr_documents_block.rb +9 -0
  87. data/app/models/sir_trevor_rails/blocks/uploaded_items_block.rb +4 -0
  88. data/app/models/spotlight/ability.rb +8 -2
  89. data/app/models/spotlight/about_page.rb +1 -1
  90. data/app/models/spotlight/attachment.rb +1 -1
  91. data/app/models/spotlight/background_job_progress.rb +96 -0
  92. data/app/models/spotlight/blacklight_configuration.rb +28 -7
  93. data/app/models/spotlight/bulk_update.rb +8 -0
  94. data/app/models/spotlight/event.rb +13 -0
  95. data/app/models/spotlight/exhibit.rb +15 -12
  96. data/app/models/spotlight/feature_page.rb +1 -3
  97. data/app/models/spotlight/featured_image.rb +41 -2
  98. data/app/models/spotlight/field_metadata.rb +4 -8
  99. data/app/models/spotlight/group.rb +22 -0
  100. data/app/models/spotlight/group_member.rb +11 -0
  101. data/app/models/spotlight/home_page.rb +1 -1
  102. data/app/models/spotlight/job_tracker.rb +114 -0
  103. data/app/models/spotlight/page.rb +3 -5
  104. data/app/models/spotlight/page_configurations.rb +15 -9
  105. data/app/models/spotlight/resource.rb +28 -62
  106. data/app/models/spotlight/resources/iiif_harvester.rb +12 -3
  107. data/app/models/spotlight/resources/iiif_manifest.rb +9 -7
  108. data/app/models/spotlight/resources/iiif_service.rb +9 -2
  109. data/app/models/spotlight/resources/json_upload.rb +12 -0
  110. data/app/models/spotlight/resources/upload.rb +25 -2
  111. data/app/models/spotlight/role.rb +1 -2
  112. data/app/models/spotlight/search.rb +5 -0
  113. data/app/models/spotlight/solr_document_sidecar.rb +2 -1
  114. data/app/presenters/spotlight/iiif_manifest_presenter.rb +2 -2
  115. data/app/services/spotlight/bulk_updates_csv_template_service.rb +93 -0
  116. data/app/services/spotlight/etl.rb +7 -0
  117. data/app/services/spotlight/etl/context.rb +52 -0
  118. data/app/services/spotlight/etl/executor.rb +192 -0
  119. data/app/services/spotlight/etl/loaders.rb +12 -0
  120. data/app/services/spotlight/etl/pipeline.rb +81 -0
  121. data/app/services/spotlight/etl/solr_loader.rb +96 -0
  122. data/app/services/spotlight/etl/sources.rb +25 -0
  123. data/app/services/spotlight/etl/step.rb +82 -0
  124. data/app/services/spotlight/etl/transforms.rb +64 -0
  125. data/app/services/spotlight/exhibit_import_export_service.rb +50 -22
  126. data/app/services/spotlight/iiif_resource_resolver.rb +1 -1
  127. data/app/services/spotlight/validity_checker.rb +5 -5
  128. data/app/uploaders/spotlight/bulk_updates_uploader.rb +7 -0
  129. data/app/uploaders/spotlight/featured_image_uploader.rb +1 -1
  130. data/app/views/catalog/_add_tags.html.erb +28 -0
  131. data/app/views/catalog/_bulk_actions.html.erb +12 -0
  132. data/app/views/catalog/_change_visibility.html.erb +35 -0
  133. data/app/views/catalog/_curator_actions.html.erb +3 -0
  134. data/app/views/catalog/_remove_tags.html.erb +37 -0
  135. data/app/views/catalog/_save_search.html.erb +1 -1
  136. data/app/views/spotlight/about_pages/_sidebar.html.erb +2 -2
  137. data/app/views/spotlight/browse/_search.html.erb +4 -3
  138. data/app/views/spotlight/browse/_search_box.html.erb +9 -9
  139. data/app/views/spotlight/browse/_search_title.html.erb +1 -1
  140. data/app/views/spotlight/browse/index.html.erb +13 -0
  141. data/app/views/spotlight/bulk_updates/_download.html.erb +23 -0
  142. data/app/views/spotlight/bulk_updates/_overview.html.erb +1 -0
  143. data/app/views/spotlight/bulk_updates/_progress_panel.html.erb +19 -0
  144. data/app/views/spotlight/bulk_updates/_upload.html.erb +12 -0
  145. data/app/views/spotlight/bulk_updates/edit.html.erb +37 -0
  146. data/app/views/spotlight/catalog/_admin_header.html.erb +1 -1
  147. data/app/views/spotlight/catalog/_admin_index_header_default.html.erb +1 -1
  148. data/app/views/spotlight/catalog/_admin_thumbnail_default.html.erb +3 -2
  149. data/app/views/spotlight/catalog/_document.html.erb +2 -4
  150. data/app/views/spotlight/catalog/_edit_default.html.erb +2 -2
  151. data/app/views/spotlight/catalog/_reindex_progress_panel.html.erb +1 -1
  152. data/app/views/spotlight/catalog/index.iiif_json.jbuilder +22 -0
  153. data/app/views/spotlight/custom_fields/_form.html.erb +1 -1
  154. data/app/views/spotlight/custom_search_fields/_form.html.erb +1 -1
  155. data/app/views/spotlight/dashboards/_reindexing_activity.html.erb +6 -6
  156. data/app/views/spotlight/exhibits/_exhibit_card.html.erb +1 -1
  157. data/app/views/spotlight/feature_pages/_sidebar.html.erb +1 -1
  158. data/app/views/spotlight/featured_images/_form.html.erb +1 -1
  159. data/app/views/spotlight/job_trackers/show.html.erb +79 -0
  160. data/app/views/spotlight/metadata_configurations/_metadata_field.html.erb +2 -2
  161. data/app/views/spotlight/pages/_form.html.erb +2 -2
  162. data/app/views/spotlight/pages/_view_type_group.html.erb +3 -3
  163. data/app/views/spotlight/pages/show.html.erb +1 -1
  164. data/app/views/spotlight/resources/_form.html.erb +1 -1
  165. data/app/views/spotlight/resources/csv_upload/_form.html.erb +1 -1
  166. data/app/views/spotlight/resources/iiif/_form.html.erb +1 -1
  167. data/app/views/spotlight/resources/json_upload/_form.html.erb +2 -2
  168. data/app/views/spotlight/resources/upload/_form.html.erb +1 -1
  169. data/app/views/spotlight/search_configurations/_document_index_view_types.html.erb +2 -2
  170. data/app/views/spotlight/searches/_form.html.erb +14 -2
  171. data/app/views/spotlight/searches/_group.html.erb +27 -0
  172. data/app/views/spotlight/searches/index.html.erb +58 -17
  173. data/app/views/spotlight/shared/_curation_sidebar.html.erb +3 -0
  174. data/app/views/spotlight/shared/_locale_picker.html.erb +1 -1
  175. data/app/views/spotlight/sir_trevor/blocks/_browse_group_categories_block.html.erb +45 -0
  176. data/app/views/spotlight/sir_trevor/blocks/_search_results_block.html.erb +1 -1
  177. data/app/views/spotlight/sir_trevor/blocks/_solr_documents_block.html.erb +8 -8
  178. data/app/views/spotlight/sir_trevor/blocks/_solr_documents_carousel_block.html.erb +7 -7
  179. data/app/views/spotlight/sir_trevor/blocks/_solr_documents_features_block.html.erb +9 -7
  180. data/app/views/spotlight/sir_trevor/blocks/_solr_documents_grid_block.html.erb +5 -5
  181. data/app/views/spotlight/sir_trevor/blocks/_uploaded_items_block.html.erb +4 -0
  182. data/app/views/spotlight/tags/_tag.html.erb +24 -0
  183. data/app/views/spotlight/tags/index.html.erb +12 -16
  184. data/app/views/spotlight/translations/_groups.html.erb +34 -0
  185. data/app/views/spotlight/translations/edit.html.erb +6 -0
  186. data/app/views/spotlight/translations/show.yaml.yamlbuilder +6 -0
  187. data/config/i18n-tasks.yml +6 -0
  188. data/config/locales/spotlight.ar.yml +11 -1
  189. data/config/locales/spotlight.en.yml +207 -11
  190. data/config/routes.rb +39 -1
  191. data/db/migrate/20210113092223_create_spotlight_groups.rb +23 -0
  192. data/db/migrate/20210122082032_create_job_trackers.rb +22 -0
  193. data/db/migrate/20210126123041_create_events.rb +15 -0
  194. data/db/migrate/20210305070001_remove_class_from_sirtrevor_image_blocks.rb +20 -0
  195. data/db/migrate/20210305171150_create_bulk_updates.rb +9 -0
  196. data/db/migrate/20210308090000_migrate_caption_values_for_title_key.rb +29 -0
  197. data/db/migrate/20210506070809_add_indexes_for_featured_images.rb +9 -0
  198. data/lib/generators/spotlight/install_generator.rb +5 -5
  199. data/lib/generators/spotlight/scaffold_resource_generator.rb +5 -13
  200. data/lib/generators/spotlight/templates/config/initializers/riiif.rb +7 -5
  201. data/lib/generators/spotlight/templates/config/initializers/spotlight_initializer.rb +1 -1
  202. data/lib/generators/spotlight/templates/solr/config/schema.xml +1 -1
  203. data/lib/migration/iiif.rb +3 -3
  204. data/lib/spotlight/engine.rb +26 -4
  205. data/lib/spotlight/version.rb +1 -1
  206. data/spec/controllers/spotlight/browse_controller_spec.rb +23 -6
  207. data/spec/controllers/spotlight/bulk_actions_controller_spec.rb +124 -0
  208. data/spec/controllers/spotlight/bulk_updates_controller_spec.rb +77 -0
  209. data/spec/controllers/spotlight/catalog_controller_spec.rb +15 -13
  210. data/spec/controllers/spotlight/feature_pages_controller_spec.rb +11 -0
  211. data/spec/controllers/spotlight/featured_images_controller_spec.rb +3 -3
  212. data/spec/controllers/spotlight/groups_controller_spec.rb +103 -0
  213. data/spec/controllers/spotlight/job_trackers_controller_spec.rb +37 -0
  214. data/spec/controllers/spotlight/searches_controller_spec.rb +10 -3
  215. data/spec/controllers/spotlight/tags_controller_spec.rb +5 -1
  216. data/spec/controllers/spotlight/view_configurations_controller_spec.rb +1 -1
  217. data/spec/examples.txt +1502 -136
  218. data/spec/factories/bulk_updates.rb +15 -0
  219. data/spec/factories/exhibits.rb +4 -0
  220. data/spec/factories/group.rb +17 -0
  221. data/spec/factories/job_trackers.rb +11 -0
  222. data/spec/factories/searches.rb +10 -0
  223. data/spec/factories/users.rb +27 -8
  224. data/spec/features/add_items_spec.rb +10 -5
  225. data/spec/features/browse_category_admin_spec.rb +36 -4
  226. data/spec/features/browse_category_navigation_spec.rb +44 -0
  227. data/spec/features/browse_category_spec.rb +2 -2
  228. data/spec/features/bulk_actions_spec.rb +72 -0
  229. data/spec/features/catalog_spec.rb +1 -0
  230. data/spec/features/exhibits/translation_editing_spec.rb +49 -0
  231. data/spec/features/home_page_spec.rb +4 -4
  232. data/spec/features/import_exhibit_spec.rb +5 -1
  233. data/spec/features/javascript/about_page_admin_spec.rb +1 -1
  234. data/spec/features/javascript/block_controls_spec.rb +1 -1
  235. data/spec/features/javascript/blocks/browse_group_categories_block_spec.rb +64 -0
  236. data/spec/features/javascript/blocks/solr_documents_block_spec.rb +4 -4
  237. data/spec/features/javascript/blocks/uploaded_items_block_spec.rb +27 -1
  238. data/spec/features/javascript/browse_group_admin_spec.rb +45 -0
  239. data/spec/features/javascript/edit_in_place_spec.rb +2 -2
  240. data/spec/features/javascript/feature_page_admin_spec.rb +1 -1
  241. data/spec/features/javascript/reindex_monitor_spec.rb +1 -1
  242. data/spec/features/site_users_management_spec.rb +5 -5
  243. data/spec/fixtures/bulk-update-template.csv +57 -0
  244. data/spec/fixtures/updated-bulk-update-template-w-tags.csv +4 -0
  245. data/spec/fixtures/updated-bulk-update-template.csv +4 -0
  246. data/spec/helpers/spotlight/application_helper_spec.rb +5 -6
  247. data/spec/helpers/spotlight/crud_link_helpers_spec.rb +3 -3
  248. data/spec/helpers/spotlight/pages_helper_spec.rb +8 -15
  249. data/spec/helpers/spotlight/roles_helper_spec.rb +1 -1
  250. data/spec/i18n_spec.rb +1 -0
  251. data/spec/jobs/spotlight/add_tags_job_spec.rb +34 -0
  252. data/spec/jobs/spotlight/add_uploads_from_csv_spec.rb +4 -1
  253. data/spec/jobs/spotlight/change_visibility_job_spec.rb +30 -0
  254. data/spec/jobs/spotlight/process_bulk_updates_csv_job_spec.rb +78 -0
  255. data/spec/jobs/spotlight/reindex_exhibit_job_spec.rb +43 -0
  256. data/spec/jobs/spotlight/reindex_job_spec.rb +34 -60
  257. data/spec/jobs/spotlight/remove_tags_job_spec.rb +39 -0
  258. data/spec/lib/migration/iiif_spec.rb +1 -1
  259. data/spec/models/sir_trevor_rails/blocks/browse_group_categories_block_spec.rb +41 -0
  260. data/spec/models/spotlight/ability_spec.rb +27 -0
  261. data/spec/models/spotlight/background_job_progress_spec.rb +137 -0
  262. data/spec/models/spotlight/blacklight_configuration_spec.rb +22 -17
  263. data/spec/models/spotlight/browse_category_search_builder_spec.rb +49 -0
  264. data/spec/models/spotlight/exhibit_spec.rb +12 -58
  265. data/spec/models/spotlight/featured_image_spec.rb +13 -1
  266. data/spec/models/spotlight/group_spec.rb +19 -0
  267. data/spec/models/spotlight/resource_spec.rb +89 -87
  268. data/spec/models/spotlight/resources/iiif_harvester_spec.rb +9 -10
  269. data/spec/models/spotlight/role_spec.rb +1 -1
  270. data/spec/models/spotlight/search_spec.rb +30 -3
  271. data/spec/models/spotlight/solr_document/atomic_updates_spec.rb +10 -0
  272. data/spec/models/spotlight/solr_document_sidecar_spec.rb +1 -0
  273. data/spec/presenters/spotlight/iiif_manifest_presenter_spec.rb +1 -1
  274. data/spec/services/spotlight/bulk_updates_csv_template_service_spec.rb +26 -0
  275. data/spec/services/spotlight/etl/context_spec.rb +66 -0
  276. data/spec/services/spotlight/etl/executor_spec.rb +149 -0
  277. data/spec/services/spotlight/etl/pipeline_spec.rb +22 -0
  278. data/spec/services/spotlight/etl/solr_loader_spec.rb +76 -0
  279. data/spec/services/spotlight/etl/step_spec.rb +70 -0
  280. data/spec/services/spotlight/exhibit_import_export_service_spec.rb +48 -1
  281. data/spec/spec_helper.rb +3 -6
  282. data/spec/support/features/test_features_helpers.rb +15 -0
  283. data/spec/test_app_templates/Gemfile.extra +2 -0
  284. data/spec/test_app_templates/catalog_controller.rb +6 -3
  285. data/spec/test_app_templates/lib/generators/test_app_generator.rb +2 -2
  286. data/spec/uploaders/spotlight/featured_image_uploader_spec.rb +2 -2
  287. data/spec/views/spotlight/browse/index.html.erb_spec.rb +2 -0
  288. data/spec/views/spotlight/catalog/_edit_default.html.erb_spec.rb +1 -1
  289. data/spec/views/spotlight/dashboards/_reindexing_activity.html.erb_spec.rb +24 -19
  290. data/spec/views/spotlight/job_trackers/show.html.erb_spec.rb +65 -0
  291. data/spec/views/spotlight/metadata_configurations/_metadata_field.html.erb_spec.rb +3 -4
  292. data/spec/views/spotlight/pages/show.html.erb_spec.rb +1 -0
  293. data/spec/views/spotlight/sir_trevor/blocks/_browse_block.html.erb_spec.rb +1 -1
  294. data/spec/views/spotlight/sir_trevor/blocks/_iframe_block.html.erb_spec.rb +1 -1
  295. data/spec/views/spotlight/sir_trevor/blocks/_link_to_search_block.html.erb_spec.rb +1 -1
  296. data/spec/views/spotlight/sir_trevor/blocks/_rule_block.html.erb_spec.rb +1 -1
  297. data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_block.html.erb_spec.rb +8 -4
  298. data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_carousel_block.html.erb_spec.rb +7 -2
  299. data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_embed_block.html.erb_spec.rb +8 -5
  300. data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_features_block.html.erb_spec.rb +3 -2
  301. data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_grid_block.html.erb_spec.rb +9 -4
  302. data/spec/views/spotlight/tags/index.html.erb_spec.rb +5 -2
  303. data/vendor/assets/javascripts/tiny-slider.js +3218 -0
  304. data/vendor/assets/stylesheets/tiny-slider.css +1 -0
  305. metadata +472 -287
  306. data/app/assets/images/blacklight/add_circle.svg +0 -1
  307. data/app/assets/images/blacklight/custom_fullscreen.svg +0 -1
  308. data/app/assets/images/blacklight/remove_circle.svg +0 -1
  309. data/app/assets/images/blacklight/resize_small.svg +0 -1
  310. data/app/models/concerns/spotlight/resources/open_graph.rb +0 -36
  311. data/app/models/spotlight/reindex_progress.rb +0 -78
  312. data/app/models/spotlight/reindexing_log_entry.rb +0 -42
  313. data/app/services/spotlight/resources/iiif_builder.rb +0 -19
  314. data/app/services/spotlight/solr_document_builder.rb +0 -77
  315. data/app/services/spotlight/upload_solr_document_builder.rb +0 -57
  316. data/spec/factories/reindexing_log_entries.rb +0 -54
  317. data/spec/models/spotlight/reindex_progress_spec.rb +0 -122
  318. data/spec/models/spotlight/reindexing_log_entry_spec.rb +0 -129
  319. data/spec/models/spotlight/resources/open_graph_spec.rb +0 -65
  320. data/spec/services/spotlight/solr_document_builder_spec.rb +0 -66
  321. data/vendor/assets/javascripts/handlebars-v1.3.0.js +0 -2746
@@ -0,0 +1,93 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'csv'
4
+
5
+ module Spotlight
6
+ # A service to generate a CSV template suitable for re-uploading for bulk updates
7
+ class BulkUpdatesCsvTemplateService
8
+ attr_reader :exhibit
9
+
10
+ def initialize(exhibit:)
11
+ @exhibit = exhibit
12
+ end
13
+
14
+ def template(view_context:, title: true, tags: true, visibility: true)
15
+ return to_enum(:template, view_context: view_context, title: title, tags: tags, visibility: visibility) unless block_given?
16
+
17
+ yield ::CSV.generate_line(csv_headers(title: title, tags: tags, visibility: visibility))
18
+ each_document do |document|
19
+ sidecar = document.sidecar(exhibit)
20
+ yield ::CSV.generate_line([
21
+ document.id,
22
+ (title_column(view_context, document) if title),
23
+ (visibility_column(sidecar) if visibility),
24
+ (tags_column(sidecar) if tags)
25
+ ].flatten.compact)
26
+ end
27
+ end
28
+
29
+ private
30
+
31
+ def title_column(view_context, document)
32
+ CGI.unescapeHTML(view_context.document_presenter(document).heading)
33
+ end
34
+
35
+ def visibility_column(sidecar)
36
+ sidecar.public ? 'TRUE' : ' '
37
+ end
38
+
39
+ def tags_column(sidecar)
40
+ exhibit_tags.map do |tag|
41
+ sidecar.all_tags_list.include?(tag) ? 'TRUE' : ' '
42
+ end
43
+ end
44
+
45
+ def exhibit_tags
46
+ @exhibit_tags ||= exhibit.owned_tags.map(&:name)
47
+ end
48
+
49
+ def csv_headers(title:, tags:, visibility:)
50
+ headers = [bulk_updates_config.csv_id]
51
+ headers.append(bulk_updates_config.csv_title) if title
52
+ headers.append(bulk_updates_config.csv_visibility) if visibility
53
+ if tags
54
+ exhibit_tags.each do |tag|
55
+ headers.append(format(bulk_updates_config.csv_tags, tag))
56
+ end
57
+ end
58
+ headers
59
+ end
60
+
61
+ def bulk_updates_config
62
+ Spotlight::Engine.config.bulk_updates
63
+ end
64
+
65
+ # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
66
+ def each_document(&block)
67
+ return to_enum(:each_document) unless block_given?
68
+
69
+ cursor_mark = nil
70
+ next_cursor_mark = '*'
71
+
72
+ solr_params = exhibit&.exhibit_search_builder&.to_h || {}
73
+
74
+ until next_cursor_mark == cursor_mark || next_cursor_mark.nil?
75
+ cursor_mark = next_cursor_mark
76
+ response = exhibit.blacklight_config.repository.search(
77
+ solr_params.merge(
78
+ 'q' => '*',
79
+ 'rows' => Spotlight::Engine.config.bulk_actions_batch_size,
80
+ 'cursorMark' => cursor_mark,
81
+ 'sort' => "#{exhibit.blacklight_config.document_model.unique_key} asc"
82
+ )
83
+ )
84
+ response.documents.each do |document|
85
+ block.call(document)
86
+ end
87
+
88
+ next_cursor_mark = response['nextCursorMark']
89
+ end
90
+ end
91
+ # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
92
+ end
93
+ end
@@ -0,0 +1,7 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Spotlight
4
+ # :nodoc:
5
+ module Etl
6
+ end
7
+ end
@@ -0,0 +1,52 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Spotlight
4
+ module Etl
5
+ # Contextual information for the ETL pipeline
6
+ class Context
7
+ # A hook for downstream applications to report or handle errors using external
8
+ # systems or services.
9
+ class_attribute :error_reporter
10
+
11
+ attr_reader :arguments, :additional_metadata, :additional_parameters, :logger
12
+
13
+ delegate :document_model, to: :resource
14
+
15
+ def initialize(*args, additional_metadata: {}, on_error: :log, logger: Rails.logger, **additional_parameters)
16
+ @arguments = args
17
+ @additional_metadata = additional_metadata
18
+ @additional_parameters = additional_parameters
19
+ @on_error = on_error
20
+ @logger = logger
21
+ end
22
+
23
+ # @return [Spotlight::Resource]
24
+ def resource
25
+ arguments.first
26
+ end
27
+
28
+ # @return [String]
29
+ def unique_key(data)
30
+ data[document_model&.unique_key&.to_sym || :id]
31
+ end
32
+
33
+ ##
34
+ # This hook receives any exceptions raised by pipeline steps and handles them
35
+ # appropriately.
36
+ def on_error(pipeline, exception, data)
37
+ error_reporter&.call(pipeline, exception, data)
38
+
39
+ case @on_error
40
+ when :log
41
+ logger.tagged('ETL') do
42
+ logger.error("Pipeline error processing resource #{resource.id}: #{exception}")
43
+ end
44
+ when :exception
45
+ raise exception
46
+ else
47
+ @on_error&.call(pipeline, exception, data)
48
+ end
49
+ end
50
+ end
51
+ end
52
+ end
@@ -0,0 +1,192 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Spotlight
4
+ module Etl
5
+ # ETL pipeline executor
6
+ class Executor
7
+ include ActiveSupport::Benchmarkable
8
+
9
+ attr_reader :pipeline, :context, :source, :cache, :logger
10
+
11
+ delegate :sources, :pre_processes, :transforms, :post_processes, :loaders, to: :pipeline
12
+
13
+ # @param [Spotlight::Etl::Pipeline] pipeline
14
+ # @param [Spotlight::Etl::Context] context
15
+ # @param [Hash] cache a shared cache for pipeline steps to store data for the lifetime of the cache
16
+ def initialize(pipeline, context, cache: nil)
17
+ @pipeline = pipeline
18
+ @context = context
19
+
20
+ @provided_cache = cache.present?
21
+ @cache = cache || {}
22
+ @step_cache = {}
23
+ end
24
+
25
+ ##
26
+ # Execute the ETL pipeline
27
+ #
28
+ # @param [Hash] data the initial data structure to pass through to the transform steps
29
+ # @yield (optionally..) each transformed document after it is transformed but before
30
+ # it is sent to the loaders
31
+ def call(data: {}, &block)
32
+ extract.with_index do |source, index|
33
+ with_source(source, index) do
34
+ catch :skip do
35
+ load(transform(data), &block)
36
+ end
37
+ rescue StandardError => e
38
+ on_error(e, data)
39
+ end
40
+ end
41
+
42
+ after_call
43
+ end
44
+
45
+ ##
46
+ # Estimate the number of documents that will be produced by the pipeline
47
+ #
48
+ # @return [Number]
49
+ def estimated_size
50
+ @estimated_size ||= compile_steps(sources).sum { |source| source.call(context).count }
51
+ end
52
+
53
+ ##
54
+ # Tagged logger for benchmarks and data flow logging.
55
+ # NOTE: this is super weird to support Rails 5.2
56
+ # @private
57
+ # @yield Logger
58
+ def with_logger
59
+ logger = (context&.logger || Rails.logger)
60
+ logger.tagged(pipeline.class) do
61
+ logger.tagged("#<#{source.class} id=#{source&.id if source.respond_to?(:id)}>") do
62
+ @logger = logger
63
+ yield logger
64
+ end
65
+ end
66
+ end
67
+
68
+ ##
69
+ # @private
70
+ # @param [Hash] data
71
+ # @return [String] a simplified + truncated version of the data hash for debugging
72
+ def transform_data_for_debugging(data, verbose: $VERBOSE, truncate: 100)
73
+ return data.inspect.truncate(truncate) unless data.is_a?(Hash)
74
+ return "id #{context.unique_key(data) || data&.first(5)&.inspect}" unless verbose
75
+
76
+ JSON.fast_generate(data).truncate(truncate)
77
+ end
78
+
79
+ ##
80
+ # Propagate exceptions up to the context's error handler.
81
+ def on_error(exception, data)
82
+ context.on_error(self, exception, data)
83
+ end
84
+
85
+ private
86
+
87
+ ##
88
+ # Set the current source
89
+ # @param [Object] source
90
+ # @param [Number] index
91
+ def with_source(source, index)
92
+ @source = source
93
+
94
+ benchmark "Indexing item #{source.inspect.truncate(50)} in resource #{context.resource.id} (#{index} / #{estimated_size})" do
95
+ yield.tap { @source = nil }
96
+ end
97
+ end
98
+
99
+ ##
100
+ # Extract data from sources. The defined sources receive the provided context
101
+ # and should return an array or other enumerable of sources to pass through
102
+ # the pipeline.
103
+ #
104
+ # @yield [Object]
105
+ def extract(&block)
106
+ return to_enum(:extract) { estimated_size } unless block_given?
107
+
108
+ compile_steps(sources).each do |source|
109
+ source.call(context).each do |data|
110
+ block.call(data)
111
+ end
112
+ end
113
+ end
114
+
115
+ ##
116
+ # Transform the source to a document.
117
+ #
118
+ # @param [Hash] from the initial seed data used as the input to the initial transforms
119
+ # @return [Hash] the transformed document
120
+ def transform(from)
121
+ compile_steps(pre_processes).each { |step| step.call(from, self) }
122
+
123
+ data = compile_steps(transforms).inject(from) { |input, step| step.call(input, self) }
124
+
125
+ compile_steps(post_processes).each { |step| step.call(data, self) }
126
+
127
+ with_logger do |logger|
128
+ logger.debug do
129
+ "Transform output: #{transform_data_for_debugging(data, verbose: true, truncate: 1000)}"
130
+ end
131
+ end
132
+
133
+ data
134
+ end
135
+
136
+ ##
137
+ # Load a document into a data sink.
138
+ #
139
+ # @param [Hash] the fully transformed data
140
+ # @yield [Hash] the data before it is sent to any loaders
141
+ def load(data, &block)
142
+ return unless data
143
+
144
+ catch :skip do
145
+ block&.call(data, self)
146
+
147
+ compile_steps(loaders).each do |loader|
148
+ loader.call(data, self)
149
+ end
150
+ end
151
+ end
152
+
153
+ ##
154
+ # A callback run after transforming data to do any finalizing or cleanup
155
+ # from the run.
156
+ def after_call
157
+ finalize_loaders
158
+ @cache = {} unless @provided_cache
159
+ @step_cache = {}
160
+ end
161
+
162
+ ##
163
+ # Loaders may implement a `#finalize` method if they want to perform any work
164
+ # after all the data is transformed.
165
+ def finalize_loaders
166
+ compile_steps(loaders).each do |step|
167
+ step.finalize(self) if step.respond_to? :finalize
168
+ end
169
+ end
170
+
171
+ ##
172
+ # DSL convenience utility for writing compact lists of steps; this unrolls
173
+ # pipeline definitions to contain arrays or hashes, e.g.:
174
+ # `pipeline.transforms = [step_1: lambda {}, step_2: lambda {}]`
175
+ #
176
+ # @return [Enumerable<Spotlight::Etl::Step>]
177
+ def compile_steps(steps)
178
+ return to_enum(:compile_steps, steps) unless block_given?
179
+
180
+ steps.flatten.each do |step|
181
+ if step.is_a? Hash
182
+ step.each do |k, v|
183
+ yield(@step_cache[k] ||= Spotlight::Etl::Step.new(v, label: k, executor: self))
184
+ end
185
+ else
186
+ yield @step_cache[step] ||= Spotlight::Etl::Step.new(step, executor: self)
187
+ end
188
+ end
189
+ end
190
+ end
191
+ end
192
+ end
@@ -0,0 +1,12 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Spotlight
4
+ module Etl
5
+ module Loaders
6
+ # A loader that just prints the data to $stderr for debugging.
7
+ WarnLoader = lambda do |data, _context|
8
+ warn(JSON.pretty_generate(data))
9
+ end
10
+ end
11
+ end
12
+ end
@@ -0,0 +1,81 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Spotlight
4
+ module Etl
5
+ # ETL pipeline definition
6
+ class Pipeline
7
+ include ActiveSupport::Benchmarkable
8
+
9
+ attr_reader :context, :source
10
+
11
+ # This ETL pipeline system, while somewhat generic, was implemented for Spotlight
12
+ # to transform Spotlight::Resource instances into Solr documents. The resources
13
+ # go through a series of steps (sources, transforms, loaders) to produce one or
14
+ # more documents in the Solr index.
15
+ #
16
+ # All of the steps below can be provided as:
17
+ # - a lambda
18
+ # - a ruby class (which will be initialized for each pipeline execution)
19
+ # - or, a hash (of any length) with:
20
+ # - a key (used only for clarity in logging, particularly useful to label lambdas)
21
+ # - a value that is one of the valid step types (lambda or ruby class).
22
+ #
23
+ # Any of the transform or loader steps can `throw :skip` to skip the current source.
24
+ #
25
+ # Any exceptions raised by the pipeline's steps are sent to the context's
26
+ # error handler by calling `#on_error` on the context object.
27
+
28
+ # sources return enumerables that convert from the Spotlight::Etl::Context
29
+ # to some data structure that the transform steps can handle. The Context is provided
30
+ # by the implementation when the pipeline is executed.
31
+ class_attribute :sources, default: []
32
+
33
+ # The transform steps (pre-processes, transforms, and post-processes) receive
34
+ # the current data state and the pipeline. The return value from the transforms
35
+ # steps replaces the current data state, however the return values for pre- and
36
+ # post- processing is ignored (although they may mutate the provided data, pipeline, etc).
37
+ #
38
+ # Through the pipeline argument, the transform steps can access:
39
+ # - `context`, the implementation-provided resource
40
+ # - `source`, the current source instance
41
+ class_attribute :pre_processes, default: []
42
+ class_attribute :transforms, default: []
43
+ class_attribute :post_processes, default: []
44
+
45
+ # loaders receive the transformed data and.. do something with it (like load it into Solr)
46
+ # After all documents are transformed, the loader may also receive `#finalize` to finish any
47
+ # additional processing.
48
+ class_attribute :loaders, default: []
49
+
50
+ def initialize
51
+ yield(self) if block_given?
52
+ end
53
+
54
+ ##
55
+ # Execute the ETL pipeline
56
+ #
57
+ # @param [Spotlight::Etl::Context] context
58
+ # @param [Hash] data the initial data structure to pass through to the transform steps
59
+ # @yield (optioanlly..) each transformed document after it is transformed but before
60
+ # it is sent to the loaders
61
+ def call(context, data: {}, cache: nil, &block)
62
+ executor(context, cache: cache).call(data: data, &block)
63
+ end
64
+
65
+ ##
66
+ # Estimate the number of documents that will be produced by the pipeline
67
+ #
68
+ # @param [Spotlight::Etl::Context] context
69
+ # @return [Number]
70
+ def estimated_size(context)
71
+ executor(context).estimated_size
72
+ end
73
+
74
+ private
75
+
76
+ def executor(context, **args)
77
+ Spotlight::Etl::Executor.new(self, context, **args)
78
+ end
79
+ end
80
+ end
81
+ end
@@ -0,0 +1,96 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Spotlight
4
+ module Etl
5
+ # Solr data loader with a built-in buffer to combine document updates into batches
6
+ class SolrLoader
7
+ attr_reader :queue, :batch_size
8
+
9
+ delegate :size, to: :queue
10
+
11
+ def initialize(batch_size: Spotlight::Engine.config.solr_batch_size, solr_connection: nil)
12
+ @queue = Queue.new
13
+ @batch_size = batch_size
14
+ @blacklight_solr = solr_connection
15
+ end
16
+
17
+ def call(data, pipeline = nil)
18
+ @queue << data
19
+
20
+ write_to_index(pipeline) if @queue.size >= @batch_size
21
+ end
22
+
23
+ def finalize(pipeline = nil)
24
+ write_to_index(pipeline)
25
+
26
+ commit! if pipeline.nil? || pipeline.context.additional_parameters[:commit]
27
+ end
28
+
29
+ private
30
+
31
+ def write_to_index(pipeline)
32
+ batch = drain_queue
33
+
34
+ return unless write? && batch.any?
35
+
36
+ send_batch(batch, pipeline)
37
+ end
38
+
39
+ def send_batch(documents, pipeline)
40
+ blacklight_solr.update params: { commitWithin: 500 },
41
+ data: documents.to_json,
42
+ headers: { 'Content-Type' => 'application/json' }
43
+ rescue StandardError => e
44
+ logger.warn "Error sending a batch of documents to solr: #{e}"
45
+
46
+ documents.each do |doc|
47
+ send_one(doc, pipeline)
48
+ end
49
+ end
50
+
51
+ def send_one(document, pipeline)
52
+ blacklight_solr.update params: { commitWithin: 500 },
53
+ data: [document].to_json,
54
+ headers: { 'Content-Type' => 'application/json' }
55
+ rescue StandardError => e
56
+ pipeline&.on_error(self, e, document.to_json)
57
+ end
58
+
59
+ def blacklight_solr
60
+ @blacklight_solr ||= RSolr.connect(connection_config.merge(adapter: connection_config[:http_adapter]))
61
+ end
62
+
63
+ def connection_config
64
+ Blacklight.connection_config
65
+ end
66
+
67
+ def drain_queue
68
+ arr = []
69
+
70
+ begin
71
+ arr << @queue.deq(true) while arr.length < @batch_size && !@queue.empty?
72
+ rescue ThreadError
73
+ # @queue throws a ThreadError if it is empty...
74
+ end
75
+
76
+ arr
77
+ end
78
+
79
+ def commit!
80
+ return unless write?
81
+
82
+ blacklight_solr.commit
83
+ rescue StandardError => e
84
+ logger.warn "Unable to commit to solr: #{e}"
85
+ end
86
+
87
+ def write?
88
+ Spotlight::Engine.config.writable_index
89
+ end
90
+
91
+ def logger
92
+ Rails.logger
93
+ end
94
+ end
95
+ end
96
+ end