blacklight_advanced_search 6.4.1 → 7.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (29) hide show
  1. checksums.yaml +5 -5
  2. data/.rubocop.yml +1 -1
  3. data/.rubocop_todo.yml +6 -374
  4. data/.travis.yml +7 -7
  5. data/Gemfile +2 -0
  6. data/Rakefile +2 -2
  7. data/VERSION +1 -1
  8. data/app/assets/stylesheets/blacklight_advanced_search/blacklight_advanced_search_styles.css.scss +4 -0
  9. data/app/controllers/blacklight_advanced_search/advanced_controller.rb +1 -1
  10. data/app/views/advanced/_advanced_search_facets_as_select.html.erb +7 -7
  11. data/app/views/advanced/_advanced_search_help.html.erb +8 -8
  12. data/app/views/advanced/_advanced_search_submit_btns.html.erb +3 -3
  13. data/app/views/advanced/_facet_limit.html.erb +4 -4
  14. data/app/views/advanced/index.html.erb +1 -1
  15. data/app/views/blacklight_advanced_search/_facet_limit.html.erb +7 -7
  16. data/blacklight_advanced_search.gemspec +4 -6
  17. data/lib/blacklight_advanced_search/advanced_search_builder.rb +1 -1
  18. data/lib/blacklight_advanced_search/engine.rb +0 -1
  19. data/lib/blacklight_advanced_search/parsing_nesting_parser.rb +1 -1
  20. data/lib/blacklight_advanced_search/render_constraints_override.rb +3 -3
  21. data/lib/generators/blacklight_advanced_search/install_generator.rb +2 -2
  22. data/solr/conf/schema.xml +326 -573
  23. data/solr/conf/solrconfig.xml +79 -294
  24. data/spec/features/blacklight_advanced_search_form_spec.rb +3 -3
  25. data/spec/lib/advanced_search_builder_spec.rb +0 -1
  26. data/spec/lib/blacklight_advanced_search/parsing_nesting_parser_spec.rb +20 -0
  27. data/spec/test_app_templates/app/controllers/catalog_controller.rb +4 -4
  28. metadata +14 -20
  29. data/solr/sample_solr_documents.yml +0 -2692
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: fec276a97930ac04d511ec8865371d1a62029449
4
- data.tar.gz: d175ff3201850ee817481815fe3f79cfef5d755b
2
+ SHA256:
3
+ metadata.gz: 7e20cc9f13b893cec492aa6cc86da05dd170a7d05aee03ab8cd2907ab82d383b
4
+ data.tar.gz: 4316c69ac26a65898b9b3a9c22486e353e49889e7134f87d49f391a3ff928966
5
5
  SHA512:
6
- metadata.gz: cf8d26bbee8f01b46326873e16f971e78f0fb66f3cb91449f8ca450f195f0e194e089609948ddc669f43aac71fe1fd5ee7f9a3e001987ea3539053bcfc61747b
7
- data.tar.gz: b877cfbf9cf87a2812fe4a44ad6e401e0368f3d638b8ac2bcc145226101f7a41f9eb521a1c4927a6fc376d64eac40f6b20974814809ccb1fff3b47b47c9ffa65
6
+ metadata.gz: feb9014523f4833d4b60fcb981e0ea403c3026a3ad8f93d9dc5ba66e6b52f1ba80a878b93a88324d8f3b0a608f1119da38909d49d1e446dee88e9f83fc17af5c
7
+ data.tar.gz: 9fd6367a4945caf22686dade81b1daf60ac8865079106e311098a8ad3765910ada88ee8c2132ff95743c5d939266912ea5f40947048e14245d917602c06209a5
@@ -11,7 +11,7 @@ AllCops:
11
11
  Rails:
12
12
  Enabled: true
13
13
 
14
- Metrics/LineLength:
14
+ Layout/LineLength:
15
15
  Max: 185
16
16
 
17
17
  Metrics/BlockLength:
@@ -1,398 +1,30 @@
1
1
  # This configuration was generated by
2
2
  # `rubocop --auto-gen-config`
3
- # on 2017-06-13 08:15:08 -0700 using RuboCop version 0.49.1.
3
+ # on 2020-01-15 10:15:34 -0500 using RuboCop version 0.79.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: 2
10
- # Configuration parameters: Include.
11
- # Include: **/Gemfile, **/gems.rb
12
- Bundler/DuplicatedGem:
13
- Exclude:
14
- - 'Gemfile'
15
-
16
- # Offense count: 1
17
- # Cop supports --auto-correct.
18
- # Configuration parameters: Include, TreatCommentsAsGroupSeparators.
19
- # Include: **/Gemfile, **/gems.rb
20
- Bundler/OrderedGems:
21
- Exclude:
22
- - 'Gemfile'
23
-
24
- # Offense count: 1
25
- # Cop supports --auto-correct.
26
- # Configuration parameters: EnforcedHashRocketStyle, SupportedHashRocketStyles, EnforcedColonStyle, SupportedColonStyles, EnforcedLastArgumentHashStyle, SupportedLastArgumentHashStyles.
27
- # SupportedHashRocketStyles: key, separator, table
28
- # SupportedColonStyles: key, separator, table
29
- # SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
30
- Layout/AlignHash:
31
- Exclude:
32
- - 'lib/parsing_nesting/tree.rb'
33
-
34
- # Offense count: 4
35
- # Cop supports --auto-correct.
36
- # Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
37
- # SupportedStyles: with_first_parameter, with_fixed_indentation
38
- Layout/AlignParameters:
39
- Exclude:
40
- - 'lib/blacklight_advanced_search/render_constraints_override.rb'
41
-
42
- # Offense count: 2
43
- # Cop supports --auto-correct.
44
- Layout/EmptyLineAfterMagicComment:
45
- Exclude:
46
- - 'lib/generators/blacklight_advanced_search/templates/saved_searches_controller.rb'
47
- - 'lib/generators/blacklight_advanced_search/templates/search_history_controller.rb'
48
-
49
- # Offense count: 1
50
- # Cop supports --auto-correct.
51
- # Configuration parameters: EnforcedStyle, SupportedStyles.
52
- # SupportedStyles: symmetrical, new_line, same_line
53
- Layout/MultilineArrayBraceLayout:
54
- Exclude:
55
- - 'spec/parsing_nesting/consuming_spec.rb'
56
-
57
- # Offense count: 2
58
- # Cop supports --auto-correct.
59
- # Configuration parameters: EnforcedStyle, SupportedStyles.
60
- # SupportedStyles: symmetrical, new_line, same_line
61
- Layout/MultilineMethodCallBraceLayout:
62
- Exclude:
63
- - 'lib/blacklight_advanced_search/render_constraints_override.rb'
64
-
65
- # Offense count: 10
66
- # Cop supports --auto-correct.
67
- # Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
68
- # SupportedStyles: aligned, indented
69
- Layout/MultilineOperationIndentation:
70
- Exclude:
71
- - 'lib/blacklight_advanced_search/advanced_search_builder.rb'
72
- - 'lib/blacklight_advanced_search/controller.rb'
73
- - 'lib/parsing_nesting/grammar.rb'
74
- - 'lib/parsing_nesting/tree.rb'
75
-
76
- # Offense count: 1
77
- # Cop supports --auto-correct.
78
- # Configuration parameters: EnforcedStyle, SupportedStyles.
79
- # SupportedStyles: space, no_space
80
- Layout/SpaceBeforeBlockBraces:
81
- Exclude:
82
- - 'blacklight_advanced_search.gemspec'
83
-
84
- # Offense count: 1
85
- Lint/AmbiguousOperator:
86
- Exclude:
87
- - 'spec/parsing_nesting/to_solr_spec.rb'
88
-
89
9
  # Offense count: 3
