activeadmin 0.6.0 → 0.6.1

data/lib/active_admin/batch_actions/resource_extension.rb

@@ -72,7 +72,7 @@ module ActiveAdmin
                       :notice => I18n.t("active_admin.batch_actions.succesfully_destroyed",
                                         :count => selected_ids.count,
                                         :model => active_admin_config.resource_label.downcase,
-                                        :plural_model => active_admin_config.plural_resource_label.downcase)
+                                        :plural_model => active_admin_config.plural_resource_label(:count => selected_ids.count).downcase)
         end
       end
 
@@ -89,11 +89,11 @@ module ActiveAdmin
     #
     # Examples:
     #
-    #   BatchAction.new :flag 
+    #   BatchAction.new :flag
     # => Will create an action that appears in the action list popover
     #
     #   BatchAction.new( :flag ) { |selection| redirect_to collection_path, :notice => "#{selection.length} users flagged" }
-    # => Will create an action that uses a block to process the request (which receives one paramater of the selected objects) 
+    # => Will create an action that uses a block to process the request (which receives one paramater of the selected objects)
     #
     #   BatchAction.new( "Perform Long Operation on the" ) { |selection| }
     # => You can create batch actions with a title instead of a Symbol

data/lib/active_admin/batch_actions/views/batch_action_selector.rb

@@ -23,7 +23,7 @@ module ActiveAdmin
       private
 
       def build_drop_down
-        dropdown_menu I18n.t("active_admin.batch_actions.button_label"), 
+        dropdown_menu I18n.t("active_admin.batch_actions.button_label"),
                       :id => "batch_actions_selector",
                       :button => { :class => "disabled" } do
           batch_actions_to_display.each do |batch_action|

data/lib/active_admin/batch_actions/views/selection_cells.rb

@@ -17,7 +17,7 @@ module ActiveAdmin
       builder_method :resource_selection_cell
 
       def build(resource)
-        input :type => "checkbox", :id => "batch_action_item_#{resource.id}", :value => resource.id, :class => "collection_selection", :name => "collection_selection[]" 
+        input :type => "checkbox", :id => "batch_action_item_#{resource.id}", :value => resource.id, :class => "collection_selection", :name => "collection_selection[]"
       end
     end
 

data/lib/active_admin/callbacks.rb

@@ -52,7 +52,7 @@ module ActiveAdmin
       #       # runs after save
       #     end
       #   end
-      #     
+      #
       def define_active_admin_callbacks(*names)
         names.each do |name|
           [:before, :after].each do |type|

data/lib/active_admin/cancan_adapter.rb

@@ -15,8 +15,8 @@ module ActiveAdmin
       @cancan_ability ||= initialize_cancan_ability
     end
 
-    def scope_collection(collection)
-      collection.accessible_by(cancan_ability)
+    def scope_collection(collection, action = ActiveAdmin::Auth::READ)
+      collection.accessible_by(cancan_ability, action)
     end
 
     private

data/lib/active_admin/comments.rb

@@ -5,7 +5,9 @@ require 'active_admin/comments/namespace_helper'
 require 'active_admin/comments/resource_helper'
 
 # Add the comments configuration
-ActiveAdmin::Application.inheritable_setting :allow_comments, true
+ActiveAdmin::Application.inheritable_setting :allow_comments,             true
+ActiveAdmin::Application.inheritable_setting :show_comments_in_menu,      true
+ActiveAdmin::Application.inheritable_setting :comments_registration_name, 'Comment'
 
 # Add the comments module to ActiveAdmin::Namespace
 ActiveAdmin::Namespace.send :include, ActiveAdmin::Comments::NamespaceHelper
@@ -20,66 +22,58 @@ ActiveAdmin.application.view_factory.show_page.send :include, ActiveAdmin::Comme
 ActiveAdmin.after_load do |app|
   app.namespaces.values.each do |namespace|
     if namespace.comments?
-      namespace.register ActiveAdmin::Comment, :as => "Comment" do
+      namespace.register ActiveAdmin::Comment, :as => namespace.comments_registration_name do
         actions :index, :show, :create
 
