lib/ransack.rb in ransack-1.7.0 vs lib/ransack.rb in ransack-1.8.0

@@ -1,15 +1,21 @@
 require 'active_support/core_ext'
-
 require 'ransack/configuration'
-
 require 'ransack/adapters'
-Ransack::Adapters.require_constants
 
+Ransack::Adapters.object_mapper.require_constants
+
 module Ransack
   extend Configuration
   class UntraversableAssociationError < StandardError; end;
+
+  SUPPORTS_ATTRIBUTE_ALIAS =
+  begin
+    ActiveRecord::Base.respond_to?(:attribute_aliases)
+  rescue NameError
+    false
+  end
 end
 
 Ransack.configure do |config|
   Ransack::Constants::AREL_PREDICATES.each do |name|
     config.add_predicate name, :arel_predicate => name
@@ -21,11 +27,10 @@
 
 require 'ransack/search'
 require 'ransack/ransacker'
 require 'ransack/helpers'
 require 'action_controller'
-
 require 'ransack/translate'
 
-Ransack::Adapters.require_adapter
+Ransack::Adapters.object_mapper.require_adapter
 
 ActionController::Base.helper Ransack::Helpers::FormHelper