activeadmin 0.6.0 → 0.6.1

data/lib/active_admin/inputs/filter_check_boxes_input.rb

@@ -13,7 +13,7 @@ module ActiveAdmin
 
       # Add whitespace before label
       def choice_label(choice)
-        " #{super(choice)}"
+        ' ' + super
       end
 
       # Don't wrap in UL tag

data/lib/active_admin/inputs/filter_numeric_input.rb

@@ -2,54 +2,9 @@ module ActiveAdmin
   module Inputs
     class FilterNumericInput < ::Formtastic::Inputs::NumberInput
       include FilterBase
+      include FilterBase::SearchMethodSelect
 
-      def to_html
-        input_wrapping do
-          [ label_html,
-            select_html,
-            " ",
-            input_html
-          ].join("\n").html_safe
-        end
-      end
-
-      def input_html
-        builder.text_field current_filter, input_html_options
-      end
-
-      def input_html_options
-        { :size => 10, :id => "#{method}_numeric" }
-      end
-
-      def select_html
-        template.select_tag '', select_options, select_html_options
-      end
-
-      def select_options
-        template.options_for_select(filters, current_filter)
-      end
-
-      def select_html_options
-        { :onchange => "document.getElementById('#{method}_numeric').name = 'q[' + this.value + ']';" }
-      end
-
-      # Returns the scope for which we are currently searching. If no search is available
-      # it returns the first scope
-      def current_filter
-        filters[1..-1].inject(filters.first){|a,b| @object.send(b[1].to_sym) ? b : a }[1]
-      end
-
-      def filters
-        (options[:filters] || default_filters).collect do |scope|
-          [scope[0], [method, scope[1]].join("_")]
-        end
-      end
-
-      def default_filters
-        [ [I18n.t('active_admin.equal_to'), 'eq'],
-          [I18n.t('active_admin.greater_than'), 'gt'],
-          [I18n.t('active_admin.less_than'), 'lt'] ]
-      end
+      filter :equals, :greater_than, :less_than
     end
   end
 end

data/lib/active_admin/inputs/filter_select_input.rb

@@ -3,25 +3,47 @@ module ActiveAdmin
     class FilterSelectInput < ::Formtastic::Inputs::SelectInput
       include FilterBase
 
+      # If MetaSearch already responds to the given method, just use it.
+      #
+      # Otherwise:
+      # When it's a HABTM or has_many association, Formtastic builds "object_ids".
+      # That doesn't fit our scenario, so we override it here.
       def input_name
-        "#{super}_eq"
+        return method if @object.respond_to? method
+
+        name = method.to_s
+        name.concat '_id' if reflection
+        name.concat multiple? ? '_in' : '_eq'
+      end
+
+      # Provide the AA translation to the blank input field.
+      def include_blank
+        I18n.t 'active_admin.any' if super
       end
 
-      def input_options
-        super.merge(:include_blank => I18n.t('active_admin.any'))
+      # was "#{object_name}[#{association_primary_key}]"
+      def input_html_options_name
+        "#{object_name}[#{input_name}]"
       end
 
-      def method
-        if super.to_s.scan(/_id/).count('_id') == 1
-          super.to_s.sub(/_id$/, '').to_sym
-        else
-          super.to_s.to_sym
+      # Would normally return true for has_many and HABTM, which would subsequently
+      # cause the select field to be multi-select instead of a dropdown.
+      def multiple_by_association?
+        false
+      end
+
+      # Provides an efficient default lookup query if the attribute is a DB column.
+      def collection
+        unless Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR < 2
+          return pluck_column if !options[:collection] && column_for(method)
         end
+        super
       end
 
-      def extra_input_html_options
-        {}
+      def pluck_column
+        @object.base.reorder("#{method} asc").uniq.pluck method
       end
+
     end
   end
 end

data/lib/active_admin/inputs/filter_string_input.rb

@@ -2,25 +2,23 @@ module ActiveAdmin
   module Inputs
     class FilterStringInput < ::Formtastic::Inputs::StringInput
       include FilterBase
+      include FilterBase::SearchMethodSelect
 
+      filter :contains, :equals, :starts_with, :ends_with
+
+      # If the filter method includes a search condition, build a normal string search field.
+      # Else, build a search field with a companion dropdown to choose a search condition from.
       def to_html
-        input_wrapping do
-          label_html <<
-          builder.text_field(input_name, input_html_options)
+        if @object.respond_to? method
+          input_wrapping do
+            label_html <<
+            builder.text_field(method, input_html_options)
+          end
+        else
+          super # SearchMethodSelect#to_html
         end
       end
 
-      def label_text
-        I18n.t('active_admin.search_field', :field => super)
-      end
-
-      def input_name
-        method.to_s.match(metasearch_conditions) ? method : "#{method}_contains"
-      end
-
-      def metasearch_conditions
-        /starts_with|ends_with/
-      end
     end
   end
 end

data/lib/active_admin/namespace.rb

@@ -1,10 +1,7 @@
-require 'active_admin/helpers/settings'
 require 'active_admin/resource_collection'
 
 module ActiveAdmin
 
