Merge pull request #541 from ASnow/exclusive-adapters

ActiveRecord should exclude Mongoid, extract logic to Ransack::Adapters

lib/ransack.rb

@@ -2,11 +2,8 @@ require 'active_support/core_ext'
 
 require 'ransack/configuration'
 
-if defined?(::Mongoid)
+require 'ransack/adapters'
-  require 'ransack/adapters/mongoid/ransack/constants'
+Ransack::Adapters.require_constants
-else
-  require 'ransack/adapters/active_record/ransack/constants'
-end
 
 module Ransack
   extend Configuration
@@ -29,14 +26,6 @@ require 'action_controller'
 
 require 'ransack/translate'
 
-if defined?(::ActiveRecord::Base)
+Ransack::Adapters.require_adapter
-  require 'ransack/adapters/active_record/ransack/translate'
-  require 'ransack/adapters/active_record'
-end
-
-if defined?(::Mongoid)
-  require 'ransack/adapters/mongoid/ransack/translate'
-  require 'ransack/adapters/mongoid'
-end
 
 ActionController::Base.helper Ransack::Helpers::FormHelper

lib/ransack/adapters.rb

@@ -0,0 +1,42 @@
+module Ransack
+  module Adapters
+
+    def self.current_adapters
+      @current_adapters ||= {
+        :active_record => defined?(::ActiveRecord::Base),
+        :mongoid => defined?(::Mongoid) && !defined?(::ActiveRecord::Base)
+      }
+    end
+    def self.require_constants
+      require 'ransack/adapters/mongoid/ransack/constants' if current_adapters[:mongoid]
+      require 'ransack/adapters/active_record/ransack/constants' if current_adapters[:active_record]
+    end
+
+    def self.require_adapter
+      if current_adapters[:active_record]
+        require 'ransack/adapters/active_record/ransack/translate'
+        require 'ransack/adapters/active_record'
+      end
+
+      if current_adapters[:mongoid]
+        require 'ransack/adapters/mongoid/ransack/translate'
+        require 'ransack/adapters/mongoid'
+      end
+    end
+
+    def self.require_context
+      require 'ransack/adapters/active_record/ransack/visitor' if current_adapters[:active_record]
+      require 'ransack/adapters/mongoid/ransack/visitor' if current_adapters[:mongoid]
+    end
+
+    def self.require_nodes
+      require 'ransack/adapters/active_record/ransack/nodes/condition' if current_adapters[:active_record]
+      require 'ransack/adapters/mongoid/ransack/nodes/condition' if current_adapters[:mongoid]
+    end
+
+    def self.require_search
+      require 'ransack/adapters/active_record/ransack/context' if current_adapters[:active_record]
+      require 'ransack/adapters/mongoid/ransack/context' if current_adapters[:mongoid]
+    end
+  end
+end

lib/ransack/context.rb

@@ -1,12 +1,5 @@
 require 'ransack/visitor'
-
+Ransack::Adapters.require_context
-if defined?(::ActiveRecord::Base)
-  require 'ransack/adapters/active_record/ransack/visitor'
-end
-
-if defined?(::Mongoid)
-  require 'ransack/adapters/mongoid/ransack/visitor'
-end
 
 module Ransack
   class Context

lib/ransack/nodes.rb

@@ -3,7 +3,6 @@ require 'ransack/nodes/node'
 require 'ransack/nodes/attribute'
 require 'ransack/nodes/value'
 require 'ransack/nodes/condition'
-require 'ransack/adapters/active_record/ransack/nodes/condition' if defined?(::ActiveRecord::Base)
+Ransack::Adapters.require_nodes
-require 'ransack/adapters/mongoid/ransack/nodes/condition' if defined?(::Mongoid)
 require 'ransack/nodes/sort'
-require 'ransack/nodes/grouping'
+require 'ransack/nodes/grouping'

lib/ransack/search.rb

@@ -1,14 +1,6 @@
 require 'ransack/nodes'
 require 'ransack/context'
-
+Ransack::Adapters.require_search
-if defined?(::ActiveRecord::Base)
-  require 'ransack/adapters/active_record/ransack/context'
-end
-
-if defined?(::Mongoid)
-  require 'ransack/adapters/mongoid/ransack/context'
-end
-
 require 'ransack/naming'
 
 module Ransack