-        # Ensure filters are turned on
-        config.filters = true
+        menu false unless namespace.show_comments_in_menu
 
-        # Don't display in the menu
-        menu false
+        config.comments      = false # Don't allow comments on comments
+        config.batch_actions = false # The default destroy batch action isn't showing up anyway...
 
-        # Don't allow comments on comments
-        config.comments = false
-
-        # Filter Comments by date
-        filter :resource_type
-        filter :body
-        filter :created_at
-
-        # Only view comments in this namespace
-        scope :all, :default => true do |comments|
-          comments.where(:namespace => active_admin_config.namespace.name.to_s)
-        end
-
-        # Always redirect to the resource on show
-        before_filter :only => :show do
-          flash[:notice] = flash[:notice].dup if flash[:notice]
-          comment = ActiveAdmin::Comment.find(params[:id])
-          resource_config = active_admin_config.namespace.resource_for(comment.resource.class)
-          redirect_to send(resource_config.route_instance_path, comment.resource)
+        scope :all, :show_count => false
+        # Register a scope for every namespace that exists.
+        # The current namespace will be the default scope.
+        app.namespaces.values.map(&:name).each do |name|
+          scope name, :default => namespace.name == name do |scope|
+            scope.where :namespace => name.to_s
+          end
         end
 
         # Store the author and namespace
         before_save do |comment|
           comment.namespace = active_admin_config.namespace.name
-          comment.author = current_active_admin_user
+          comment.author    = current_active_admin_user
         end
 
-        # Redirect to the resource show page when failing to add a comment
-        # TODO: Provide helpers to make such kind of customization much simpler
+        # Redirect to the resource show page after comment creation
         controller do
+          # Prevent N+1 queries
+          def scoped_collection
+            resource_class.includes :author, :resource
+          end unless Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR == 0
           def create
             create! do |success, failure|
-              failure.html do 
-                resource_config = active_admin_config.namespace.resource_for(@comment.resource.class)
+              # FYI: below we call `resource.resource`. First is the comment, second is the associated resource.
+              resource_config = active_admin_config.namespace.resource_for resource.resource.class
+              resource_url    = resource_config.route_instance_path        resource.resource
+              success.html{ redirect_to resource_url }
+              failure.html do
                 flash[:error] = I18n.t('active_admin.comments.errors.empty_text')
-                redirect_to send(resource_config.route_instance_path, @comment.resource)
+                redirect_to resource_url
               end
             end
           end
         end
 
-        # Display as a table
         index do
-          column(I18n.t('active_admin.comments.resource')){|comment| auto_link(comment.resource) }
-          column(I18n.t('active_admin.comments.author')){|comment| auto_link(comment.author) }
-          column(I18n.t('active_admin.comments.body')){|comment| comment.body }
+          column I18n.t('active_admin.comments.resource_type'), :resource_type
+          column I18n.t('active_admin.comments.author_type'),   :author_type
+          column I18n.t('active_admin.comments.resource'),      :resource
+          column I18n.t('active_admin.comments.author'),        :author
+          column I18n.t('active_admin.comments.body'),          :body
+          actions
         end
       end
     end
   end
 end
-
-# @deprecated #allow_comments_on - Remove in 0.5.0
-ActiveAdmin::Application.deprecated_setting :allow_comments_in, [], 'The "allow_comments_in = []" setting is deprecated and will be remove by Active Admin 0.5.0. Please use "allow_comments = true|false" instead.'

data/lib/active_admin/comments/comment.rb

@@ -7,13 +7,11 @@ module ActiveAdmin
 
   class Comment < ActiveRecord::Base
     belongs_to :resource, :polymorphic => true
-    belongs_to :author, :polymorphic => true
+    belongs_to :author,   :polymorphic => true
 
     attr_accessible :resource, :resource_id, :resource_type, :body, :namespace
 
