blacklight 6.25.0 → 7.0.0.rc1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (400) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +1 -0
  3. data/.npmignore +23 -0
  4. data/.rubocop.yml +15 -3
  5. data/.rubocop_todo.yml +242 -379
  6. data/.solr_wrapper.yml +1 -1
  7. data/.travis.yml +40 -0
  8. data/Gemfile +1 -4
  9. data/README.md +21 -4
  10. data/Rakefile +1 -2
  11. data/VERSION +1 -1
  12. data/app/assets/images/blacklight/list.svg +1 -0
  13. data/app/assets/images/blacklight/search.svg +1 -0
  14. data/app/assets/javascripts/blacklight/blacklight.js +496 -56
  15. data/app/assets/stylesheets/blacklight/_balanced_list.scss +7 -12
  16. data/app/assets/stylesheets/blacklight/_blacklight_base.scss +3 -1
  17. data/app/assets/stylesheets/blacklight/_bookmark.scss +1 -13
  18. data/app/assets/stylesheets/blacklight/_bootstrap_overrides.scss +27 -0
  19. data/app/assets/stylesheets/blacklight/_constraints.scss +17 -25
  20. data/app/assets/stylesheets/blacklight/_controls.scss +8 -16
  21. data/app/assets/stylesheets/blacklight/_facets.scss +74 -92
  22. data/app/assets/stylesheets/blacklight/_header.scss +35 -48
  23. data/app/assets/stylesheets/blacklight/_icons.scss +29 -0
  24. data/app/assets/stylesheets/blacklight/_layout.scss +0 -10
  25. data/app/assets/stylesheets/blacklight/_mixins.scss +15 -0
  26. data/app/assets/stylesheets/blacklight/_modal.scss +9 -17
  27. data/app/assets/stylesheets/blacklight/_pagination.scss +2 -17
  28. data/app/assets/stylesheets/blacklight/_search_history.scss +5 -13
  29. data/app/assets/stylesheets/blacklight/_search_results.scss +9 -8
  30. data/app/assets/stylesheets/blacklight/_twitter_typeahead.scss +1 -2
  31. data/app/builders/blacklight/action_builder.rb +56 -0
  32. data/app/controllers/bookmarks_controller.rb +2 -2
  33. data/app/controllers/catalog_controller.rb +2 -2
  34. data/app/controllers/concerns/blacklight/base.rb +0 -33
  35. data/app/controllers/concerns/blacklight/bookmarks.rb +20 -37
  36. data/app/controllers/concerns/blacklight/catalog.rb +254 -213
  37. data/app/controllers/concerns/blacklight/controller.rb +117 -133
  38. data/app/controllers/concerns/blacklight/default_component_configuration.rb +12 -43
  39. data/app/controllers/concerns/blacklight/search_context.rb +10 -14
  40. data/app/controllers/concerns/blacklight/search_fields.rb +4 -14
  41. data/app/controllers/concerns/blacklight/token_based_user.rb +6 -10
  42. data/app/helpers/blacklight/blacklight_helper_behavior.rb +32 -118
  43. data/app/helpers/blacklight/catalog_helper_behavior.rb +94 -88
  44. data/app/helpers/blacklight/component_helper_behavior.rb +19 -19
  45. data/app/helpers/blacklight/configuration_helper_behavior.rb +25 -54
  46. data/app/helpers/blacklight/facets_helper_behavior.rb +40 -39
  47. data/app/helpers/blacklight/hash_as_hidden_fields_helper_behavior.rb +9 -11
  48. data/app/helpers/blacklight/icon_helper_behavior.rb +16 -0
  49. data/app/helpers/blacklight/layout_helper_behavior.rb +3 -10
  50. data/app/helpers/blacklight/render_constraints_helper_behavior.rb +6 -6
  51. data/app/helpers/blacklight/render_partials_helper_behavior.rb +195 -0
  52. data/app/helpers/blacklight/search_history_constraints_helper_behavior.rb +18 -11
  53. data/app/helpers/blacklight/suggest_helper_behavior.rb +1 -0
  54. data/app/helpers/blacklight/url_helper_behavior.rb +21 -27
  55. data/app/{assets/javascripts → javascript}/blacklight/autocomplete.js +3 -2
  56. data/app/javascript/blacklight/autofocus.js +20 -0
  57. data/app/javascript/blacklight/bookmark_toggle.js +25 -0
  58. data/app/javascript/blacklight/checkbox_submit.js +133 -0
  59. data/app/{assets/javascripts → javascript}/blacklight/collapsable.js +1 -1
  60. data/app/javascript/blacklight/core.js +39 -0
  61. data/app/{assets/javascripts → javascript}/blacklight/facet_load.js +6 -6
  62. data/app/{assets/javascripts/blacklight/ajax_modal.js → javascript/blacklight/modal.js} +63 -63
  63. data/app/{assets/javascripts → javascript}/blacklight/search_context.js +10 -2
  64. data/app/models/blacklight/facet_paginator.rb +3 -3
  65. data/app/models/blacklight/icon.rb +53 -0
  66. data/app/models/blacklight/solr/facet_paginator.rb +3 -3
  67. data/app/models/blacklight/suggest_search.rb +15 -4
  68. data/app/models/bookmark.rb +4 -9
  69. data/app/models/concerns/blacklight/configurable.rb +13 -13
  70. data/app/models/concerns/blacklight/document/active_model_shim.rb +8 -11
  71. data/app/models/concerns/blacklight/document/cache_key.rb +1 -1
  72. data/app/models/concerns/blacklight/document/dublin_core.rb +2 -2
  73. data/app/models/concerns/blacklight/document/email.rb +1 -1
  74. data/app/models/concerns/blacklight/document/extensions.rb +5 -5
  75. data/app/models/concerns/blacklight/document/semantic_fields.rb +9 -9
  76. data/app/models/concerns/blacklight/document/sms.rb +1 -1
  77. data/app/models/concerns/blacklight/document.rb +8 -42
  78. data/app/models/concerns/blacklight/solr/document.rb +7 -8
  79. data/app/models/concerns/blacklight/suggest/response.rb +3 -5
  80. data/app/models/concerns/blacklight/user.rb +6 -6
  81. data/app/models/record_mailer.rb +5 -6
  82. data/app/models/search.rb +5 -9
  83. data/app/presenters/blacklight/field_presenter.rb +5 -5
  84. data/app/presenters/blacklight/index_presenter.rb +34 -71
  85. data/app/presenters/blacklight/json_presenter.rb +7 -4
  86. data/app/presenters/blacklight/link_alternate_presenter.rb +1 -1
  87. data/app/presenters/blacklight/rendering/abstract_step.rb +5 -5
  88. data/app/presenters/blacklight/rendering/helper_method.rb +8 -8
  89. data/app/presenters/blacklight/rendering/join.rb +3 -3
  90. data/app/presenters/blacklight/rendering/link_to_facet.rb +19 -19
  91. data/app/presenters/blacklight/rendering/microdata.rb +3 -3
  92. data/app/presenters/blacklight/rendering/pipeline.rb +5 -5
  93. data/app/presenters/blacklight/search_bar_presenter.rb +37 -0
  94. data/app/presenters/blacklight/show_presenter.rb +20 -69
  95. data/app/presenters/blacklight/thumbnail_presenter.rb +72 -0
  96. data/app/services/blacklight/document_factory.rb +11 -0
  97. data/app/services/blacklight/field_retriever.rb +24 -24
  98. data/app/services/blacklight/search_service.rb +154 -0
  99. data/app/views/blacklight/nav/_bookmark.html.erb +2 -2
  100. data/app/views/blacklight/nav/_search_history.html.erb +1 -1
  101. data/app/views/bookmarks/_tools.html.erb +2 -2
  102. data/app/views/bookmarks/index.html.erb +2 -2
  103. data/app/views/catalog/_bookmark_control.html.erb +26 -10
  104. data/app/views/catalog/_citation.html.erb +18 -23
  105. data/app/views/catalog/_constraints.html.erb +5 -8
  106. data/app/views/catalog/_constraints_element.html.erb +6 -6
  107. data/app/views/catalog/{_document_default.atom.builder → _document.atom.builder} +2 -2
  108. data/app/views/catalog/_document.html.erb +5 -3
  109. data/app/views/catalog/{_document_default.rss.builder → _document.rss.builder} +0 -0
  110. data/app/views/catalog/_document_action.html.erb +2 -1
  111. data/app/views/catalog/_email_form.html.erb +8 -4
  112. data/app/views/catalog/_facet_index_navigation.html.erb +3 -3
  113. data/app/views/catalog/_facet_layout.html.erb +5 -7
  114. data/app/views/catalog/_facet_limit.html.erb +3 -2
  115. data/app/views/catalog/_facet_pagination.html.erb +10 -10
  116. data/app/views/catalog/_facet_pivot.html.erb +2 -2
  117. data/app/views/catalog/_facets.html.erb +8 -12
  118. data/app/views/catalog/{_group_default.html.erb → _group.html.erb} +0 -0
  119. data/app/views/catalog/_home_text.html.erb +32 -36
  120. data/app/views/catalog/_index.html.erb +12 -0
  121. data/app/views/catalog/{_index_header_default.html.erb → _index_header.html.erb} +2 -2
  122. data/app/views/catalog/_per_page_widget.html.erb +6 -7
  123. data/app/views/catalog/_previous_next_doc.html.erb +6 -14
  124. data/app/views/catalog/_search_form.html.erb +12 -8
  125. data/app/views/catalog/_search_header.html.erb +0 -3
  126. data/app/views/catalog/_search_results.html.erb +4 -0
  127. data/app/views/catalog/_show.html.erb +10 -0
  128. data/app/views/catalog/{_show_header_default.html.erb → _show_header.html.erb} +0 -0
  129. data/app/views/catalog/_show_main_content.html.erb +4 -4
  130. data/app/views/catalog/_show_sidebar.html.erb +3 -3
  131. data/app/views/catalog/_show_tools.html.erb +9 -11
  132. data/app/views/catalog/_sms_form.html.erb +8 -4
  133. data/app/views/catalog/_sort_and_per_page.html.erb +3 -3
  134. data/app/views/catalog/_sort_widget.html.erb +7 -7
  135. data/app/views/catalog/_thumbnail.html.erb +5 -0
  136. data/app/views/catalog/_view_type_group.html.erb +2 -2
  137. data/app/views/catalog/citation.html.erb +1 -1
  138. data/app/views/catalog/citation.js.erb +9 -1
  139. data/app/views/catalog/email.html.erb +5 -5
  140. data/app/views/catalog/email_success.html.erb +11 -9
  141. data/app/views/catalog/facet.html.erb +5 -6
  142. data/app/views/catalog/index.atom.builder +10 -15
  143. data/app/views/catalog/index.html.erb +9 -11
  144. data/app/views/catalog/index.json.jbuilder +65 -3
  145. data/app/views/catalog/index.rss.builder +5 -5
  146. data/app/views/catalog/opensearch.xml.builder +10 -10
  147. data/app/views/catalog/show.html.erb +11 -6
  148. data/app/views/catalog/sms.html.erb +2 -3
  149. data/app/views/catalog/sms_success.html.erb +11 -10
  150. data/app/views/kaminari/blacklight/_first_page.html.erb +2 -2
  151. data/app/views/kaminari/blacklight/_gap.html.erb +2 -2
  152. data/app/views/kaminari/blacklight/_last_page.html.erb +2 -2
  153. data/app/views/kaminari/blacklight/_next_page.html.erb +4 -4
  154. data/app/views/kaminari/blacklight/_page.html.erb +3 -3
  155. data/app/views/kaminari/blacklight/_prev_page.html.erb +4 -4
  156. data/app/views/kaminari/blacklight_compact/_paginator.html.erb +4 -4
  157. data/app/views/layouts/blacklight/base.html.erb +43 -0
  158. data/app/views/layouts/blacklight.html.erb +14 -41
  159. data/app/views/layouts/catalog_result.html.erb +11 -0
  160. data/app/views/search_history/index.html.erb +16 -21
  161. data/app/views/{_flash_msg.html.erb → shared/_flash_msg.html.erb} +0 -0
  162. data/app/views/shared/_header_navbar.html.erb +8 -13
  163. data/app/views/shared/_modal.html.erb +6 -0
  164. data/app/views/shared/_user_util_links.html.erb +22 -0
  165. data/blacklight.gemspec +10 -11
  166. data/config/locales/blacklight.de.yml +56 -86
  167. data/config/locales/blacklight.en.yml +1 -27
  168. data/config/locales/blacklight.es.yml +0 -30
  169. data/config/locales/blacklight.fr.yml +0 -30
  170. data/config/locales/blacklight.hu.yml +210 -0
  171. data/config/locales/blacklight.it.yml +0 -30
  172. data/config/locales/blacklight.nl.yml +210 -0
  173. data/config/locales/blacklight.pt-BR.yml +6 -32
  174. data/config/locales/blacklight.sq.yml +1 -28
  175. data/config/locales/blacklight.zh.yml +0 -25
  176. data/config/routes.rb +3 -10
  177. data/db/migrate/20140202020202_create_bookmarks.rb +0 -1
  178. data/db/migrate/20140320000000_add_polymorphic_type_to_bookmarks.rb +1 -1
  179. data/lib/blacklight/abstract_repository.rb +9 -21
  180. data/lib/blacklight/configuration/context.rb +1 -1
  181. data/lib/blacklight/configuration/facet_field.rb +16 -9
  182. data/lib/blacklight/configuration/field.rb +32 -3
  183. data/lib/blacklight/configuration/fields.rb +41 -48
  184. data/lib/blacklight/configuration/search_field.rb +2 -2
  185. data/lib/blacklight/configuration/sort_field.rb +2 -2
  186. data/lib/blacklight/configuration/view_config.rb +4 -0
  187. data/lib/blacklight/configuration.rb +82 -89
  188. data/lib/blacklight/engine.rb +5 -11
  189. data/lib/blacklight/exceptions.rb +4 -7
  190. data/lib/blacklight/nested_open_struct_with_hash_access.rb +107 -0
  191. data/lib/blacklight/open_struct_with_hash_access.rb +49 -0
  192. data/lib/blacklight/parameters.rb +1 -1
  193. data/lib/blacklight/routes/searchable.rb +1 -0
  194. data/lib/blacklight/search_builder.rb +26 -35
  195. data/lib/blacklight/search_state.rb +8 -8
  196. data/lib/blacklight/solr/repository.rb +3 -36
  197. data/lib/blacklight/solr/request.rb +1 -1
  198. data/lib/blacklight/solr/response/facets.rb +29 -31
  199. data/lib/blacklight/solr/response/group.rb +3 -3
  200. data/lib/blacklight/solr/response/group_response.rb +1 -1
  201. data/lib/blacklight/solr/response/more_like_this.rb +2 -2
  202. data/lib/blacklight/solr/response/response.rb +2 -2
  203. data/lib/blacklight/solr/response/spelling.rb +3 -3
  204. data/lib/blacklight/solr/response.rb +29 -30
  205. data/lib/blacklight/solr/search_builder_behavior.rb +25 -29
  206. data/lib/blacklight/version.rb +1 -1
  207. data/lib/blacklight.rb +4 -5
  208. data/lib/generators/blacklight/assets_generator.rb +8 -8
  209. data/lib/generators/blacklight/controller_generator.rb +4 -5
  210. data/lib/generators/blacklight/document_generator.rb +1 -1
  211. data/lib/generators/blacklight/install_generator.rb +18 -21
  212. data/lib/generators/blacklight/search_builder_generator.rb +1 -1
  213. data/lib/generators/blacklight/{solr5_generator.rb → solr_generator.rb} +4 -6
  214. data/lib/generators/blacklight/templates/.solr_wrapper.yml +5 -0
  215. data/lib/generators/blacklight/templates/blacklight.scss +0 -2
  216. data/lib/generators/blacklight/templates/catalog_controller.rb +52 -51
  217. data/{solr → lib/generators/blacklight/templates/solr}/conf/_rest_managed.json +0 -0
  218. data/{solr → lib/generators/blacklight/templates/solr}/conf/admin-extra.html +0 -0
  219. data/{solr → lib/generators/blacklight/templates/solr}/conf/elevate.xml +0 -0
  220. data/{solr → lib/generators/blacklight/templates/solr}/conf/mapping-ISOLatin1Accent.txt +0 -0
  221. data/{solr → lib/generators/blacklight/templates/solr}/conf/protwords.txt +0 -0
  222. data/lib/generators/blacklight/templates/solr/conf/schema.xml +390 -0
  223. data/{solr → lib/generators/blacklight/templates/solr}/conf/scripts.conf +0 -0
  224. data/lib/generators/blacklight/templates/solr/conf/solrconfig.xml +195 -0
  225. data/{solr → lib/generators/blacklight/templates/solr}/conf/spellings.txt +0 -0
  226. data/{solr → lib/generators/blacklight/templates/solr}/conf/stopwords.txt +0 -0
  227. data/{solr → lib/generators/blacklight/templates/solr}/conf/stopwords_en.txt +0 -0
  228. data/{solr → lib/generators/blacklight/templates/solr}/conf/synonyms.txt +0 -0
  229. data/{solr → lib/generators/blacklight/templates/solr}/conf/xslt/example.xsl +0 -0
  230. data/{solr → lib/generators/blacklight/templates/solr}/conf/xslt/example_atom.xsl +0 -0
  231. data/{solr → lib/generators/blacklight/templates/solr}/conf/xslt/example_rss.xsl +0 -0
  232. data/{solr → lib/generators/blacklight/templates/solr}/conf/xslt/luke.xsl +0 -0
  233. data/lib/generators/blacklight/test_support_generator.rb +10 -10
  234. data/lib/generators/blacklight/user_generator.rb +3 -6
  235. data/lib/railties/blacklight.rake +19 -14
  236. data/package-lock.json +2057 -0
  237. data/package.json +28 -0
  238. data/spec/controllers/alternate_controller_spec.rb +1 -1
  239. data/spec/controllers/application_controller_spec.rb +1 -1
  240. data/spec/controllers/blacklight/base_spec.rb +1 -1
  241. data/spec/controllers/blacklight/catalog/component_configuration_spec.rb +11 -7
  242. data/spec/controllers/blacklight/facet_spec.rb +1 -1
  243. data/spec/controllers/blacklight/search_fields_spec.rb +1 -13
  244. data/spec/controllers/bookmarks_controller_spec.rb +1 -36
  245. data/spec/controllers/catalog_controller_spec.rb +153 -53
  246. data/spec/controllers/search_history_controller_spec.rb +2 -2
  247. data/spec/features/alternate_controller_spec.rb +1 -1
  248. data/spec/features/autocomplete_spec.rb +2 -2
  249. data/spec/features/bookmarks_spec.rb +10 -10
  250. data/spec/features/did_you_mean_spec.rb +3 -9
  251. data/spec/features/facets_spec.rb +11 -11
  252. data/spec/features/record_view_spec.rb +1 -6
  253. data/spec/features/search_context_spec.rb +2 -2
  254. data/spec/features/search_filters_spec.rb +41 -41
  255. data/spec/features/search_formats_spec.rb +1 -1
  256. data/spec/features/search_history_spec.rb +1 -26
  257. data/spec/features/search_pagination_spec.rb +1 -1
  258. data/spec/features/search_results_spec.rb +3 -4
  259. data/spec/features/search_sort_spec.rb +2 -2
  260. data/spec/features/search_spec.rb +5 -10
  261. data/{solr → spec/fixtures}/sample_solr_documents.yml +688 -688
  262. data/spec/helpers/{configuration_helper_spec.rb → blacklight/configuration_helper_behavior_spec.rb} +70 -65
  263. data/spec/helpers/{facets_helper_spec.rb → blacklight/facets_helper_behavior_spec.rb} +7 -8
  264. data/spec/helpers/{hash_as_hidden_fields_spec.rb → blacklight/hash_as_hidden_fields_behavior_spec.rb} +1 -1
  265. data/spec/helpers/blacklight/icon_helper_behavior_spec.rb +8 -0
  266. data/spec/helpers/{layout_helper_spec.rb → blacklight/layout_helper_behavior_spec.rb} +5 -15
  267. data/spec/helpers/{render_constraints_helper_spec.rb → blacklight/render_constraints_helper_behavior_spec.rb} +2 -3
  268. data/spec/helpers/blacklight/render_partials_helper_behavior_spec.rb +80 -0
  269. data/spec/helpers/{search_history_constraints_helper_spec.rb → blacklight/search_history_constraints_helper_behavior_spec.rb} +9 -9
  270. data/spec/helpers/{suggest_helper_spec.rb → blacklight/suggest_helper_behavior_spec.rb} +4 -2
  271. data/spec/helpers/{url_helper_spec.rb → blacklight/url_helper_behavior_spec.rb} +11 -15
  272. data/spec/helpers/blacklight_helper_spec.rb +36 -141
  273. data/spec/helpers/catalog_helper_spec.rb +37 -56
  274. data/spec/integration/generators/blacklight/{solr5_generator_spec.rb → solr_generator_spec.rb} +3 -3
  275. data/spec/lib/blacklight/configuration/facet_field_spec.rb +11 -0
  276. data/spec/lib/blacklight/configuration/field_spec.rb +12 -0
  277. data/spec/lib/blacklight/nested_open_struct_with_hash_access_spec.rb +17 -0
  278. data/spec/lib/blacklight/open_struct_with_hash_access_spec.rb +153 -0
  279. data/spec/lib/blacklight/parameters_spec.rb +1 -1
  280. data/spec/lib/blacklight/search_state_spec.rb +2 -2
  281. data/spec/lib/blacklight_spec.rb +1 -1
  282. data/spec/lib/tasks/blacklight_task_spec.rb +1 -1
  283. data/spec/models/blacklight/configurable_spec.rb +15 -16
  284. data/spec/models/blacklight/configuration/context_spec.rb +1 -1
  285. data/spec/models/blacklight/configuration_spec.rb +146 -135
  286. data/spec/models/blacklight/document/active_model_shim_spec.rb +11 -1
  287. data/spec/models/blacklight/document/cache_key_spec.rb +1 -1
  288. data/spec/models/blacklight/document/dublin_core_spec.rb +5 -5
  289. data/spec/models/blacklight/document/email_spec.rb +3 -3
  290. data/spec/models/blacklight/document/sms_spec.rb +3 -3
  291. data/spec/models/blacklight/document_spec.rb +3 -16
  292. data/spec/models/blacklight/facet_paginator_spec.rb +1 -1
  293. data/spec/models/blacklight/icon_spec.rb +34 -0
  294. data/spec/models/blacklight/search_builder_spec.rb +33 -27
  295. data/spec/models/blacklight/solr/document_spec.rb +18 -7
  296. data/spec/models/blacklight/solr/facet_paginator_spec.rb +1 -1
  297. data/spec/models/blacklight/solr/repository_spec.rb +32 -27
  298. data/spec/models/blacklight/solr/request_spec.rb +1 -1
  299. data/spec/models/blacklight/solr/response/facets_spec.rb +1 -1
  300. data/spec/models/blacklight/solr/response/group_response_spec.rb +1 -1
  301. data/spec/models/blacklight/solr/response/group_spec.rb +1 -1
  302. data/spec/models/blacklight/solr/response_spec.rb +9 -6
  303. data/spec/models/blacklight/solr/search_builder_spec.rb +35 -48
  304. data/spec/models/blacklight/suggest/response_spec.rb +4 -5
  305. data/spec/models/blacklight/suggest_search_spec.rb +14 -7
  306. data/spec/models/blacklight/user_spec.rb +1 -1
  307. data/spec/models/bookmark_spec.rb +1 -1
  308. data/spec/models/record_mailer_spec.rb +2 -2
  309. data/spec/models/search_spec.rb +15 -36
  310. data/spec/models/solr_document_spec.rb +3 -3
  311. data/spec/presenters/blacklight/search_bar_presenter_spec.rb +72 -0
  312. data/spec/presenters/index_presenter_spec.rb +70 -143
  313. data/spec/presenters/pipeline_spec.rb +4 -4
  314. data/spec/presenters/show_presenter_spec.rb +83 -145
  315. data/spec/presenters/thumbnail_presenter_spec.rb +171 -0
  316. data/spec/routing/catalog_routing_spec.rb +1 -32
  317. data/spec/services/blacklight/search_service_spec.rb +446 -0
  318. data/spec/spec_helper.rb +22 -9
  319. data/spec/test_app_templates/Gemfile.extra +2 -5
  320. data/spec/test_app_templates/lib/generators/test_app_generator.rb +1 -1
  321. data/spec/views/catalog/_constraints.html.erb_spec.rb +1 -3
  322. data/spec/views/catalog/_constraints_element.html.erb_spec.rb +8 -8
  323. data/spec/views/catalog/_document.html.erb_spec.rb +7 -7
  324. data/spec/views/catalog/_document_list.html.erb_spec.rb +1 -1
  325. data/spec/views/catalog/_facet_index_navigation.html.erb_spec.rb +1 -1
  326. data/spec/views/catalog/_facet_layout.html.erb_spec.rb +6 -6
  327. data/spec/views/catalog/_facets.html.erb_spec.rb +2 -2
  328. data/spec/views/catalog/{_index_default.erb_spec.rb → _index.html.erb_spec.rb} +1 -1
  329. data/spec/views/catalog/{_index_header_default.html.erb_spec.rb → _index_header.html.erb_spec.rb} +4 -4
  330. data/spec/views/catalog/_paginate_compact.html.erb_spec.rb +4 -27
  331. data/spec/views/catalog/_search_header.erb_spec.rb +1 -3
  332. data/spec/views/catalog/{_show_default.erb_spec.rb → _show.html.erb_spec.rb} +1 -1
  333. data/spec/views/catalog/_show_sidebar.erb_spec.rb +3 -3
  334. data/spec/views/catalog/_show_tools.html.erb_spec.rb +3 -3
  335. data/spec/views/catalog/_sort_and_per_page.html.erb_spec.rb +1 -1
  336. data/spec/views/catalog/{_thumbnail_default.erb_spec.rb → _thumbnail.html.erb_spec.rb} +3 -3
  337. data/spec/views/catalog/_view_type_group.html.erb_spec.rb +5 -1
  338. data/spec/views/catalog/email_success.html.erb_spec.rb +9 -0
  339. data/spec/views/catalog/facet.html.erb_spec.rb +1 -1
  340. data/spec/views/catalog/facet.json.jbuilder_spec.rb +1 -1
  341. data/spec/views/catalog/index.atom.builder_spec.rb +2 -2
  342. data/spec/views/catalog/index.html.erb_spec.rb +4 -7
  343. data/spec/views/catalog/index.json.jbuilder_spec.rb +66 -21
  344. data/spec/views/catalog/opensearch.xml.builder_spec.rb +1 -1
  345. data/spec/views/catalog/show.html.erb_spec.rb +2 -2
  346. data/spec/views/catalog/sms_success.html.erb_spec.rb +9 -0
  347. data/spec/views/{_user_util_links.html.erb_spec.rb → shared/_user_util_links.html.erb_spec.rb} +4 -4
  348. data/tasks/blacklight.rake +28 -47
  349. data/template.demo.rb +1 -11
  350. metadata +172 -196
  351. data/.docker/app/Dockerfile +0 -28
  352. data/.docker/app/entrypoint.sh +0 -6
  353. data/.dockerignore +0 -3
  354. data/.env +0 -5
  355. data/.github/workflows/ruby.yml +0 -61
  356. data/app/assets/javascripts/blacklight/autofocus.js +0 -16
  357. data/app/assets/javascripts/blacklight/bookmark_toggle.js +0 -23
  358. data/app/assets/javascripts/blacklight/checkbox_submit.js +0 -139
  359. data/app/assets/javascripts/blacklight/core.js +0 -30
  360. data/app/controllers/concerns/blacklight/request_builders.rb +0 -77
  361. data/app/controllers/concerns/blacklight/saved_searches.rb +0 -70
  362. data/app/controllers/concerns/blacklight/search_helper.rb +0 -161
  363. data/app/controllers/concerns/blacklight/suggest.rb +0 -25
  364. data/app/controllers/saved_searches_controller.rb +0 -4
  365. data/app/controllers/suggest_controller.rb +0 -4
  366. data/app/helpers/blacklight/deprecated_url_helper_behavior.rb +0 -57
  367. data/app/helpers/blacklight/render_partials_helper.rb +0 -205
  368. data/app/helpers/blacklight_configuration_helper.rb +0 -4
  369. data/app/helpers/blacklight_url_helper.rb +0 -4
  370. data/app/helpers/component_helper.rb +0 -4
  371. data/app/helpers/facets_helper.rb +0 -4
  372. data/app/helpers/hash_as_hidden_fields_helper.rb +0 -4
  373. data/app/helpers/layout_helper.rb +0 -4
  374. data/app/helpers/render_constraints_helper.rb +0 -4
  375. data/app/helpers/search_history_constraints_helper.rb +0 -4
  376. data/app/helpers/suggest_helper.rb +0 -4
  377. data/app/models/concerns/blacklight/solr/document/more_like_this.rb +0 -6
  378. data/app/presenters/blacklight/document_presenter.rb +0 -153
  379. data/app/services/blacklight/search_params_yaml_coder.rb +0 -48
  380. data/app/views/_user_util_links.html.erb +0 -26
  381. data/app/views/blacklight/nav/_saved_searches.html.erb +0 -1
  382. data/app/views/catalog/_index_default.html.erb +0 -12
  383. data/app/views/catalog/_show_default.html.erb +0 -10
  384. data/app/views/catalog/_thumbnail_default.html.erb +0 -5
  385. data/app/views/saved_searches/index.html.erb +0 -32
  386. data/app/views/shared/_ajax_modal.html.erb +0 -6
  387. data/docker-compose.yml +0 -38
  388. data/lib/blacklight/utils.rb +0 -183
  389. data/lib/generators/blacklight/solr4_generator.rb +0 -31
  390. data/solr/conf/schema.xml +0 -627
  391. data/solr/conf/solrconfig.xml +0 -411
  392. data/spec/controllers/blacklight/search_helper_spec.rb +0 -489
  393. data/spec/controllers/saved_searches_controller_spec.rb +0 -32
  394. data/spec/controllers/suggest_controller_spec.rb +0 -17
  395. data/spec/features/saved_searches_spec.rb +0 -47
  396. data/spec/helpers/deprecated_url_helper_behavior_spec.rb +0 -101
  397. data/spec/lib/blacklight/utils_spec.rb +0 -167
  398. data/spec/models/blacklight/solr/document/more_like_this_spec.rb +0 -18
  399. data/spec/presenters/document_presenter_spec.rb +0 -438
  400. data/spec/support/backport_test.rb +0 -14
