rsolr 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: def877722611e3004a0264d334d6807aade91d4af710c3b0846a9023cf44e620
-  data.tar.gz: 9a5b3e5c1252fe6cb78669286f0a90449fbe923b9a6385a211f70ff6462b2a43
+  metadata.gz: f44e7e34b8e615204b49052907e322c46387d858f147b7e34bd4c53edf6b336e
+  data.tar.gz: b5ad262ba4b5777f18b817c529f9cb8768843972f394420a4798191f92a11b17
 SHA512:
-  metadata.gz: a7d50dddb8b4408965f3c09b16a05f3306de7cde2f89f668a3e847f1e842b44f4e6372f43e7c2fa26ab4287d64c183a969721701ea54ce51716f8afc71126755
-  data.tar.gz: 0137a6861afffa2cdd51effc56805997641943037bc65ef9170a9feef35c1675d14f80d318fb97b3b9e1c45971b71b69ebdc2ced1976c000296829580b9642f8
+  metadata.gz: c230788c63b34623fa05608af73c25c5c7bd6fbab106afc62c63b1347a688bf302d0b03323204b0efd047f01ddc2d957722cd5ed0f98553ec3974b7ed2653c79
+  data.tar.gz: 606324146e3acb8cb86c726a528550fefd0bd57fdebce977fc260c5a38caf4b1c5aeca7c3f23637dcf4bf04e8fbc196e60e4cc63f9827ee7e88af01e816ce3a4

data/.github/workflows/ruby.yml

@@ -11,7 +11,27 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [jruby-9.2.20.0, 2.4, 2.5, 2.6, 2.7, 3.0]
+        ruby: [jruby-9.3.3.0, 2.7, '3.0', '3.1']
+        faraday: ['~> 0.17', '~> 1', '~>2']
+    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:
+        FARADAY_VERSION: ${{ matrix.faraday}}
+    - name: Run tests
+      run: bundle exec rake
+      env:
+        FARADAY_VERSION: ${{ matrix.faraday}}
+  legacy_tests:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [jruby-9.2.20.0, 2.4, 2.5, 2.6, 2.7]
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby

data/Gemfile

@@ -4,6 +4,10 @@ gemspec
 
 gem "builder", ">= 2.1.2"
 
-# HTTP.rb (used by solr_wrapper to download solr for integration testing) fails
-# to download the full contents of files (under jruby)?
-gem "http", '< 5', platforms: :jruby
+if defined? JRUBY_VERSION
+  # HTTP.rb (used by solr_wrapper to download solr for integration testing) fails
+  # to download the full contents of files (under jruby)?
+  gem "http", '< 5', platforms: :jruby
+end
+
+gem 'faraday', ENV['FARADAY_VERSION'] if ENV['FARADAY_VERSION']

data/lib/rsolr/client.rb

@@ -314,12 +314,22 @@ class RSolr::Client
       conn_opts[:request][:params_encoder] = Faraday::FlatParamsEncoder
 
       Faraday.new(conn_opts) do |conn|
-        conn.basic_auth(uri.user, uri.password) if uri.user && uri.password
+        if uri.user && uri.password
+          case Faraday::VERSION
+          when /^0/
+            conn.basic_auth uri.user, uri.password
+          when /^1/
+            conn.request :basic_auth, uri.user, uri.password
+          else
+            conn.request :authorization, :basic_auth, uri.user, uri.password
+          end
+        end
+
         conn.response :raise_error
         conn.request :retry, max: options[:retry_after_limit], interval: 0.05,
                              interval_randomness: 0.5, backoff_factor: 2,
                              exceptions: ['Faraday::Error', 'Timeout::Error'] if options[:retry_503]
-        conn.adapter options[:adapter] || Faraday.default_adapter
+        conn.adapter options[:adapter] || Faraday.default_adapter || :net_http
       end
     end
   end

data/lib/rsolr/version.rb

@@ -1,5 +1,5 @@
 module RSolr
-  VERSION = "2.4.0"
+  VERSION = "2.5.0"
 
   def self.version
     VERSION

data/rsolr.gemspec

@@ -27,13 +27,13 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {spec}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  
+
   s.required_ruby_version      = '>= 1.9.3'
-  
+
   s.requirements << 'Apache Solr'
 
   s.add_dependency 'builder', '>= 2.1.2'
-  s.add_dependency 'faraday', '>= 0.9.0'
+  s.add_dependency 'faraday', '>= 0.9', '!= 2.0.0', '< 3'
 
   s.add_development_dependency 'activesupport'
   s.add_development_dependency 'nokogiri', '>= 1.4.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsolr
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Antoine Latter
@@ -29,7 +29,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-15 00:00:00.000000000 Z
+date: 2022-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -51,14 +51,26 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0.9'
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0.9'
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -225,7 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - Apache Solr
-rubygems_version: 3.1.6
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: A Ruby client for Apache Solr