-    validates_presence_of :resource
-    validates_presence_of :body
-    validates_presence_of :namespace
+    validates_presence_of :body, :namespace, :resource
 
     # @returns [String] The name of the record to use for the polymorphic relationship
     def self.resource_type(record)
@@ -30,13 +28,13 @@ module ActiveAdmin
     end
 
     def self.find_for_resource_in_namespace(resource, namespace)
-      where(:resource_type => resource_type(resource),
-            :resource_id => resource_id_cast(resource),
-            :namespace => namespace.to_s)
+      where :resource_type => resource_type(resource),
+            :resource_id   => resource_id_cast(resource),
+            :namespace     => namespace.to_s
     end
 
     def self.resource_id_type
-      columns.select { |i| i.name == "resource_id" }.first.type
+      columns.detect{ |i| i.name == "resource_id" }.type
     end
 
     def self.table_name

data/lib/active_admin/comments/views.rb

@@ -1,3 +1,2 @@
 require 'active_admin/views'
 require 'active_admin/comments/views/active_admin_comments'
-require 'active_admin/comments/views/active_admin_comment'

data/lib/active_admin/comments/views/active_admin_comments.rb

@@ -8,70 +8,59 @@ module ActiveAdmin
       class Comments < ActiveAdmin::Views::Panel
         builder_method :active_admin_comments_for
 
-        def build(record)
-          @record = record
-          super(title_content, :for => record)
+        def build(resource)
+          @resource = resource
+          @comments = ActiveAdmin::Comment.find_for_resource_in_namespace @resource, active_admin_namespace.name
+          super(title, :for => resource)
           build_comments
         end
 
         protected
 
-        def title_content
-          I18n.t('active_admin.comments.title_content', :count => record_comments.count)
-        end
-
-        def record_comments
-          @record_comments ||= ActiveAdmin::Comment.find_for_resource_in_namespace(@record, active_admin_namespace.name)
+        def title
+          I18n.t 'active_admin.comments.title_content', :count => @comments.count
         end
 
         def build_comments
-          if record_comments.count > 0
-            record_comments.each do |comment|
-              build_comment(comment)
-            end
-          else
-            build_empty_message
-          end
+          @comments.any? ? @comments.each(&method(:build_comment)) : build_empty_message
           build_comment_form
         end
 
         def build_comment(comment)
           div :for => comment do
-            div :class => "active_admin_comment_meta" do
-              user_name = comment.author ? auto_link(comment.author) : "Anonymous"
-              h4(user_name, :class => "active_admin_comment_author")
-              span(pretty_format(comment.created_at))
+            div :class => 'active_admin_comment_meta' do
+              h4 :class => 'active_admin_comment_author' do
+                comment.author ? auto_link(comment.author) : 'Anonymous'
+              end
+              span pretty_format comment.created_at
             end
-            div :class => "active_admin_comment_body" do
-              simple_format(comment.body)
+            div :class => 'active_admin_comment_body' do
+              simple_format comment.body
             end
-            div :style => "clear:both;"
           end
         end
 
         def build_empty_message
-          span :class => "empty" do
-            I18n.t('active_admin.comments.no_comments_yet')
-          end
+          span I18n.t('active_admin.comments.no_comments_yet'), :class => 'empty'
         end
 
         def comment_form_url
-          if active_admin_namespace.root?
-            comments_path
-          else
-            send(:"#{active_admin_namespace.name}_comments_path")
-          end
+          parts = []
+          parts << active_admin_namespace.name unless active_admin_namespace.root?
+          parts << active_admin_namespace.comments_registration_name.underscore.pluralize
+          parts << 'path'
+          send parts.join '_'
         end
 
         def build_comment_form
