blacklight_advanced_search 8.0.0.alpha2 → 8.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59198eb4fdf853ede08ae5f3511341a98c81c83080daf40e757e9232af860dea
-  data.tar.gz: 225901fe9571fe867a36c198e4cf0366b62ab13b81bcf57f8a0fb9e5e7734fd6
+  metadata.gz: 1373f3849b2564bb57b5a4596dc798f26fa47566dcea685a9a24f202f9ef5e63
+  data.tar.gz: 494eb7f9dd89f644a3228423a555153a68d734e71f990570a9f4be2169babfac
 SHA512:
-  metadata.gz: 1bbfbd5f818a220bddd0acc60fceee62ca50f6c538dff9274a7defe410e2adfe4215269df4ad4df1c04e496214d3effd7a7d9139d98206bfad6bb6e8832584fa
-  data.tar.gz: 180e2984ff0c3afcc2ec09b2ec799e5b279f28518ea4cc028a5eb63503ac95ac55bd4613996a7c7221c1a9b4d4f9e75d204f93741161acbdfb2ffe616da5e997
+  metadata.gz: ac4768563ed3ff1370260a14523ff977db90d663ff054258589e48c087dfd18e9149b00402521aab4506e083a9efdea48e0e4800d421c5228451893781d5bfe7
+  data.tar.gz: 596aed99657baa1e2b840bda03fd32fbdeb80a55c4dfe2b00434b52660d2c0c9f5b832fbc4ba4084350178b9c2feaead208a347ca186e66b1633b9ab9bd90fda

data/.github/workflows/ruby.yml

@@ -1,10 +1,3 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
-# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
-
 name: CI
 
 on:
@@ -13,113 +6,52 @@ on:
       - main
       - 'release-*'
   pull_request:
+    branches:
+      - main
+      - 'release-*'
 
 jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v6
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7
+        ruby-version: 3.1
     - name: Install dependencies
       run: bundle install
     - name: Run linter
       run: bundle exec rake rubocop
   test:
     runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.experimental }}
     strategy:
       matrix:
-        ruby: [2.7, '3.0', 3.1]
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-    - name: Install dependencies
-      run: bundle install
-    - name: Run tests
-      run: bundle exec rake ci
-      env:
-        ENGINE_CART_RAILS_OPTIONS: '-a propshaft --skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test'
-  test_bootstrap5:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ruby: ['3.0']
+        ruby: ['3.2', '3.3', '3.4']
+        rails_version: ['~> 7.2.4', '~> 8.1']
+        blacklight_version: ['~> 8.0']
+        experimental: [false]
+        include:
+        - ruby: '3.4'
+          rails_version: '~> 8.1'
+          blacklight_version: '~> 9.0'
+          experimental: false
+        - ruby: '3.4'
+          rails_version: '~> 8.1'
+          blacklight_version: 'github'
+          experimental: true
+    env:
+      RAILS_VERSION: ${{ matrix.rails_version }}
+      BLACKLIGHT_VERSION: ${{ matrix.blacklight_version }}
+      ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test --skip-kamal --css=bootstrap --js=esbuild'
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
+    - uses: actions/checkout@v6
+    - name: Set up Ruby ${{ matrix.ruby }}
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
-    - name: Install dependencies
-      run: bundle install
-    - name: Run tests
-      run: bundle exec rake ci
-      env:
-        BOOTSTRAP_VERSION: '~> 5.0'
-        ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test'
-  test_rails6_0:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ruby: [2.6]
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-    - name: Install dependencies
-      run: bundle install
-      env:
-        RAILS_VERSION: 6.0.3.7
-    - name: Run tests
-      run: bundle exec rake ci
-      env:
-        RAILS_VERSION: 6.0.3.7
-        ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test'
-  test_rails5_2:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ruby: [2.7]
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-    - name: Install dependencies
-      run: bundle install
-      env:
-        RAILS_VERSION: 5.2.4.6
-    - name: Run tests
-      run: bundle exec rake ci
-      env:
-        RAILS_VERSION: 5.2.4.6
-        ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test'
-
-  test_rails6_1:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ruby: ['3.0']
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-    - name: Install dependencies
+    - name: Install dependencies with Rails ${{ matrix.rails_version }}
       run: bundle install