@@ -1,183 +0,0 @@
1
- # frozen_string_literal: true
2
- require 'ostruct'
3
- module Blacklight
4
- module Utils
5
- def self.needs_attr_accessible?
6
- protected_attributes_enabled?
7
- end
8
-
9
- def self.protected_attributes_enabled?
10
- defined?(ActiveModel::MassAssignmentSecurity)
11
- end
12
- end
13
-
14
- ##
15
- # An OpenStruct that responds to common Hash methods
16
- class OpenStructWithHashAccess < OpenStruct
17
- delegate :keys, :each, :map, :has_key?, :key?, :include?, :empty?, :length, :delete, :delete_if, :keep_if, :clear, :reject!, :select!, :replace, :fetch, :to_json, :as_json, :any?, to: :to_h
18
-
19
- ##
20
- # Expose the internal hash
21
- # @return [Hash]
22
- def to_h
23
- @table
24
- end
25
-
26
- def select *args, &block
27
- self.class.new to_h.select(*args, &block)
28
- end
29
-
30
- def sort_by *args, &block
31
- self.class.new Hash[to_h.sort_by(*args, &block)]
32
- end
33
-
34
- def sort_by! *args, &block
35
- replace Hash[to_h.sort_by(*args, &block)]
36
- self
37
- end
38
-
39
- ##
40
- # Merge the values of this OpenStruct with another OpenStruct or Hash
41
- # @param [Hash,#to_h] other_hash
42
- # @return [OpenStructWithHashAccess] a new instance of an OpenStructWithHashAccess
43
- def merge other_hash
44
- self.class.new to_h.merge((other_hash if other_hash.is_a? Hash) || other_hash.to_h)
45
- end
46
-
47
- ##
48
- # Merge the values of another OpenStruct or Hash into this object
49
- # @param [Hash,#to_h] other_hash
50
- # @return [OpenStructWithHashAccess] a new instance of an OpenStructWithHashAccess
51
- def merge! other_hash
52
- @table.merge!((other_hash if other_hash.is_a? Hash) || other_hash.to_h)
53
- end
54
-
55
- def deep_dup
56
- self.class.new @table.deep_dup
57
- end
58
- end
59
-
60
- ##
61
- # An OpenStruct refinement that converts any hash-keys into
62
- # additional instances of NestedOpenStructWithHashAccess
63
- class NestedOpenStructWithHashAccess < OpenStructWithHashAccess
64
- attr_reader :nested_class
65
- delegate :default_proc=, :to => :to_h
66
-
67
- def initialize klass, *args
68
- @nested_class = klass
69
- hash = {}
70
-
71
- hashes_and_keys = args.flatten
72
- lazy_configs = hashes_and_keys.extract_options!
73
-
74
- hashes_and_keys.each do |v|
75
- if v.is_a? Hash
76
- key = v.first
77
- value = v[key]
78
-
79
- hash[key] = nested_class.new value
80
- else
81
- hash[v] = nested_class.new
82
- end
83
- end
84
-
85
- lazy_configs.each do |k,v|
86
- hash[k] = if v.is_a? nested_class
87
- v
88
- else
89
- nested_class.new v
90
- end
91
- end
92
-
93
- super hash
94
- set_default_proc!
95
- end
96
-
97
- ##
98
- # Add an new key to the object, with a default default
99
- def << key
100
- @table[key]
101
- end
102
-
103
- ##
104
- # Add a new key/value to the object; if it's a Hash, turn it
105
- # into another NestedOpenStructWithHashAccess
106
- def []=(key, value)
107
- if value.is_a? Hash
108
- send "#{key}=", nested_class.new(value)
109
- else
110
- super
111
- end
112
- end
113
-
114
- ##
115
- # Before serializing, we need to reset the default proc
116
- # so it can be serialized appropriately
117
- def marshal_dump
118
- h = to_h.dup
119
- h.default = nil
120
-
121
- [nested_class, h]
122
- end
123
-
124
- ##
125
- # After deserializing, we need to re-add the default proc
126
- # to the internal hash
127
- def marshal_load x
128
- @nested_class = x.first
129
- super x.last
130
- set_default_proc!
131
- end
132
-
133
- def deep_dup
134
- self.class.new self.nested_class, @table.deep_dup
135
- end
136
-
137
- def select *args, &block
138
- self.class.new nested_class, to_h.select(*args, &block)
139
- end
140
-
141
- ##
142
- # Merge the values of this OpenStruct with another OpenStruct or Hash
143
- # @param [Hash,#to_h] other_hash
144
- # @return [OpenStructWithHashAccess] a new instance of an OpenStructWithHashAccess
145
- def merge other_hash
146
- self.class.new nested_class, to_h.merge((other_hash if other_hash.is_a? Hash) || other_hash.to_h)
147
- end
148
-
149
- ##
150
- # Merge the values of another OpenStruct or Hash into this object
151
- # @param [Hash,#to_h] other_hash
152
- # @return [OpenStructWithHashAccess] a new instance of an OpenStructWithHashAccess
153
- def merge! other_hash
154
- @table.merge!(nested_class, (other_hash if other_hash.is_a? Hash) || other_hash.to_h)
155
- end
156
-
157
- ##
158
- # Override #method_missing from OpenStruct to ensure the default_proc logic
159
- # gets triggered.
160
- def method_missing(mid, *args)
161
- len = args.length
162
-
163
- if len.zero?
164
- if respond_to?(:new_ostruct_member!, true)
165
- new_ostruct_member!(mid)
166
- else
167
- new_ostruct_member(mid)
168
- end
169
- @table[mid]
170
- else
171
- super
172
- end
173
- end
174
-
175
- private
176
-
177
- def set_default_proc!
178
- self.default_proc = lambda do |hash, key|
179
- hash[key] = self.nested_class.new
180
- end
181
- end
182
- end
183
- end
@@ -1,31 +0,0 @@
1
- # frozen_string_literal: true
2
- require 'rails/generators'
3
-
4
- module Blacklight
5
- class Solr4Generator < Rails::Generators::Base
6
- source_root File.expand_path('../templates', __FILE__)
7
-
8
- class_option :jettywrapper, type: :boolean, default: false, desc: "Use jettywrapper to download and control Jetty"
9
-
10
- desc <<-EOS
11
- This generator makes the following changes to your application:
12
- 1. Installs jettywrapper into your application
13
- 2. Adds rsolr to your Gemfile
14
- EOS
15
-
16
- def install_jettywrapper
17
- return unless options[:jettywrapper]
18
-
19
- gem "jettywrapper".dup, ">= 2.0"
20
- copy_file "config/jetty.yml", "config/jetty.yml"
21
-
22
- append_to_file "Rakefile",
23
- "\nZIP_URL = \"https://github.com/projectblacklight/blacklight-jetty/archive/v4.10.4.zip\"\n" \
24
- "require 'jettywrapper'\n"
25
- end
26
-
27
- def add_rsolr_gem
28
- gem "rsolr".dup, '>= 1.0', '< 3'
29
- end
30
- end
31
- end