blacklight_advanced_search 6.0.2 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a35c0640635eb3eb11120e2f48f91e2ce2f837bd
-  data.tar.gz: e1d9545fabe6ad579a6c066af9e03ea410500fc2
+  metadata.gz: 1a0d1a3ae8894d6913705748f4f0c36cd946aed0
+  data.tar.gz: 490f7bd162c8016890aafb194d6f2219fd4275ed
 SHA512:
-  metadata.gz: 3663a1780f7317d5132f457e49e0171124cee6cc327458d96e6670129a027ff3c2397adcf9aaadfb1c72fffb3358305b611e685c29b69ccd7c2675734d014e3c
-  data.tar.gz: 3d110353293c52a756c9e6b43731251900e382f03488661accadf6fecbc49b13fbf8f064a5c05bbd7b7dbbd98308008eb5fc8ce4f79dfa6ef1dd455dad729cf4
+  metadata.gz: 37e8e598f7d4f513085ba671ceed8f9ad3fe273235fcb05c690dfd9912af8848af63e4a68d5e60ae6d709e9c2156240bca9e1d6d567259d55a8e581ce1c3aa48
+  data.tar.gz: 7be40cbe6fcbcf8b5c14220f4f7ddaedc94c519576938c8766862e2c3d6890ea445d9b6a3c5ae5df37823edf84067bd54af7951d22367a1257a4539733e9d646

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/.rubocop.yml

@@ -0,0 +1,15 @@
+inherit_from: .rubocop_todo.yml
+require: rubocop-rspec
+
+AllCops:
+  DisplayCopNames: true
+  Include:
+    - '**/Rakefile'
+  Exclude:
+    - '.internal_test_app/**/*'
+
+Rails:
+  Enabled: true
+
+Metrics/LineLength:
+  Max: 185

data/.rubocop_todo.yml