-  class ResourceMismatchError < StandardError; end
-
   # Namespaces are the basic organizing principle for resources within Active Admin
   #
   # Each resource is registered into a namespace which defines:
@@ -13,7 +10,7 @@ module ActiveAdmin
   #   * the menu which gets displayed (other resources in the same namespace)
   #
   # For example:
-  #   
+  #
   #   ActiveAdmin.register Post, :namespace => :admin
   #
   # Will register the Post model into the "admin" namespace. This will namespace the
@@ -24,12 +21,10 @@ module ActiveAdmin
   #
   #   ActiveAdmin.register Post, :namespace => false
   #
-  # This will register the resource to an instantiated namespace called :root. The 
+  # This will register the resource to an instantiated namespace called :root. The
   # resource will be accessible from "/posts" and the controller will be PostsController.
   #
   class Namespace
-    include Settings
-
     RegisterEvent = 'active_admin.namespace.register'.freeze
 
     attr_reader :application, :resources, :name, :menus
@@ -39,12 +34,11 @@ module ActiveAdmin
       @name = name.to_s.underscore.to_sym
       @resources = ResourceCollection.new
       register_module unless root?
-      generate_dashboard_controller
       build_menu_collection
     end
 
-    # Register a resource into this namespace. The preffered method to access this is to 
-    # use the global registration ActiveAdmin.register which delegates to the proper 
+    # Register a resource into this namespace. The preffered method to access this is to
+    # use the global registration ActiveAdmin.register which delegates to the proper
     # namespace instance.
     def register(resource_class, options = {}, &block)
       config = find_or_build_resource(resource_class, options)
@@ -54,9 +48,6 @@ module ActiveAdmin
       parse_registration_block(config, &block) if block_given?
       reset_menu!
 
-      # Ensure that the dashboard is generated
-      generate_dashboard_controller
-
       # Dispatch a registration event
       ActiveAdmin::Event.dispatch ActiveAdmin::Resource::RegisterEvent, config
 
@@ -82,7 +73,7 @@ module ActiveAdmin
     # Returns the name of the module if required. Will be nil if none
     # is required.
     #
-    # eg: 
+    # eg:
     #   Namespace.new(:admin).module_name # => 'Admin'
     #   Namespace.new(:root).module_name # => nil
     #
@@ -91,21 +82,15 @@ module ActiveAdmin
       @module_name ||= name.to_s.camelize
     end
 
-    # Returns the name of the dashboard controller for this namespace
-    def dashboard_controller_name
-      [module_name, "DashboardController"].compact.join("::")
-    end
-
     # Unload all the registered resources for this namespace
     def unload!
       unload_resources!
-      unload_dashboard!
       reset_menu!
     end
 
     # Returns the first registered ActiveAdmin::Resource instance for a given class
     def resource_for(klass)
-      resources.find_by_resource_class(klass)
+      resources[klass]
     end
 
     # Override from ActiveAdmin::Settings to inherit default attributes
@@ -161,10 +146,6 @@ module ActiveAdmin
       @menus = MenuCollection.new
 
       @menus.on_build do |menus|
-        # Support for deprecated dashboards...
-        Dashboards.add_to_menu(self, menus.menu(DEFAULT_MENU))
-
-        # Build the default utility navigation
         build_default_utility_nav
 
         resources.each do |resource|
@@ -178,10 +159,10 @@ module ActiveAdmin
       return if @menus.exists? :utility_navigation
       @menus.menu :utility_navigation do |menu|
         menu.add  :label  => proc{ display_name current_active_admin_user },
-                  :url    => '#',
+                  :url    => proc{ url_for [active_admin_namespace.name, current_active_admin_user] rescue '#' },
                   :id     => 'current_user',
                   :if     => proc{ current_active_admin_user? }
-                  
+
         add_logout_button_to_menu menu
       end
     end
@@ -217,11 +198,6 @@ module ActiveAdmin
       @resources = ResourceCollection.new
     end
 
-    def unload_dashboard!
-      # TODO: Only clear out my sections
-      Dashboards.clear_all_sections!
-    end
-
     # Creates a ruby module to namespace all the classes in if required
     def register_module
       eval "module ::#{module_name}; end"
@@ -241,13 +217,5 @@ module ActiveAdmin
       PageDSL.new(config).run_registration_block(&block)
     end
 
-    # Creates a dashboard controller for this config
-    def generate_dashboard_controller
-      return unless ActiveAdmin::Dashboards.built?
-
-      eval "class ::#{dashboard_controller_name} < ActiveAdmin::PageController
-              include ActiveAdmin::Dashboards::DashboardController
-            end"
-    end
   end
 end

data/lib/active_admin/page.rb

@@ -17,7 +17,7 @@ module ActiveAdmin
 
     # An array of custom actions defined for this page
     attr_reader :page_actions
-    
+
     # Set breadcrumb builder
     attr_accessor :breadcrumb
 
@@ -78,7 +78,7 @@ module ActiveAdmin
 
     def add_default_sidebar_sections
     end
