blacklight 6.5.0 → 6.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (111) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +3 -0
  3. data/.rubocop.yml +5 -0
  4. data/.rubocop_todo.yml +114 -213
  5. data/{.solr_wrapper → .solr_wrapper.yml} +0 -0
  6. data/.yardopts +3 -1
  7. data/Gemfile +0 -3
  8. data/Rakefile +1 -1
  9. data/VERSION +1 -1
  10. data/Vagrantfile +0 -2
  11. data/app/controllers/bookmarks_controller.rb +0 -2
  12. data/app/controllers/catalog_controller.rb +0 -2
  13. data/app/controllers/concerns/blacklight/base.rb +0 -1
  14. data/app/controllers/concerns/blacklight/bookmarks.rb +1 -1
  15. data/app/controllers/concerns/blacklight/catalog.rb +7 -11
  16. data/app/controllers/concerns/blacklight/controller.rb +11 -7
  17. data/app/controllers/concerns/blacklight/default_component_configuration.rb +24 -37
  18. data/app/controllers/concerns/blacklight/facet.rb +2 -11
  19. data/app/controllers/concerns/blacklight/request_builders.rb +1 -3
  20. data/app/controllers/concerns/blacklight/search_context.rb +0 -1
  21. data/app/controllers/concerns/blacklight/search_fields.rb +2 -2
  22. data/app/controllers/concerns/blacklight/search_helper.rb +14 -24
  23. data/app/controllers/concerns/blacklight/token_based_user.rb +0 -2
  24. data/app/helpers/blacklight/blacklight_helper_behavior.rb +27 -28
  25. data/app/helpers/blacklight/catalog_helper_behavior.rb +15 -15
  26. data/app/helpers/blacklight/component_helper_behavior.rb +2 -5
  27. data/app/helpers/blacklight/configuration_helper_behavior.rb +2 -3
  28. data/app/helpers/blacklight/deprecated_url_helper_behavior.rb +1 -3
  29. data/app/helpers/blacklight/facets_helper_behavior.rb +21 -25
  30. data/app/helpers/blacklight/hash_as_hidden_fields_helper_behavior.rb +1 -2
  31. data/app/helpers/blacklight/render_constraints_helper_behavior.rb +8 -9
  32. data/app/helpers/blacklight/render_partials_helper.rb +14 -13
  33. data/app/helpers/blacklight/search_history_constraints_helper_behavior.rb +1 -4
  34. data/app/helpers/blacklight/url_helper_behavior.rb +1 -1
  35. data/app/models/blacklight/facet_paginator.rb +2 -2
  36. data/app/models/concerns/blacklight/document.rb +1 -6
  37. data/app/models/concerns/blacklight/document/active_model_shim.rb +0 -1
  38. data/app/models/concerns/blacklight/document/cache_key.rb +3 -3
  39. data/app/models/concerns/blacklight/document/dublin_core.rb +0 -1
  40. data/app/models/concerns/blacklight/document/email.rb +0 -2
  41. data/app/models/concerns/blacklight/document/export.rb +1 -2
  42. data/app/models/concerns/blacklight/document/schema_org.rb +0 -2
  43. data/app/models/concerns/blacklight/document/sms.rb +0 -2
  44. data/app/models/concerns/blacklight/solr/document.rb +0 -1
  45. data/app/models/record_mailer.rb +0 -1
  46. data/app/models/solr_document.rb +0 -2
  47. data/app/presenters/blacklight/document_presenter.rb +14 -11
  48. data/app/presenters/blacklight/index_presenter.rb +5 -5
  49. data/app/presenters/blacklight/json_presenter.rb +0 -1
  50. data/app/presenters/blacklight/rendering/abstract_step.rb +0 -1
  51. data/app/presenters/blacklight/rendering/helper_method.rb +5 -5
  52. data/app/presenters/blacklight/rendering/link_to_facet.rb +1 -1
  53. data/app/presenters/blacklight/show_presenter.rb +4 -5
  54. data/app/services/blacklight/field_retriever.rb +8 -9
  55. data/app/views/catalog/_facet_limit.html.erb +1 -1
  56. data/blacklight.gemspec +4 -0
  57. data/lib/blacklight.rb +2 -2
  58. data/lib/blacklight/abstract_repository.rb +4 -3
  59. data/lib/blacklight/configuration.rb +57 -92
  60. data/lib/blacklight/configuration/context.rb +3 -3
  61. data/lib/blacklight/configuration/fields.rb +24 -7
  62. data/lib/blacklight/exceptions.rb +0 -2
  63. data/lib/blacklight/parameters.rb +1 -1
  64. data/lib/blacklight/search_builder.rb +92 -96
  65. data/lib/blacklight/search_state.rb +2 -1
  66. data/lib/blacklight/solr/repository.rb +3 -4
  67. data/lib/blacklight/solr/request.rb +0 -2
  68. data/lib/blacklight/solr/response/facets.rb +23 -28
  69. data/lib/blacklight/solr/response/group.rb +0 -1
  70. data/lib/blacklight/solr/response/group_response.rb +1 -5
  71. data/lib/blacklight/solr/response/pagination_methods.rb +0 -1
  72. data/lib/blacklight/solr/response/response.rb +1 -1
  73. data/lib/blacklight/solr/response/spelling.rb +0 -4
  74. data/lib/blacklight/solr/search_builder_behavior.rb +29 -41
  75. data/lib/blacklight/utils.rb +10 -7
  76. data/lib/generators/blacklight/assets_generator.rb +0 -1
  77. data/lib/generators/blacklight/document_generator.rb +0 -1
  78. data/lib/generators/blacklight/install_generator.rb +2 -6
  79. data/lib/generators/blacklight/models_generator.rb +0 -3
  80. data/lib/generators/blacklight/search_builder_generator.rb +0 -1
  81. data/lib/generators/blacklight/solr4_generator.rb +0 -2
  82. data/lib/generators/blacklight/solr5_generator.rb +15 -1
  83. data/lib/generators/blacklight/test_support_generator.rb +0 -1
  84. data/lib/railties/blacklight.rake +3 -3
  85. data/spec/controllers/blacklight/catalog/component_configuration_spec.rb +1 -4
  86. data/spec/controllers/blacklight/search_helper_spec.rb +5 -7
  87. data/spec/controllers/blacklight/suggest_search_spec.rb +2 -2
  88. data/spec/controllers/bookmarks_controller_spec.rb +2 -2
  89. data/spec/controllers/catalog_controller_spec.rb +6 -6
  90. data/spec/features/search_context_spec.rb +4 -5
  91. data/spec/features/search_formats_spec.rb +0 -6
  92. data/spec/helpers/blacklight_helper_spec.rb +7 -7
  93. data/spec/helpers/catalog_helper_spec.rb +10 -10
  94. data/spec/helpers/configuration_helper_spec.rb +3 -3
  95. data/spec/helpers/facets_helper_spec.rb +1 -2
  96. data/spec/helpers/render_constraints_helper_spec.rb +8 -0
  97. data/spec/integration/generators/blacklight/solr5_generator_spec.rb +60 -0
  98. data/spec/models/blacklight/document_spec.rb +1 -1
  99. data/spec/models/blacklight/search_builder_spec.rb +5 -4
  100. data/spec/models/blacklight/solr/search_builder_spec.rb +12 -18
  101. data/spec/presenters/pipeline_spec.rb +1 -1
  102. data/spec/spec_helper.rb +43 -0
  103. data/spec/views/catalog/_index_header_default.html.erb_spec.rb +1 -1
  104. data/spec/views/catalog/_show_tools.html.erb_spec.rb +1 -1
  105. data/spec/views/catalog/_sort_and_per_page.html.erb_spec.rb +2 -2
  106. data/spec/views/catalog/_thumbnail_default.erb_spec.rb +1 -1
  107. data/spec/views/catalog/_view_type_group.html.erb_spec.rb +3 -3
  108. data/spec/views/catalog/index.html.erb_spec.rb +1 -1
  109. data/spec/views/catalog/index.json.jbuilder_spec.rb +2 -2
  110. data/tasks/blacklight.rake +3 -0
  111. metadata +61 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: a6689bf20317b8fb6bee88d3064ce8528fbfe2ec
