Refactor adapters (#1348)

* Refactor constants * Remove Ransack::Adapters * Refactor Context * Refactor Translate * Refactor Visitor * Refactor Condition * Move active_record.rb * Remove lib/ransack/nodes.rb
activerecord-hackery · Nov 22, 2022 · 0070757 · 0070757
1 parent 4352d1a
commit 0070757
Show file tree

Hide file tree

Showing 15 changed files with 281 additions and 377 deletions.
diff --git a/lib/ransack.rb b/lib/ransack.rb
@@ -1,10 +1,7 @@
 require 'active_support/core_ext'
 require 'ransack/configuration'
-require 'ransack/adapters'
 require 'polyamorous/polyamorous'
 
-Ransack::Adapters.object_mapper.require_constants
-
 module Ransack
   extend Configuration
   class UntraversableAssociationError < StandardError; end
@@ -22,8 +19,8 @@ class UntraversableAssociationError < StandardError; end
 require 'ransack/search'
 require 'ransack/ransacker'
 require 'ransack/translate'
-
-Ransack::Adapters.object_mapper.require_adapter
+require 'ransack/active_record'
+require 'ransack/context'
 
 ActiveSupport.on_load(:action_controller) do
   require 'ransack/helpers'

diff --git a/lib/ransack/adapters/active_record.rb → lib/ransack/active_record.rb b/lib/ransack/adapters/active_record.rb → lib/ransack/active_record.rb
diff --git a/lib/ransack/adapters.rb b/lib/ransack/adapters.rb
diff --git a/lib/ransack/adapters/active_record/ransack/constants.rb b/lib/ransack/adapters/active_record/ransack/constants.rb
diff --git a/lib/ransack/adapters/active_record/ransack/context.rb b/lib/ransack/adapters/active_record/ransack/context.rb
diff --git a/lib/ransack/adapters/active_record/ransack/nodes/condition.rb b/lib/ransack/adapters/active_record/ransack/nodes/condition.rb
diff --git a/lib/ransack/adapters/active_record/ransack/translate.rb b/lib/ransack/adapters/active_record/ransack/translate.rb
diff --git a/lib/ransack/adapters/active_record/ransack/visitor.rb b/lib/ransack/adapters/active_record/ransack/visitor.rb