activeadmin 1.0.0.pre1 → 2.9.0

data/lib/active_admin/resource/routes.rb

@@ -4,24 +4,36 @@ module ActiveAdmin
       # @param params [Hash] of params: { study_id: 3 }
       # @return [String] the path to this resource collection page
       # @example "/admin/posts"
-      def route_collection_path(params = {})
-        RouteBuilder.new(self).collection_path(params)
+      def route_collection_path(params = {}, additional_params = {})
+        route_builder.collection_path(params, additional_params)
+      end
+
+      def route_batch_action_path(params = {}, additional_params = {})
+        route_builder.batch_action_path(params, additional_params)
       end
 
       # @param resource [ActiveRecord::Base] the instance we want the path of
       # @return [String] the path to this resource collection page
       # @example "/admin/posts/1"
-      def route_instance_path(resource)
-        RouteBuilder.new(self).instance_path(resource)
+      def route_instance_path(resource, additional_params = {})
+        route_builder.instance_path(resource, additional_params)
       end
 
-      def route_edit_instance_path(resource)
-        RouteBuilder.new(self).edit_instance_path(resource)
+      def route_edit_instance_path(resource, additional_params = {})
+        route_builder.member_action_path(:edit, resource, additional_params)
+      end
+
+      def route_member_action_path(action, resource, additional_params = {})
+        route_builder.member_action_path(action, resource, additional_params)
       end
 
       # Returns the routes prefix for this config
       def route_prefix
-        namespace.module_name.try(:underscore)
+        namespace.route_prefix
+      end
+
+      def route_builder
+        @route_builder ||= RouteBuilder.new(self)
       end
 
       def route_uncountable?
@@ -30,39 +42,50 @@ module ActiveAdmin
         config[:route_collection_name] == config[:route_instance_name]
       end
 
-      private
-
       class RouteBuilder
         def initialize(resource)
           @resource = resource
         end
 
-        def collection_path(params)
+        def collection_path(params, additional_params = {})
           route_name = route_name(
             resource.resources_configuration[:self][:route_collection_name],
             suffix: (resource.route_uncountable? ? "index_path" : "path")
           )
 
-          routes.public_send route_name, *route_collection_params(params)
+          routes.public_send route_name, *route_collection_params(params), additional_params
+        end
+
+        def batch_action_path(params, additional_params = {})
+          route_name = route_name(
+            resource.resources_configuration[:self][:route_collection_name],
+            action: :batch_action,
+            suffix: (resource.route_uncountable? ? "index_path" : "path")
+          )
+
+          query = params.slice(:q, :scope)
+          query = query.permit!.to_h
+          routes.public_send route_name, *route_collection_params(params), additional_params.merge(query)
         end
 
         # @return [String] the path to this resource collection page
         # @param instance [ActiveRecord::Base] the instance we want the path of
         # @example "/admin/posts/1"
-        def instance_path(instance)
+        def instance_path(instance, additional_params = {})
           route_name = route_name(resource.resources_configuration[:self][:route_instance_name])
 
-          routes.public_send route_name, *route_instance_params(instance)
+          routes.public_send route_name, *route_instance_params(instance), additional_params
         end
 
-        # @return [String] the path to the edit page of this resource
+        # @return [String] the path to the member action of this resource
+        # @param action [Symbol]
         # @param instance [ActiveRecord::Base] the instance we want the path of
         # @example "/admin/posts/1/edit"
-        def edit_instance_path(instance)
+        def member_action_path(action, instance, additional_params = {})
           path = resource.resources_configuration[:self][:route_instance_name]
-          route_name = route_name(path, action: :edit)
+          route_name = route_name(path, action: action)
 
-          routes.public_send route_name, *route_instance_params(instance)
+          routes.public_send route_name, *route_instance_params(instance), additional_params
         end
 
         private
@@ -73,20 +96,19 @@ module ActiveAdmin
           suffix = options[:suffix] || "path"
           route = []
 
-          route << options[:action]           # "edit" or "new"
-          route << resource.route_prefix      # "admin"
+          route << options[:action] # "batch_action", "edit" or "new"
+          route << resource.route_prefix # "admin"
           route << belongs_to_name if nested? # "category"
-          route << resource_path_name         # "posts" or "post"
-          route << suffix                     # "path" or "index path"
+          route << resource_path_name # "posts" or "post"
+          route << suffix # "path" or "index path"
 
-          route.compact.join('_').to_sym      # :admin_category_posts_path
+          route.compact.join("_").to_sym # :admin_category_posts_path
         end
 
