From 177d0f8a6c18394677f6559aafff5a8be38cb086 Mon Sep 17 00:00:00 2001
From: Zhomart Mukhamejanov <mzhomart@gmail.com>
Date: Sun, 1 Feb 2015 21:34:56 -0800
Subject: [PATCH] more AbstractAdapter improvements

---
 lib/active_admin.rb                            | 2 ++
 lib/active_admin/error.rb                      | 3 +++
 lib/active_admin/filters/forms.rb              | 3 ++-
 lib/active_admin/filters/formtastic_addons.rb  | 3 ++-
 lib/active_admin/filters/resource_extension.rb | 3 ++-
 5 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/lib/active_admin.rb b/lib/active_admin.rb
index 0c77e866301..3128af304b9 100644
--- a/lib/active_admin.rb
+++ b/lib/active_admin.rb
@@ -131,6 +131,8 @@ def object_mapper_for(thing)
 require 'active_admin/batch_actions'
 require 'active_admin/filters'
 
+require 'active_admin/object_mapper/abstract_adapter'
+
 # Require ORM-specific plugins
 require 'active_admin/object_mapper/active_record' if defined? ::ActiveRecord
 require 'active_admin/object_mapper/mongoid'       if defined? ::Mongoid
diff --git a/lib/active_admin/error.rb b/lib/active_admin/error.rb
index 61987ef97cb..39c4935e0e5 100644
--- a/lib/active_admin/error.rb
+++ b/lib/active_admin/error.rb
@@ -56,4 +56,7 @@ class DependencyError < ErrorLoading
   class NoMenuError < KeyError
   end
 
+  class NoAdapterFound < Error
+  end
+
 end
diff --git a/lib/active_admin/filters/forms.rb b/lib/active_admin/filters/forms.rb
index 3449a3dcc80..b2d054bab9e 100644
--- a/lib/active_admin/filters/forms.rb
+++ b/lib/active_admin/filters/forms.rb
@@ -14,7 +14,8 @@ class FormBuilder < ::ActiveAdmin::FormBuilder
       protected
 
       def form_builder_adapter
-        @form_builder_adapter ||= ActiveAdmin.object_mapper_for(klass).form_builder_adapter(self)
+        @form_builder_adapter ||=
+          ActiveAdmin.object_mapper_for(klass).adapter(:form_builder, self)
       end
 
     end
diff --git a/lib/active_admin/filters/formtastic_addons.rb b/lib/active_admin/filters/formtastic_addons.rb
index c55c430dca5..7444b93d697 100644
--- a/lib/active_admin/filters/formtastic_addons.rb
+++ b/lib/active_admin/filters/formtastic_addons.rb
@@ -70,7 +70,8 @@ def scope?
       protected
 
       def formtastic_addons_adapter
-        @formtastic_addons_adapter ||= ActiveAdmin.object_mapper_for(klass).formtastic_addons_adapter(self)
+        @formtastic_addons_adapter ||=
+          ActiveAdmin.object_mapper_for(klass).adapter(:formtastic_addons, self)
       end
 
     end
diff --git a/lib/active_admin/filters/resource_extension.rb b/lib/active_admin/filters/resource_extension.rb
index dabb01dae3e..01801e00f9e 100644
--- a/lib/active_admin/filters/resource_extension.rb
+++ b/lib/active_admin/filters/resource_extension.rb
@@ -125,7 +125,8 @@ def filters_sidebar_section
       end
 
       def resource_extension_adapter
-        @resource_extension_adapter ||= ActiveAdmin.object_mapper_for(resource_class).resource_extension_adapter(self)
+        @resource_extension_adapter ||=
+          ActiveAdmin.object_mapper_for(resource_class).adapter(:resource_extension, self)
       end
 
     end