90
- # Configuration parameters: AllowSafeAssignment.
91
- Lint/AssignmentInCondition:
92
- Exclude:
93
- - 'lib/parsing_nesting/tree.rb'
94
-
95
- # Offense count: 3
96
- # Cop supports --auto-correct.
97
- # Configuration parameters: EnforcedStyleAlignWith, SupportedStylesAlignWith, AutoCorrect.
98
- # SupportedStylesAlignWith: keyword, variable, start_of_line
99
- Lint/EndAlignment:
100
- Exclude:
101
- - 'lib/blacklight_advanced_search/advanced_search_builder.rb'
102
- - 'lib/blacklight_advanced_search/redirect_legacy_params_filter.rb'
103
- - 'lib/parsing_nesting/tree.rb'
104
-
105
- # Offense count: 17
106
- Lint/ShadowingOuterLocalVariable:
107
- Exclude:
108
- - 'spec/parsing_nesting/build_tree_spec.rb'
109
- - 'spec/parsing_nesting/to_solr_spec.rb'
110
-
111
- # Offense count: 1
112
- Lint/UselessAssignment:
113
- Exclude:
114
- - 'lib/blacklight_advanced_search/advanced_search_builder.rb'
115
-
116
- # Offense count: 7
117
- Metrics/AbcSize:
118
- Max: 38
119
-
120
- # Offense count: 3
121
- Metrics/CyclomaticComplexity:
122
- Max: 11
123
-
124
- # Offense count: 13
125
- # Configuration parameters: CountComments.
126
- Metrics/MethodLength:
127
- Max: 22
128
-
129
- # Offense count: 2
130
- Metrics/PerceivedComplexity:
131
- Max: 13
132
-
133
- # Offense count: 1
134
- RSpec/BeforeAfterAll:
135
- Exclude:
136
- - 'spec/spec_helper.rb'
137
- - 'spec/rails_helper.rb'
138
- - 'spec/support/**/*.rb'
139
- - 'spec/features/blacklight_advanced_search_form_spec.rb'
140
-
141
- # Offense count: 7
142
- RSpec/DescribeClass:
143
- Exclude:
144
- - 'spec/features/blacklight_advanced_search_form_spec.rb'
145
- - 'spec/integration/blacklight_stub_spec.rb'
146
- - 'spec/lib/deep_merge_spec.rb'
147
- - 'spec/lib/filter_parser_spec.rb'
148
- - 'spec/parsing_nesting/build_tree_spec.rb'
149
- - 'spec/parsing_nesting/consuming_spec.rb'
150
- - 'spec/parsing_nesting/to_solr_spec.rb'
151
-
152
- # Offense count: 6
153
- RSpec/EmptyLineAfterFinalLet:
154
- Exclude:
155
- - 'spec/helpers/advanced_helper_spec.rb'
156
- - 'spec/lib/advanced_search_builder_spec.rb'
157
-
158
- # Offense count: 21
159
- # Configuration parameters: Max.
160
- RSpec/ExampleLength:
161
- Exclude:
162
- - 'spec/parsing_nesting/build_tree_spec.rb'
163
- - 'spec/parsing_nesting/to_solr_spec.rb'
164
-
165
- # Offense count: 40
166
- # Configuration parameters: CustomTransform, IgnoredWords.
167
- RSpec/ExampleWording:
168
- Exclude:
169
- - 'spec/features/blacklight_advanced_search_form_spec.rb'
170
- - 'spec/helpers/advanced_helper_spec.rb'
171
- - 'spec/integration/blacklight_stub_spec.rb'
172
- - 'spec/lib/filter_parser_spec.rb'
173
- - 'spec/parsing_nesting/build_tree_spec.rb'
174
- - 'spec/parsing_nesting/to_solr_spec.rb'
175
-
176
- # Offense count: 1
177
- # Configuration parameters: CustomTransform, IgnoreMethods.
178
- RSpec/FilePath:
179
- Exclude:
180
- - 'spec/lib/advanced_search_builder_spec.rb'
181
-
182
- # Offense count: 10
183
- # Configuration parameters: AssignmentOnly.
184
- RSpec/InstanceVariable:
185
- Exclude:
186
- - 'spec/parsing_nesting/consuming_spec.rb'
187
- - 'spec/parsing_nesting/to_solr_spec.rb'
188
-
189
- # Offense count: 2
190
- # Configuration parameters: SupportedStyles.
191
- # SupportedStyles: have_received, receive
192
- RSpec/MessageSpies:
193
- EnforcedStyle: receive
194
-
195
- # Offense count: 33
196
- RSpec/MultipleExpectations:
197
- Max: 6
198
-
199
- # Offense count: 10
200
- # Configuration parameters: Max.
201
- RSpec/NestedGroups:
202
- Exclude:
203
- - 'spec/lib/advanced_search_builder_spec.rb'
204
- - 'spec/parsing_nesting/to_solr_spec.rb'
205
-
206
- # Offense count: 2
207
- # Configuration parameters: IgnoreSymbolicNames.
208
- RSpec/VerifiedDoubles:
209
- Exclude:
210
- - 'spec/helpers/advanced_helper_spec.rb'
211
-
212
- # Offense count: 1
213
- Rails/OutputSafety:
214
- Exclude:
215
- - 'lib/blacklight_advanced_search/render_constraints_override.rb'
216
-
217
- # Offense count: 2
218
10
  # Cop supports --auto-correct.
219
- # Configuration parameters: NotNilAndNotEmpty, NotBlank, UnlessBlank.
220
- Rails/Present:
221
- Exclude:
222
- - 'app/helpers/blacklight_advanced_search/advanced_helper_behavior.rb'
223
- - 'lib/blacklight_advanced_search/advanced_query_parser.rb'
224
-
225
- # Offense count: 1
226
- Style/AccessorMethodName:
227
- Exclude:
228
- - 'app/controllers/blacklight_advanced_search/advanced_controller.rb'
229
-
230
- # Offense count: 7
231
- # Configuration parameters: EnforcedStyle, SupportedStyles.
232
- # SupportedStyles: nested, compact
233
- Style/ClassAndModuleChildren:
234
- Exclude:
235
- - 'app/controllers/blacklight_advanced_search/advanced_controller.rb'
236
- - 'lib/blacklight_advanced_search/catalog_helper_override.rb'
237
- - 'lib/blacklight_advanced_search/controller.rb'
238
- - 'lib/blacklight_advanced_search/filter_parser.rb'
239
- - 'lib/blacklight_advanced_search/parsing_nesting_parser.rb'
240
- - 'lib/blacklight_advanced_search/render_constraints_override.rb'
241
- - 'lib/parsing_nesting/tree.rb'
242
-
243
- # Offense count: 26
244
- Style/Documentation:
245
- Enabled: false
246
-
247
- # Offense count: 1
248
- # Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts, AllowedAcronyms.
249
- # AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
250
- Style/FileName:
251
- Exclude:
252
- - 'Gemfile'
253
-
254
- # Offense count: 6
255
- # Configuration parameters: MinBodyLength.
256
- Style/GuardClause:
257
- Exclude:
258
- - 'app/helpers/blacklight_advanced_search/advanced_helper_behavior.rb'
259
- - 'lib/blacklight_advanced_search/advanced_search_builder.rb'
260
- - 'lib/blacklight_advanced_search/redirect_legacy_params_filter.rb'
261
- - 'lib/blacklight_advanced_search/render_constraints_override.rb'
262
- - 'lib/parsing_nesting/tree.rb'
263
-
264
- # Offense count: 76
265
- # Cop supports --auto-correct.
266
- # Configuration parameters: EnforcedStyle, SupportedStyles, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
11
+ # Configuration parameters: EnforcedStyle, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
267
12
  # SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
268
13
  Style/HashSyntax:
269
14
  Exclude:
270
15
  - 'Rakefile'
271
- - 'lib/blacklight_advanced_search/advanced_query_parser.rb'
272
- - 'lib/blacklight_advanced_search/redirect_legacy_params_filter.rb'
273
- - 'lib/blacklight_advanced_search/render_constraints_override.rb'
274
- - 'lib/generators/blacklight_advanced_search/assets_generator.rb'
275
- - 'lib/generators/blacklight_advanced_search/templates/advanced_controller.rb'
276
- - 'lib/parsing_nesting/tree.rb'
277
- - 'spec/features/blacklight_advanced_search_form_spec.rb'
278
- - 'spec/lib/advanced_search_builder_spec.rb'
279
- - 'spec/lib/filter_parser_spec.rb'
280
- - 'spec/parsing_nesting/to_solr_spec.rb'
281
- - 'spec/test_app_templates/app/controllers/catalog_controller.rb'
282
- - 'spec/test_app_templates/lib/generators/test_app_generator.rb'
283
-
284
- # Offense count: 1
285
- # Configuration parameters: EnforcedStyle, SupportedStyles.
286
- # SupportedStyles: snake_case, camelCase
287
- Style/MethodName:
288
- Exclude:
289
- - 'spec/lib/filter_parser_spec.rb'
290
-
291
- # Offense count: 5
292
- # Cop supports --auto-correct.
293
- # Configuration parameters: AllowSafeAssignment.
294
- Style/ParenthesesAroundCondition:
295
- Exclude:
296
- - 'lib/blacklight_advanced_search/catalog_helper_override.rb'
297
- - 'lib/blacklight_advanced_search/render_constraints_override.rb'
298
-
299
- # Offense count: 2
300
- # Cop supports --auto-correct.
301
- # Configuration parameters: PreferredDelimiters.
302
- Style/PercentLiteralDelimiters:
303
- Exclude:
304
- - 'spec/lib/filter_parser_spec.rb'
305
-
306
- # Offense count: 4
307
- # Cop supports --auto-correct.
308
- Style/PerlBackrefs:
309
- Exclude:
310
- - 'spec/parsing_nesting/to_solr_spec.rb'
311
-
312
- # Offense count: 2
313
- # Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist.
314
- # NamePrefix: is_, has_, have_
315
- # NamePrefixBlacklist: is_, has_, have_
316
- # NameWhitelist: is_a?
317
- Style/PredicateName:
318
- Exclude:
319
- - 'spec/**/*'
320
- - 'lib/blacklight_advanced_search/advanced_search_builder.rb'
321
- - 'lib/blacklight_advanced_search/controller.rb'
322
-
323
- # Offense count: 5
324
- # Cop supports --auto-correct.
325
- # Configuration parameters: EnforcedStyle, SupportedStyles.
326
- # SupportedStyles: short, verbose
327
- Style/PreferredHashMethods:
328
- Exclude:
329
- - 'lib/parsing_nesting/tree.rb'
330
-
331
- # Offense count: 4
332
- # Cop supports --auto-correct.
333
- # Configuration parameters: AllowMultipleReturnValues.
334
- Style/RedundantReturn:
335
- Exclude:
336
- - 'app/helpers/blacklight_advanced_search/advanced_helper_behavior.rb'
337
- - 'lib/blacklight_advanced_search/render_constraints_override.rb'
338
-
339
- # Offense count: 6
340
- # Cop supports --auto-correct.
341
- Style/RedundantSelf:
342
- Exclude:
343
- - 'lib/blacklight_advanced_search/advanced_search_builder.rb'
344
- - 'lib/blacklight_advanced_search/render_constraints_override.rb'
345
- - 'lib/blacklight_advanced_search/version.rb'
346
- - 'lib/parsing_nesting/tree.rb'
347
16
 
348
17
  # Offense count: 1
349
18
  # Cop supports --auto-correct.
350
- # Configuration parameters: SupportedStyles.
19
+ # Configuration parameters: .
351
20
  # SupportedStyles: use_perl_names, use_english_names
352
21
  Style/SpecialGlobalVars:
353
22
  EnforcedStyle: use_perl_names
354
23
 
355
- # Offense count: 398
24
+ # Offense count: 7
356
25
  # Cop supports --auto-correct.
357
- # Configuration parameters: EnforcedStyle, SupportedStyles, ConsistentQuotesInMultiline.
26
+ # Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
358
27
  # SupportedStyles: single_quotes, double_quotes
359
28
  Style/StringLiterals:
360
- Enabled: false
361
-
362
- # Offense count: 1
363
- # Cop supports --auto-correct.
364
- # Configuration parameters: EnforcedStyle, SupportedStyles.
365
- # SupportedStyles: single_quotes, double_quotes
366
- Style/StringLiteralsInInterpolation:
367
- Exclude:
368
- - 'lib/parsing_nesting/tree.rb'
369
-
370
- # Offense count: 1
371
- # Cop supports --auto-correct.
372
- # Configuration parameters: MinSize, SupportedStyles.
373
- # SupportedStyles: percent, brackets
374
- Style/SymbolArray:
375
- EnforcedStyle: brackets
376
-
377
- # Offense count: 9
378
- # Cop supports --auto-correct.
379
- # Configuration parameters: IgnoredMethods.
380
- # IgnoredMethods: respond_to, define_method
381
- Style/SymbolProc:
382
- Exclude:
383
- - 'lib/parsing_nesting/tree.rb'
384
- - 'spec/spec_helper.rb'
385
-
386
- # Offense count: 1
387
- # Cop supports --auto-correct.
388
- # Configuration parameters: AllowNamedUnderscoreVariables.
389
- Style/TrailingUnderscoreVariable:
390
- Exclude:
391
- - 'app/controllers/blacklight_advanced_search/advanced_controller.rb'
392
-
393
- # Offense count: 2
394
- # Configuration parameters: EnforcedStyle, SupportedStyles.
395
- # SupportedStyles: snake_case, camelCase
396
- Style/VariableName:
397
29
  Exclude:
398
- - 'lib/parsing_nesting/tree.rb'
30
+ - 'Rakefile'
@@ -1,14 +1,14 @@
1
1
  notifications:
2
2
  email: false
3
3
 
4
- rvm:
5
- - 2.4.1
6
- - 2.3.3
7
-
8
4
  matrix:
9
5
  include:
10
- - rvm: 2.3.3
11
- env: "RAILS_VERSION=5.0.3"
6
+ - rvm: 2.6.5
7
+ env: "RAILS_VERSION=6.0.0 ENGINE_CART_RAILS_OPTIONS=\"--skip-webpack-install\""
8
+ - rvm: 2.6.5
9
+ env: "RAILS_VERSION=5.2.3"
10
+ - rvm: 2.5.7
11
+ env: "RAILS_VERSION=5.1.7"
12
12
 
13
13
  notifications:
14
14
  irc: "irc.freenode.org#blacklight"
@@ -18,4 +18,4 @@ env:
18
18
  global:
19
19
  - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
20
20
 
21
- jdk: oraclejdk8
21
+ jdk: openjdk11