-
         # @return params to pass to instance path
         def route_instance_params(instance)
           if nested?
-            [instance.public_send(belongs_to_name).to_param, instance.to_param]
+            [instance.public_send(belongs_to_target_name).to_param, instance.to_param]
           else
             instance.to_param
           end
@@ -99,11 +121,19 @@ module ActiveAdmin
         end
 
         def nested?
-          resource.belongs_to? && resource.belongs_to_config.required?
+          resource.belongs_to? && belongs_to_config.required?
+        end
+
+        def belongs_to_target_name
+          belongs_to_config.target_name
         end
 
         def belongs_to_name
-          resource.belongs_to_config.target.resource_name.singular if nested?
+          belongs_to_config.target.resource_name.singular
+        end
+
+        def belongs_to_config
+          resource.belongs_to_config
         end
 
         def routes

data/lib/active_admin/resource/scope_to.rb

@@ -38,10 +38,10 @@ module ActiveAdmin
         options = args.extract_options!
         method = args.first
 
-        scope_to_config[:method]              = block || method
-        scope_to_config[:association_method]  = options[:association_method]
-        scope_to_config[:if]                  = options[:if]
-        scope_to_config[:unless]              = options[:unless]
+        scope_to_config[:method] = block || method
+        scope_to_config[:association_method] = options[:association_method]
+        scope_to_config[:if] = options[:if]
+        scope_to_config[:unless] = options[:unless]
 
       end
 
@@ -55,10 +55,10 @@ module ActiveAdmin
 
       def scope_to_config
         @scope_to_config ||= {
-          method:             nil,
+          method: nil,
           association_method: nil,
-          if:                 nil,
-          unless:             nil
+          if: nil,
+          unless: nil
         }
       end
 

data/lib/active_admin/resource/scopes.rb

@@ -10,7 +10,7 @@ module ActiveAdmin
       # Returns a scope for this object by its identifier
       def get_scope_by_id(id)
         id = id.to_s
-        scopes.find{|s| s.id == id }
+        scopes.find { |s| s.id == id }
       end
 
       def default_scope(context = nil)
@@ -27,14 +27,16 @@ module ActiveAdmin
       # If you want to internationalize the scope name, you can add
       # to your i18n files a key like "active_admin.scopes.scope_method".
       def scope(*args, &block)
-        options = args.extract_options!
+        default_options = { show_count: namespace.scopes_show_count }
+        options = default_options.merge(args.extract_options!)
         title = args[0] rescue nil
         method = args[1] rescue nil
 
+        options[:localizer] ||= ActiveAdmin::Localizers.resource(self)
         scope = ActiveAdmin::Scope.new(title, method, options, &block)
 
         # Finds and replaces a scope by the same name if it already exists
-        existing_scope_index = scopes.index{|existing_scope| existing_scope.id == scope.id }
+        existing_scope_index = scopes.index { |existing_scope| existing_scope.id == scope.id }
         if existing_scope_index
           scopes.delete_at(existing_scope_index)
           scopes.insert(existing_scope_index, scope)

data/lib/active_admin/resource/sidebars.rb

@@ -1,4 +1,4 @@
-require 'active_admin/helpers/optional_display'
+require "active_admin/helpers/optional_display"
 
 module ActiveAdmin
 
@@ -14,7 +14,7 @@ module ActiveAdmin
       end
 
       def sidebar_sections_for(action, render_context = nil)
-        sidebar_sections.select{|section| section.display_on?(action, render_context) }
+        sidebar_sections.select { |section| section.display_on?(action, render_context) }
           .sort_by(&:priority)
       end
 

data/lib/active_admin/resource.rb

@@ -1,15 +1,18 @@
-require 'active_admin/resource/action_items'
-require 'active_admin/resource/controllers'
-require 'active_admin/resource/menu'
-require 'active_admin/resource/page_presenters'
-require 'active_admin/resource/pagination'
-require 'active_admin/resource/routes'
-require 'active_admin/resource/naming'
-require 'active_admin/resource/scopes'
-require 'active_admin/resource/includes'
-require 'active_admin/resource/scope_to'
-require 'active_admin/resource/sidebars'
-require 'active_admin/resource/belongs_to'
+require "active_admin/resource/action_items"
+require "active_admin/resource/attributes"
+require "active_admin/resource/controllers"
+require "active_admin/resource/menu"
+require "active_admin/resource/page_presenters"
+require "active_admin/resource/pagination"
+require "active_admin/resource/routes"
+require "active_admin/resource/naming"
+require "active_admin/resource/scopes"
+require "active_admin/resource/includes"
+require "active_admin/resource/scope_to"
+require "active_admin/resource/sidebars"
+require "active_admin/resource/belongs_to"
+require "active_admin/resource/ordering"
+require "active_admin/resource/model"
 
 module ActiveAdmin
 
