blacklight 7.0.0 → 7.4.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (141) hide show
  1. checksums.yaml +4 -4
  2. data/.jshintrc +3 -1
  3. data/.rubocop_todo.yml +54 -62
  4. data/.travis.yml +19 -18
  5. data/CONTRIBUTING.md +50 -0
  6. data/Gemfile +2 -0
  7. data/VERSION +1 -1
  8. data/app/assets/images/blacklight/list.svg +1 -1
  9. data/app/assets/images/blacklight/search.svg +1 -1
  10. data/app/assets/javascripts/blacklight/blacklight.js +130 -132
  11. data/app/assets/stylesheets/blacklight/_bootstrap_overrides.scss +17 -13
  12. data/app/assets/stylesheets/blacklight/_constraints.scss +1 -1
  13. data/app/assets/stylesheets/blacklight/_facets.scss +3 -0
  14. data/app/assets/stylesheets/blacklight/_header.scss +26 -0
  15. data/app/assets/stylesheets/blacklight/_icons.scss +6 -6
  16. data/app/assets/stylesheets/blacklight/_mixins.scss +3 -3
  17. data/app/assets/stylesheets/blacklight/_pagination.scss +6 -0
  18. data/app/assets/stylesheets/blacklight/_search_results.scss +3 -3
  19. data/app/controllers/concerns/blacklight/bookmarks.rb +1 -0
  20. data/app/controllers/concerns/blacklight/catalog.rb +2 -9
  21. data/app/controllers/concerns/blacklight/facet.rb +20 -9
  22. data/app/controllers/concerns/blacklight/searchable.rb +17 -0
  23. data/app/helpers/blacklight/blacklight_helper_behavior.rb +7 -6
  24. data/app/helpers/blacklight/catalog_helper_behavior.rb +25 -22
  25. data/app/helpers/blacklight/component_helper_behavior.rb +2 -2
  26. data/app/helpers/blacklight/configuration_helper_behavior.rb +3 -3
  27. data/app/helpers/blacklight/facets_helper_behavior.rb +26 -5
  28. data/app/helpers/blacklight/layout_helper_behavior.rb +9 -2
  29. data/app/helpers/blacklight/render_partials_helper_behavior.rb +13 -9
  30. data/app/helpers/blacklight/url_helper_behavior.rb +5 -5
  31. data/app/javascript/blacklight/button_focus.js +9 -0
  32. data/app/javascript/blacklight/checkbox_submit.js +3 -3
  33. data/app/javascript/blacklight/facet_load.js +18 -19
  34. data/app/javascript/blacklight/search_context.js +67 -49
  35. data/app/models/blacklight/icon.rb +28 -5
  36. data/app/models/concerns/blacklight/document/email.rb +4 -4
  37. data/app/models/concerns/blacklight/document/sms.rb +2 -2
  38. data/app/models/record_mailer.rb +4 -1
  39. data/app/models/search.rb +1 -1
  40. data/app/presenters/blacklight/document_presenter.rb +74 -4
  41. data/app/presenters/blacklight/field_presenter.rb +26 -12
  42. data/app/presenters/blacklight/index_presenter.rb +11 -51
  43. data/app/presenters/blacklight/json_presenter.rb +1 -1
  44. data/app/presenters/blacklight/rendering/pipeline.rb +20 -5
  45. data/app/presenters/blacklight/search_bar_presenter.rb +3 -1
  46. data/app/presenters/blacklight/show_presenter.rb +6 -53
  47. data/app/presenters/blacklight/thumbnail_presenter.rb +14 -4
  48. data/app/services/blacklight/field_retriever.rb +7 -1
  49. data/app/services/blacklight/search_service.rb +4 -3
  50. data/app/views/catalog/_bookmark_control.html.erb +11 -13
  51. data/app/views/catalog/_citation.html.erb +23 -18
  52. data/app/views/catalog/_constraints_element.html.erb +1 -1
  53. data/app/views/catalog/_document.atom.builder +2 -2
  54. data/app/views/catalog/_document.rss.builder +2 -2
  55. data/app/views/catalog/_facet_group.html.erb +19 -0
  56. data/app/views/catalog/_facet_layout.html.erb +13 -4
  57. data/app/views/catalog/_facets.html.erb +3 -18
  58. data/app/views/catalog/_opensearch_response_metadata.html.erb +3 -3
  59. data/app/views/catalog/_per_page_widget.html.erb +1 -1
  60. data/app/views/catalog/_search_form.html.erb +2 -2
  61. data/app/views/catalog/_search_results.html.erb +5 -1
  62. data/app/views/catalog/_show_sidebar.html.erb +7 -5
  63. data/app/views/catalog/_show_tools.html.erb +0 -9
  64. data/app/views/catalog/_sort_widget.html.erb +1 -1
  65. data/app/views/catalog/citation.html.erb +1 -1
  66. data/app/views/catalog/citation.js.erb +1 -9
  67. data/app/views/catalog/index.atom.builder +16 -15
  68. data/app/views/catalog/index.json.jbuilder +2 -3
  69. data/app/views/catalog/index.rss.builder +1 -1
  70. data/app/views/catalog/show.html.erb +1 -1
  71. data/app/views/catalog/show.json.jbuilder +3 -3
  72. data/app/views/layouts/blacklight.html.erb +2 -2
  73. data/app/views/layouts/blacklight/base.html.erb +12 -7
  74. data/app/views/record_mailer/email_record.text.erb +6 -5
  75. data/app/views/shared/_flash_msg.html.erb +5 -3
  76. data/app/views/shared/_header_navbar.html.erb +1 -1
  77. data/blacklight.gemspec +5 -7
  78. data/config/i18n-tasks.yml +1 -1
  79. data/config/locales/blacklight.ar.yml +250 -0
  80. data/config/locales/blacklight.de.yml +17 -2
  81. data/config/locales/blacklight.en.yml +17 -2
  82. data/config/locales/blacklight.es.yml +17 -2
  83. data/config/locales/blacklight.fr.yml +17 -2
  84. data/config/locales/blacklight.hu.yml +25 -3
  85. data/config/locales/blacklight.it.yml +17 -2
  86. data/config/locales/blacklight.nl.yml +25 -3
  87. data/config/locales/blacklight.pt-BR.yml +17 -2
  88. data/config/locales/blacklight.sq.yml +26 -2
  89. data/config/locales/blacklight.zh.yml +25 -3
  90. data/lib/blacklight/configuration.rb +24 -5
  91. data/lib/blacklight/engine.rb +5 -4
  92. data/lib/blacklight/solr.rb +2 -0
  93. data/{app/models/concerns → lib}/blacklight/solr/document.rb +0 -0
  94. data/{app/models → lib}/blacklight/solr/facet_paginator.rb +0 -0
  95. data/lib/blacklight/solr/response/facets.rb +9 -0
  96. data/lib/blacklight/solr/response/group_response.rb +10 -0
  97. data/lib/blacklight/solr/response/pagination_methods.rb +12 -0
  98. data/lib/blacklight/solr/search_builder_behavior.rb +2 -2
  99. data/lib/generators/blacklight/assets_generator.rb +17 -2
  100. data/lib/generators/blacklight/install_generator.rb +1 -10
  101. data/lib/generators/blacklight/templates/solr/conf/solrconfig.xml +1 -1
  102. data/package-lock.json +2210 -1612
  103. data/package.json +7 -6
  104. data/spec/controllers/bookmarks_controller_spec.rb +4 -0
  105. data/spec/controllers/catalog_controller_spec.rb +3 -3
  106. data/spec/features/facets_spec.rb +22 -1
  107. data/spec/features/search_filters_spec.rb +25 -5
  108. data/spec/features/search_formats_spec.rb +3 -4
  109. data/spec/features/search_spec.rb +5 -0
  110. data/spec/helpers/blacklight/configuration_helper_behavior_spec.rb +4 -6
  111. data/spec/helpers/blacklight/facets_helper_behavior_spec.rb +10 -6
  112. data/spec/helpers/blacklight/layout_helper_behavior_spec.rb +14 -4
  113. data/spec/helpers/blacklight/url_helper_behavior_spec.rb +10 -5
  114. data/spec/helpers/blacklight_helper_spec.rb +42 -0
  115. data/spec/helpers/catalog_helper_spec.rb +20 -11
  116. data/spec/models/blacklight/configuration_spec.rb +32 -10
  117. data/spec/models/blacklight/document/cache_key_spec.rb +1 -1
  118. data/spec/models/blacklight/icon_spec.rb +40 -2
  119. data/spec/models/blacklight/solr/response/facets_spec.rb +39 -2
  120. data/spec/models/blacklight/solr/response/group_response_spec.rb +13 -0
  121. data/spec/models/blacklight/solr/response_spec.rb +20 -17
  122. data/spec/models/blacklight/suggest/response_spec.rb +1 -1
  123. data/spec/models/solr_document_spec.rb +1 -1
  124. data/spec/presenters/blacklight/document_presenter_spec.rb +9 -14
  125. data/spec/presenters/blacklight/search_bar_presenter_spec.rb +15 -0
  126. data/spec/presenters/blacklight/show_presenter_spec.rb +23 -6
  127. data/spec/presenters/pipeline_spec.rb +25 -5
  128. data/spec/presenters/thumbnail_presenter_spec.rb +1 -2
  129. data/spec/services/blacklight/search_service_spec.rb +8 -1
  130. data/spec/spec_helper.rb +2 -11
  131. data/spec/views/catalog/_facet_group.html.erb_spec.rb +82 -0
  132. data/spec/views/catalog/_facet_layout.html.erb_spec.rb +4 -3
  133. data/spec/views/catalog/_facets.html.erb_spec.rb +5 -43
  134. data/spec/views/catalog/_show_sidebar.erb_spec.rb +3 -3
  135. data/spec/views/catalog/_show_tools.html.erb_spec.rb +1 -1
  136. data/spec/views/catalog/index.html.erb_spec.rb +1 -1
  137. data/tasks/blacklight.rake +3 -10
  138. data/template.demo.rb +2 -2
  139. metadata +31 -49
  140. data/.solr_wrapper.yml +0 -12
  141. data/app/javascript/blacklight/collapsable.js +0 -9
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 85a532b997b308e09d4a8a2e9d32dad2875f6a5a9b47f3b02fcdff79bd237b2e
4
- data.tar.gz: d103e0ede5a6c2bfb658ff7ec3dfe049d63aa261d3f8ba2e6f41273702c465cf
3
+ metadata.gz: 05d5576219e73622cf05af970590c5492d1e7f18a2b1a3654fb26de71d424b64
4
+ data.tar.gz: 94a2e2b0b64d07b4fe0083df1e7658130c6d9dfba7c3acae4ee5b930a1ceb74c
5
5
  SHA512:
6
- metadata.gz: dfe1f7f5c84c9643861c8bf0e471190a0f364439c88ed19bc94ec66b52f18bc70092415016759d0118eb8372470fd85d56c775529732c46dbfbf52f0c7d83dbb
7
- data.tar.gz: 212410aeded08255f08403d19fea41311426441d442d18dd9f54d451641eae9c93d03f016ca2dbda56aff5a70333ff08ae162bf4b5ca6980bf068666ffc8e636
6
+ metadata.gz: 9d8fbf65bfad8b2d4dfac62bb3048dfdebca06f4752b6b66bfbfce218afa1b5deef6b7865896056760c1f7265e7d5968ffa3d52511ce49d54004a118191261b9
7
+ data.tar.gz: f1921d4f36915aa5761788ae8a80ddb1836777c2a6db8613d01987930af30ac8d2a273ccea62ecdbcb502c3716747a4ea551a64cc02b3cda7e1ade71067ddbb2
data/.jshintrc CHANGED
@@ -1,4 +1,5 @@
1
1
  {
2
+ "asi": true,
2
3
  "browser": true,
3
4
  "jquery": true,
4
5
  "node": true,
@@ -15,6 +16,7 @@
15
16
  "unused": true,
16
17
  "eqnull": true,
17
18
  "predef": [
18
- "Blacklight"
19
+ "Blacklight",
20
+ "Rails"
19
21
  ]
20
22
  }
@@ -1,12 +1,13 @@
1
1
  # This configuration was generated by
2
2
  # `rubocop --auto-gen-config`
3
- # on 2018-10-31 21:34:01 -0500 using RuboCop version 0.60.0.
3
+ # on 2019-09-11 10:59:32 -0500 using RuboCop version 0.63.1.
4
4
  # The point is for the user to remove these configuration records
5
5
  # one by one as the offenses are removed from the code base.
6
6
  # Note that changes in the inspected code, or installation of new
7
7
  # versions of RuboCop, may require this file to be generated again.
8
8
 
9
9
  # Offense count: 4
10
+ # Cop supports --auto-correct.
10
11
  Capybara/CurrentPathExpectation:
11
12
  Exclude:
12
13
  - 'spec/features/alternate_controller_spec.rb'
@@ -68,11 +69,10 @@ Layout/LeadingCommentSpace:
68
69
  - 'app/models/concerns/blacklight/document/export.rb'
69
70
  - 'app/views/catalog/_document.atom.builder'
70
71
 
71
- # Offense count: 2
72
+ # Offense count: 1
72
73
  # Cop supports --auto-correct.
73
74
  Layout/MultilineBlockLayout:
74
75
  Exclude:
75
- - 'lib/generators/blacklight/install_generator.rb'
76
76
  - 'lib/generators/blacklight/test_support_generator.rb'
77
77
 
78
78
  # Offense count: 2
@@ -126,14 +126,12 @@ Layout/SpaceInsideParens:
126
126
  - 'app/views/catalog/_document.rss.builder'
127
127
  - 'app/views/catalog/index.atom.builder'
128
128
 
129
- # Offense count: 27
129
+ # Offense count: 1
130
130
  # Cop supports --auto-correct.
131
131
  # Configuration parameters: AllowInHeredoc.
132
132
  Layout/TrailingWhitespace:
133
133
  Exclude:
134
- - 'app/views/catalog/_document.atom.builder'
135
134
  - 'app/views/catalog/_document.rss.builder'
136
- - 'app/views/catalog/index.atom.builder'
137
135
 
138
136
  # Offense count: 1
139
137
  Lint/AmbiguousBlockAssociation:
@@ -151,7 +149,7 @@ Lint/AmbiguousOperator:
151
149
  - 'spec/models/blacklight/solr/search_builder_spec.rb'
152
150
  - 'spec/services/blacklight/search_service_spec.rb'
153
151
 
154
- # Offense count: 58
152
+ # Offense count: 55
155
153
  Lint/AmbiguousRegexpLiteral:
156
154
  Exclude:
157
155
  - 'spec/controllers/catalog_controller_spec.rb'
@@ -187,7 +185,7 @@ Lint/UselessComparison:
187
185
  Exclude:
188
186
  - 'spec/models/blacklight/document/active_model_shim_spec.rb'
189
187
 
190
- # Offense count: 57
188
+ # Offense count: 58
191
189
  Metrics/AbcSize:
192
190
  Max: 49
193
191
 
@@ -211,7 +209,7 @@ Metrics/ClassLength:
211
209
  Metrics/CyclomaticComplexity:
212
210
  Max: 12
213
211
 
214
- # Offense count: 46
212
+ # Offense count: 48
215
213
  # Configuration parameters: CountComments, ExcludedMethods.
216
214
  Metrics/MethodLength:
217
215
  Max: 35
@@ -219,7 +217,7 @@ Metrics/MethodLength:
219
217
  # Offense count: 8
220
218
  # Configuration parameters: CountComments.
221
219
  Metrics/ModuleLength:
222
- Max: 215
220
+ Max: 210
223
221
 
224
222
  # Offense count: 1
225
223
  # Configuration parameters: CountKeywordArgs.
@@ -247,15 +245,15 @@ Naming/UncommunicativeMethodParamName:
247
245
  Exclude:
248
246
  - 'app/models/blacklight/facet_paginator.rb'
249
247
  - 'app/models/concerns/blacklight/document.rb'
250
- - 'app/models/concerns/blacklight/solr/document.rb'
251
248
  - 'app/presenters/blacklight/rendering/link_to_facet.rb'
252
249
  - 'lib/blacklight/nested_open_struct_with_hash_access.rb'
253
250
  - 'lib/blacklight/search_state.rb'
251
+ - 'lib/blacklight/solr/document.rb'
254
252
  - 'lib/blacklight/solr/search_builder_behavior.rb'
255
253
  - 'spec/features/search_context_spec.rb'
256
254
  - 'spec/features/search_results_spec.rb'
257
255
 
258
- # Offense count: 15
256
+ # Offense count: 16
259
257
  # Configuration parameters: EnforcedStyle.
260
258
  # SupportedStyles: snake_case, normalcase, non_integer
261
259
  Naming/VariableNumber:
@@ -271,11 +269,10 @@ Performance/TimesMap:
271
269
  Exclude:
272
270
  - 'spec/views/catalog/index.atom.builder_spec.rb'
273
271
 
274
- # Offense count: 3
272
+ # Offense count: 2
275
273
  Performance/UnfreezeString:
276
274
  Exclude:
277
275
  - 'lib/generators/blacklight/install_generator.rb'
278
- - 'spec/helpers/blacklight/url_helper_behavior_spec.rb'
279
276
  - 'spec/helpers/blacklight_helper_spec.rb'