-          self << active_admin_form_for(ActiveAdmin::Comment.new, :url => comment_form_url, :html => {:class => "inline_form"}) do |form|
-            form.inputs do
-              form.input :resource_type, :input_html => { :value => ActiveAdmin::Comment.resource_type(@record) }, :as => :hidden
-              form.input :resource_id, :input_html => { :value => @record.id }, :as => :hidden
-              form.input :body, :input_html => { :size => "80x8" }, :label => false
+          self << active_admin_form_for(ActiveAdmin::Comment.new, :url => comment_form_url) do |f|
+            f.inputs do
+              f.input :resource_type, :as => :hidden,  :input_html => { :value => ActiveAdmin::Comment.resource_type(@resource) }
+              f.input :resource_id,   :as => :hidden,  :input_html => { :value => @resource.id }
+              f.input :body,          :label => false, :input_html => { :size => '80x8' }
             end
-            form.actions do
-              form.action :submit, :label => I18n.t('active_admin.comments.add'), :button_html => { :value => I18n.t('active_admin.comments.add') }
+            f.actions do
+              f.action :submit, :label => I18n.t('active_admin.comments.add')
             end
           end
         end

data/lib/active_admin/csv_builder.rb

@@ -7,7 +7,7 @@ module ActiveAdmin
   #   csv_builder.column :id
   #   csv_builder.column("Name") { |resource| resource.full_name }
   #
-  #   csv_builder = CSVBuilder.new :separator => ";"
+  #   csv_builder = CSVBuilder.new :col_sep => ";"
   #   csv_builder.column :id
   #
   #
@@ -25,12 +25,10 @@ module ActiveAdmin
       end
     end
 
-    attr_reader :columns, :column_separator, :options
+    attr_reader :columns, :options
 
     def initialize(options={}, &block)
-      @columns          = []
-      @column_separator = options.delete(:separator)
-      @options          = options.delete(:options)
+      @columns, @options = [], options
       instance_eval &block if block_given?
     end
 
@@ -41,7 +39,7 @@ module ActiveAdmin
 
     class Column
       attr_reader :name, :data
-      
+
       def initialize(name, block = nil)
         @name = name.is_a?(Symbol) ? name.to_s.titleize : name
         @data = block || name.to_sym

data/lib/active_admin/dependency_checker.rb

@@ -37,6 +37,10 @@ module ActiveAdmin
           false
         end
       end
+
+      def cancan?
+        !!Gem.loaded_specs['cancan']
+      end
     end
   end
 end

data/lib/active_admin/deprecation.rb

@@ -1,6 +1,6 @@
 module ActiveAdmin
   module Deprecation
-    extend self
+    module_function
 
     def warn(message, callstack = caller)
       ActiveSupport::Deprecation.warn "Active Admin: #{message}", callstack
@@ -23,8 +23,8 @@ module ActiveAdmin
     #     end
     #
     def deprecate(klass, method, message)