@@ -24,7 +27,7 @@ module ActiveAdmin
   class Resource
 
     # Event dispatched when a new resource is registered
-    RegisterEvent = 'active_admin.resource.register'.freeze
+    RegisterEvent = "active_admin.resource.register".freeze
 
     # The namespace this config belongs to
     attr_reader :namespace
@@ -41,7 +44,7 @@ module ActiveAdmin
     # The default sort order to use in the controller
     attr_writer :sort_order
     def sort_order
-      @sort_order ||= (resource_class.respond_to?(:primary_key) ? resource_class.primary_key.to_s : 'id') + '_desc'
+      @sort_order ||= (resource_class.respond_to?(:primary_key) ? resource_class.primary_key.to_s : "id") + "_desc"
     end
 
     # Set the configuration for the CSV
@@ -50,6 +53,12 @@ module ActiveAdmin
     # Set breadcrumb builder
     attr_writer :breadcrumb
 
+    #Set order clause
+    attr_writer :order_clause
+    # Display create another checkbox on a new page
+    # @return [Boolean]
+    attr_writer :create_another
+
     # Store a reference to the DSL so that we can dereference it during garbage collection.
     attr_accessor :dsl
 
@@ -61,9 +70,10 @@ module ActiveAdmin
       def initialize(namespace, resource_class, options = {})
         @namespace = namespace
         @resource_class_name = "::#{resource_class.name}"
-        @options    = options
+        @options = options
         @sort_order = options[:sort_order]
-        @member_actions, @collection_actions = [], []
+        @member_actions = []
+        @collection_actions = []
       end
     end
 
@@ -82,6 +92,8 @@ module ActiveAdmin
     include ScopeTo
     include Sidebars
     include Routes
+    include Ordering
+    include Attributes
 
     # The class this resource wraps. If you register the Post model, Resource#resource_class
     # will point to the Post class
@@ -93,6 +105,10 @@ module ActiveAdmin
       ActiveSupport::Dependencies.constantize(decorator_class_name) if decorator_class_name
     end
 
+    def resource_name_extension
+      @resource_name_extension ||= define_resource_name_extension(self)
+    end
+
     def resource_table_name
       resource_class.quoted_table_name
     end
@@ -121,7 +137,8 @@ module ActiveAdmin
 
     def belongs_to(target, options = {})
       @belongs_to = Resource::BelongsTo.new(self, target, options)
-      self.navigation_menu_name = target unless @belongs_to.optional?
+      self.menu_item_options = false if @belongs_to.required?
+      options[:class_name] ||= @belongs_to.resource.resource_class_name if @belongs_to.resource
       controller.send :belongs_to, target, options.dup
     end
 
@@ -129,6 +146,12 @@ module ActiveAdmin
       @belongs_to
     end
 
+    def belongs_to_param
+      if belongs_to? && belongs_to_config.required?
+        belongs_to_config.to_param
+      end
+    end
+
     # Do we belong to another resource?
     def belongs_to?
       !!belongs_to_config
@@ -143,20 +166,55 @@ module ActiveAdmin
       instance_variable_defined?(:@breadcrumb) ? @breadcrumb : namespace.breadcrumb
     end
 
+    def order_clause
+      @order_clause || namespace.order_clause
+    end
+
+    def create_another
+      instance_variable_defined?(:@create_another) ? @create_another : namespace.create_another
+    end
+
     def find_resource(id)
-      resource = resource_class.public_send(method_for_find, id)
-      decorator_class ? decorator_class.new(resource) : resource
+      resource = resource_class.public_send *method_for_find(id)
+      (decorator_class && resource) ? decorator_class.new(resource) : resource
+    end
+
+    def resource_columns
+      resource_attributes.values
+    end
+
+    def resource_attributes
+      @resource_attributes ||= default_attributes
+    end
+
+    def association_columns
+      @association_columns ||= resource_attributes.select { |key, value| key != value }.values
+    end
+
+    def content_columns
+      @content_columns ||= resource_attributes.select { |key, value| key == value }.values
     end
 
     private
 