-    
+
     # Clears all the custom actions this page knows about
     def clear_page_actions!
       @page_actions = []

data/lib/active_admin/page_dsl.rb

@@ -17,7 +17,7 @@ module ActiveAdmin
     def content(options = {}, &block)
       config.set_page_presenter :index, ActiveAdmin::PagePresenter.new(options, &block)
     end
-    
+
     def page_action(name, options = {}, &block)
       config.page_actions << ControllerAction.new(name, options)
       controller do

data/lib/active_admin/reloader.rb

@@ -7,11 +7,11 @@ module ActiveAdmin
     #
     # @param [Rails::Application] rails_app The current rails application
     # @param [ActiveAdmin::Application] active_admin_app The current Active Admin app
-    # @param [String] rails_version The version of Rails we're using. 
+    # @param [String] rails_version The version of Rails we're using.
     #
     # @returns A concrete subclass of AbstractReloader
     def self.build(rails_app, active_admin_app, rails_version)
-      reloader_class = rails_version[0..2] == "3.2" ? Rails32Reloader : RailsLessThan31Reloader
+      reloader_class = rails_version.to_f >= 3.2 ? Rails32Reloader : RailsLessThan31Reloader
       reloader_class.new(rails_app, active_admin_app, rails_version)
     end
 
@@ -64,7 +64,7 @@ module ActiveAdmin
 
     end
 
-    # Deals with reloading Active Admin on each request in 
+    # Deals with reloading Active Admin on each request in
     # development and once in production in Rails < 3.2.
     class RailsLessThan31Reloader < AbstractReloader
 

data/lib/active_admin/resource.rb

@@ -6,6 +6,7 @@ require 'active_admin/resource/pagination'
 require 'active_admin/resource/routes'
 require 'active_admin/resource/naming'
 require 'active_admin/resource/scopes'
+require 'active_admin/resource/scope_to'
 require 'active_admin/resource/sidebars'
 require 'active_admin/resource/belongs_to'
 
@@ -39,15 +40,9 @@ module ActiveAdmin
     # The default sort order to use in the controller
     attr_accessor :sort_order
 
-    # Scope this resource to an association in the controller
-    attr_accessor :scope_to
-
-    # If we're scoping resources, use this method on the parent to return the collection
-    attr_accessor :scope_to_association_method
-
     # Set the configuration for the CSV
     attr_writer :csv_builder
-    
+
     # Set breadcrumb builder
     attr_accessor :breadcrumb
 
@@ -68,6 +63,8 @@ module ActiveAdmin
       end
     end
 
+    include MethodOrProcHelper
+
     include Base
     include ActionItems
     include Authorization
@@ -77,6 +74,7 @@ module ActiveAdmin
     include PagePresenters
     include Pagination
     include Scopes
+    include ScopeTo
     include Sidebars
     include Menu
     include Routes
@@ -103,11 +101,6 @@ module ActiveAdmin
       resource_class.connection.quote_column_name(column)
     end
 
-    # Returns the named route for an instance of this resource
-    def route_instance_path
-      [route_prefix, controller.resources_configuration[:self][:route_instance_name], 'path'].compact.join('_').to_sym
-    end
-
     # Clears all the member actions this resource knows about
     def clear_member_actions!
       @member_actions = []
@@ -119,27 +112,22 @@ module ActiveAdmin
 
     # Return only defined resource actions
     def defined_actions
-      controller.instance_methods.map { |m| m.to_sym } & ResourceController::ACTIVE_ADMIN_ACTIONS
-    end
-
-    # Are admin notes turned on for this resource
-    def admin_notes?
-      admin_notes.nil? ? ActiveAdmin.admin_notes : admin_notes
+      controller.instance_methods.map(&:to_sym) & ResourceController::ACTIVE_ADMIN_ACTIONS
     end
 
     def belongs_to(target, options = {})
       @belongs_to = Resource::BelongsTo.new(self, target, options)
-      self.menu_item_menu_name = target unless @belongs_to.optional?
-      controller.belongs_to(target, options.dup)
+      self.navigation_menu_name = target unless @belongs_to.optional?
+      controller.send :belongs_to, target, options.dup
     end
 
     def belongs_to_config
       @belongs_to
     end
 
-    # Do we belong to another resource
+    # Do we belong to another resource?
     def belongs_to?
-      !belongs_to_config.nil?
+      !!belongs_to_config
     end
 
     # The csv builder for this resource
@@ -147,6 +135,11 @@ module ActiveAdmin
       @csv_builder || default_csv_builder
     end
 
+    def find_resource(id)
+      resource = resource_class.where(resource_class.primary_key => id).first
+      decorator_class ? decorator_class.new(resource) : resource
+    end
+
     # @deprecated
     def resource
       resource_class
@@ -158,7 +151,7 @@ module ActiveAdmin
 
     def default_options
       {
-        :sort_order => "#{resource_class.respond_to?(:primary_key) ? resource_class.primary_key : 'id'}_desc"
+        :sort_order => (resource_class.respond_to?(:primary_key) ? resource_class.primary_key.to_s : 'id') + '_desc'
       }
     end