blacklight-spotlight 0.4.1 → 0.5.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (367) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +22 -8
  3. data/Rakefile +40 -39
  4. data/app/assets/javascripts/spotlight/blacklight_configuration.js +16 -0
  5. data/app/assets/javascripts/spotlight/blocks/resources_block.js +3 -1
  6. data/app/assets/stylesheets/spotlight/_blacklight_configuration.scss +2 -2
  7. data/app/assets/stylesheets/spotlight/_blacklight_overrides.scss +24 -0
  8. data/app/assets/stylesheets/spotlight/_header.scss +150 -47
  9. data/app/assets/stylesheets/spotlight/_pages.scss +62 -11
  10. data/app/assets/stylesheets/spotlight/_report_a_problem.scss +1 -0
  11. data/app/assets/stylesheets/spotlight/_spotlight.scss +1 -0
  12. data/app/builders/spotlight/bootstrap_breadcrumbs_builder.rb +28 -21
  13. data/app/controllers/spotlight/about_pages_controller.rb +25 -14
  14. data/app/controllers/spotlight/appearances_controller.rb +34 -30
  15. data/app/controllers/spotlight/application_controller.rb +2 -1
  16. data/app/controllers/spotlight/attachments_controller.rb +9 -7
  17. data/app/controllers/spotlight/browse_controller.rb +13 -9
  18. data/app/controllers/spotlight/catalog_controller.rb +179 -161
  19. data/app/controllers/spotlight/concerns/application_controller.rb +22 -20
  20. data/app/controllers/spotlight/concerns/catalog_search_context.rb +44 -0
  21. data/app/controllers/spotlight/confirmations_controller.rb +5 -2
  22. data/app/controllers/spotlight/contact_forms_controller.rb +13 -7
  23. data/app/controllers/spotlight/contacts_controller.rb +13 -4
  24. data/app/controllers/spotlight/custom_fields_controller.rb +48 -40
  25. data/app/controllers/spotlight/dashboards_controller.rb +17 -8
  26. data/app/controllers/spotlight/default_controller.rb +3 -1
  27. data/app/controllers/spotlight/exhibits_controller.rb +69 -62
  28. data/app/controllers/spotlight/feature_pages_controller.rb +21 -11
  29. data/app/controllers/spotlight/home_pages_controller.rb +6 -5
  30. data/app/controllers/spotlight/lock_controller.rb +3 -1
  31. data/app/controllers/spotlight/metadata_configurations_controller.rb +49 -0
  32. data/app/controllers/spotlight/pages_controller.rb +28 -18
  33. data/app/controllers/spotlight/resources/upload_controller.rb +53 -46
  34. data/app/controllers/spotlight/resources_controller.rb +9 -5
  35. data/app/controllers/spotlight/roles_controller.rb +26 -22
  36. data/app/controllers/spotlight/search_configurations_controller.rb +66 -0
  37. data/app/controllers/spotlight/searches_controller.rb +91 -82
  38. data/app/controllers/spotlight/solr_controller.rb +20 -13
  39. data/app/controllers/spotlight/tags_controller.rb +5 -3
  40. data/app/controllers/spotlight/versions_controller.rb +15 -12
  41. data/app/controllers/spotlight/view_configurations_controller.rb +17 -0
  42. data/app/helpers/spotlight/application_helper.rb +44 -32
  43. data/app/helpers/spotlight/browse_helper.rb +13 -1
  44. data/app/helpers/spotlight/crud_link_helpers.rb +22 -14
  45. data/app/helpers/spotlight/jcrop_helper.rb +4 -2
  46. data/app/helpers/spotlight/main_app_helpers.rb +45 -41
  47. data/app/helpers/spotlight/navbar_helper.rb +6 -0
  48. data/app/helpers/spotlight/pages_helper.rb +23 -15
  49. data/app/helpers/spotlight/roles_helper.rb +10 -4
  50. data/app/helpers/spotlight/search_configurations_helper.rb +22 -0
  51. data/app/helpers/spotlight/title_helper.rb +16 -13
  52. data/app/jobs/spotlight/add_uploads_from_csv.rb +13 -9
  53. data/app/jobs/spotlight/reindex_job.rb +9 -9
  54. data/app/jobs/spotlight/rename_sidecar_field_job.rb +3 -0
  55. data/app/mailers/spotlight/confirmation_mailer.rb +2 -0
  56. data/app/mailers/spotlight/indexing_complete_mailer.rb +4 -2
  57. data/app/models/ability.rb +3 -0
  58. data/app/models/concerns/spotlight/ar_light.rb +49 -25
  59. data/app/models/concerns/spotlight/blacklight_configuration_defaults.rb +25 -10
  60. data/app/models/concerns/spotlight/exhibit_analytics.rb +28 -0
  61. data/app/models/concerns/spotlight/image_derivatives.rb +25 -26
  62. data/app/models/concerns/spotlight/resources/open_graph.rb +23 -19
  63. data/app/models/concerns/spotlight/resources/web.rb +25 -24
  64. data/app/models/concerns/spotlight/solr_document.rb +40 -34
  65. data/app/models/concerns/spotlight/solr_document/active_model_concern.rb +29 -40
  66. data/app/models/concerns/spotlight/solr_document/atomic_updates.rb +22 -18
  67. data/app/models/concerns/spotlight/solr_document/finder.rb +23 -18
  68. data/app/models/concerns/spotlight/solr_document/spotlight_images.rb +43 -39
  69. data/app/models/concerns/spotlight/solr_document/uploaded_resource.rb +41 -29
  70. data/app/models/concerns/spotlight/user.rb +25 -19
  71. data/app/models/sir_trevor_rails/blocks/browse_block.rb +36 -30
  72. data/app/models/sir_trevor_rails/blocks/featured_pages_block.rb +24 -18
  73. data/app/models/sir_trevor_rails/blocks/oembed_block.rb +8 -4
  74. data/app/models/sir_trevor_rails/blocks/search_results_block.rb +29 -23
  75. data/app/models/sir_trevor_rails/blocks/solr_documents_block.rb +43 -42
  76. data/app/models/sir_trevor_rails/blocks/solr_documents_carousel_block.rb +16 -12
  77. data/app/models/sir_trevor_rails/blocks/solr_documents_embed_block.rb +7 -3
  78. data/app/models/sir_trevor_rails/blocks/solr_documents_features_block.rb +7 -3
  79. data/app/models/sir_trevor_rails/blocks/solr_documents_grid_block.rb +7 -3
  80. data/app/models/sir_trevor_rails/blocks/textable.rb +18 -18
  81. data/app/models/spotlight/ability.rb +32 -33
  82. data/app/models/spotlight/about_page.rb +3 -1
  83. data/app/models/spotlight/analytics/ga.rb +46 -27
  84. data/app/models/spotlight/attachment.rb +3 -1
  85. data/app/models/spotlight/blacklight_configuration.rb +146 -68
  86. data/app/models/spotlight/contact.rb +35 -30
  87. data/app/models/spotlight/contact_email.rb +6 -3
  88. data/app/models/spotlight/contact_form.rb +4 -3
  89. data/app/models/spotlight/custom_field.rb +41 -33
  90. data/app/models/spotlight/exhibit.rb +104 -130
  91. data/app/models/spotlight/feature_page.rb +9 -7
  92. data/app/models/spotlight/featured_image.rb +10 -10
  93. data/app/models/spotlight/field_metadata.rb +46 -0
  94. data/app/models/spotlight/home_page.rb +8 -5
  95. data/app/models/spotlight/lock.rb +4 -3
  96. data/app/models/spotlight/main_navigation.rb +9 -3
  97. data/app/models/spotlight/masthead.rb +17 -16
  98. data/app/models/spotlight/page.rb +16 -16
  99. data/app/models/spotlight/resource.rb +69 -22
  100. data/app/models/spotlight/resources/csv_upload.rb +8 -4
  101. data/app/models/spotlight/resources/upload.rb +68 -57
  102. data/app/models/spotlight/role.rb +30 -34
  103. data/app/models/spotlight/search.rb +74 -63
  104. data/app/models/spotlight/solr_document_sidecar.rb +17 -15
  105. data/app/serializers/spotlight/exhibit_export_serializer.rb +65 -29
  106. data/app/serializers/spotlight/page_representer.rb +10 -6
  107. data/app/uploaders/spotlight/attachment_uploader.rb +4 -6
  108. data/app/uploaders/spotlight/avatar_uploader.rb +4 -3
  109. data/app/uploaders/spotlight/featured_image_uploader.rb +15 -14
  110. data/app/uploaders/spotlight/item_uploader.rb +3 -1
  111. data/app/uploaders/spotlight/masthead_uploader.rb +4 -2
  112. data/app/views/catalog/_search_form.html.erb +24 -0
  113. data/app/views/shared/_browse_navbar.html.erb +1 -1
  114. data/app/views/shared/_exhibit_navbar.html.erb +1 -1
  115. data/app/views/spotlight/appearances/edit.html.erb +13 -45
  116. data/app/views/spotlight/catalog/_edit_default.html.erb +1 -1
  117. data/app/views/spotlight/custom_fields/_form.html.erb +1 -1
  118. data/app/views/spotlight/exhibits/edit.html.erb +4 -4
  119. data/app/views/spotlight/home_pages/_empty.html.erb +1 -3
  120. data/app/views/spotlight/home_pages/_page_options.html.erb +1 -1
  121. data/app/views/spotlight/{blacklight_configurations → metadata_configurations}/_metadata_field.html.erb +0 -0
  122. data/app/views/spotlight/{blacklight_configurations/edit_metadata_fields.html.erb → metadata_configurations/edit.html.erb} +1 -1
  123. data/app/views/spotlight/pages/show.html.erb +2 -2
  124. data/app/views/spotlight/search_configurations/_default_per_page.html.erb +5 -0
  125. data/app/views/spotlight/search_configurations/_document_index_view_types.html.erb +7 -0
  126. data/app/views/spotlight/search_configurations/_facets.html.erb +38 -0
  127. data/app/views/spotlight/search_configurations/_search_fields.html.erb +58 -0
  128. data/app/views/spotlight/search_configurations/_sort.html.erb +53 -0
  129. data/app/views/spotlight/search_configurations/edit.html.erb +46 -0
  130. data/app/views/spotlight/searches/_search.html.erb +1 -1
  131. data/app/views/spotlight/shared/_admin_sidebar.html.erb +0 -2
  132. data/app/views/spotlight/shared/_curation_sidebar.html.erb +2 -3
  133. data/app/views/spotlight/shared/_report_a_problem.html.erb +2 -2
  134. data/app/views/spotlight/sir_trevor/blocks/_oembed_block.html.erb +5 -1
  135. data/app/views/spotlight/sir_trevor/blocks/_solr_documents_block.html.erb +7 -5
  136. data/app/views/spotlight/sir_trevor/blocks/_solr_documents_carousel_block.html.erb +2 -2
  137. data/app/views/spotlight/sir_trevor/blocks/_solr_documents_embed_block.html.erb +7 -5
  138. data/app/views/spotlight/sir_trevor/blocks/_solr_documents_features_block.html.erb +2 -2
  139. data/app/views/spotlight/sir_trevor/blocks/_solr_documents_grid_block.html.erb +14 -9
  140. data/config/locales/spotlight.en.yml +94 -49
  141. data/config/routes.rb +11 -20
  142. data/db/migrate/20150410180014_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb +15 -0
  143. data/db/migrate/20150410180015_add_missing_taggable_index.acts_as_taggable_on_engine.rb +10 -0
  144. data/db/migrate/20150410180016_change_collation_for_tag_names.acts_as_taggable_on_engine.rb +10 -0
  145. data/db/migrate/20150713160101_change_spotlight_searches_to_published.rb +5 -0
  146. data/db/migrate/20151016092343_remove_searchable_from_exhibit.rb +20 -0
  147. data/lib/blacklight/spotlight.rb +1 -1
  148. data/lib/generators/spotlight/install_generator.rb +27 -25
  149. data/lib/generators/spotlight/templates/catalog_controller.rb +7 -5
  150. data/lib/generators/spotlight/templates/jetty.rake +8 -2
  151. data/lib/generators/spotlight/templates/spotlight_helper.rb +3 -1
  152. data/lib/spotlight.rb +4 -2
  153. data/lib/spotlight/base.rb +21 -14
  154. data/lib/spotlight/catalog.rb +10 -9
  155. data/lib/spotlight/catalog/access_controls_enforcement.rb +30 -15
  156. data/lib/spotlight/config.rb +4 -2
  157. data/lib/spotlight/controller.rb +12 -11
  158. data/lib/spotlight/engine.rb +30 -22
  159. data/lib/spotlight/rails/routes.rb +7 -4
  160. data/lib/spotlight/version.rb +2 -1
  161. data/lib/tasks/spotlight_tasks.rake +56 -50
  162. data/spec/controllers/application_controller_spec.rb +13 -13
  163. data/spec/controllers/spotlight/about_pages_controller_spec.rb +63 -59
  164. data/spec/controllers/spotlight/appearances_controller_spec.rb +29 -24
  165. data/spec/controllers/spotlight/application_controller_spec.rb +3 -3
  166. data/spec/controllers/spotlight/attachments_controller_spec.rb +10 -10
  167. data/spec/controllers/spotlight/browse_controller_spec.rb +23 -25
  168. data/spec/controllers/spotlight/catalog_controller_spec.rb +82 -87
  169. data/spec/controllers/spotlight/confirmations_controller_spec.rb +13 -11
  170. data/spec/controllers/spotlight/contact_forms_controller_spec.rb +17 -12
  171. data/spec/controllers/spotlight/contacts_controller_spec.rb +36 -36
  172. data/spec/controllers/spotlight/custom_fields_controller_spec.rb +26 -26
  173. data/spec/controllers/spotlight/dashboards_controller_spec.rb +14 -14
  174. data/spec/controllers/spotlight/exhibits_controller_spec.rb +59 -54
  175. data/spec/controllers/spotlight/feature_pages_controller_spec.rb +59 -59
  176. data/spec/controllers/spotlight/home_pages_controller_spec.rb +28 -29
  177. data/spec/controllers/spotlight/metadata_configurations_controller_spec.rb +84 -0
  178. data/spec/controllers/spotlight/resources/upload_controller_spec.rb +42 -33
  179. data/spec/controllers/spotlight/resources_controller_spec.rb +25 -29
  180. data/spec/controllers/spotlight/roles_controller_spec.rb +37 -19
  181. data/spec/controllers/spotlight/search_configurations_controller_spec.rb +125 -0
  182. data/spec/controllers/spotlight/searches_controller_spec.rb +84 -63
  183. data/spec/controllers/spotlight/solr_controller_spec.rb +13 -14
  184. data/spec/controllers/spotlight/tags_controller_spec.rb +16 -16
  185. data/spec/controllers/spotlight/versions_controller_spec.rb +15 -18
  186. data/spec/controllers/spotlight/view_configurations_controller_spec.rb +31 -0
  187. data/spec/factories/contacts.rb +1 -3
  188. data/spec/factories/custom_fields.rb +2 -4
  189. data/spec/factories/exhibits.rb +4 -2
  190. data/spec/factories/pages.rb +8 -11
  191. data/spec/factories/resources.rb +4 -4
  192. data/spec/factories/searches.rb +10 -13
  193. data/spec/factories/tags.rb +0 -3
  194. data/spec/factories/users.rb +2 -4
  195. data/spec/features/about_page_spec.rb +19 -19
  196. data/spec/features/add_contacts_spec.rb +34 -34
  197. data/spec/features/add_custom_field_metadata_spec.rb +24 -26
  198. data/spec/features/add_item_bookmarklet_spec.rb +12 -12
  199. data/spec/features/browse_category_admin_spec.rb +39 -39
  200. data/spec/features/catalog_spec.rb +9 -10
  201. data/spec/features/confirm_email_spec.rb +10 -10
  202. data/spec/features/create_exhibit_spec.rb +18 -15
  203. data/spec/features/create_page_spec.rb +8 -8
  204. data/spec/features/curator_items.rb +3 -3
  205. data/spec/features/dashboard_spec.rb +15 -16
  206. data/spec/features/edit_contact_spec.rb +8 -10
  207. data/spec/features/edit_search_fields_spec.rb +79 -0
  208. data/spec/features/exhibits/add_tags_spec.rb +15 -16
  209. data/spec/features/exhibits/administration_spec.rb +25 -25
  210. data/spec/features/exhibits/custom_metadata_fields_spec.rb +41 -43
  211. data/spec/features/exhibits/edit_metadata_fields_spec.rb +19 -19
  212. data/spec/features/feature_page_spec.rb +49 -48
  213. data/spec/features/home_page_spec.rb +38 -38
  214. data/spec/features/import_exhibit_spec.rb +23 -20
  215. data/spec/features/item_admin_spec.rb +28 -29
  216. data/spec/features/javascript/about_page_admin_spec.rb +9 -9
  217. data/spec/features/javascript/block_controls_spec.rb +16 -18
  218. data/spec/features/javascript/blocks/featured_browse_categories_block_spec.rb +11 -12
  219. data/spec/features/javascript/blocks/featured_pages_block_spec.rb +12 -13
  220. data/spec/features/javascript/blocks/search_result_block_spec.rb +17 -17
  221. data/spec/features/javascript/blocks/solr_documents_block_spec.rb +67 -65
  222. data/spec/features/javascript/edit_in_place_spec.rb +30 -56
  223. data/spec/features/javascript/feature_page_admin_spec.rb +73 -59
  224. data/spec/features/javascript/home_page_edit_spec.rb +6 -6
  225. data/spec/features/javascript/metadata_admin_spec.rb +15 -15
  226. data/spec/features/javascript/multi_image_select_spec.rb +17 -18
  227. data/spec/features/javascript/preview_block_spec.rb +11 -12
  228. data/spec/features/javascript/rule_block_spec.rb +7 -7
  229. data/spec/features/javascript/search_config_admin_spec.rb +144 -0
  230. data/spec/features/javascript/search_context_spec.rb +41 -42
  231. data/spec/features/main_navigation_spec.rb +22 -22
  232. data/spec/features/metadata_admin_spec.rb +8 -8
  233. data/spec/features/multiple_exhibits_spec.rb +15 -17
  234. data/spec/features/report_a_problem_spec.rb +23 -17
  235. data/spec/features/site_masthead_spec.rb +46 -46
  236. data/spec/features/slideshow_spec.rb +8 -9
  237. data/spec/features/tags_admin_spec.rb +11 -11
  238. data/spec/features/upload_non_repository_item_spec.rb +32 -32
  239. data/spec/features/user_admin_spec.rb +7 -7
  240. data/spec/helpers/spotlight/application_helper_spec.rb +63 -56
  241. data/spec/helpers/spotlight/browse_helper_spec.rb +6 -6
  242. data/spec/helpers/spotlight/crud_link_helpers_spec.rb +58 -52
  243. data/spec/helpers/spotlight/main_app_helpers_spec.rb +44 -24
  244. data/spec/helpers/spotlight/navbar_helper_spec.rb +4 -4
  245. data/spec/helpers/spotlight/pages_helper_spec.rb +56 -37
  246. data/spec/helpers/spotlight/roles_helper_spec.rb +3 -3
  247. data/spec/helpers/spotlight/search_configurations_helper_spec.rb +24 -0
  248. data/spec/helpers/spotlight/title_helper_spec.rb +33 -35
  249. data/spec/jobs/spotlight/reindex_job_spec.rb +6 -6
  250. data/spec/jobs/spotlight/rename_sidecar_field_job_spec.rb +7 -7
  251. data/spec/lib/spotlight/catalog/access_controls_enforcement_spec.rb +41 -26
  252. data/spec/lib/spotlight/controller_spec.rb +10 -10
  253. data/spec/lib/spotlight/routes_spec.rb +4 -4
  254. data/spec/mailers/spotlight/indexing_complete_mailer_spec.rb +13 -13
  255. data/spec/models/sir_trevor_rails/blocks/solr_documents_block_spec.rb +8 -8
  256. data/spec/models/{spotlight/sir_trevor_blocks → sir_trevor_rails/blocks}/textable_spec.rb +7 -8
  257. data/spec/models/solr_document_spec.rb +49 -50
  258. data/spec/models/spotlight/ability_spec.rb +17 -20
  259. data/spec/models/spotlight/about_page_spec.rb +6 -6
  260. data/spec/models/spotlight/analytics/ga_spec.rb +2 -2
  261. data/spec/models/spotlight/blacklight_configuration_spec.rb +196 -133
  262. data/spec/models/spotlight/contact_email_spec.rb +28 -24
  263. data/spec/models/spotlight/contact_spec.rb +6 -7
  264. data/spec/models/spotlight/custom_field_spec.rb +51 -52
  265. data/spec/models/spotlight/exhibit_spec.rb +102 -60
  266. data/spec/models/spotlight/feature_page_spec.rb +32 -32
  267. data/spec/models/spotlight/featured_image_spec.rb +5 -5
  268. data/spec/models/spotlight/field_metadata_spec.rb +78 -0
  269. data/spec/models/spotlight/home_page_spec.rb +11 -20
  270. data/spec/models/spotlight/{spotlight_image_derivatives_spec.rb → image_derivatives_spec.rb} +2 -2
  271. data/spec/models/spotlight/main_navigation_spec.rb +7 -9
  272. data/spec/models/spotlight/masthead_spec.rb +6 -6
  273. data/spec/models/spotlight/page_spec.rb +26 -29
  274. data/spec/models/spotlight/resource_spec.rb +56 -26
  275. data/spec/models/spotlight/resources/open_graph_spec.rb +16 -18
  276. data/spec/models/spotlight/resources/upload_spec.rb +32 -35
  277. data/spec/models/spotlight/resources/web_spec.rb +9 -11
  278. data/spec/models/spotlight/role_spec.rb +20 -20
  279. data/spec/models/spotlight/search_spec.rb +32 -15
  280. data/spec/models/spotlight/solr_document/atomic_updates_spec.rb +34 -0
  281. data/spec/models/spotlight/{solr_document_images_spec.rb → solr_document/spotlight_images_spec.rb} +18 -10
  282. data/spec/models/spotlight/solr_document/uploaded_resource_spec.rb +52 -0
  283. data/spec/models/spotlight/solr_document_sidecar_spec.rb +3 -4
  284. data/spec/routing/spotlight/exhibit_catalog_spec.rb +5 -5
  285. data/spec/routing/spotlight/pages_routing_spec.rb +24 -25
  286. data/spec/serializers/spotlight/exhibit_export_serializer_spec.rb +88 -68
  287. data/spec/spec_helper.rb +13 -22
  288. data/spec/support/features/test_features_helpers.rb +50 -46
  289. data/spec/support/views/test_view_helpers.rb +1 -1
  290. data/spec/test_app_templates/Gemfile.extra +0 -1
  291. data/spec/test_app_templates/carrierwave.rb +2 -2
  292. data/spec/test_app_templates/catalog_controller.rb +42 -42
  293. data/spec/test_app_templates/lib/generators/test_app_generator.rb +20 -11
  294. data/spec/test_app_templates/spotlight_test.rake +3 -3
  295. data/spec/uploaders/spotlight/item_uploader_spec.rb +68 -0
  296. data/spec/views/_user_util_links.html.erb_spec.rb +14 -14
  297. data/spec/views/shared/_analytics.html.erb_spec.rb +4 -6
  298. data/spec/views/shared/_exhibit_masthead.html.erb_spec.rb +19 -20
  299. data/spec/views/shared/_exhibit_navbar.html.erb_spec.rb +129 -131
  300. data/spec/views/shared/_footer.html.erb_spec.rb +6 -7
  301. data/spec/views/shared/_header_navbar.html.erb_spec.rb +5 -5
  302. data/spec/views/spotlight/about_pages/_empty.html.erb_spec.rb +4 -4
  303. data/spec/views/spotlight/about_pages/_sidebar.html.erb_spec.rb +9 -11
  304. data/spec/views/spotlight/about_pages/index.html.erb_spec.rb +31 -28
  305. data/spec/views/spotlight/browse/_search.html.erb_spec.rb +6 -6
  306. data/spec/views/spotlight/browse/_sort_and_per_page.html.erb_spec.rb +10 -12
  307. data/spec/views/spotlight/browse/index.html.erb_spec.rb +6 -6
  308. data/spec/views/spotlight/browse/show.html.erb_spec.rb +19 -20
  309. data/spec/views/spotlight/catalog/_edit_default.html.erb_spec.rb +7 -7
  310. data/spec/views/spotlight/catalog/admin.html.erb_spec.rb +7 -7
  311. data/spec/views/spotlight/catalog/edit.html.erb_spec.rb +3 -6
  312. data/spec/views/spotlight/catalog/new.html.erb_spec.rb +8 -10
  313. data/spec/views/spotlight/contacts/edit.html.erb_spec.rb +8 -8
  314. data/spec/views/spotlight/dashboards/_analytics.html.erb_spec.rb +22 -22
  315. data/spec/views/spotlight/exhibits/edit.html.erb_spec.rb +7 -8
  316. data/spec/views/spotlight/feature_pages/_empty.html.erb_spec.rb +5 -5
  317. data/spec/views/spotlight/feature_pages/_sidebar.html.erb_spec.rb +24 -26
  318. data/spec/views/spotlight/home_pages/_empty.html.erb_spec.rb +13 -9
  319. data/spec/views/spotlight/home_pages/_sidebar.html.erb_spec.rb +6 -6
  320. data/spec/views/spotlight/metadata_configurations/_metadata_field.html.erb_spec.rb +26 -0
  321. data/spec/views/spotlight/metadata_configurations/edit.html.erb_spec.rb +22 -0
  322. data/spec/views/spotlight/pages/edit.html.erb_spec.rb +16 -16
  323. data/spec/views/spotlight/pages/index.html.erb_spec.rb +19 -17
  324. data/spec/views/spotlight/pages/new.html.erb_spec.rb +6 -6
  325. data/spec/views/spotlight/pages/show.html.erb_spec.rb +27 -28
  326. data/spec/views/spotlight/roles/index.html.erb_spec.rb +6 -6
  327. data/spec/views/spotlight/search_configurations/_search_fields.html.erb_spec.rb +54 -0
  328. data/spec/views/spotlight/search_configurations/_sort.html.erb_spec.rb +28 -0
  329. data/spec/views/spotlight/searches/_search.html.erb_spec.rb +20 -10
  330. data/spec/views/spotlight/searches/edit.html.erb_spec.rb +12 -11
  331. data/spec/views/spotlight/searches/index.html.erb_spec.rb +12 -7
  332. data/spec/views/spotlight/sir_trevor/blocks/_iframe_block.html.erb_spec.rb +7 -8
  333. data/spec/views/spotlight/sir_trevor/blocks/_rule_block.html.erb_spec.rb +4 -4
  334. data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_block.html.erb_spec.rb +38 -0
  335. data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_carousel_block.html.erb_spec.rb +7 -8
  336. data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_embed_block.html.erb_spec.rb +18 -13
  337. data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_features_block.html.erb_spec.rb +14 -12
  338. data/spec/views/spotlight/sir_trevor/blocks/_solr_documents_grid_block.html.erb_spec.rb +11 -12
  339. data/spec/views/spotlight/tags/index.html.erb_spec.rb +9 -9
  340. metadata +167 -83
  341. data/app/controllers/spotlight/blacklight_configurations_controller.rb +0 -101
  342. data/app/controllers/spotlight/resources/csv_controller.rb +0 -23
  343. data/app/forms/spotlight/appearance.rb +0 -86
  344. data/app/helpers/spotlight/attachments_helper.rb +0 -4
  345. data/app/helpers/spotlight/blacklight_configurations_helper.rb +0 -15
  346. data/app/jobs/spotlight/set_default_thumbnail_job.rb +0 -16
  347. data/app/models/spotlight/resources/csv.rb +0 -80
  348. data/app/uploaders/spotlight/csv_uploader.rb +0 -15
  349. data/app/views/spotlight/blacklight_configurations/edit_facet_fields.html.erb +0 -47
  350. data/app/views/spotlight/blacklight_configurations/edit_sort_fields.html.erb +0 -65
  351. data/app/views/spotlight/resources/csv/_form.html.erb +0 -17
  352. data/app/views/spotlight/resources/csv/new.html.erb +0 -3
  353. data/spec/controllers/spotlight/blacklight_configurations_controller_spec.rb +0 -167
  354. data/spec/features/edit_sort_fields_spec.rb +0 -42
  355. data/spec/features/exhibits/edit_facet_fields_spec.rb +0 -37
  356. data/spec/features/javascript/facet_admin_spec.rb +0 -36
  357. data/spec/features/search_facets_admin_spec.rb +0 -19
  358. data/spec/features/update_appearance_spec.rb +0 -58
  359. data/spec/helpers/spotlight/blacklight_configurations_helper_spec.rb +0 -12
  360. data/spec/models/spotlight/appearance_spec.rb +0 -33
  361. data/spec/models/spotlight/resources/csv_spec.rb +0 -101
  362. data/spec/models/spotlight/solr_document_atomic_updates_spec.rb +0 -29
  363. data/spec/models/spotlight/solr_document_uploaded_resource_spec.rb +0 -45
  364. data/spec/uploaders/item_uploader_spec.rb +0 -62
  365. data/spec/views/spotlight/blacklight_configuration/_metadata_field.html.erb_spec.rb +0 -27
  366. data/spec/views/spotlight/blacklight_configuration/edit_metadata_fields.html.erb_spec.rb +0 -23
  367. data/spec/views/spotlight/blacklight_configuration/edit_sort_fields.html.erb_spec.rb +0 -19
@@ -1,101 +0,0 @@
1
- class Spotlight::BlacklightConfigurationsController < Spotlight::ApplicationController
2
- before_filter :authenticate_user!
3
- load_and_authorize_resource :exhibit, class: Spotlight::Exhibit
4
- load_and_authorize_resource through: :exhibit, singleton: true
5
-
6
- include Blacklight::SearchHelper
7
-
8
- def update
9
- if @blacklight_configuration.update(exhibit_params)
10
- flash[:notice] = t(:'helpers.submit.blacklight_configuration.updated', model: @blacklight_configuration.class.model_name.human.downcase)
11
- end
12
-
13
- if params[:blacklight_configuration][:index_fields]
14
- redirect_to exhibit_edit_metadata_path(@exhibit)
15
- elsif params[:blacklight_configuration][:facet_fields]
16
- redirect_to exhibit_edit_facets_path(@exhibit)
17
- elsif params[:blacklight_configuration][:sort_fields]
18
- redirect_to exhibit_edit_sort_fields_path(@exhibit)
19
- else
20
- redirect_to exhibit_dashboard_path(@exhibit)
21
- end
22
- end
23
-
24
- def metadata_fields
25
- respond_to do |format|
26
- format.json { render json: @blacklight_configuration.blacklight_config.index_fields.as_json }
27
- end
28
- end
29
-
30
- def available_search_views
31
- respond_to do |format|
32
- format.json { render json: @blacklight_configuration.default_blacklight_config.view.to_h.reject { |k,v| v.if === false}.keys }
33
- end
34
- end
35
-
36
- ##
37
- # Edit the index and show view metadata fields
38
- def edit_metadata_fields
39
- add_breadcrumb t(:'spotlight.exhibits.breadcrumb', title: @exhibit.title), @exhibit
40
- add_breadcrumb t(:'spotlight.curation.sidebar.header'), exhibit_dashboard_path(@exhibit)
41
- add_breadcrumb t(:'spotlight.curation.sidebar.metadata'), exhibit_edit_metadata_path(@exhibit)
42
- end
43
-
44
- ##
45
- # Edit the index and show view metadata fields
46
- def edit_facet_fields
47
- add_breadcrumb t(:'spotlight.exhibits.breadcrumb', title: @exhibit.title), @exhibit
48
- add_breadcrumb t(:'spotlight.curation.sidebar.header'), exhibit_dashboard_path(@exhibit)
49
- add_breadcrumb t(:'spotlight.curation.sidebar.search_facets'), exhibit_edit_facets_path(@exhibit)
50
- @fields = repository.send_and_receive('admin/luke', fl: '*', 'json.nl' => 'map')['fields']
51
- end
52
-
53
- ##
54
- # Edit the index and show view metadata fields
55
- def edit_sort_fields
56
- add_breadcrumb t(:'spotlight.exhibits.breadcrumb', title: @exhibit.title), @exhibit
57
- add_breadcrumb t(:'spotlight.curation.sidebar.header'), exhibit_dashboard_path(@exhibit)
58
- add_breadcrumb t(:'spotlight.curation.sidebar.sort_fields'), exhibit_edit_sort_fields_path(@exhibit)
59
- end
60
-
61
-
62
- # the luke request handler can return document counts, but the seem to be incorrect.
63
- # They seem to be for the whole index and they decrease after optimizing.
64
- # This method finds those counts by doing regular facet queries
65
- def alternate_count
66
- @alt_count ||= begin
67
- facet_query = @blacklight_configuration.blacklight_config.facet_fields.reject { |k, v| v.pivot || v.query }.map { |key, fields| "#{fields.field}:[* TO *]" }
68
- solr_resp = repository.search('facet.query' => facet_query, 'rows' =>0, 'facet' => true)
69
- @alt_count = solr_resp['facet_counts']['facet_queries'].each_with_object({}) do |(key, val), alt_count|
70
- alt_count[key.split(/:/).first] = val
71
- end
72
- end
73
- end
74
-
75
- helper_method :alternate_count
76
-
77
- protected
78
-
79
- def exhibit_params
80
- params.require(:blacklight_configuration).permit(
81
- facet_fields: [exhibit_configuration_facet_params],
82
- index_fields: [exhibit_configuration_index_params],
83
- sort_fields: [exhibit_configuration_sort_params]
84
- )
85
- end
86
-
87
- def exhibit_configuration_index_params
88
- views = @blacklight_configuration.default_blacklight_config.view.keys | [:show]
89
-
90
- @blacklight_configuration.blacklight_config.index_fields.keys.inject({}) { |result, element| result[element] = ([:enabled, :label, :weight] | views); result }
91
- end
92
-
93
- def exhibit_configuration_facet_params
94
- @blacklight_configuration.blacklight_config.facet_fields.keys.inject({}) { |result, element| result[element] = [:show, :label, :weight]; result }
95
- end
96
-
97
- def exhibit_configuration_sort_params
98
- @blacklight_configuration.blacklight_config.sort_fields.keys.inject({}) { |result, element| result[element] = [:enabled, :label, :weight]; result }
99
- end
100
-
101
- end
@@ -1,23 +0,0 @@
1
- require 'csv'
2
-
3
- module Spotlight::Resources
4
- class CsvController < Spotlight::ResourcesController
5
- before_filter :build_resource, only: [:new, :create, :template]
6
-
7
- load_and_authorize_resource class: 'Spotlight::Resources::Csv', instance_name: 'resource'
8
-
9
- def template
10
- render text: CSV.generate { |csv| csv << @resource.label_to_field.keys }
11
- end
12
-
13
- protected
14
- def build_resource
15
- @resource ||= Spotlight::Resources::Csv.new exhibit: @exhibit
16
- end
17
-
18
- def resource_params
19
- params.require(:resource_csv).permit!
20
- end
21
-
22
- end
23
- end
@@ -1,86 +0,0 @@
1
- module Spotlight
2
- class Appearance
3
- extend ActiveModel::Naming
4
- extend ActiveModel::Translation
5
- include ActiveModel::Conversion
6
-
7
- def initialize(configuration)
8
- @configuration = configuration
9
- end
10
-
11
- attr_reader :configuration
12
- delegate :persisted?, :exhibit, :exhibit_id, :default_per_page,
13
- :default_blacklight_config, to: :configuration
14
-
15
- delegate :main_navigations, :searchable, to: :exhibit
16
-
17
- ##
18
- # This enables us to have a group of checkboxes that is backed by the array
19
- # stored in Spotlight::BlacklightConfiguration#document_index_view_types
20
- def document_index_view_types
21
- vals = configuration.document_index_view_types
22
- Blacklight::OpenStructWithHashAccess.new.tap do |s|
23
- view_type_options.each do |k|
24
- s[k] = vals.include?(k.to_s)
25
- end
26
- end
27
- end
28
-
29
- def update(params)
30
- exhibit_status = configuration.exhibit.update(exhibit_params(params))
31
- configuration_status = configuration.update(configuration_params(params))
32
- exhibit_status && configuration_status
33
- end
34
-
35
- def view_type_options
36
- default_blacklight_config.view.select { |k,v| v.if != false }.keys
37
- end
38
-
39
- def per_page_options
40
- default_blacklight_config.per_page
41
- end
42
-
43
- def errors
44
- errors = ActiveModel::Errors.new(self)
45
- (configuration.exhibit.errors.to_a + configuration.errors.to_a).each do |e|
46
- errors.add :base, e
47
- end
48
- errors
49
- end
50
-
51
- protected
52
-
53
- def configuration_params(params)
54
- p = params.except(:main_navigations, :searchable, :masthead, :thumbnail)
55
- p[:document_index_view_types] = keep_selected_values(p[:document_index_view_types])
56
- p
57
- end
58
-
59
- def exhibit_params(params)
60
- p = {searchable: params[:searchable]}
61
- if main_nav_attributes = params[:main_navigations].try(:values)
62
- p[:main_navigations_attributes] = main_nav_attributes
63
- end
64
-
65
- if masthead_attributes = params.slice(:masthead).try(:values).try(:first)
66
- p[:masthead_attributes] = masthead_attributes if masthead_attributes["image"].present? or masthead_attributes["remote_image_url"].present?
67
- end
68
-
69
- if thumbnail_attributes = params.slice(:thumbnail).try(:values).try(:first)
70
- p[:thumbnail_attributes] = thumbnail_attributes if thumbnail_attributes["image"].present? or thumbnail_attributes["remote_image_url"].present?
71
- end
72
- p
73
- end
74
-
75
- ##
76
- # A group of checkboxes on a form returns values like this:
77
- # {"list"=>["0", "1"], "gallery"=>["0", "1"], "map"=>["0"]}
78
- # where, "list" and "gallery" are selected and "map" is not. This function
79
- # digests that hash into a list of selected values. e.g.:
80
- # ["list", "gallery"]
81
- def keep_selected_values h
82
- return if h.nil?
83
- h.each_with_object([]) { |(k, v), o| o << k if v.include?("1")}
84
- end
85
- end
86
- end
@@ -1,4 +0,0 @@
1
- module Spotlight
2
- module AttachmentsHelper
3
- end
4
- end
@@ -1,15 +0,0 @@
1
- module Spotlight
2
- module BlacklightConfigurationsHelper
3
- def translate_sort_fields(sort_config)
4
- if sort_config[:sort]
5
- safe_join(sort_config[:sort].split(',').map do |sort|
6
- sort_field, sort_order = sort.split(' ')
7
- safe_join([
8
- t(:"spotlight.blacklight_configurations.edit_sort_fields.sort_keys.#{sort_field}"),
9
- t(:"spotlight.blacklight_configurations.edit_sort_fields.sort_keys.#{sort_order}")
10
- ], " ")
11
- end, ", ")
12
- end
13
- end
14
- end
15
- end
@@ -1,16 +0,0 @@
1
- # This is not currently used.
2
- # Leaving around as a proof-of-concept for future improvement.
3
- module Spotlight
4
- class SetDefaultThumbnailJob < ActiveJob::Base
5
- queue_as :default
6
-
7
- def perform(resource)
8
-
9
- first_item = images.first
10
-
11
- if first_item
12
- self.thumbnail = self.create_thumbnail remote_image_url: first_item.last
13
- end
14
- end
15
- end
16
- end
@@ -1,80 +0,0 @@
1
- require 'csv'
2
-
3
- module Spotlight
4
- class Resources::Csv < Spotlight::Resource
5
- mount_uploader :url, Spotlight::CsvUploader
6
-
7
- # we want to do this before reindexing
8
- after_save :update_exhibit_specific_fields, if: :url_changed?, prepend: true
9
-
10
- def to_solr
11
- store_url! # so that #url doesn't return the tmp directory
12
-
13
- base_doc = super
14
-
15
- base_doc.merge!(
16
- :"#{Spotlight::Engine.config.solr_fields.prefix}spotlight_resource_url#{Spotlight::Engine.config.solr_fields.string_suffix}" => url.url
17
- )
18
-
19
- csv.map do |row|
20
- h = base_doc.merge(document_model.new(base_doc).to_solr)
21
- row.each do |k,v|
22
- if label_to_field[k]
23
- h[label_to_field[k]] ||= []
24
- h[label_to_field[k]] << v
25
- end
26
- end
27
- h
28
- end
29
- end
30
-
31
- def label_to_field
32
- @label_to_field ||= begin
33
- label_to_field = {}
34
- label_to_field['id'] ||= document_model.unique_key
35
- label_to_field[title_field_name] ||= exhibit.blacklight_config.index.title_field
36
- label_to_field[public_field_name] ||= Spotlight::SolrDocument.visibility_field(exhibit)
37
- label_to_field.merge! Hash[exhibit.blacklight_config.index_fields.map { |k,v| [v.label, v.field]}]
38
- label_to_field.merge! Hash[exhibit.blacklight_config.facet_fields.map { |k,v| [v.label, v.field]}]
39
- label_to_field
40
- end
41
- end
42
-
43
- def csv options={ headers: true }, &block
44
- CSV.new File.open(url.path, 'r'), options
45
- end
46
-
47
- private
48
- def update_exhibit_specific_fields
49
-
50
- csv.map do |row|
51
- sidecar_updates = {}
52
- row.each do |label,v|
53
- if custom_fields[label]
54
- sidecar_updates[custom_fields[label]] = v
55
- end
56
- end
57
-
58
- unless row[public_field_name].blank? and sidecar_updates.empty?
59
- sidecar = document_model.new(id: row['id']).sidecar(exhibit)
60
- sidecar.update(
61
- public: row[public_field_name],
62
- data: sidecar.data.merge(sidecar_updates)
63
- )
64
- end
65
- end
66
- end
67
-
68
- def custom_fields
69
- Hash[exhibit.custom_fields.map { |f| [f.label, f.field] }]
70
- end
71
-
72
- def title_field_name
73
- "Title"
74
- end
75
-
76
- def public_field_name
77
- "Public"
78
- end
79
- end
80
- end
@@ -1,15 +0,0 @@
1
- # encoding: utf-8
2
- module Spotlight
3
- class CsvUploader < CarrierWave::Uploader::Base
4
-
5
- storage Spotlight::Engine.config.uploader_storage
6
-
7
- # Override the directory where uploaded files will be stored.
8
- # This is a sensible default for uploaders that are meant to be mounted:
9
- def store_dir
10
- "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
11
- end
12
-
13
-
14
- end
15
- end
@@ -1,47 +0,0 @@
1
- <%= render 'spotlight/shared/curation_sidebar' %>
2
- <div id="content" class="col-md-9">
3
- <%= curation_page_title %>
4
- <%= bootstrap_form_for @blacklight_configuration, url: spotlight.exhibit_blacklight_configuration_path(@exhibit), layout: :horizontal, label_col: 'col-md-3', control_col: 'col-sm-5' do |f| %>
5
- <div class="panel-group dd facet_fields" id="nested-fields" data-behavior="nestable" data-max-depth="1">
6
- <ol class="dd-list">
7
- <%= f.fields_for :facet_fields do |idxf| %>
8
- <% @blacklight_configuration.blacklight_config.facet_fields.each do |key, config| %>
9
- <li class="dd-item" data-id="<%= key.parameterize %>">
10
- <div class="dd-handle dd3-handle"><%= t :drag %></div>
11
- <%= idxf.fields_for key do |facet| %>
12
- <div class="dd3-content panel panel-default facet-config-<%= key.parameterize %>">
13
- <div class="panel-heading page">
14
- <%= facet.hidden_field :weight, 'data-property' => 'weight' %>
15
- <%= facet.check_box :show, checked: config.show, label: "", title: key %>
16
- <div class="main row">
17
- <div class="col-sm-7">
18
- <h3 class="panel-title" data-in-place-edit-target=".edit-in-place" data-in-place-edit-field-target="[data-edit-field-target='true']">
19
- <a href="#edit-in-place" class="field-label edit-in-place"><%= facet_field_label(key) %></a>
20
- <%= facet.hidden_field :label, value: facet_field_label(key), class: 'form-control input-sm', data: {:"edit-field-target" => 'true'} %>
21
- </h3>
22
- </div>
23
- <% if metadata = @fields.fetch(key.to_s, {}) %>
24
- <div class="facet-metadata col-sm-5">
25
- <%= content_tag :span, t(:'.items_count', count: alternate_count.fetch(key, 0)) %>
26
- <% if (values_count = metadata.fetch('distinct', 0)) > 0 %>
27
- • <%= content_tag :span, t(:'.values_count', count: values_count) %>
28
- <%= tag("span", class: 'btn-with-tooltip glyphicon glyphicon-info-sign', data: {container: 'body', toggle: 'tooltip', placement: 'top', title: metadata.fetch('topTerms', {}).map { |k,v| String.new(k) }.join(" • ")}) %>
29
- <% end %>
30
- </div>
31
- <% end %>
32
- </div>
33
- </div>
34
- </div>
35
- <% end %>
36
- </li>
37
- <% end %>
38
- <% end %>
39
- </ol>
40
- </div>
41
- <div class="form-actions">
42
- <div class="primary-actions">
43
- <%= f.submit nil, class: 'btn btn-primary' %>
44
- </div>
45
- </div>
46
- <% end %>
47
- </div>
@@ -1,65 +0,0 @@
1
- <%= render 'spotlight/shared/curation_sidebar' %>
2
- <div id="content" class="col-md-9">
3
- <%= curation_page_title %>
4
- <%= bootstrap_form_for @blacklight_configuration, url: spotlight.exhibit_blacklight_configuration_path(@exhibit), layout: :horizontal, label_col: 'col-md-3', control_col: 'col-sm-5' do |f| %>
5
- <% default_field = @blacklight_configuration.blacklight_config.default_sort_field %>
6
- <%= field_set_tag do %>
7
- <p class="instructions"><%= t(:'.help') %></p>
8
-
9
- <%= f.fields_for :sort_fields, @blacklight_configuration.blacklight_config.sort_fields.keys do |vt| %>
10
- <ol class="dd-list col-md-7 disabled-sort-option sort_fields_admin">
11
- <li>
12
- <div class="panel panel-default">
13
- <div class="panel-content">
14
- <div class="panel-heading">
15
- <h3 class="panel-title">
16
- <%= vt.fields_for default_field.key, default_field do |sort| %>
17
- <%= sort.check_box_without_bootstrap :enable, checked: true, disabled: true, data: { readonly: true } %>
18
- <%= sort.hidden_field :enabled, value: '1', readonly: true %>
19
- <%= sort.hidden_field :label, readonly: true %>
20
- <%= sort.hidden_field :weight, value: "-1", readonly: true %>
21
- <%= default_field.label %>
22
- <% end %>
23
- </h3>
24
- (<%= translate_sort_fields(default_field) %>)
25
- </div>
26
- </div>
27
- </div>
28
- </li>
29
- </ol>
30
- <div class="panel-group dd sort_fields_admin col-sm-7" id="nested-sort-fields" data-behavior="nestable" data-max-depth="1">
31
- <ol class="dd-list">
32
- <% @blacklight_configuration.blacklight_config.sort_fields.except(default_field.key).each_with_index do |(k, config), index| %>
33
- <li class="dd-item dd3-item" data-id="<%= k %>-id">
34
- <div class="dd3-content panel panel-default">
35
- <div class="dd-handle dd3-handle"><%= t(:drag) %></div>
36
- <div class="panel-heading" data-behavior="restore-default">
37
- <div class="row">
38
- <div class="col-sm-12">
39
- <%= vt.fields_for k, config do |sort| %>
40
- <%= sort.check_box_without_bootstrap :enabled %>
41
- <h3 class="panel-title" data-in-place-edit-target=".edit-in-place" data-in-place-edit-field-target="[data-edit-field-target='true']">
42
- <a href="#edit-in-place" class="field-label edit-in-place"><%= config.label %></a>
43
- <%= sort.hidden_field :label, {data: {:"edit-field-target" => "true"}} %>
44
- </h3>
45
- (<%= translate_sort_fields(config) %>)
46
- <%= sort.hidden_field :weight, {value: index, data: {property: "weight"}} %>
47
- <% end %>
48
- </div>
49
- </div>
50
- </div>
51
- </div>
52
- </li>
53
- <% end %>
54
- </ol>
55
- </div>
56
- <% end %>
57
- <% end %>
58
-
59
- <div class="form-actions">
60
- <div class="primary-actions">
61
- <%= f.submit nil, class: 'btn btn-primary' %>
62
- </div>
63
- </div>
64
- <% end %>
65
- </div>