-    def method_for_find
-      resources_configuration[:self][:finder] || :"find_by_#{resource_class.primary_key}"
+    def method_for_find(id)
+      if finder = resources_configuration[:self][:finder]
+        [finder, id]
+      else
+        [:find_by, { resource_class.primary_key => id }]
+      end
     end
 
     def default_csv_builder
-      @default_csv_builder ||= CSVBuilder.default_for_resource(resource_class)
+      @default_csv_builder ||= CSVBuilder.default_for_resource(self)
     end
 
+    def define_resource_name_extension(resource)
+      Module.new do
+        define_method :model_name do
+          resource.resource_name
+        end
+      end
+    end
   end # class Resource
 end # module ActiveAdmin

data/lib/active_admin/resource_collection.rb

@@ -33,15 +33,17 @@ module ActiveAdmin
     # Finds a resource based on the resource name, resource class, or base class.
     def find_resource(obj)
       resources.detect do |r|
-        r.resource_name.to_s == obj.to_s || r.resource_class.to_s == obj.to_s
+        r.resource_name.to_s == obj.to_s
+      end || resources.detect do |r|
+        r.resource_class.to_s == obj.to_s
       end ||
       if obj.respond_to? :base_class
-        resources.detect{ |r| r.resource_class.to_s == obj.base_class.to_s }
+        resources.detect { |r| r.resource_class.to_s == obj.base_class.to_s }
       end
     end
 
     def resources
-      select{ |r| r.class <= Resource } # can otherwise be a Page
+      select { |r| r.class <= Resource } # can otherwise be a Page
     end
 
     def raise_if_mismatched!(existing, given)

data/lib/active_admin/resource_controller/action_builder.rb

@@ -7,12 +7,22 @@ module ActiveAdmin
       module ClassMethods
 
         def clear_member_actions!
+          remove_action_methods(:member)
           active_admin_config.clear_member_actions!
         end
 
         def clear_collection_actions!
+          remove_action_methods(:collection)
           active_admin_config.clear_collection_actions!
         end
+
+        private
+
+        def remove_action_methods(actions_type)
+          active_admin_config.public_send("#{actions_type}_actions").each do |action|
+            remove_method action.name
+          end
+        end
       end
 
     end

data/lib/active_admin/resource_controller/data_access.rb

@@ -14,6 +14,8 @@ module ActiveAdmin
           include ScopeChain
 
           define_active_admin_callbacks :build, :create, :update, :save, :destroy
+
+          helper_method :current_scope
         end
       end
 
@@ -45,7 +47,6 @@ module ActiveAdmin
         end
       end
 
-
       # Does the actual work of retrieving the current collection from the db.
       # This is a great method to override if you would like to perform
       # some additional db # work before your controller returns and
@@ -60,7 +61,6 @@ module ActiveAdmin
         collection
       end
 
-
       # Override this method in your controllers to modify the start point
       # of our searches and index.
       #
@@ -88,9 +88,9 @@ module ActiveAdmin
       def resource
         get_resource_ivar || begin
           resource = find_resource
+          resource = apply_decorations(resource)
           authorize_resource! resource
 
-          resource = apply_decorator resource
           set_resource_ivar resource
         end
       end
@@ -98,16 +98,11 @@ module ActiveAdmin
       # Does the actual work of finding a resource in the database. This
       # method uses the finder method as defined in InheritedResources.
       #
-      # Note that public_send can't be used here because Rails 3.2's
-      # ActiveRecord::Associations::CollectionProxy (belongs_to associations)
-      # mysteriously returns an Enumerator object.
-      #
       # @return [ActiveRecord::Base] An active record object.
       def find_resource
         scoped_collection.send method_for_find, params[:id]
       end
 
-
       # Builds, memoize and authorize a new instance of the resource. The
       # actual work of building the new instance is delegated to the
       # #build_new_resource method.
@@ -119,10 +114,11 @@ module ActiveAdmin
       def build_resource
         get_resource_ivar || begin
           resource = build_new_resource
+          resource = apply_decorations(resource)
+          resource = assign_attributes(resource, resource_params)
           run_build_callbacks resource
           authorize_resource! resource
 
-          resource = apply_decorator resource
           set_resource_ivar resource
         end
       end
@@ -130,12 +126,12 @@ module ActiveAdmin
       # Builds a new resource. This method uses the method_for_build provided
       # by Inherited Resources.
       #
-      # Note that public_send can't be used here w/ Rails 3.2 & a belongs_to
-      # config, or you'll get undefined method `build' for []:Array.
-      #
       # @return [ActiveRecord::Base] An un-saved active record base object
       def build_new_resource
