Merge branch 'sunspot:master' into patch-ruby-3-deprecation

.github/workflows/ci.yml

@@ -30,6 +30,8 @@ jobs:
           - '2.5'
           - '2.6'
           - '2.7'
+          - '3.0'
+          - '3.1'
           # - 'head'
         gem: ['sunspot', 'sunspot_rails', 'sunspot_solr']
         update-format: ['xml', 'json']

sunspot_rails/Appraisals

@@ -1,64 +1,31 @@
 ruby_version = Gem::Version.new(RUBY_VERSION)
 
-if ruby_version < Gem::Version.new('2.2.0')
-  ['3.0.0', '3.1.0'].each do |rails_version|
-    appraise "rails-#{rails_version}" do
-      gem 'bundler',  '>= 1.3.0', '< 2.0'
-      gem 'sunspot', path: File.expand_path('sunspot', ENV['SUNSPOT_LIB_HOME'])
-      gem 'sunspot_solr', path: File.expand_path('sunspot_solr', ENV['SUNSPOT_LIB_HOME'])
-      gem 'rails', "~> #{rails_version}"
-      gem 'progress_bar', '~> 1.0.5', require: false
-      gem 'rspec', '~> 3.4.0'
-      gem 'rspec-rails', '~> 3.4.0'
-    end
-  end
-end
-
-if ruby_version < Gem::Version.new('2.4.0')
-  appraise 'rails-3.2.0' do
-    gem 'bundler',  '>= 1.3.0', '< 2.0'
-    gem 'sunspot', path: File.expand_path('sunspot', ENV['SUNSPOT_LIB_HOME'])
-    gem 'sunspot_solr', path: File.expand_path('sunspot_solr', ENV['SUNSPOT_LIB_HOME'])
-    gem 'rails', '~> 3.2.0'
-    gem 'progress_bar', '~> 1.0.5', require: false
-    gem 'test-unit', '~> 3.2.0'
-    gem 'rspec', '~> 3.4.0'
-    gem 'rspec-rails', '~> 3.4.0'
-  end
-
-  ['4.0.0', '4.1.0'].each do |rails_version|
+if ruby_version < Gem::Version.new('3.0.0')
+  ['5.0.0', '5.1.0', '5.2.0'].each do |rails_version|
     appraise "rails-#{rails_version}" do
-      gem 'bundler',  '>= 1.3.0', '< 2.0'
       gem 'sunspot', path: File.expand_path('sunspot', ENV['SUNSPOT_LIB_HOME'])
       gem 'sunspot_solr', path: File.expand_path('sunspot_solr', ENV['SUNSPOT_LIB_HOME'])
       gem 'rails', "~> #{rails_version}"
+      gem 'sprockets', '~> 3.0'
       gem 'progress_bar', '~> 1.0.5', require: false
-      gem 'rspec', '~> 3.4.0'
-      gem 'rspec-rails', '~> 3.4.0'
+      gem 'sqlite3', '~> 1.3.0'
+      gem 'rspec', '~> 3.7'
+      gem 'rspec-rails', '~> 3.7'
     end
   end
 end
 
-if ruby_version < Gem::Version.new('2.5.0')
-  appraise 'rails-4.2.0' do
-    gem 'bundler', '>= 1.3.0', '< 2.0'
-    gem 'sunspot', path: File.expand_path('sunspot', ENV['SUNSPOT_LIB_HOME'])
-    gem 'sunspot_solr', path: File.expand_path('sunspot_solr', ENV['SUNSPOT_LIB_HOME'])
-    gem 'rails', '~> 4.2.0'
-    gem 'progress_bar', '~> 1.0.5', require: false
-    gem 'rspec', '~> 3.4.0'
-    gem 'rspec-rails', '~> 3.4.0'
-  end
-end
-
-if ruby_version >= Gem::Version.new('2.2.0')
-  ['5.0.0', '5.1.0', '5.2.0'].each do |rails_version|
+if Gem::Version.new('3.0.0') <= ruby_version && ruby_version < Gem::Version.new('3.3.0')
+  ['6.1.0', '7.0.0'].each do |rails_version|
     appraise "rails-#{rails_version}" do
       gem 'sunspot', path: File.expand_path('sunspot', ENV['SUNSPOT_LIB_HOME'])
       gem 'sunspot_solr', path: File.expand_path('sunspot_solr', ENV['SUNSPOT_LIB_HOME'])
       gem 'rails', "~> #{rails_version}"
       gem 'sprockets', '~> 3.0'
       gem 'progress_bar', '~> 1.0.5', require: false
+      gem 'sqlite3', '~> 1.4.0'
+      gem 'rspec', '~> 3'
+      gem 'rspec-rails', '~> 6'
     end
   end
 end

sunspot_rails/spec/model_lifecycle_spec.rb

@@ -15,7 +15,7 @@
   describe 'on update' do
     before :each do
       @post = PostWithAuto.create
-      @post.update_attributes(:title => 'Test 1')
+      @post.update(:title => 'Test 1')
       Sunspot.commit
     end
 

sunspot_rails/spec/rails_app/config/storage.yml

@@ -0,0 +1,3 @@
+test:
+  service: Disk
+  root: <%= Rails.root.join("storage") %>

sunspot_rails/sunspot_rails.gemspec

@@ -30,21 +30,13 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  if RUBY_VERSION < '2.2'
-    s.add_dependency 'rails', '>= 3', '< 5'
-  else
-    s.add_dependency 'rails', '>= 3'
-  end
-
+  s.add_dependency 'rails', '>= 5'
   s.add_dependency 'sunspot', Sunspot::VERSION
 
   s.add_development_dependency 'appraisal', '2.2.0'
   s.add_development_dependency 'bundler',  '>= 1.3.0', '< 2.0' if RUBY_VERSION <= '2.0.0'
   s.add_development_dependency 'nokogiri', '< 1.7' if RUBY_VERSION <= '2.0.0'
   s.add_development_dependency 'rake', '< 12.3'
-  s.add_development_dependency 'rspec', '~> 3.7'
-  s.add_development_dependency 'rspec-rails', '~> 3.7'
-  s.add_development_dependency 'sqlite3',  '~> 1.3.0'
 
   s.rdoc_options << '--webcvs=http://github.com/outoftime/sunspot/tree/master/%s' <<
                   '--title' << 'Sunspot-Rails - Rails integration for the Sunspot Solr search library - API Documentation' <<