280
277
 
281
278
  # Offense count: 9
@@ -293,7 +290,7 @@ RSpec/BeforeAfterAll:
293
290
  - 'spec/models/blacklight/document/sms_spec.rb'
294
291
  - 'spec/models/blacklight/solr/document_spec.rb'
295
292
 
296
- # Offense count: 70
293
+ # Offense count: 71
297
294
  # Configuration parameters: Prefixes.
298
295
  # Prefixes: when, with, without
299
296
  RSpec/ContextWording:
@@ -309,7 +306,7 @@ RSpec/EmptyExampleGroup:
309
306
  Exclude:
310
307
  - 'spec/models/blacklight/solr/search_builder_spec.rb'
311
308
 
312
- # Offense count: 126
309
+ # Offense count: 127
313
310
  # Configuration parameters: Max.
314
311
  RSpec/ExampleLength:
315
312
  Enabled: false
@@ -333,7 +330,7 @@ RSpec/FilePath:
333
330
  - 'spec/presenters/pipeline_spec.rb'
334
331
  - 'spec/presenters/thumbnail_presenter_spec.rb'
335
332
 
336
- # Offense count: 194
333
+ # Offense count: 196
337
334
  # Configuration parameters: AssignmentOnly.
338
335
  RSpec/InstanceVariable:
339
336
  Enabled: false
@@ -345,6 +342,18 @@ RSpec/IteratedExpectation:
345
342
  - 'spec/models/blacklight/solr/response/group_spec.rb'
346
343
  - 'spec/models/blacklight/solr/response_spec.rb'
347
344
 
345
+ # Offense count: 17
346
+ RSpec/LeakyConstantDeclaration:
347
+ Exclude:
348
+ - 'spec/controllers/blacklight/search_fields_spec.rb'
349
+ - 'spec/controllers/bookmarks_controller_spec.rb'
350
+ - 'spec/controllers/catalog_controller_spec.rb'
351
+ - 'spec/models/blacklight/configurable_spec.rb'
352
+ - 'spec/models/blacklight/document/active_model_shim_spec.rb'
353
+ - 'spec/models/blacklight/document_spec.rb'
354
+ - 'spec/models/blacklight/solr/document_spec.rb'
355
+ - 'spec/presenters/blacklight/show_presenter_spec.rb'
356
+
348
357
  # Offense count: 8
349
358
  RSpec/MessageChain:
350
359
  Exclude:
@@ -352,18 +361,33 @@ RSpec/MessageChain:
352
361
  - 'spec/presenters/blacklight/show_presenter_spec.rb'
353
362
  - 'spec/views/shared/_user_util_links.html.erb_spec.rb'
354
363
 
355
- # Offense count: 62
356
- # Configuration parameters: .
364
+ # Offense count: 67
365
+ # Configuration parameters: EnforcedStyle.
357
366
  # SupportedStyles: have_received, receive
358
367
  RSpec/MessageSpies:
359
- Enabled: false
368
+ Exclude:
369
+ - 'spec/controllers/catalog_controller_spec.rb'
370
+ - 'spec/helpers/blacklight/configuration_helper_behavior_spec.rb'
371
+ - 'spec/helpers/blacklight/facets_helper_behavior_spec.rb'
372
+ - 'spec/helpers/blacklight/render_constraints_helper_behavior_spec.rb'
373
+ - 'spec/helpers/blacklight/suggest_helper_behavior_spec.rb'
374
+ - 'spec/helpers/blacklight/url_helper_behavior_spec.rb'
375
+ - 'spec/helpers/blacklight_helper_spec.rb'
376
+ - 'spec/helpers/catalog_helper_spec.rb'
377
+ - 'spec/lib/blacklight/configuration/facet_field_spec.rb'
378
+ - 'spec/models/blacklight/search_builder_spec.rb'
379
+ - 'spec/models/blacklight/suggest_search_spec.rb'
380
+ - 'spec/presenters/blacklight/index_presenter_spec.rb'
381
+ - 'spec/presenters/blacklight/show_presenter_spec.rb'
382
+ - 'spec/presenters/thumbnail_presenter_spec.rb'
360
383
 
361
- # Offense count: 339
384
+ # Offense count: 346
362
385
  # Configuration parameters: AggregateFailuresByDefault.
363
386
  RSpec/MultipleExpectations:
364
387
  Max: 16
365
388
 
