ISSUE-126: Update ransack to 4.1.

rocket-turtle · Nov 2, 2023 · 0e16abb · 0e16abb
1 parent c6f46ac
commit 0e16abb
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## [Unreleased]
+- Update ransack to 4.1.
 - Drop support for Ruby 2.6 and 2.7.
 - Drop support for ActiveRecord 6.0.
 

diff --git a/baby_squeel.gemspec b/baby_squeel.gemspec
@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.files = Dir.glob('{lib/**/*,*.{md,txt,gemspec}}')
 
   spec.add_dependency 'activerecord', '>= 6.1', '< 7.1'
-  spec.add_dependency 'ransack', '~> 2.3'
+  spec.add_dependency 'ransack', '~> 4.1'
 
   spec.add_development_dependency 'bundler', '~> 2'
   spec.add_development_dependency 'rake', '~> 13.0'

diff --git a/lib/baby_squeel.rb b/lib/baby_squeel.rb
@@ -1,11 +1,7 @@
 require 'active_record'
 require 'active_record/relation'
-begin
-  require 'polyamorous'
-rescue LoadError
-  # Trying loading from 'ransack' as of commit c9cc20de9 (post v2.3.2)
-  require 'polyamorous/polyamorous'
-end
+# Loading polyamorous from 'ransack' as of commit c9cc20de9 (post v2.3.2)
+require 'polyamorous/polyamorous'
 require 'baby_squeel/version'
 require 'baby_squeel/errors'
 require 'baby_squeel/active_record/base'