@@ -0,0 +1,351 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2016-08-25 19:29:18 -0700 using RuboCop version 0.42.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Manually added to prevent `unrecognized cop` warnings during execution.
+require: rubocop-rspec
+
+# Offense count: 2
+Lint/AmbiguousOperator:
+  Exclude:
+    - 'app/helpers/advanced_helper.rb'
+    - 'spec/parsing_nesting/to_solr_spec.rb'
+
+# Offense count: 3
+# Configuration parameters: AllowSafeAssignment.
+Lint/AssignmentInCondition:
+  Exclude:
+    - 'lib/parsing_nesting/tree.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: AlignWith, SupportedStyles, AutoCorrect.
+# SupportedStyles: keyword, variable, start_of_line
+Lint/EndAlignment:
+  Exclude:
+    - 'lib/blacklight_advanced_search/advanced_search_builder.rb'
+    - 'lib/blacklight_advanced_search/redirect_legacy_params_filter.rb'
+    - 'lib/parsing_nesting/tree.rb'
+
+# Offense count: 17
+Lint/ShadowingOuterLocalVariable:
+  Exclude:
+    - 'spec/parsing_nesting/build_tree_spec.rb'
+    - 'spec/parsing_nesting/to_solr_spec.rb'
+
+# Offense count: 1
+Lint/UselessAssignment:
+  Exclude:
+    - 'lib/blacklight_advanced_search/advanced_search_builder.rb'
+
+# Offense count: 7
+Metrics/AbcSize:
+  Max: 38
+
+# Offense count: 3
+Metrics/CyclomaticComplexity:
+  Max: 11
+
+# Offense count: 14
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 22
+
+# Offense count: 2
+Metrics/PerceivedComplexity:
+  Max: 13
+
+# Offense count: 7
+RSpec/DescribeClass:
+  Exclude:
+    - 'spec/features/blacklight_advanced_search_form_spec.rb'
+    - 'spec/integration/blacklight_stub_spec.rb'
+    - 'spec/lib/deep_merge_spec.rb'
+    - 'spec/lib/filter_parser_spec.rb'
+    - 'spec/parsing_nesting/build_tree_spec.rb'
+    - 'spec/parsing_nesting/consuming_spec.rb'
+    - 'spec/parsing_nesting/to_solr_spec.rb'
+
+# Offense count: 21
+# Configuration parameters: Max.
+RSpec/ExampleLength:
+  Exclude:
+    - 'spec/parsing_nesting/build_tree_spec.rb'
+    - 'spec/parsing_nesting/to_solr_spec.rb'
+
+# Offense count: 40
+# Configuration parameters: CustomTransform, IgnoredWords.
+RSpec/ExampleWording:
+  Exclude:
+    - 'spec/features/blacklight_advanced_search_form_spec.rb'
+    - 'spec/helpers/advanced_helper_spec.rb'
+    - 'spec/integration/blacklight_stub_spec.rb'
+    - 'spec/lib/filter_parser_spec.rb'
+    - 'spec/parsing_nesting/build_tree_spec.rb'
+    - 'spec/parsing_nesting/to_solr_spec.rb'
+
+# Offense count: 1
+# Configuration parameters: CustomTransform.
+RSpec/FilePath:
+  Exclude:
+    - 'spec/lib/advanced_search_builder_spec.rb'
+
+# Offense count: 17
+# Configuration parameters: AssignmentOnly.
+RSpec/InstanceVariable:
+  Exclude:
+    - 'spec/lib/deep_merge_spec.rb'
+    - 'spec/parsing_nesting/consuming_spec.rb'
+    - 'spec/parsing_nesting/to_solr_spec.rb'
+
+# Offense count: 2
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: allow, expect
+RSpec/MessageExpectation:
+  Exclude:
+    - 'spec/helpers/advanced_helper_spec.rb'
+
+# Offense count: 29
+RSpec/MultipleExpectations:
+  Max: 6
+
+# Offense count: 4
+# Configuration parameters: MaxNesting.
+RSpec/NestedGroups:
+  Exclude:
+    - 'spec/lib/advanced_search_builder_spec.rb'
+
+# Offense count: 5
+# Configuration parameters: IgnoreSymbolicNames.
+RSpec/VerifiedDoubles:
+  Exclude:
+    - 'spec/helpers/advanced_helper_spec.rb'
+    - 'spec/lib/advanced_search_builder_spec.rb'
+
+# Offense count: 1
+Rails/OutputSafety:
+  Exclude:
+    - 'lib/blacklight_advanced_search/render_constraints_override.rb'
+
+# Offense count: 1
+Style/AccessorMethodName:
+  Exclude:
+    - 'app/controllers/blacklight_advanced_search/advanced_controller.rb'
+
+# Offense count: 9
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle, SupportedLastArgumentHashStyles.
+# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
+Style/AlignHash:
+  Exclude:
+    - 'lib/parsing_nesting/tree.rb'
+    - 'spec/lib/deep_merge_spec.rb'
+
+# Offense count: 4
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
+# SupportedStyles: with_first_parameter, with_fixed_indentation
+Style/AlignParameters:
+  Exclude:
+    - 'lib/blacklight_advanced_search/render_constraints_override.rb'
+
+# Offense count: 7
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: nested, compact
+Style/ClassAndModuleChildren:
+  Exclude:
+    - 'app/controllers/blacklight_advanced_search/advanced_controller.rb'
+    - 'lib/blacklight_advanced_search/catalog_helper_override.rb'
+    - 'lib/blacklight_advanced_search/controller.rb'
+    - 'lib/blacklight_advanced_search/filter_parser.rb'
+    - 'lib/blacklight_advanced_search/parsing_nesting_parser.rb'
+    - 'lib/blacklight_advanced_search/render_constraints_override.rb'
+    - 'lib/parsing_nesting/tree.rb'
+
+# Offense count: 1
+Style/ClassVars:
+  Exclude:
+    - 'lib/blacklight_advanced_search/advanced_search_builder.rb'
+
+# Offense count: 25
+Style/Documentation:
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
+    - 'lib/blacklight_advanced_search.rb'
+    - 'lib/blacklight_advanced_search/advanced_search_builder.rb'
+    - 'lib/blacklight_advanced_search/catalog_helper_override.rb'
+    - 'lib/blacklight_advanced_search/filter_parser.rb'
+    - 'lib/blacklight_advanced_search/parsing_nesting_parser.rb'
+    - 'lib/blacklight_advanced_search/redirect_legacy_params_filter.rb'
+    - 'lib/blacklight_advanced_search/version.rb'
+    - 'lib/generators/blacklight_advanced_search/assets_generator.rb'
+    - 'lib/generators/blacklight_advanced_search/blacklight_advanced_search_generator.rb'
+    - 'lib/generators/blacklight_advanced_search/install_generator.rb'
+    - 'lib/generators/blacklight_advanced_search/templates/advanced_controller.rb'
+    - 'lib/generators/blacklight_advanced_search/templates/saved_searches_controller.rb'
+    - 'lib/generators/blacklight_advanced_search/templates/search_history_controller.rb'
+    - 'lib/parsing_nesting/grammar.rb'
+    - 'lib/parsing_nesting/tree.rb'
+
+# Offense count: 4
+# Configuration parameters: MinBodyLength.
+Style/GuardClause:
+  Exclude:
+    - 'app/helpers/advanced_helper.rb'
+    - 'lib/blacklight_advanced_search/advanced_search_builder.rb'
+    - 'lib/blacklight_advanced_search/render_constraints_override.rb'
+    - 'lib/parsing_nesting/tree.rb'
+
+# Offense count: 76
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
+# SupportedStyles: ruby19, ruby19_no_mixed_keys, hash_rockets
+Style/HashSyntax:
+  Exclude:
+    - 'Rakefile'
+    - 'app/helpers/advanced_helper.rb'
+    - 'lib/blacklight_advanced_search/advanced_query_parser.rb'
+    - 'lib/blacklight_advanced_search/redirect_legacy_params_filter.rb'
+    - 'lib/blacklight_advanced_search/render_constraints_override.rb'
+    - 'lib/generators/blacklight_advanced_search/assets_generator.rb'
+    - 'lib/generators/blacklight_advanced_search/templates/advanced_controller.rb'
+    - 'lib/parsing_nesting/tree.rb'
+    - 'spec/features/blacklight_advanced_search_form_spec.rb'
+    - 'spec/lib/advanced_search_builder_spec.rb'
+    - 'spec/lib/filter_parser_spec.rb'
+    - 'spec/parsing_nesting/to_solr_spec.rb'
+    - 'spec/test_app_templates/app/controllers/catalog_controller.rb'
+    - 'spec/test_app_templates/lib/generators/test_app_generator.rb'
+
+# Offense count: 1
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: snake_case, camelCase
+Style/MethodName:
+  Exclude:
+    - 'spec/lib/filter_parser_spec.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: symmetrical, new_line, same_line
+Style/MultilineArrayBraceLayout:
+  Exclude:
+    - 'spec/parsing_nesting/consuming_spec.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: symmetrical, new_line, same_line
+Style/MultilineHashBraceLayout:
+  Exclude:
+    - 'spec/lib/deep_merge_spec.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: symmetrical, new_line, same_line
+Style/MultilineMethodCallBraceLayout:
+  Exclude:
+    - 'lib/blacklight_advanced_search/render_constraints_override.rb'
+
+# Offense count: 10
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
+# SupportedStyles: aligned, indented
+Style/MultilineOperationIndentation:
+  Exclude:
+    - 'lib/blacklight_advanced_search/advanced_search_builder.rb'
+    - 'lib/blacklight_advanced_search/controller.rb'
+    - 'lib/parsing_nesting/grammar.rb'
+    - 'lib/parsing_nesting/tree.rb'
+
+# Offense count: 7
+# Cop supports --auto-correct.
+# Configuration parameters: AllowSafeAssignment.
+Style/ParenthesesAroundCondition:
+  Exclude:
+    - 'lib/blacklight_advanced_search.rb'
+    - 'lib/blacklight_advanced_search/catalog_helper_override.rb'
+    - 'lib/blacklight_advanced_search/render_constraints_override.rb'
+
+# Offense count: 4
+# Cop supports --auto-correct.
+Style/PerlBackrefs:
+  Exclude:
+    - 'spec/parsing_nesting/to_solr_spec.rb'
+
+# Offense count: 2
+# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist.
+# NamePrefix: is_, has_, have_
+# NamePrefixBlacklist: is_, has_, have_
+# NameWhitelist: is_a?
+Style/PredicateName:
+  Exclude:
+    - 'spec/**/*'
+    - 'lib/blacklight_advanced_search/advanced_search_builder.rb'
+    - 'lib/blacklight_advanced_search/controller.rb'
+
+# Offense count: 5
+# Cop supports --auto-correct.
+Style/PreferredHashMethods:
+  Exclude:
+    - 'lib/parsing_nesting/tree.rb'
+
+# Offense count: 6
+# Cop supports --auto-correct.
+Style/RedundantSelf:
+  Exclude:
+    - 'lib/blacklight_advanced_search/advanced_search_builder.rb'
+    - 'lib/blacklight_advanced_search/render_constraints_override.rb'
+    - 'lib/blacklight_advanced_search/version.rb'
+    - 'lib/parsing_nesting/tree.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: SupportedStyles.
+# SupportedStyles: use_perl_names, use_english_names
+Style/SpecialGlobalVars:
+  EnforcedStyle: use_perl_names
+
+# Offense count: 430
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, ConsistentQuotesInMultiline.
+# SupportedStyles: single_quotes, double_quotes
+Style/StringLiterals:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: single_quotes, double_quotes
+Style/StringLiteralsInInterpolation:
+  Exclude:
+    - 'lib/parsing_nesting/tree.rb'
+
+# Offense count: 9
+# Cop supports --auto-correct.
+# Configuration parameters: IgnoredMethods.
+# IgnoredMethods: respond_to, define_method
+Style/SymbolProc:
+  Exclude:
+    - 'lib/parsing_nesting/tree.rb'
+    - 'spec/spec_helper.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: AllowNamedUnderscoreVariables.
+Style/TrailingUnderscoreVariable:
+  Exclude:
+    - 'app/controllers/blacklight_advanced_search/advanced_controller.rb'
+
+# Offense count: 2
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: snake_case, camelCase
+Style/VariableName:
+  Exclude:
+    - 'lib/parsing_nesting/tree.rb'

data/.solr_wrapper.yml

@@ -0,0 +1,5 @@
+# Place any default configuration for solr_wrapper here
+# port: 8983
+collection:
+  dir: solr/conf/
+  name: blacklight-core

data/.travis.yml

@@ -2,13 +2,8 @@ notifications:
   email: false
 
 rvm:
-  - 2.2
-  - 2.1
-  # - 1.9.3
-  # - jruby-19mode
-before_install:
-  - rvm @global do gem uninstall bundler -a -x
-  - rvm @global do gem install bundler -v 1.10.6
+  - 2.3.1
+  - 2.2.5
 
 notifications:
   irc: "irc.freenode.org#blacklight"
@@ -17,3 +12,5 @@ notifications:
 env:
   global:
     - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
+
+jdk: oraclejdk8

data/Gemfile

@@ -3,10 +3,10 @@ source 'http://rubygems.org'
 gemspec
 
 # BEGIN ENGINE_CART BLOCK
-# engine_cart: 0.8.0
-# engine_cart stanza: 0.8.0
+# engine_cart: 0.10.0
+# engine_cart stanza: 0.10.0
 # the below comes from engine_cart, a gem used to test this Rails engine gem in the context of a Rails app.
-file = File.expand_path("Gemfile", ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path(".internal_test_app", File.dirname(__FILE__)))
+file = File.expand_path('Gemfile', ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path('.internal_test_app', File.dirname(__FILE__)))
 if File.exist?(file)
   begin
     eval_gemfile file