366
- # Offense count: 326
389
+ # Offense count: 332
390
+ # Configuration parameters: IgnoreSharedExamples.
367
391
  RSpec/NamedSubject:
368
392
  Enabled: false
369
393
 
@@ -392,13 +416,14 @@ RSpec/ScatteredLet:
392
416
  - 'spec/models/blacklight/solr/search_builder_spec.rb'
393
417
  - 'spec/views/catalog/index.atom.builder_spec.rb'
394
418
 
395
- # Offense count: 4
419
+ # Offense count: 10
396
420
  RSpec/SubjectStub:
397
421
  Exclude:
398
422
  - 'spec/lib/blacklight/search_state_spec.rb'
423
+ - 'spec/models/blacklight/search_builder_spec.rb'
399
424
  - 'spec/services/blacklight/search_service_spec.rb'
400
425
 
401
- # Offense count: 117
426
+ # Offense count: 119
402
427
  # Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
403
428
  RSpec/VerifiedDoubles:
404
429
  Enabled: false
@@ -408,13 +433,6 @@ RSpec/VoidExpect:
408
433
  Exclude:
409
434
  - 'spec/lib/blacklight/configuration/facet_field_spec.rb'
410
435
 
411
- # Offense count: 1
412
- # Cop supports --auto-correct.
413
- # Configuration parameters: NilOrEmpty, NotPresent, UnlessPresent.
414
- Rails/Blank:
415
- Exclude:
416
- - 'lib/blacklight/solr/search_builder_behavior.rb'
417
-
418
436
  # Offense count: 4
419
437
  # Configuration parameters: EnforcedStyle.
420
438
  # SupportedStyles: strict, flexible
@@ -422,18 +440,6 @@ Rails/Date:
422
440
  Exclude:
423
441
  - 'spec/models/search_spec.rb'
424
442
 
425
- # Offense count: 13
426
- # Cop supports --auto-correct.
427
- # Configuration parameters: NotNilAndNotEmpty, NotBlank, UnlessBlank.
428
- Rails/Present:
429
- Exclude:
430
- - 'app/controllers/concerns/blacklight/catalog.rb'
431
- - 'app/helpers/blacklight/component_helper_behavior.rb'
432
- - 'app/helpers/blacklight/facets_helper_behavior.rb'
433
- - 'app/models/concerns/blacklight/document/email.rb'
434
- - 'app/models/concerns/blacklight/document/sms.rb'
435
- - 'lib/blacklight/solr/search_builder_behavior.rb'
436
-
437
443
  # Offense count: 1
438
444
  # Configuration parameters: EnforcedStyle.
439
445
  # SupportedStyles: strict, flexible
@@ -481,7 +487,7 @@ Style/BracesAroundHashParameters:
481
487
  - 'lib/blacklight/solr/response/facets.rb'
482
488
  - 'lib/generators/blacklight/test_support_generator.rb'
483
489
 
484
- # Offense count: 50
490
+ # Offense count: 51
485
491
  # Cop supports --auto-correct.
486
492
  # Configuration parameters: AutoCorrect, EnforcedStyle.
487
493
  # SupportedStyles: nested, compact
@@ -502,13 +508,7 @@ Style/ConditionalAssignment:
502
508
  Exclude:
503
509
  - 'lib/blacklight/solr/response/spelling.rb'
504
510
 
505
- # Offense count: 1
506
- # Configuration parameters: AllowCoercion.
507
- Style/DateTime:
508
- Exclude:
509
- - 'spec/models/blacklight/solr/search_builder_spec.rb'
510
-
511
- # Offense count: 93
511
+ # Offense count: 94
512
512
  Style/Documentation:
513
513
  Enabled: false
514
514
 
@@ -548,15 +548,7 @@ Style/GuardClause:
548
548
  - 'app/helpers/blacklight/catalog_helper_behavior.rb'
549
549
  - 'lib/blacklight/solr/search_builder_behavior.rb'
550
550
 
551
- # Offense count: 1
552
- # Cop supports --auto-correct.
553
- # Configuration parameters: EnforcedStyle, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
554
- # SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
555
- Style/HashSyntax:
556
- Exclude:
557
- - 'app/helpers/blacklight/url_helper_behavior.rb'
558
-
559
- # Offense count: 39
551
+ # Offense count: 40
560
552
  # Cop supports --auto-correct.
561
553
  Style/IfUnlessModifier:
562
554
  Enabled: false
@@ -595,9 +587,9 @@ Style/NumericPredicate:
595
587
  Exclude:
596
588
  - 'spec/**/*'
597
589
  - 'app/helpers/blacklight/catalog_helper_behavior.rb'
598
- - 'app/models/blacklight/solr/facet_paginator.rb'
599
590
  - 'app/services/blacklight/search_service.rb'
600
591
  - 'lib/blacklight/search_builder.rb'
592
+ - 'lib/blacklight/solr/facet_paginator.rb'
601
593
  - 'lib/blacklight/solr/response/facets.rb'
602
594
  - 'lib/blacklight/solr/search_builder_behavior.rb'
603
595
  - 'lib/railties/blacklight.rake'
@@ -652,7 +644,7 @@ Style/Semicolon:
652
644
  - 'spec/models/blacklight/solr/repository_spec.rb'
653
645
  - 'spec/views/catalog/_paginate_compact.html.erb_spec.rb'
654
646
 
655
- # Offense count: 32
647
+ # Offense count: 31
656
648
  # Cop supports --auto-correct.
657
649
  # Configuration parameters: MinSize.
658
650
  # SupportedStyles: percent, brackets
@@ -1,4 +1,4 @@
1
- dist: trusty
1
+ dist: bionic
2
2
  addons:
3
3
  chrome: stable
4
4
  language: ruby
@@ -8,25 +8,26 @@ notifications:
8
8
 
9
9
  matrix:
10
10
  include:
11
- - rvm: 2.5.3
12
- env: "RAILS_VERSION=5.1.6"
13
- - rvm: 2.4.5
14
- env: "RAILS_VERSION=5.2.1"
15
- - rvm: 2.5.3
16
- env: "RAILS_VERSION=5.2.1 BLACKLIGHT_API_TEST=true ENGINE_CART_RAILS_OPTIONS=\"--api --skip-git --skip-bundle --skip-listen --skip-spring --skip-yarn --skip-keeps --skip-action-cable --skip-coffee --skip-test\""
17
- - rvm: 2.4.5
18
- env: "RAILS_VERSION=5.1.6"
19
- - rvm: 2.3.8
20
- env: "RAILS_VERSION=5.2.1"
21
- - rvm: jruby-9.2.0.0
22
- env: "RAILS_VERSION=5.1.6 JRUBY_OPTS=\"-J-Xms512m -J-Xmx1024m\""
11
+ - rvm: 2.6.5
12
+ env: "RAILS_VERSION=6.0.0 ENGINE_CART_RAILS_OPTIONS=\"--skip-webpack-install\""
13
+ - rvm: 2.6.5
14
+ env: "RAILS_VERSION=5.2.3"
15
+ - rvm: 2.5.7
16
+ env: "RAILS_VERSION=5.1.7"
17
+ - rvm: 2.5.7
18
+ env: "RAILS_VERSION=5.2.3 BLACKLIGHT_API_TEST=true ENGINE_CART_RAILS_OPTIONS=\"--api --skip-git --skip-bundle --skip-listen --skip-spring --skip-yarn --skip-keeps --skip-action-cable --skip-coffee --skip-test\""
19
+ - rvm: 2.4.9
20
+ env: "RAILS_VERSION=5.1.7"
21
+ - rvm: jruby-9.2.8.0
22
+ env: "RAILS_VERSION=5.1.7 JRUBY_OPTS=\"-J-Xms512m -J-Xmx1024m\""
23
23
  allow_failures:
24
- - rvm: jruby-9.2.0.0
24
+ - rvm: jruby-9.2.8.0
25
25
  fast_finish: true
26
26
 
27
27
  before_install:
28
- - gem update --system
29
- - gem install bundler
28
+ - docker pull solr:7
29
+ - docker run -d -p 8983:8983 -v $PWD/lib/generators/blacklight/templates/solr/conf:/myconfig solr:7 solr-create -c blacklight-core -d /myconfig
30
+ - docker ps -a
30
31
  - google-chrome-stable --headless --disable-gpu --no-sandbox --remote-debugging-port=9222 http://localhost &
31
32
 
32
33
  notifications:
@@ -36,10 +37,10 @@ notifications:
36
37
 
37
38
  global_env:
38
39
  - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
39
- - ENGINE_CART_RAILS_OPTIONS='--skip-git --skip-bundle --skip-listen --skip-spring --skip-yarn --skip-keeps --skip-action-cable --skip-coffee --skip-test'
40
+ - ENGINE_CART_RAILS_OPTIONS='--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test'
40
41
  - CC_TEST_REPORTER_ID=5042c7358c96b0b926088a4cda3e132fffe7a66ce8047cdb1dc6f0b4b6676b79
