solr_wrapper 4.1.3 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a95e5af0cdecef5309de51b47fa1b4b4172c5bef9e84d029d7835b208e1dbfd5
-  data.tar.gz: 9324671fad88ddf5db41b28d5b5082aa4b24ff1e6a017394ac164314e3f307c1
+  metadata.gz: 18f3d35de784cb86498a00c3441df0319346e4612cc701a0884285d2d1fec8f7
+  data.tar.gz: a2b668dfb513b3c95e0bb9eedb5b891e1121cc329214dee4bc984702f66709ef
 SHA512:
-  metadata.gz: 86620b8d9dba64df3d86544bc6224eeeb18cf69f0854e578b3e130af15c90018973a227ce5d98842efe44a99e8d6ae9f80164a8462a4218751dda6ed421549ac
-  data.tar.gz: 5e5b9769e578bf695ed773e62537c12e0d3640104d39f4656a091f69cea8ea57226a98a69173f03b60c14370f657dcc42f00b96812bf662b4734bb020d0e5d98
+  metadata.gz: 5c10dc4da08e95d372b7755ee8c86f42ed6788a002660b226581b38609452808c2219e759739f7ee0da567c40ca40a573617c72bbb25e1ed88edb729ed6e07d0
+  data.tar.gz: b17bef09a92418ca361767b867d562bc3110865731abf48d18fa185f279750947e57df7a707315bd4de0b1be5a2495d1b3b31121e7dc1149c0b9221b3b3a413e

data/.github/workflows/ci.yml

@@ -12,14 +12,14 @@ jobs:
     strategy:
       matrix:
         ruby:
-          - '3.2.5'
-          - '3.3.4'
-          - jruby-9.4.8.0
+          - '3.4.7'
+          - '3.3.10'
+          - jruby-9.4.14.0
         solr_version: ['']
         include:
-          - ruby: '3.3.4'
+          - ruby: '3.4.7'
             solr_version: '8.11.4'
-          - ruby: '3.3.4'
+          - ruby: '3.4.7'
             solr_version: '9.6.1'
     env:
       SOLR_WRAPPER_SOLR_VERSION: ${{ matrix.solr_version }}

data/lib/solr_wrapper/instance.rb

@@ -150,7 +150,9 @@ module SolrWrapper
         options[:name] ||= SecureRandom.hex
 
         create_options = {}
-        if version >= '9.7'
+        if greater_than_solr98?
+          create_options[:s] = config.base_url
+        elsif greater_than_solr97?
           create_options[:url] = config.base_url
         else
           create_options[:p] = port
@@ -159,12 +161,17 @@ module SolrWrapper
         create_options[:n] = options[:config_name] if options[:config_name]
 
         if options[:dir]
+          # Turn a relative path to absolute. Solr 9.7+ changes relative to be
+          # relative to solr instance dir (which can be a temp dir for us),
+          # instead of command CWD. Normalize to absolute is good for all.
+          options[:dir] = File.absolute_path(options[:dir])
+
           # Solr 9.7 required that the dir argument contain a `conf` directory that
           # contains the actual configuration files.
-          if version >= '9.7' && !File.exist?(File.join(options[:dir], 'conf'))
-
-            if options[:dir].match?(/conf\/$/)
-              create_options[:d] = File.expand_path(options[:dir], '..')
+          if greater_than_solr97? && !File.exist?(File.join(options[:dir], 'conf'))
+            # ends in `conf` or `conf/`
+            if options[:dir].match?(/conf\/?$/)
+              create_options[:d] = File.expand_path("..", options[:dir])
             else
               tmpdir = Dir.mktmpdir
 
@@ -234,7 +241,9 @@ module SolrWrapper
     def delete(name, _options = {})
       delete_options = { c: name }
 
-      if version >= '9.7'
+      if greater_than_solr98?
+        delete_options[:s] = config.base_url
+      elsif greater_than_solr97?
         delete_options[:url] = config.base_url
       else
         delete_options[:p] = port
@@ -390,6 +399,18 @@ module SolrWrapper
       end
     end
 
+    def greater_than_solr97?
+      Gem::Version.new(version) >= Gem::Version.new('9.7.0')
+    rescue ArgumentError
+      true
+    end
+
+    def greater_than_solr98?
+      Gem::Version.new(version) >= Gem::Version.new('9.8.0')
+    rescue ArgumentError
+      true
+    end
+
     def zkhost
       "#{config.zookeeper_host}:#{config.zookeeper_port}" if config.cloud
     end

data/lib/solr_wrapper/version.rb

@@ -1,3 +1,3 @@
 module SolrWrapper
-  VERSION = '4.1.3'
+  VERSION = '4.3.0'
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: solr_wrapper
 version: !ruby/object:Gem::Version
-  version: 4.1.3
+  version: 4.3.0
 platform: ruby
 authors:
 - Chris Beer
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-03-18 00:00:00.000000000 Z
+date: 2025-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -182,7 +181,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
 email:
 - chris@cbeer.info
 executables:
@@ -235,7 +233,6 @@ homepage: https://github.com/cbeer/solr_wrapper
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -250,8 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
-signing_key:
+rubygems_version: 3.6.3
 specification_version: 4
 summary: Solr service wrapper
 test_files: