Merge branch 'master' into drop_rails_5_0_and_5_1_support

CHANGELOG.md

@@ -4,6 +4,9 @@
 
 * Drop support for Active Record 5.0, 5.1, and 5.2.0.
   PR [#1073](https://github.com/activerecord-hackery/ransack/pull/1073)
+  
+* Drop support for rubies under 2.3.
+  PR [#1070](https://github.com/activerecord-hackery/ransack/pull/1070)
 
 ## 2.3.0 - 2019-08-18
 

Gemfile

@@ -5,8 +5,17 @@ gem 'rake'
 
 rails = ENV['RAILS'] || '6-0-stable'
 
+rails_version = case rails
+                when /\// # A path
+                  File.read(File.join(rails, "RAILS_VERSION"))
+                when /^v/ # A tagged version
+                  rails.gsub(/^v/, '')
+                else
+                  rails
+                end
+
 gem 'faker', '~> 0.9.5'
-gem 'sqlite3', ::Gem::Version.new(rails.gsub(/^v/, '')) >= ::Gem::Version.new('6-0-stable') ? '~> 1.4.1' : '~> 1.3.3'
+gem 'sqlite3', ::Gem::Version.new(rails_version) >= ::Gem::Version.new('6-0-stable') ? '~> 1.4.1' : '~> 1.3.3'
 gem 'pg', '~> 1.0'
 gem 'pry', '0.10'
 gem 'byebug'
@@ -14,8 +23,10 @@ gem 'byebug'
 case rails
 when /\// # A path
   gem 'activesupport', path: "#{rails}/activesupport"
+  gem 'activemodel', path: "#{rails}/activemodel"
   gem 'activerecord', path: "#{rails}/activerecord", require: false
   gem 'actionpack', path: "#{rails}/actionpack"
+  gem 'actionview', path: "#{rails}/actionview"
 when /^v/ # A tagged version
   git 'https://github.com/rails/rails.git', :tag => rails do
     gem 'activesupport'
@@ -36,7 +47,5 @@ gem 'mysql2', '~> 0.5.2'
 group :test do
   gem 'machinist', '~> 1.0.6'
   gem 'rspec', '~> 3'
-  # TestUnit was removed from Ruby 2.2 but still needed for testing Rails 3.x.
-  gem 'test-unit', '~> 3.0' if RUBY_VERSION >= '2.2'
   gem 'simplecov', :require => false
 end

README.md

@@ -32,11 +32,10 @@ you're reading the documentation for the master branch with the latest features.
 
 ## Getting started
 
-Ransack is compatible with Rails 6.0, and 5.2 on Ruby 2.2 and later.
-If you are using Rails 5.0 or Rails 5.1 use the 2.3 line of Ransack.
+Ransack is compatible with Rails 6.0, 5.0, 5.1 and 5.2 on Ruby 2.3 and later.
 If you are using Rails <5.0 use the 1.8 line of Ransack.
-If you are using Ruby 1.8 or an earlier JRuby and run into compatibility
-issues, you can use an earlier version of Ransack, say, up to 1.3.0.
+If you are using Ruby 2.2 or an earlier JRuby and run into compatibility
+issues, you can use an earlier version of Ransack, say, up to 2.3.0.
 
 Ransack works out-of-the-box with Active Record and also features limited
 support for Mongoid 4 and 5 (without associations, further details

ransack.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.homepage    = "https://github.com/activerecord-hackery/ransack"
   s.summary     = %q{Object-based searching for Active Record and Mongoid (currently).}
   s.description = %q{Ransack is the successor to the MetaSearch gem. It improves and expands upon MetaSearch's functionality, but does not have a 100%-compatible API.}
-  s.required_ruby_version = '>= 1.9'
+  s.required_ruby_version = '>= 2.3'
   s.license     = 'MIT'
 
   s.add_dependency 'actionpack', '>= 5.2.1'