4
- data.tar.gz: 2a83b261f71d22b9959014af71f0cc64736bd228
3
+ metadata.gz: 05f26b2934ec715bf60ceb53cb37dce8ad9f7729
4
+ data.tar.gz: 7af379edd938e32431e36400e89d28091f5633b7
5
5
  SHA512:
6
- metadata.gz: 0e83db02e3fa34951449c29fcc84ea4e92395d90a914b0432f6a2494c52f12b0032f482fbd5fbd0f309c03457038546f4eee4273f9a26ca39869ccc09af92160
7
- data.tar.gz: 6273e3a816b869b90ed3f4eb5e1dffcf2d15786687b806fd45c9b0c61e76894158d4b0a3a741e10fd06c94b865342edcfdb589ba959dfa3cf3857a85e3d53a00
6
+ metadata.gz: f6e430a8c3ad05a9ae743f01fef4e46711a2ff426046b84b64b3feeeccbad3bc14bbc7d0d627006fcb5ed399e431fe3cc78dcaa77dff8d666503276b5f23592e
7
+ data.tar.gz: ac0253c38de32fdfd764041eb6a498abcc0cb36a2155045db43eb7b752246b89bcab2042b7dd169267785bbf21b2f6ea395d159696267f5a73e6a52d210d1fc3
data/.gitignore CHANGED
@@ -2,10 +2,12 @@
2
2
  *.sw[pon]
3
3
  .bundle
4
4
  .byebug_history
5
+ .yardoc
5
6
  .rvmrc
6
7
  *.log
7
8
  Gemfile.lock
8
9
  coverage/
10
+ doc/
9
11
  gemfiles/*.gemfile.lock
10
12
  jetty/
11
13
  log/*
@@ -13,3 +15,4 @@ tmp/*
13
15
  pkg/*
14
16
  .internal_test_app
15
17
  .vagrant
18
+ /spec/examples.txt
@@ -1,3 +1,5 @@
1
+ require: rubocop-rspec
2
+
1
3
  inherit_from:
2
4
  - .rubocop_todo.yml
3
5
 
@@ -17,3 +19,6 @@ Style/StringLiterals:
17
19
 
18
20
  Style/IndentationConsistency:
19
21
  Enabled: false
22
+
23
+ Rails/OutputSafety:
24
+ Enabled: false
@@ -1,21 +1,33 @@
1
1
  # This configuration was generated by
2
2
  # `rubocop --auto-gen-config`
3
- # on 2016-03-04 09:27:52 -0800 using RuboCop version 0.37.2.
3
+ # on 2016-08-25 07:56:15 -0700 using RuboCop version 0.42.0.
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
- # Offense count: 24
9
+ # Offense count: 19
10
10
  # Cop supports --auto-correct.
11
11
  # Configuration parameters: AlignWith, SupportedStyles, AutoCorrect.
12
12
  # SupportedStyles: keyword, variable, start_of_line
13
13
  Lint/EndAlignment:
14
- Enabled: false
14
+ Exclude:
15
+ - 'app/controllers/concerns/blacklight/token_based_user.rb'
16
+ - 'app/helpers/blacklight/catalog_helper_behavior.rb'
17
+ - 'app/helpers/blacklight/deprecated_url_helper_behavior.rb'
18
+ - 'app/helpers/blacklight/facets_helper_behavior.rb'
19
+ - 'app/helpers/blacklight/render_partials_helper.rb'
20
+ - 'app/helpers/blacklight/url_helper_behavior.rb'
21
+ - 'app/models/concerns/blacklight/configurable.rb'
22
+ - 'app/presenters/blacklight/index_presenter.rb'
23
+ - 'lib/blacklight/configuration/fields.rb'
24
+ - 'lib/blacklight/search_builder.rb'
25
+ - 'lib/blacklight/solr/response/facets.rb'
26
+ - 'lib/blacklight/solr/search_builder_behavior.rb'
15
27
 
16
28
  # Offense count: 30
17
29
  # Cop supports --auto-correct.
18
- # Configuration parameters: IgnoreEmptyBlocks.
30
+ # Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments.
19
31
  Lint/UnusedBlockArgument:
20
32
  Exclude:
21
33
  - 'app/controllers/concerns/blacklight/search_context.rb'
@@ -62,54 +74,50 @@ Lint/UselessAssignment:
62
74
  - 'lib/blacklight/solr/response/spelling.rb'
63
75
  - 'lib/railties/blacklight.rake'
64
76
 
65
- # Offense count: 58
77
+ # Offense count: 61
66
78
  Metrics/AbcSize:
67
- Max: 54
79
+ Max: 53
68
80
 
69
81
  # Offense count: 1
70
82
  Metrics/BlockNesting:
71
83
  Max: 4
72
84
 
73
- # Offense count: 3
85
+ # Offense count: 2
74
86
  # Configuration parameters: CountComments.
75
87
  Metrics/ClassLength:
76
- Max: 193
88
+ Max: 200
77
89
 
78
- # Offense count: 22
90
+ # Offense count: 20
79
91
  Metrics/CyclomaticComplexity:
80
- Max: 19
92
+ Max: 12
81
93
 
82
- # Offense count: 63
94
+ # Offense count: 59
83
95
  # Configuration parameters: CountComments.
84
96
  Metrics/MethodLength:
85
- Max: 50
97
+ Max: 52
86
98
 
87
99
  # Offense count: 9
88
100
  # Configuration parameters: CountComments.
89
101
  Metrics/ModuleLength:
90
- Max: 218
102
+ Max: 213
91
103
 
92
- # Offense count: 20
93
- Metrics/PerceivedComplexity:
94
- Max: 22
104
+ # Offense count: 1
105
+ # Configuration parameters: CountKeywordArgs.
106
+ Metrics/ParameterLists:
107
+ Max: 6
95
108
 
96
- # Offense count: 6
97
- # Cop supports --auto-correct.
98
- Rails/Delegate:
99
- Exclude:
100
- - 'app/controllers/concerns/blacklight/controller.rb'
101
- - 'app/controllers/concerns/blacklight/request_builders.rb'
102
- - 'app/controllers/concerns/blacklight/search_helper.rb'
103
- - 'app/helpers/blacklight/deprecated_url_helper_behavior.rb'
104
- - 'app/models/concerns/blacklight/document.rb'
105
- - 'lib/blacklight/search_builder.rb'
109
+ # Offense count: 18
110
+ Metrics/PerceivedComplexity:
111
+ Max: 14
106
112
 
107
113
  # Offense count: 2
108
114
  # Cop supports --auto-correct.
109
115
  # Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
110
116
  # SupportedStyles: outdent, indent
111
117
  Style/AccessModifierIndentation:
112
- Enabled: false
118
+ Exclude:
119
+ - 'app/controllers/concerns/blacklight/catalog.rb'
120
+ - 'app/controllers/concerns/blacklight/controller.rb'
113
121
 
114
122
  # Offense count: 9
115
123
  # Cop supports --auto-correct.
@@ -126,7 +134,7 @@ Style/Alias:
126
134
 
127
135
  # Offense count: 7
128
136
  # Cop supports --auto-correct.
129
- # Configuration parameters: EnforcedStyle, SupportedStyles.
137
+ # Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
130
138
  # SupportedStyles: with_first_parameter, with_fixed_indentation
131
139
  Style/AlignParameters:
132
140
  Exclude:
@@ -135,7 +143,7 @@ Style/AlignParameters:
135
143
  - 'lib/blacklight/configuration.rb'
136
144
  - 'lib/generators/blacklight/solr4_generator.rb'
137
145
 
138
- # Offense count: 73
146
+ # Offense count: 66
139
147
  # Cop supports --auto-correct.
140
148
  # Configuration parameters: EnforcedStyle, SupportedStyles.
141
149
  # SupportedStyles: always, conditionals
@@ -152,143 +160,63 @@ Style/BracesAroundHashParameters:
152
160
  - 'lib/blacklight/solr/response/facets.rb'
153
161
  - 'lib/generators/blacklight/test_support_generator.rb'
154
162
 
155
- # Offense count: 8
156
- Style/CaseEquality:
157
- Exclude:
158
- - 'app/helpers/blacklight/catalog_helper_behavior.rb'
159
- - 'app/helpers/blacklight/facets_helper_behavior.rb'
160
- - 'app/presenters/blacklight/document_presenter.rb'
161
- - 'lib/blacklight/configuration/context.rb'
162
- - 'lib/blacklight/configuration/fields.rb'
163
- - 'lib/blacklight/search_builder.rb'
164
-
165
- # Offense count: 23
163
+ # Offense count: 13
166
164
  # Cop supports --auto-correct.
167
165
  # Configuration parameters: IndentWhenRelativeTo, SupportedStyles, IndentOneStep, IndentationWidth.
168
166
  # SupportedStyles: case, end
169
167
  Style/CaseIndentation:
170
- Enabled: false
168
+ Exclude:
169
+ - 'app/helpers/blacklight/catalog_helper_behavior.rb'
170
+ - 'app/helpers/blacklight/deprecated_url_helper_behavior.rb'
171
+ - 'app/presenters/blacklight/index_presenter.rb'
172
+ - 'lib/blacklight/configuration/fields.rb'
173
+ - 'lib/blacklight/search_builder.rb'
171
174
 
172
- # Offense count: 50
175
+ # Offense count: 51
173
176
  # Configuration parameters: EnforcedStyle, SupportedStyles.
174
177
  # SupportedStyles: nested, compact
175
178
  Style/ClassAndModuleChildren:
176
179
  Enabled: false
177
180
 
178
- # Offense count: 4
179
- # Cop supports --auto-correct.
180
- Style/ClosingParenthesisIndentation:
181
- Exclude:
182
- - 'app/helpers/blacklight/facets_helper_behavior.rb'
183
- - 'app/helpers/blacklight/render_constraints_helper_behavior.rb'
184
- - 'app/helpers/blacklight/search_history_constraints_helper_behavior.rb'
185
- - 'lib/blacklight/configuration.rb'
186
-
187
181
  # Offense count: 2
188
182
  # Cop supports --auto-correct.
189
- # Configuration parameters: SingleLineConditionsOnly.
183
+ # Configuration parameters: EnforcedStyle, SupportedStyles, SingleLineConditionsOnly.
184
+ # SupportedStyles: assign_to_condition, assign_inside_condition
190
185
  Style/ConditionalAssignment:
191
186
  Exclude:
192
187
  - 'lib/blacklight/solr/response/spelling.rb'
193
188
 
194
- # Offense count: 52
189
+ # Offense count: 104
195
190
  Style/Documentation:
196
191
  Enabled: false
197
192
 
198
- # Offense count: 9
193
+ # Offense count: 7
199
194
  # Cop supports --auto-correct.
200
195
  # Configuration parameters: EnforcedStyle, SupportedStyles.
201
196
  # SupportedStyles: leading, trailing
202
197
  Style/DotPosition:
203
- Enabled: false
198
+ Exclude:
199
+ - 'app/controllers/concerns/blacklight/search_helper.rb'
200
+ - 'lib/blacklight/search_builder.rb'
204
201
 
205
202
  # Offense count: 1
206
203
  Style/DoubleNegation:
207
204
  Exclude:
208
205
  - 'lib/blacklight/search_builder.rb'
209
206
 
210
- # Offense count: 21
207
+ # Offense count: 16
211
208
  # Cop supports --auto-correct.
212
209
  Style/ElseAlignment:
213
210
  Exclude:
214
- - 'app/controllers/concerns/blacklight/search_context.rb'
215
211
  - 'app/helpers/blacklight/catalog_helper_behavior.rb'
216
212
  - 'app/helpers/blacklight/facets_helper_behavior.rb'
217
213
  - 'app/helpers/blacklight/url_helper_behavior.rb'
218
214
  - 'app/models/concerns/blacklight/configurable.rb'
219
- - 'app/presenters/blacklight/document_presenter.rb'
220
215
  - 'lib/blacklight/search_builder.rb'
221
216
  - 'lib/blacklight/solr/response/facets.rb'
222
217
  - 'lib/blacklight/solr/search_builder_behavior.rb'
223
218
 
224
- # Offense count: 12
225
- # Cop supports --auto-correct.
226
- Style/EmptyLines:
227
- Exclude:
228
- - 'Vagrantfile'
229
- - 'app/controllers/concerns/blacklight/bookmarks.rb'
230
- - 'app/controllers/concerns/blacklight/catalog.rb'
231
- - 'app/controllers/concerns/blacklight/controller.rb'
232
- - 'app/helpers/blacklight/facets_helper_behavior.rb'
233
- - 'app/helpers/blacklight/render_partials_helper.rb'
234
- - 'app/presenters/blacklight/json_presenter.rb'
235
- - 'lib/blacklight/solr/search_builder_behavior.rb'
236
- - 'lib/blacklight/utils.rb'
237
- - 'lib/generators/blacklight/models_generator.rb'
238
- - 'lib/generators/blacklight/test_support_generator.rb'
239
-
240
- # Offense count: 10
241
- # Cop supports --auto-correct.
242
- Style/EmptyLinesAroundAccessModifier:
243
- Exclude:
244
- - 'app/controllers/concerns/blacklight/bookmarks.rb'
245
- - 'app/controllers/concerns/blacklight/catalog.rb'
246
- - 'app/helpers/blacklight/render_partials_helper.rb'
247
- - 'lib/blacklight/abstract_repository.rb'
248
- - 'lib/blacklight/configuration/fields.rb'
249
- - 'lib/blacklight/search_builder.rb'
250
- - 'lib/blacklight/solr/response/facets.rb'
251
- - 'lib/blacklight/utils.rb'
252
-
253
- # Offense count: 5
254
- # Cop supports --auto-correct.
255
- # Configuration parameters: EnforcedStyle, SupportedStyles.
256
- # SupportedStyles: empty_lines, no_empty_lines
257
- Style/EmptyLinesAroundBlockBody:
258
- Exclude:
259
- - 'Vagrantfile'
260
- - 'app/controllers/concerns/blacklight/controller.rb'
261
- - 'app/controllers/concerns/blacklight/search_context.rb'
262
- - 'app/controllers/concerns/blacklight/token_based_user.rb'
263
- - 'lib/generators/blacklight/install_generator.rb'
264
-
265
- # Offense count: 22
266
- # Cop supports --auto-correct.
267
- # Configuration parameters: EnforcedStyle, SupportedStyles.
268
- # SupportedStyles: empty_lines, no_empty_lines
269
- Style/EmptyLinesAroundClassBody:
270
- Enabled: false
271
-
272
- # Offense count: 9
273
- # Cop supports --auto-correct.
274
- Style/EmptyLinesAroundMethodBody:
275
- Exclude:
276
- - 'app/controllers/concerns/blacklight/base.rb'
277
- - 'app/controllers/concerns/blacklight/search_context.rb'
278
- - 'lib/blacklight/configuration.rb'
279
- - 'lib/blacklight/solr/response/group_response.rb'
280
- - 'lib/blacklight/solr/search_builder_behavior.rb'
281
- - 'lib/generators/blacklight/assets_generator.rb'
282
- - 'lib/generators/blacklight/install_generator.rb'
283
-
284
- # Offense count: 33
285
- # Cop supports --auto-correct.
286
- # Configuration parameters: EnforcedStyle, SupportedStyles.
287
- # SupportedStyles: empty_lines, no_empty_lines
288
- Style/EmptyLinesAroundModuleBody:
289
- Enabled: false
290
-
291
- # Offense count: 27
219
+ # Offense count: 26
292
220
  # Cop supports --auto-correct.
293
221
  # Configuration parameters: AllowForAlignment, ForceEqualSignAlignment.
294
222
  Style/ExtraSpacing:
@@ -300,7 +228,6 @@ Style/ExtraSpacing:
300
228
  - 'app/models/record_mailer.rb'
301
229
  - 'blacklight.gemspec'
302
230
  - 'config/routes.rb'
303
- - 'db/migrate/20140202020201_create_searches.rb'
304
231
  - 'lib/blacklight/configuration.rb'
305
232
  - 'lib/generators/blacklight/controller_generator.rb'
306
233
  - 'lib/generators/blacklight/document_generator.rb'
@@ -309,7 +236,7 @@ Style/ExtraSpacing:
309
236
  - 'lib/railties/blacklight.rake'
310
237
  - 'tasks/blacklight.rake'
311
238
 
312
- # Offense count: 10
239
+ # Offense count: 9
313
240
  # Configuration parameters: MinBodyLength.
314
241
  Style/GuardClause:
315
242
  Exclude:
@@ -320,35 +247,27 @@ Style/GuardClause:
320
247
  - 'app/helpers/blacklight/catalog_helper_behavior.rb'
321
248
  - 'lib/blacklight/solr/search_builder_behavior.rb'
322
249
 
323
- # Offense count: 121
250
+ # Offense count: 111
324
251
  # Cop supports --auto-correct.
325
- # Configuration parameters: EnforcedStyle, SupportedStyles, UseHashRocketsWithSymbolValues.
252
+ # Configuration parameters: EnforcedStyle, SupportedStyles, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
326
253
  # SupportedStyles: ruby19, ruby19_no_mixed_keys, hash_rockets
327
254
  Style/HashSyntax:
328
255
  Enabled: false
329
256
 
330
- # Offense count: 1
331
- Style/IfInsideElse:
332
- Exclude:
333
- - 'app/controllers/concerns/blacklight/bookmarks.rb'
334
-
335
- # Offense count: 19
257
+ # Offense count: 16
336
258
  # Cop supports --auto-correct.
337
259
  # Configuration parameters: MaxLineLength.
338
260
  Style/IfUnlessModifier:
339
261
  Exclude:
340
262
  - 'app/controllers/concerns/blacklight/controller.rb'
341
263
  - 'app/controllers/concerns/blacklight/request_builders.rb'
342
- - 'app/controllers/concerns/blacklight/search_helper.rb'
343
264
  - 'app/controllers/concerns/blacklight/token_based_user.rb'
344
265
  - 'app/helpers/blacklight/catalog_helper_behavior.rb'
345
266
  - 'app/helpers/blacklight/url_helper_behavior.rb'
346
267
  - 'app/models/blacklight/facet_paginator.rb'
347
- - 'app/models/search.rb'
348
268
  - 'lib/blacklight/configuration.rb'
349
269
  - 'lib/blacklight/configuration/fields.rb'
350
270
  - 'lib/blacklight/search_state.rb'
351
- - 'lib/blacklight/solr/search_builder_behavior.rb'
352
271
  - 'lib/generators/blacklight/install_generator.rb'
353
272
  - 'lib/railties/blacklight.rake'
354
273
 
@@ -357,34 +276,15 @@ Style/IfUnlessModifier:
357
276
  # Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
358
277
  # SupportedStyles: special_inside_parentheses, consistent, align_braces
359
278
  Style/IndentHash:
360
- Enabled: false
361
-
362
- # Offense count: 54
363
- # Cop supports --auto-correct.
364
- # Configuration parameters: EnforcedStyle, SupportedStyles.
365
- # SupportedStyles: normal, rails
366
- Style/IndentationConsistency:
367
279
  Exclude:
368
- - 'app/controllers/concerns/blacklight/catalog.rb'
369
- - 'app/controllers/concerns/blacklight/controller.rb'
370
- - 'app/controllers/concerns/blacklight/saved_searches.rb'
371
- - 'app/controllers/concerns/blacklight/search_helper.rb'
372
- - 'app/helpers/blacklight/catalog_helper_behavior.rb'
373
- - 'app/helpers/blacklight/render_partials_helper.rb'
374
- - 'app/presenters/blacklight/document_presenter.rb'
375
- - 'lib/blacklight/abstract_repository.rb'
376
280
  - 'lib/blacklight/configuration.rb'
377
- - 'lib/blacklight/solr/repository.rb'
378
- - 'lib/blacklight/solr/response.rb'
379
- - 'lib/blacklight/solr/response/spelling.rb'
380
281
 
381
- # Offense count: 26
282
+ # Offense count: 23
382
283
  # Cop supports --auto-correct.
383
284
  # Configuration parameters: Width.
384
285
  Style/IndentationWidth:
385
286
  Exclude:
386
287
  - 'app/controllers/concerns/blacklight/bookmarks.rb'
387
- - 'app/controllers/concerns/blacklight/search_context.rb'
388
288
  - 'app/controllers/concerns/blacklight/search_fields.rb'
389
289
  - 'app/controllers/concerns/blacklight/token_based_user.rb'
390
290
  - 'app/helpers/blacklight/catalog_helper_behavior.rb'
@@ -393,7 +293,6 @@ Style/IndentationWidth:
393
293
  - 'app/helpers/blacklight/render_partials_helper.rb'
394
294
  - 'app/helpers/blacklight/url_helper_behavior.rb'
395
295
  - 'app/models/concerns/blacklight/configurable.rb'
396
- - 'app/presenters/blacklight/document_presenter.rb'
397
296
  - 'lib/blacklight/search_builder.rb'
398
297
  - 'lib/blacklight/solr/response/facets.rb'
399
298
  - 'lib/blacklight/solr/search_builder_behavior.rb'
@@ -409,7 +308,7 @@ Style/LeadingCommentSpace:
409
308
  - 'lib/blacklight/configuration.rb'
410
309
  - 'lib/blacklight/solr/response/spelling.rb'
411
310
 
412
- # Offense count: 146
311
+ # Offense count: 139
413
312
  # Cop supports --auto-correct.
414
313
  # Configuration parameters: EnforcedStyle, SupportedStyles.
415
314
  # SupportedStyles: require_parentheses, require_no_parentheses, require_no_parentheses_except_multiline
@@ -426,16 +325,24 @@ Style/MultilineBlockLayout:
426
325
  # Offense count: 13
427
326
  # Cop supports --auto-correct.
428
327
  # Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
429
- # SupportedStyles: aligned, indented
328
+ # SupportedStyles: aligned, indented, indented_relative_to_receiver
430
329
  Style/MultilineMethodCallIndentation:
431
- Enabled: false
330
+ Exclude:
331
+ - 'app/controllers/concerns/blacklight/search_helper.rb'
332
+ - 'lib/blacklight/search_builder.rb'
432
333
 
433
- # Offense count: 12
334
+ # Offense count: 13
434
335
  # Cop supports --auto-correct.
435
336
  # Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
436
337
  # SupportedStyles: aligned, indented
437
338
  Style/MultilineOperationIndentation:
438
- Enabled: false
339
+ Exclude:
340
+ - 'app/controllers/concerns/blacklight/default_component_configuration.rb'
341
+ - 'app/helpers/blacklight/facets_helper_behavior.rb'
342
+ - 'app/helpers/blacklight/search_history_constraints_helper_behavior.rb'
343
+ - 'lib/blacklight/configuration/context.rb'
344
+ - 'lib/blacklight/search_state.rb'
345
+ - 'lib/blacklight/solr/search_builder_behavior.rb'
439
346
 
440
347
  # Offense count: 2
441
348
  # Cop supports --auto-correct.
@@ -443,15 +350,6 @@ Style/MutableConstant:
443
350
  Exclude:
444
351
  - 'lib/blacklight/solr/request.rb'
445
352
 
446
- # Offense count: 4
447
- # Cop supports --auto-correct.
448
- # Configuration parameters: EnforcedStyle, MinBodyLength, SupportedStyles.
449
- # SupportedStyles: skip_modifier_ifs, always
450
- Style/Next:
451
- Exclude:
452
- - 'lib/blacklight/solr/response/facets.rb'
453
- - 'lib/blacklight/solr/search_builder_behavior.rb'
454
-
455
353
  # Offense count: 8
456
354
  # Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist.
457
355
  # NamePrefix: is_, has_, have_
@@ -459,6 +357,7 @@ Style/Next:
459
357
  # NameWhitelist: is_a?
460
358
  Style/PredicateName:
461
359
  Exclude:
360
+ - 'spec/**/*'
462
361
  - 'app/controllers/concerns/blacklight/catalog.rb'
463
362
  - 'app/controllers/concerns/blacklight/controller.rb'
464
363
  - 'app/helpers/blacklight/catalog_helper_behavior.rb'
@@ -468,17 +367,7 @@ Style/PredicateName:
468
367
  - 'app/models/concerns/blacklight/solr/document.rb'
469
368
  - 'lib/generators/blacklight/assets_generator.rb'
470
369
 
471
- # Offense count: 4
472
- # Cop supports --auto-correct.
473
- # Configuration parameters: AllowMultipleReturnValues.
474
- Style/RedundantReturn:
475
- Exclude:
476
- - 'app/helpers/blacklight/blacklight_helper_behavior.rb'
477
- - 'app/helpers/blacklight/facets_helper_behavior.rb'
478
- - 'lib/blacklight.rb'
479
- - 'lib/blacklight/solr/search_builder_behavior.rb'
480
-
481
- # Offense count: 42
370
+ # Offense count: 43
482
371
  # Cop supports --auto-correct.
483
372
  Style/RedundantSelf:
484
373
  Enabled: false
@@ -508,27 +397,36 @@ Style/SpaceAroundBlockParameters:
508
397
  - 'app/controllers/concerns/blacklight/catalog.rb'
509
398
  - 'app/models/concerns/blacklight/document/extensions.rb'
510
399
 
511
- # Offense count: 28
400
+ # Offense count: 27
512
401
  # Cop supports --auto-correct.
513
402
  # Configuration parameters: EnforcedStyle, SupportedStyles.
514
403
  # SupportedStyles: space, no_space
515
404
  Style/SpaceAroundEqualsInParameterDefault:
516
- Enabled: false
405
+ Exclude:
406
+ - 'app/controllers/concerns/blacklight/search_helper.rb'
407
+ - 'app/helpers/blacklight/blacklight_helper_behavior.rb'
408
+ - 'app/helpers/blacklight/component_helper_behavior.rb'
409
+ - 'app/helpers/blacklight/configuration_helper_behavior.rb'
410
+ - 'app/helpers/blacklight/facets_helper_behavior.rb'
411
+ - 'app/helpers/blacklight/render_partials_helper.rb'
412
+ - 'app/helpers/blacklight/url_helper_behavior.rb'
413
+ - 'app/models/concerns/blacklight/document.rb'
414
+ - 'app/presenters/blacklight/document_presenter.rb'
415
+ - 'app/presenters/blacklight/index_presenter.rb'
416
+ - 'app/presenters/blacklight/show_presenter.rb'
417
+ - 'lib/blacklight/search_state.rb'
517
418
 
518
- # Offense count: 17
419
+ # Offense count: 13
519
420
  # Cop supports --auto-correct.