-      klass.class_eval <<-EOC, __FILE__, __LINE__
-        alias_method :"deprecated_#{method}", :#{method}
+      klass.class_eval <<-EOC, __FILE__, __LINE__ + 1
+        alias_method :deprecated_#{method}, :#{method}
         def #{method}(*args)
           ActiveAdmin::Deprecation.warn('#{message}', caller)
           send(:deprecated_#{method}, *args)

data/lib/active_admin/dsl.rb

@@ -2,7 +2,7 @@ module ActiveAdmin
 
   #
   # The Active Admin DSL. This class is where all the registration blocks
-  # are instance eval'd. This is the central place for the API given to 
+  # are instance eval'd. This is the central place for the API given to
   # users of Active Admin
   #
   class DSL
@@ -21,7 +21,7 @@ module ActiveAdmin
     # modify options:
     #
     # eg:
-    # 
+    #
     #   ActiveAdmin.register Post do
     #     config.sort_order = "id_desc"
     #   end
@@ -89,7 +89,7 @@ module ActiveAdmin
 
     # Add a new batch action item to the resource
     # Provide a symbol/string to register the action, options, & block to execute on request
-    # 
+    #
     # To unregister an existing action, just provide the symbol & pass false as the second param
     #
     # @param [Symbol or String] title
@@ -100,13 +100,13 @@ module ActiveAdmin
     #
     def batch_action(title, options = {}, &block)
       # Create symbol & title information
-      if title.is_a?( String )
+      if title.is_a? String
         sym = title.titleize.gsub(' ', '').underscore.to_sym
       else
         sym = title
         title = sym.to_s.titleize
       end
-      
+
       # Either add/remove the batch action
       unless options == false
         config.add_batch_action( sym, title, options, &block )

data/lib/active_admin/engine.rb

@@ -1,5 +1,5 @@
 module ActiveAdmin
-  class Engine < Rails::Engine
+  class Engine < ::Rails::Engine
     if Rails.version > "3.1"
       initializer "ActiveAdmin precompile hook", :group => :all do |app|
         app.config.assets.precompile += %w(active_admin.js active_admin.css active_admin/print.css)

data/lib/active_admin/filters.rb

@@ -1,5 +1,6 @@
 require 'active_admin/filters/dsl'
-require "active_admin/filters/resource_extension"
+require 'active_admin/filters/resource_extension'
+require 'active_admin/filters/formtastic_addons'
 require 'active_admin/filters/forms'
 
 # Add our Extensions

data/lib/active_admin/filters/forms.rb

@@ -4,37 +4,40 @@ module ActiveAdmin
     # 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
+      include ::ActiveAdmin::Filters::FormtasticAddons
+
+      def initialize(*args)
+        @use_form_buffer = true # force ActiveAdmin::FormBuilder to use the form buffer
+        super
+      end
 
       def filter(method, options = {})
-        return "" if method.blank? ||
-                     (options[:as] ||= default_input_type(method)).nil?
-        content = input(method, options)
-        form_buffers.last << content.html_safe if content
+        if method.present? && options[:as] ||= default_input_type(method)
+          input(method, options)
+        end
       end
 
       protected
 
-      # Returns the default filter type for a given attribute
+      # Returns the default filter type for a given attribute. If you want
+      # to use a custom search method, you have to specify the type yourself.
       def default_input_type(method, options = {})
-        if (column = column_for(method))
+        if method =~ /_(contains|starts_with|ends_with)\z/
+          :string
+        elsif reflection_for(method) || polymorphic_foreign_type?(method)
+          :select
+        elsif column = column_for(method)
           case column.type
           when :date, :datetime
-            return :date_range
+            :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
+            :string
+          when :integer, :float, :decimal
+            :numeric
           when :boolean
-            return :boolean
+            :boolean
           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)
@@ -45,17 +48,6 @@ module ActiveAdmin
         "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
 
 
@@ -64,26 +56,27 @@ module ActiveAdmin
 
       # 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")
+        defaults = { :builder => ActiveAdmin::Filters::FormBuilder,
+                     :url     => collection_path,
+                     :html    => {:class  => 'filter_form'} }
+        required = { :html    => {:method => :get},
+                     :as      => :q }
+        options  = defaults.deep_merge(options).deep_merge(required)
+
         form_for search, options do |f|
           filters.group_by{ |o| o[:attribute] }.each do |attribute, array|
-            options      = array.last # grab last-defined `filter` call from DSL
-            if_block     = options[:if]     || proc{ true }
-            unless_block = options[:unless] || proc{ false }
-            if call_method_or_proc_on(self, if_block) && !call_method_or_proc_on(self, unless_block)
-              f.filter options[:attribute], options.except(:attribute, :if, :unless)
+            opts     = array.last # grab last-defined `filter` call from DSL
+            should   = opts.delete(:if)     || proc{ true }
+            shouldnt = opts.delete(:unless) || proc{ false }
+
+            if call_method_or_proc_on(self, should) && !call_method_or_proc_on(self, shouldnt)
+              f.filter attribute, opts
             end
           end
 
           buttons = content_tag :div, :class => "buttons" do
-            f.submit(I18n.t('active_admin.filter')) +
-              clear_link +
+            f.submit(I18n.t('active_admin.filters.buttons.filter')) +
+              link_to(I18n.t('active_admin.filters.buttons.clear'), '#', :class => 'clear_filters_btn') +
               hidden_field_tags_for(params, :except => [:q, :page])
           end