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
@@ -1 +0,0 @@
1
- <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0V0z"/><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm5 11h-4v4h-2v-4H7v-2h4V7h2v4h4v2z"/></svg>
@@ -1 +0,0 @@
1
- <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M7,14H5v5h5V17H7Zm7-9V7h3v3h2V5Z" /><path d="M22.517,1.524H1.736V22.37H22.517Zm-2,18.845H3.736V3.524H20.517Z" /></svg>
@@ -1 +0,0 @@
1
- <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0V0z"/><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm5 11H7v-2h10v2z"/></svg>
@@ -1 +0,0 @@
1
- <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M5,16H8v3h2V14H5ZM16,8V5H14v5h5V8Z"/><path d="M22.517,1.524H1.736V22.37H22.517Zm-2,18.845H3.736V3.524H20.517Z"/></svg>
@@ -1,36 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- module Spotlight
4
- module Resources
5
- ##
6
- # OpenGraph metadata harvester
7
- module OpenGraph
8
- extend ActiveSupport::Concern
9
- include Spotlight::Resources::Web
10
-
11
- def opengraph
12
- @opengraph ||= begin
13
- page = {}
14
-
15
- body.css('meta').select { |m| m.attribute('property') }.each do |m|
16
- page[m.attribute('property').to_s] = m.attribute('content').to_s
17
- end
18
-
19
- page
20
- end
21
- end
22
-
23
- def opengraph_properties
24
- Hash[opengraph.map do |k, v|
25
- ["#{opengraph_solr_field_name(k)}_tesim", v]
26
- end]
27
- end
28
-
29
- private
30
-
31
- def opengraph_solr_field_name(field)
32
- field.parameterize(separator: '_')
33
- end
34
- end
35
- end
36
- end
@@ -1,78 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- module Spotlight
4
- ##
5
- # ReindexProgress is a class that models the progress of reindexing a list of resources
6
- class ReindexProgress
7
- attr_reader :current_log_entry
8
-
9
- delegate :updated_at, to: :current_log_entry
10
-
11
- def initialize(current_log_entry)
12
- @current_log_entry = current_log_entry
13
- end
14
-
15
- def recently_in_progress?
16
- return true if current_log_entry.in_progress?
17
-
18
- current_log_entry.end_time.present? && (current_log_entry.end_time > Spotlight::Engine.config.reindex_progress_window.minutes.ago)
19
- end
20
-
21
- def started_at
22
- current_log_entry.start_time
23
- end
24
-
25
- def finished?
26
- current_log_entry.succeeded? || current_log_entry.failed?
27
- end
28
-
29
- def finished_at
30
- current_log_entry.end_time
31
- end
32
-
33
- def total
34
- current_log_entry.items_reindexed_estimate
35
- end
36
-
37
- def completed
38
- current_log_entry.items_reindexed_count
39
- end
40
-
41
- def errored?
42
- current_log_entry.failed?
43
- end
44
-
45
- def as_json(*)
46
- {
47
- recently_in_progress: recently_in_progress?,
48
- started_at: localized_start_time,
49
- finished_at: localized_finish_time,
50
- updated_at: localized_updated_time,
51
- total: total,
52
- completed: completed,
53
- finished: finished?,
54
- errored: errored?
55
- }
56
- end
57
-
58
- private
59
-
60
- def localized_start_time
61
- return unless started_at
62
-
63
- I18n.l(started_at, format: :long)
64
- end
65
-
66
- def localized_finish_time
67
- return unless finished_at
68
-
69
- I18n.l(finished_at, format: :long)
70
- end
71
-
72
- def localized_updated_time
73
- return unless updated_at
74
-
75
- I18n.l(updated_at, format: :long)
76
- end
77
- end
78
- end
@@ -1,42 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- module Spotlight
4
- ##
5
- # a log entry representing an attempt to reindex some number of records in an exhibit
6
- class ReindexingLogEntry < ActiveRecord::Base
7
- enum job_status: { unstarted: 0, in_progress: 1, succeeded: 2, failed: 3 }
8
-
9
- belongs_to :exhibit, class_name: 'Spotlight::Exhibit'
10
- belongs_to :user, class_name: '::User', optional: true
11
-
12
- # null start times sort to the top, to more easily surface pending reindexing
13
- default_scope { order(Arel.sql('start_time IS NOT NULL, start_time DESC')) }
14
- scope :recent, -> { limit(5) }
15
- scope :started_or_completed, -> { where.not(job_status: 'unstarted') }
16
-
17
- def duration
18
- end_time - start_time if end_time
19
- end
20
-
21
- def in_progress!
22
- self.start_time = Time.zone.now
23
- super
24
- rescue StandardError
25
- Rails.logger.error "unexpected error updating log entry to :in_progress from #{caller}"
26
- end
27
-
28
- def succeeded!
29
- self.end_time = Time.zone.now
30
- super
31
- rescue StandardError
32
- Rails.logger.error "unexpected error updating log entry to :succeeded from #{caller}"
33
- end
34
-
35
- def failed!
36
- self.end_time = Time.zone.now
37
- super
38
- rescue StandardError
39
- Rails.logger.error "unexpected error updating log entry to :failed from #{caller}"
40
- end
41
- end
42
- end
@@ -1,19 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- module Spotlight
4
- module Resources
5
- # transforms a IiifHarvester into solr documents
6
- class IiifBuilder < Spotlight::SolrDocumentBuilder
7
- def to_solr
8
- return to_enum(:to_solr) { 0 } unless block_given?
9
-
10
- base_doc = super
11
- resource.iiif_manifests.each do |manifest|
12
- manifest.with_exhibit(exhibit)
13
- manifest_solr = manifest.to_solr
14
- yield base_doc.merge(manifest_solr) if manifest_solr.present?
15
- end
16
- end
17
- end
18
- end
19
- end
@@ -1,77 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- module Spotlight
4
- # Creates solr documents for the documents in a resource
5
- class SolrDocumentBuilder
6
- def initialize(resource)
7
- @resource = resource
8
- end
9
-
10
- attr_reader :resource
11
-
12
- delegate :exhibit, :document_model, to: :resource
13
-
14
- ##
15
- # @return an enumerator of all the indexable documents for this resource
16
- def documents_to_index
17
- data = to_solr
18
- return [] if data.blank?
19
-
20
- data &&= [data] if data.is_a? Hash
21
-
22
- return to_enum(:documents_to_index) { data.size } unless block_given?
23
-
24
- data.lazy.reject(&:blank?).each do |doc|
25
- yield doc.reverse_merge(exhibit_solr_doc(doc[unique_key]).to_solr)
26
- end
27
- end
28
-
29
- protected
30
-
31
- ##
32
- # @abstract
33
- # Convert this resource into zero-to-many new solr documents. The data here
34
- # should be merged into the resource-specific {#to_solr} data.
35
- #
36
- # @return [Hash] a single solr document hash
37
- # @return [Enumerator<Hash>] multiple solr document hashes. This can be a
38
- # simple array, or an lazy enumerator
39
- def to_solr
40
- spotlight_resource_metadata_for_solr
41
- end
42
-
43
- private
44
-
45
- # Null object for SolrDocument
46
- module NilSolrDocument
47
- def self.to_solr
48
- {}
49
- end
50
- end
51
-
52
- ##
53
- # Get any exhibit-specific metadata stored in e.g. sidecars, tags, etc
54
- # This needs the generated solr document
55
- # @returns [#to_solr] something that responds to `to_solr'
56
- def exhibit_solr_doc(id)
57
- return NilSolrDocument unless document_model || id.present?
58
-
59
- document_model.build_for_exhibit(id, exhibit, resource: (resource if resource.persisted?))
60
- end
61
-
62
- def unique_key
63
- if document_model
64
- document_model.unique_key.to_sym
65
- else
66
- :id
67
- end
68
- end
69
-
70
- def spotlight_resource_metadata_for_solr
71
- {
72
- Spotlight::Engine.config.resource_global_id_field => (resource.to_global_id.to_s if resource.persisted?),
73
- document_model.resource_type_field => resource.class.to_s.tableize
74
- }
75
- end
76
- end
77
- end
@@ -1,57 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- module Spotlight
4
- # Creates solr documents for the uploaded documents in a resource
5
- class UploadSolrDocumentBuilder < SolrDocumentBuilder
6
- delegate :compound_id, to: :resource
7
-
8
- def to_solr
9
- super.tap do |solr_hash|
10
- add_default_solr_fields solr_hash
11
- add_sidecar_fields solr_hash
12
-
13
- if attached_file?
14
- add_image_dimensions solr_hash
15
- add_file_versions solr_hash
16
- add_manifest_path solr_hash
17
- end
18
- end
19
- end
20
-
21
- private
22
-
23
- def add_default_solr_fields(solr_hash)
24
- solr_hash[exhibit.blacklight_config.document_model.unique_key.to_sym] = compound_id
25
- end
26
-
27
- def add_image_dimensions(solr_hash)
28
- dimensions = Riiif::Image.new(resource.upload_id).info
29
- solr_hash[:spotlight_full_image_width_ssm] = dimensions.width
30
- solr_hash[:spotlight_full_image_height_ssm] = dimensions.height
31
- end
32
-
33
- def add_file_versions(solr_hash)
34
- solr_hash[Spotlight::Engine.config.thumbnail_field] = riiif.image_path(resource.upload_id, size: '!400,400')
35
- end
36
-
37
- def add_sidecar_fields(solr_hash)
38
- solr_hash.merge! resource.sidecar.to_solr
39
- end
40
-
41
- def add_manifest_path(solr_hash)
42
- solr_hash[Spotlight::Engine.config.iiif_manifest_field] = spotlight_routes.manifest_exhibit_solr_document_path(exhibit, resource.compound_id)
43
- end
44
-
45
- def spotlight_routes
46
- Spotlight::Engine.routes.url_helpers
47
- end
48
-
49
- def riiif
50
- Riiif::Engine.routes.url_helpers
51
- end
52
-
53
- def attached_file?
54
- resource.upload&.file_present?
55
- end
56
- end
57
- end
@@ -1,54 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- FactoryBot.define do
4
- factory :unstarted_reindexing_log_entry, class: 'Spotlight::ReindexingLogEntry' do
5
- items_reindexed_count { 15 }
6
- job_status { 'unstarted' }
7
- exhibit
8
- user
9
- end
10
-
11
- factory :reindexing_log_entry, class: 'Spotlight::ReindexingLogEntry' do
12
- items_reindexed_count { 10 }
13
- start_time { Time.zone.parse('2017-01-05 23:00:00') }
14
- end_time { Time.zone.parse('2017-01-05 23:05:00') }
15
- job_status { 'succeeded' }
16
- exhibit
17
- user
18
- end
19
-
20
- factory :reindexing_log_entry_no_user, class: 'Spotlight::ReindexingLogEntry' do
21
- items_reindexed_count { 10 }
22
- start_time { Time.zone.parse('2017-01-05 23:00:00') }
23
- end_time { Time.zone.parse('2017-01-05 23:05:00') }
24
- job_status { 'succeeded' }
25
- exhibit
26
- end
27
-
28
- factory :in_progress_reindexing_log_entry, class: 'Spotlight::ReindexingLogEntry' do
29
- items_reindexed_count { 100 }
30
- start_time { Time.zone.now - 300 }
31
- end_time { nil }
32
- job_status { 'in_progress' }
33
- exhibit
34
- user
35
- end
36
-
37
- factory :recent_reindexing_log_entry, class: 'Spotlight::ReindexingLogEntry' do
38
- sequence(:items_reindexed_count)
39
- start_time { Time.zone.now - 86_400 }
40
- end_time { Time.zone.now - 86_100 }
41
- job_status { 'succeeded' }
42
- exhibit
43
- user
44
- end
45
-
46
- factory :failed_reindexing_log_entry, class: 'Spotlight::ReindexingLogEntry' do
47
- items_reindexed_count { 10 }
48
- start_time { Time.zone.parse('2017-01-10 23:00:00') }
49
- end_time { Time.zone.parse('2017-01-10 23:05:00') }
50
- job_status { 'failed' }
51
- exhibit
52
- user
53
- end
54
- end
@@ -1,122 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- describe Spotlight::ReindexProgress, type: :model do
4
- let(:reindexing_log_entry) do
5
- FactoryBot.create(:failed_reindexing_log_entry, items_reindexed_estimate: 12)
6
- end
7
-
8
- let(:subject) { described_class.new(reindexing_log_entry) }
9
-
10
- describe '#started_at' do
11
- it 'returns start_time for current_log_entry' do
12
- expect(subject.started_at).to eq reindexing_log_entry.start_time
13
- end
14
- end
15
-
16
- describe '#updated_at' do
17
- it 'returns the time of last update for current_log_entry' do
18
- expect(subject.updated_at).to eq reindexing_log_entry.updated_at
19
- end
20
- end
21
-
22
- describe '#finished?' do
23
- it 'returns true if current_log_entry is succeeded or failed' do
24
- expect(subject.finished?).to be true
25
- end
26
- end
27
-
28
- describe '#finished_at' do
29
- it 'returns end_time for current_log_entry' do
30
- expect(subject.finished_at).to eq(reindexing_log_entry.end_time)
31
- end
32
- end
33
-
34
- describe '#total' do
35
- it 'returns items_reindexed_estimate for current_log_entry' do
36
- expect(subject.total).to be 12
37
- end
38
- end
39
-
40
- describe '#completed' do
41
- it 'returns items_reindexed_count for current_log_entry' do
42
- expect(subject.completed).to be 10
43
- end
44
- end
45
-
46
- describe '#errored?' do
47
- it 'returns true for log entries marked as failed' do
48
- expect(subject).to be_errored
49
- end
50
- end
51
-
52
- describe '#as_json' do
53
- it 'returns a hash with values for current_log_entry via the various helper methods' do
54
- expect(subject.as_json).to eq(
55
- recently_in_progress: subject.recently_in_progress?,
56
- started_at: I18n.l(reindexing_log_entry.start_time, format: :long),
57
- finished_at: I18n.l(reindexing_log_entry.end_time, format: :long),
58
- updated_at: I18n.l(reindexing_log_entry.updated_at, format: :long),
59
- total: subject.total,
60
- completed: subject.completed,
61
- errored: subject.errored?,
62
- finished: subject.finished?
63
- )
64
- end
65
- end
66
-
67
- describe '#recently_in_progress?' do
68
- context 'there is no end_time for current_log_entry' do
69
- let(:reindexing_log_entry) { FactoryBot.create(:in_progress_reindexing_log_entry) }
70
-
71
- it 'returns true' do
72
- expect(subject).to be_recently_in_progress
73
- end
74
- end
75
-
76
- context 'current_log_entry has an end_time less than Spotlight::Engine.config.reindex_progress_window.minutes.ago' do
77
- let(:reindexing_log_entry) { FactoryBot.create(:recent_reindexing_log_entry, end_time: Time.zone.now) }
78
-
79
- it 'returns true' do
80
- expect(subject).to be_recently_in_progress
81
- end
82
- end
83
-
84
- context 'current_log_entry is unstarted ' do
85
- let(:reindexing_log_entry) { FactoryBot.create(:unstarted_reindexing_log_entry) }
86
-
87
- it 'returns false' do
88
- expect(subject).not_to be_recently_in_progress
89
- end
90
- end
91
- end
92
-
93
- context 'current_log_entry is blan' do
94
- let(:reindexing_log_entry) { Spotlight::ReindexingLogEntry.new }
95
-
96
- # rubocop:disable RSpec/MultipleExpectations
97
- it 'methods return gracefully' do
98
- expect(subject.recently_in_progress?).to be false
99
- expect(subject.started_at).to be nil
100
- expect(subject.updated_at).to be nil
101
- expect(subject.finished?).to be false
102
- expect(subject.finished_at).to be nil
103
- expect(subject.total).to be nil
104
- expect(subject.completed).to be nil
105
- expect(subject.errored?).to be false
106
- expect(subject.send(:localized_start_time)).to be nil
107
- expect(subject.send(:localized_finish_time)).to be nil
108
- expect(subject.send(:localized_updated_time)).to be nil
109
- expect(subject.as_json).to eq(
110
- recently_in_progress: false,
111
- started_at: nil,
112
- finished_at: nil,
113
- updated_at: nil,
114
- total: nil,
115
- completed: nil,
116
- errored: false,
117
- finished: false
118
- )
119
- end
120
- # rubocop:enable RSpec/MultipleExpectations
121
- end
122
- end