41
42
 
42
- jdk: oraclejdk9
43
+ jdk: openjdk11
43
44
 
44
45
  before_script:
45
46
  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
@@ -0,0 +1,50 @@
1
+ # Contributing to Blacklight
2
+
3
+ Blacklight is a collaborative, open source project produced by developers from many diverse organizations. The Blacklight developers want to create an out-of-the-box framework that is easy to install and get started with, both as a service to the community and in the interests of our own institutions in creating a sustainable project and product.
4
+
5
+ Development is largely motivated by the needs of each developer’s organization, and we work on the shared project together so we can benefit from the community’s development efforts, experiences building discovery systems, and shared problem solving.
6
+
7
+ We always welcome contributions from the community, especially to add new features, address bugs or defects, and clarify existing code for future developers.
8
+
9
+ ## Adding a ticket
10
+ Let us know you're interested in working on a feature by filing a ticket in our [issue tracker](https://github.com/projectblacklight/blacklight/issues).
11
+
12
+ ## Making Your Changes
13
+
14
+ * Fork the project
15
+ * Start a feature/bugfix branch
16
+ * Commit and push until you are happy with your contribution
17
+ * Make sure to add tests for it. This is important so we don't break it in a future version unintentionally.
18
+ * After making your changes, be sure to run the [Blacklight tests](https://github.com/projectblacklight/blacklight/wiki/testing) to make sure everything works.
19
+ * Submit your change as a [Pull Request](https://help.github.com/en/articles/about-pull-requests).
20
+
21
+ ## Pull Requests and Code Review
22
+ - Pull requests must be reviewed and approved by one non-author with write-permissions
23
+ - If additional code changes are made after approval, another approval (from the same or another qualified person) is required.
24
+ - A reviewer who has approved a PR but has not merged it should provide a comment (e.g. "This looks good, I'm just waiting for Travis to build", "This is a breaking change. I would like at least one more reviewer.")
25
+ - An approved PR may be merged by the reviewer, the author, or another committer
26
+ - Additional discussion and feedback by non-maintainers is heartily encouraged.
27
+
28
+ ## Support
29
+ If you are interested in working on the Blacklight plugin, but want guidance or support, please send an email to our [Blacklight-development mailing list](http://groups.google.com/group/blacklight-development) and we'll be glad to help. The #blacklight channel on [code4lib Slack](https://code4lib.org/irc/) is another active forum for informal discussion and troubleshooting.
30
+
31
+ ## Becoming a Committer
32
+
33
+ Anyone can contribute to Blacklight using pull requests, the issue tracker, and being active on the mailing list and IRC channels. Being a contributor means that you take an active interest in the project and contribute regularly in some way, ranging from asking sensible questions (which documents the project and provides feedback to developers) to providing new features as patches.
34
+
35
+ If you become a valuable contributor to the project you may be invited to become a committer. Blacklight code contributors become committers after being sponsored by one of the current active committers. The committers will take an Apache-style (+1/0/-1) vote to elevate them, and then a formal invitation will be extended to the contributor.
36
+
37
+ Committers should be:
38
+
39
+ - technically adept
40
+ - constructive, positive members of the Blacklight software community
41
+ - committed to producing useful, practical code for the community
42
+
43
+ You're expected to:
44
+
45
+ - contribute patches and new functionality to Blacklight and other shared development efforts (RSolr, Blacklight plugins, etc)
46
+ - actively participate in technical discussions on the email list, IRC, and github
47
+ - answer user support questions via the various channels
48
+ - review pull requests from fellow committers and the community
49
+ - test-drive new release candidates against your own institution's Blacklight applications
50
+ - participate in regular committer meetings, usually in the form of conference calls, to coordinate development & direction
data/Gemfile CHANGED
@@ -34,6 +34,8 @@ else
34
34
  end
35
35
 
36
36
  case ENV['RAILS_VERSION']
37
+ when /^5.[12]/, /^6.0/
38
+ gem 'sass-rails', '~> 5.0'
37
39
  when /^4.2/
38
40
  gem 'responders', '~> 2.0'
39
41
  gem 'sass-rails', '>= 5.0'
data/VERSION CHANGED
@@ -1 +1 @@
1
- 7.0.0
1
+ 7.4.0