@@ -17,15 +17,22 @@ if File.exist?(file)
 else
   Bundler.ui.warn "[EngineCart] Unable to find test application dependencies in #{file}, using placeholder dependencies"
 
-  gem 'rails', ENV['RAILS_VERSION'] if ENV['RAILS_VERSION']
+  if ENV['RAILS_VERSION']
+    if ENV['RAILS_VERSION'] == 'edge'
+      gem 'rails', github: 'rails/rails'
+      ENV['ENGINE_CART_RAILS_OPTIONS'] = '--edge --skip-turbolinks'
+    else
+      gem 'rails', ENV['RAILS_VERSION']
+    end
+  end
 
-  if ENV['RAILS_VERSION'].nil? || ENV['RAILS_VERSION'] =~ /^4.2/
-    gem 'bootstrap-sass', '>= 3.3.5.1'
-    gem 'responders', "~> 2.0"
-    gem 'sass-rails', ">= 5.0"
-  else
-    gem 'bootstrap-sass', '< 3.3.5' # 3.3.5 requires sass 3.3, incompatible with sass-rails 4.x
-    gem 'sass-rails', "< 5.0"
+  case ENV['RAILS_VERSION']
+  when /^4.2/
+    gem 'responders', '~> 2.0'
+    gem 'sass-rails', '>= 5.0'
+    gem 'coffee-rails', '~> 4.1.0'
+  when /^4.[01]/
+    gem 'sass-rails', '< 5.0'
   end
 end
 # END ENGINE_CART BLOCK