520
421
  # Configuration parameters: AllowForAlignment.
521
422
  Style/SpaceAroundOperators:
522
423
  Exclude:
523
- - 'Gemfile'
524
424
  - 'app/controllers/concerns/blacklight/request_builders.rb'
525
425
  - 'app/helpers/blacklight/blacklight_helper_behavior.rb'
526
426
  - 'app/helpers/blacklight/facets_helper_behavior.rb'
527
- - 'app/helpers/blacklight/render_constraints_helper_behavior.rb'
528
427
  - 'app/helpers/blacklight/search_history_constraints_helper_behavior.rb'
529
428
  - 'app/helpers/blacklight/url_helper_behavior.rb'
530
429
  - 'app/models/concerns/blacklight/document/export.rb'
531
- - 'db/migrate/20140202020202_create_bookmarks.rb'
532
430
  - 'lib/blacklight/configuration.rb'
533
431
  - 'lib/blacklight/solr/repository.rb'
534
432
  - 'lib/blacklight/solr/response/spelling.rb'
@@ -539,7 +437,8 @@ Style/SpaceAroundOperators:
539
437
  # Configuration parameters: EnforcedStyle, SupportedStyles.
540
438
  # SupportedStyles: space, no_space
541
439
  Style/SpaceBeforeBlockBraces:
542
- Enabled: false
440
+ Exclude:
441
+ - 'lib/blacklight/solr/response.rb'
543
442
 
544
443
  # Offense count: 15
545
444
  # Cop supports --auto-correct.
@@ -552,22 +451,30 @@ Style/SpaceBeforeComma:
552
451
  - 'lib/generators/blacklight/search_builder_generator.rb'
553
452
  - 'lib/generators/blacklight/user_generator.rb'
554
453
 
555
- # Offense count: 4
454
+ # Offense count: 3
556
455
  # Cop supports --auto-correct.
557
456
  # Configuration parameters: AllowForAlignment.
558
457
  Style/SpaceBeforeFirstArg:
559
458
  Exclude:
560
- - 'db/migrate/20140202020201_create_searches.rb'
561
459
  - 'lib/generators/blacklight/controller_generator.rb'
562
460
  - 'lib/generators/blacklight/document_generator.rb'
563
461
  - 'lib/generators/blacklight/search_builder_generator.rb'
564
462
 
565
- # Offense count: 14
463
+ # Offense count: 15
566
464
  # Cop supports --auto-correct.
567
465
  # Configuration parameters: EnforcedStyle, SupportedStyles, EnforcedStyleForEmptyBraces, SpaceBeforeBlockParameters.
568
466
  # SupportedStyles: space, no_space