-      env:
-        RAILS_VERSION: 6.1.5
     - name: Run tests
-      run: bundle exec rake ci
-      env:
-        RAILS_VERSION: 6.1.5
-        ENGINE_CART_RAILS_OPTIONS: '--skip-git --skip-keeps --skip-action-cable --skip-test'
+      run: bundle exec rake

data/.solr_wrapper.yml

@@ -3,3 +3,5 @@
 collection:
   dir: solr/conf/
   name: blacklight-core
+env:
+  SOLR_OPTS: '-Dsolr.config.lib.enabled=true'

data/Gemfile

@@ -32,3 +32,5 @@ else
   end
 end
 # END ENGINE_CART BLOCK
+
+eval_gemfile File.expand_path("spec/test_app_templates/Gemfile.extra", File.dirname(__FILE__))

data/Rakefile

@@ -7,6 +7,52 @@ require 'rdoc/task'
 require 'rubocop/rake_task'
 require 'rspec/core/rake_task'
 require 'engine_cart/rake_task'
+require 'net/http'
+
+# Run Solr with docker compose when it's available, otherwise with solr_wrapper.
+def with_solr(&block)
+  if system('docker compose version', out: File::NULL, err: File::NULL)
+    with_docker_solr(&block)
+  else
+    with_solr_wrapper(&block)
+  end
+end
+
+def with_docker_solr
+  puts 'Starting Solr'
+  system('docker compose up -d solr', exception: true)
+  wait_for_solr
+  yield
+ensure
+  puts 'Stopping Solr'
+  system('docker compose stop solr')
+end
+
+def with_solr_wrapper(&block)
+  require 'solr_wrapper'
+
+  SolrWrapper.wrap(port: '8983') do |solr|
+    solr.with_collection(name: 'blacklight-core', dir: File.join(File.expand_path(__dir__), "solr", "conf"), &block)
+  end
+end
+
+# `docker compose up -d` returns before Solr has created the core.
+def wait_for_solr(timeout: 60)
+  ping = URI("http://127.0.0.1:#{ENV.fetch('SOLR_PORT', 8983)}/solr/blacklight-core/admin/ping")
+  deadline = Process.clock_gettime(Process::CLOCK_MONOTONIC) + timeout
+
+  until solr_ping?(ping)
+    raise "Solr did not respond at #{ping} within #{timeout} seconds" if Process.clock_gettime(Process::CLOCK_MONOTONIC) > deadline
+
+    sleep 1
+  end
+end
+
+def solr_ping?(uri)
+  Net::HTTP.get_response(uri).is_a?(Net::HTTPSuccess)
+rescue StandardError
+  false
+end
 
 task :default => :ci
 
@@ -24,13 +70,9 @@ end
 
 desc "Execute Continuous Integration build"
 task :ci => ['rubocop', 'engine_cart:generate'] do
-  require 'solr_wrapper'
-
-  SolrWrapper.wrap(port: '8983') do |solr|
-    solr.with_collection(name: 'blacklight-core', dir: File.join(File.expand_path(__dir__), "solr", "conf")) do
-      Rake::Task['fixtures'].invoke
-      Rake::Task['spec'].invoke
-    end
+  with_solr do
+    Rake::Task['fixtures'].invoke
+    Rake::Task['spec'].invoke
   end
 end
 

data/VERSION

@@ -1 +1 @@
-8.0.0.alpha2
+8.1.0

data/blacklight_advanced_search.gemspec

@@ -16,11 +16,11 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'blacklight', '>= 7.15', '< 9'
+  s.add_dependency 'blacklight', '>= 7.15', '< 10'
   s.add_dependency "parslet"
 
   s.add_development_dependency "rails"
-  s.add_development_dependency "rspec-rails", "~> 5.0"
+  s.add_development_dependency "rspec-rails", "~> 8.0"
   s.add_development_dependency "capybara"
   s.add_development_dependency 'solr_wrapper'
   s.add_development_dependency 'engine_cart', "~> 2.0"

data/compose.yaml

