blacklight_advanced_search 8.0.0 → 8.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 863f87d073f3a7e0d89385ab55f1cb18ad064cd13ce8c1971b9ee57e3669aa74
-  data.tar.gz: 6f1d559935ed0467adb44f37f568265eb6571e81db3ba9319e8b0dee8c259910
+  metadata.gz: 1373f3849b2564bb57b5a4596dc798f26fa47566dcea685a9a24f202f9ef5e63
+  data.tar.gz: 494eb7f9dd89f644a3228423a555153a68d734e71f990570a9f4be2169babfac
 SHA512:
-  metadata.gz: 59d72605083343d869eeeab7eb4c275185bd2f70c28793e0ec55fc413266577588ae062ced95d68ed73eda219e7b763b9a796255602dd8925fac7a4535d6e0dd
-  data.tar.gz: '09d0649bf731822a18067bb6199cea04625efb7bad7c6c0fe4f0f10c7c8c2359af9d59a57ea1fc8adac6ca1e2fd3d95b3c8d093de740c35e74bee0b7b17e8e22'
+  metadata.gz: ac4768563ed3ff1370260a14523ff977db90d663ff054258589e48c087dfd18e9149b00402521aab4506e083a9efdea48e0e4800d421c5228451893781d5bfe7
+  data.tar.gz: 596aed99657baa1e2b840bda03fd32fbdeb80a55c4dfe2b00434b52660d2c0c9f5b832fbc4ba4084350178b9c2feaead208a347ca186e66b1633b9ab9bd90fda

data/.github/workflows/ruby.yml

@@ -29,7 +29,7 @@ jobs:
     strategy:
       matrix:
         ruby: ['3.2', '3.3', '3.4']
-        rails_version: ['~> 7.2', '~> 8.1']
+        rails_version: ['~> 7.2.4', '~> 8.1']
         blacklight_version: ['~> 8.0']
         experimental: [false]
         include:

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
+8.1.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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight_advanced_search
 version: !ruby/object:Gem::Version
-  version: 8.0.0
+  version: 8.1.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -188,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
@@ -247,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.22
 specification_version: 4
 summary: Blacklight Advanced Search plugin
 test_files: