more AbstractAdapter improvements

Zhomart · Feb 2, 2015 · 177d0f8 · 177d0f8
1 parent 073d6a2
commit 177d0f8
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up / @@ -56,4 +56,7 @@ class DependencyError < ErrorLoading @@
       class NoMenuError < KeyError
       end
+      class NoAdapterFound < Error
+      end
     end