Moved view related filter code into the filters directory

* Renamed ActiveAdmin::FilterFormBuilder
  to ActiveAdmin::Filters::FormBuilder
* Renamed ActiveAdmin::ViewHelpers::FilterFormHelper
  to ActiveAdmin::Filters::ViewHelper

Author: gregbell

lib/active_admin.rb

@@ -28,7 +28,6 @@ module ActiveAdmin
   autoload :DSL,                      'active_admin/dsl'
   autoload :Event,                    'active_admin/event'
   autoload :FormBuilder,              'active_admin/form_builder'
-  autoload :FilterFormBuilder,        'active_admin/filter_form_builder'
   autoload :Inputs,                   'active_admin/inputs'
   autoload :Iconic,                   'active_admin/iconic'
   autoload :Menu,                     'active_admin/menu'

lib/active_admin/filter_form_builder.rb

@@ -1,10 +1,8 @@
-ActiveAdmin.before_load do |app|
+require 'active_admin/filters/dsl'
+require "active_admin/filters/resource_extension"
+require 'active_admin/filters/forms'
 
-  require 'active_admin/filters/dsl'
-  require "active_admin/filters/resource_extension"
-
-  # Add our Extensions
-  ActiveAdmin::ResourceDSL.send :include, ActiveAdmin::Filters::DSL
-  ActiveAdmin::Resource.send :include, ActiveAdmin::Filters::ResourceExtension
-
-end
+# Add our Extensions
+ActiveAdmin::ResourceDSL.send :include, ActiveAdmin::Filters::DSL
+ActiveAdmin::Resource.send    :include, ActiveAdmin::Filters::ResourceExtension
+ActiveAdmin::ViewHelpers.send :include, ActiveAdmin::Filters::ViewHelper

lib/active_admin/filters.rb

@@ -0,0 +1,90 @@
+module ActiveAdmin
+  module Filters
+
+    # This form builder defines methods to build filter forms such
+    # as the one found in the sidebar of the index page of a standard resource.
+    class FormBuilder < ::ActiveAdmin::FormBuilder
+
+      def filter(method, options = {})
+        return "" if method.nil? || method == ""
+        options[:as] ||= default_input_type(method)
+        return "" unless options[:as]
+        content = input(method, options)
+        form_buffers.last << content.html_safe if content
+      end
+
+      protected
+
+      # Returns the default filter type for a given attribute
+      def default_input_type(method, options = {})
+        if column = column_for(method)
+          case column.type
+          when :date, :datetime
+            return :date_range
+          when :string, :text
+            return :string
+          when :integer
+            return :select if reflection_for(method.to_s.gsub('_id','').to_sym)
+            return :numeric
+          when :float, :decimal
+            return :numeric
+          end
+        end
+
+        if reflection = reflection_for(method)
+          return :select if reflection.macro == :belongs_to && !reflection.options[:polymorphic]
+        end
+      end
+
+      def custom_input_class_name(as)
+        "ActiveAdmin::Inputs::Filter#{as.to_s.camelize}Input"
+      end
+
+      # Returns the column for an attribute on the object being searched
+      # if it exists. Otherwise returns nil
+      def column_for(method)
+        @object.base.columns_hash[method.to_s] if @object.base.respond_to?(:columns_hash)
+      end
+
+      # Returns the association reflection for the method if it exists
+      def reflection_for(method)
+        @object.base.reflect_on_association(method) if @object.base.respond_to?(:reflect_on_association)
+      end
+
+    end
+
+
+    # This module is included into the view
+    module ViewHelper
+
+      # Helper method to render a filter form
+      def active_admin_filters_form_for(search, filters, options = {})
+        options[:builder] ||= ActiveAdmin::Filters::FormBuilder
+        options[:url] ||= collection_path
+        options[:html] ||= {}
+        options[:html][:method] = :get
+        options[:html][:class] ||= "filter_form"
+        options[:as] = :q
+        clear_link = link_to(I18n.t('active_admin.clear_filters'), "#", :class => "clear_filters_btn")
+        form_for search, options do |f|
+          filters.each do |filter_options|
+            filter_options = filter_options.dup
+            attribute = filter_options.delete(:attribute)
+            f.filter attribute, filter_options
+          end
+
+          buttons = content_tag :div, :class => "buttons" do
+            f.submit(I18n.t('active_admin.filter')) +
+              clear_link +
+              hidden_field_tag("order", params[:order]) +
+              hidden_field_tag("scope", params[:scope])
+          end
+
+          f.form_buffers.last + buttons
+        end
+      end
+
+    end
+
+  end
+end

lib/active_admin/filters/forms.rb

@@ -13,7 +13,6 @@ module ViewHelpers
     include MethodOrProcHelper
     include SidebarHelper
     include FormHelper
-    include FilterFormHelper
     include TitleHelper
     include ViewFactoryHelper
 

lib/active_admin/view_helpers.rb

@@ -1,7 +1,7 @@
 require 'spec_helper' 
 
 
-describe ActiveAdmin::ViewHelpers::FilterFormHelper do
+describe ActiveAdmin::Filters::ViewHelper do
 
   # Setup an ActionView::Base object which can be used for
   # generating the form for.