@@ -0,0 +1,16 @@
+services:
+  solr:
+    image: "solr:${SOLR_VERSION:-9.10.1}"
+    volumes:
+      - $PWD/solr/conf:/opt/solr/conf
+    ports:
+      - "${SOLR_PORT:-8983}:8983"
+    environment:
+      - SOLR_OPTS=-Dsolr.config.lib.enabled=true
+    entrypoint:
+      - docker-entrypoint.sh
+      - solr-precreate
+      - blacklight-core
+      - /opt/solr/conf
+      - "-Xms256m"
+      - "-Xmx512m"

data/lib/blacklight_advanced_search/advanced_search_builder.rb

@@ -49,9 +49,10 @@ module BlacklightAdvancedSearch
     # parse and send it straight to solr same as if advanced_parse_q
     # were not being used.
     def add_advanced_parse_q_to_solr(solr_parameters)
-      return if blacklight_params[:q].blank? || !blacklight_params[:q].respond_to?(:to_str)
+      params = search_state.params
+      return if params[:q].blank? || !params[:q].respond_to?(:to_str)
 
-      field_def = blacklight_config.search_fields[blacklight_params[:search_field]] ||
+      field_def = blacklight_config.search_fields[params[:search_field]] ||
         blacklight_config.default_search_field
 
       # If the individual field has advanced_parse_q suppressed, punt
@@ -63,7 +64,7 @@ module BlacklightAdvancedSearch
       # See if we can parse it, if we can't, we're going to give up
       # and just allow basic search, perhaps with a warning.
       begin
-        adv_search_params = ParsingNesting::Tree.parse(blacklight_params[:q], blacklight_config.advanced_search[:query_parser]).to_single_query_params(solr_local_params)
+        adv_search_params = ParsingNesting::Tree.parse(params[:q], blacklight_config.advanced_search[:query_parser]).to_single_query_params(solr_local_params)
 
         BlacklightAdvancedSearch.deep_merge!(solr_parameters, solr_direct_params)
         BlacklightAdvancedSearch.deep_merge!(solr_parameters, adv_search_params)

data/spec/test_app_templates/Gemfile.extra

@@ -0,0 +1,5 @@
+if ENV['BLACKLIGHT_VERSION'] == 'github'
+  gem 'blacklight', github: 'projectblacklight/blacklight'
+elsif ENV['BLACKLIGHT_VERSION'] && !ENV['BLACKLIGHT_VERSION'].empty?
+  gem 'blacklight', ENV['BLACKLIGHT_VERSION']
+end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blacklight_advanced_search
 version: !ruby/object:Gem::Version
-  version: 8.0.0.alpha2
+  version: 8.1.0
 platform: ruby
 authors:
 - Jonathan Rochkind
 - Chris Beer
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-12 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -20,7 +19,7 @@ dependencies:
         version: '7.15'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '9'
+        version: '10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +29,7 @@ dependencies:
         version: '7.15'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '9'
+        version: '10'
 - !ruby/object:Gem::Dependency
   name: parslet
   requirement: !ruby/object:Gem::Requirement
@@ -65,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '8.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -171,7 +170,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
 email:
 - blacklight-development@googlegroups.com
 executables: []
@@ -190,6 +188,7 @@ files:
 - Rakefile
 - VERSION
 - blacklight_advanced_search.gemspec
+- compose.yaml
 - config/routes.rb
 - lib/blacklight_advanced_search.rb
 - lib/blacklight_advanced_search/advanced_query_parser.rb
@@ -228,13 +227,13 @@ files:
 - spec/parsing_nesting/to_solr_spec.rb
 - spec/rcov.opts
 - spec/spec_helper.rb
+- spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/app/controllers/catalog_controller.rb
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 homepage: http://projectblacklight.org/
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -245,12 +244,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 4.0.22
 specification_version: 4
 summary: Blacklight Advanced Search plugin
 test_files:
@@ -263,5 +261,6 @@ test_files:
 - spec/parsing_nesting/to_solr_spec.rb
 - spec/rcov.opts
 - spec/spec_helper.rb
+- spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/app/controllers/catalog_controller.rb
 - spec/test_app_templates/lib/generators/test_app_generator.rb