-        scoped_collection.send method_for_build, *resource_params
+        scoped_collection.send(
+          method_for_build,
+          *resource_params.map { |params| params.slice(active_admin_config.resource_class.inheritance_column) }
+        )
       end
 
       # Calls all the appropriate callbacks and then creates the new resource.
@@ -171,11 +167,7 @@ module ActiveAdmin
       #
       # @return [void]
       def update_resource(object, attributes)
-        if object.respond_to?(:assign_attributes)
-          object.assign_attributes(*attributes)
-        else
-          object.attributes = attributes[0]
-        end
+        object = assign_attributes(object, attributes)
 
         run_update_callbacks object do
           save_resource(object)
@@ -191,12 +183,10 @@ module ActiveAdmin
         end
       end
 
-
       #
       # Collection Helper Methods
       #
 
-
       # Gives the authorization library a change to pre-scope the collection.
       #
       # In the case of the CanCan adapter, it calls `#accessible_by` on
@@ -212,11 +202,10 @@ module ActiveAdmin
 
       def apply_sorting(chain)
         params[:order] ||= active_admin_config.sort_order
-
-        order_clause = OrderClause.new params[:order]
+        order_clause = active_admin_config.order_clause.new(active_admin_config, params[:order])
 
         if order_clause.valid?
-          chain.reorder(order_clause.to_sql(active_admin_config))
+          order_clause.apply(chain)
         else
           chain # just return the chain
         end
@@ -225,18 +214,10 @@ module ActiveAdmin
       # Applies any Ransack search methods to the currently scoped collection.
       # Both `search` and `ransack` are provided, but we use `ransack` to prevent conflicts.
       def apply_filtering(chain)
-        @search = chain.ransack clean_search_params params[:q]
+        @search = chain.ransack(params[:q] || {})
         @search.result
       end
 
-      def clean_search_params(params)
-        if params.is_a? Hash
-          params.dup.delete_if{ |key, value| value.blank? }
-        else
-          {}
-        end
-      end
-
       def apply_scoping(chain)
         @collection_before_scope = chain
 
@@ -261,13 +242,15 @@ module ActiveAdmin
 
       def current_scope
         @current_scope ||= if params[:scope]
-          active_admin_config.get_scope_by_id(params[:scope])
-        else
-          active_admin_config.default_scope(self)
-        end
+                             active_admin_config.get_scope_by_id(params[:scope])
+                           else
+                             active_admin_config.default_scope(self)
+                           end
       end
 
       def apply_pagination(chain)
+        # skip pagination if already was paginated by scope
+        return chain if chain.respond_to?(:total_pages)
         page_method_name = Kaminari.config.page_method_name
         page = params[Kaminari.config.param_name]
 
@@ -277,14 +260,15 @@ module ActiveAdmin
       def collection_applies(options = {})
         only = Array(options.fetch(:only, COLLECTION_APPLIES))
         except = Array(options.fetch(:except, []))
-        COLLECTION_APPLIES && only - except
+
+        COLLECTION_APPLIES & only - except
       end
 
       def per_page
         if active_admin_config.paginate
           dynamic_per_page || configured_per_page
         else
-          max_per_page
+          active_admin_config.max_per_page
         end
       end
 
@@ -293,17 +277,46 @@ module ActiveAdmin
       end
 
       def configured_per_page
-        if active_admin_config.per_page.is_a?(Array)
-          active_admin_config.per_page[0]
+        Array(active_admin_config.per_page).first
+      end
+
+      # @param resource [ActiveRecord::Base]
+      # @param attributes [Array<Hash]
+      # @return [ActiveRecord::Base] resource
+      #
+      def assign_attributes(resource, attributes)
+        if resource.respond_to?(:assign_attributes)
+          resource.assign_attributes(*attributes)
         else
-          active_admin_config.per_page
+          resource.attributes = attributes[0]
         end
+
+        resource
       end
 
-      def max_per_page
-        10_000
+      # @param resource [ActiveRecord::Base]
+      # @return [ActiveRecord::Base] resource
+      #
+      def apply_decorations(resource)
+        apply_decorator(resource)
       end
 
+      # @return [String]
+      def smart_resource_url
+        if create_another?
+          new_resource_url(create_another: params[:create_another])
+        else
+          super
+        end
+      end
+
+      private
+
+      # @return [Boolean] true if user requested to create one more
+      #   resource after creating this one.
+      def create_another?
+        params[:create_another].present?
+      end
     end
   end
 end