569
467
  Style/SpaceInsideBlockBraces:
570
- Enabled: false
468
+ Exclude:
469
+ - 'app/controllers/concerns/blacklight/bookmarks.rb'
470
+ - 'app/controllers/concerns/blacklight/controller.rb'
471
+ - 'app/controllers/concerns/blacklight/search_helper.rb'
472
+ - 'app/helpers/blacklight/catalog_helper_behavior.rb'
473
+ - 'app/helpers/blacklight/facets_helper_behavior.rb'
474
+ - 'lib/blacklight/search_builder.rb'
475
+ - 'lib/blacklight/solr/request.rb'
476
+ - 'lib/blacklight/solr/response.rb'
477
+ - 'lib/blacklight/solr/response/group.rb'
571
478
 
572
479
  # Offense count: 8
573
480
  # Cop supports --auto-correct.
@@ -578,9 +485,17 @@ Style/SpaceInsideBrackets:
578
485
  # Offense count: 18
579
486
  # Cop supports --auto-correct.
580
487
  # Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces, SupportedStyles.
581
- # SupportedStyles: space, no_space
488
+ # SupportedStyles: space, no_space, compact
582
489
  Style/SpaceInsideHashLiteralBraces:
583
- Enabled: false
490
+ Exclude:
491
+ - 'app/controllers/concerns/blacklight/bookmarks.rb'
492
+ - 'app/controllers/concerns/blacklight/catalog.rb'
493
+ - 'app/controllers/concerns/blacklight/search_context.rb'
494
+ - 'app/helpers/blacklight/render_constraints_helper_behavior.rb'
495
+ - 'app/helpers/blacklight/url_helper_behavior.rb'
496
+ - 'app/models/concerns/blacklight/document/extensions.rb'
497
+ - 'lib/blacklight/configuration.rb'
498
+ - 'lib/blacklight/solr/repository.rb'
584
499
 
585
500
  # Offense count: 19
586
501
  # Cop supports --auto-correct.
@@ -598,22 +513,8 @@ Style/SpaceInsideParens:
598
513
  - 'lib/blacklight/search_state.rb'
599
514
  - 'lib/blacklight/solr/search_builder_behavior.rb'
600
515
 
601
- # Offense count: 4
602
- # Cop supports --auto-correct.
603
- # Configuration parameters: EnforcedStyle, SupportedStyles.
604
- # SupportedStyles: single_quotes, double_quotes
605
- Style/StringLiteralsInInterpolation:
606
- Enabled: false
607
-
608
- # Offense count: 242
516
+ # Offense count: 217
609
517
  # Cop supports --auto-correct.
610
518
  Style/TrailingWhitespace:
611
519
  Enabled: false
612
520
 
613
- # Offense count: 1
614
- # Cop supports --auto-correct.
615
- # Configuration parameters: ExactNameMatch, AllowPredicates, AllowDSLWriters, IgnoreClassMethods, Whitelist.
616
- # Whitelist: to_ary, to_a, to_c, to_enum, to_h, to_hash, to_i, to_int, to_io, to_open, to_path, to_proc, to_r, to_regexp, to_str, to_s, to_sym
617
- Style/TrivialAccessors:
618
- Exclude:
619
- - 'lib/blacklight/search_builder.rb'