activeadmin 1.0.0.pre5 → 1.0.0

data/lib/active_admin/devise.rb

@@ -43,7 +43,7 @@ module ActiveAdmin
                  "/#{namespace}"
                end
 
-        # NOTE: `relative_url_root` is deprecated by rails.
+        # NOTE: `relative_url_root` is deprecated by Rails.
         #       Remove prefix here if it is removed completely.
         prefix = Rails.configuration.action_controller[:relative_url_root] || ''
         prefix + path

data/lib/active_admin/error.rb

@@ -5,7 +5,7 @@ module ActiveAdmin
   class AccessDenied < StandardError
     attr_reader :user, :action, :subject
 
-    def initialize(user, action, subject)
+    def initialize(user, action, subject = nil)
       @user, @action, @subject = user, action, subject
 
       super()

data/lib/active_admin/filters/active.rb

@@ -8,23 +8,15 @@ module ActiveAdmin
 
       def initialize(resource_class, params)
         @resource_class = resource_class
-        @params = normalize_params(params)
+        @params = params.to_unsafe_h
         @scope = humanize_scope
         @filters = build_filters
       end
 
       private
 
-      def normalize_params(params)
-        if params.is_a?(HashWithIndifferentAccess)
-          params
-        else
-          params.to_unsafe_h
-        end
-      end
-
       def build_filters
-        filters = @params[:q] || []
+        filters = @params['q'] || []
         filters.map{ |param| Humanized.new(param) }
       end
 

data/lib/active_admin/filters/resource_extension.rb

@@ -109,7 +109,7 @@ module ActiveAdmin
       def default_filters
         result = []
         result.concat default_association_filters if namespace.include_default_association_filters
-        result.concat default_content_filters
+        result.concat content_columns
         result.concat custom_ransack_filters
         result
       end
@@ -137,15 +137,6 @@ module ActiveAdmin
         end
       end
 
-      # Returns a default set of filters for the content columns
-      def default_content_filters
-        if resource_class.respond_to? :content_columns
-          resource_class.content_columns.map{ |c| c.name.to_sym }
-        else
-          []
-        end
-      end
-
       def add_filters_sidebar_section
         self.sidebar_sections << filters_sidebar_section
       end

data/lib/active_admin/inputs/filters/date_range_input.rb

@@ -27,7 +27,7 @@ module ActiveAdmin
           current_value = begin
             #cast value to date object before rendering input
             @object.public_send(input_name).to_s.to_date
-          rescue 
+          rescue
             nil
           end
           { size: 12,

data/lib/active_admin/inputs/filters/select_input.rb

@@ -45,8 +45,7 @@ module ActiveAdmin
         end
 
         def pluck_column
-          distinct = ActiveAdmin::Dependency.rails >= 4 ? :distinct : :uniq
-          klass.reorder("#{method} asc").public_send(distinct).pluck method
+          klass.reorder("#{method} asc").distinct.pluck method
         end
 
       end

data/lib/active_admin/inputs/filters/text_input.rb

@@ -7,8 +7,8 @@ module ActiveAdmin
 
         def input_html_options
           {
-            :cols => builder.default_text_area_width,
-            :rows => builder.default_text_area_height
+            cols: builder.default_text_area_width,
+            rows: builder.default_text_area_height
           }.merge(super)
         end
 

data/lib/active_admin/menu.rb

@@ -71,7 +71,7 @@ module ActiveAdmin
       # Returns sorted array of menu items that should be displayed in this context.
       # Sorts by priority first, then alphabetically by label if needed.
       def items(context = nil)
-        @children.values.select{ |i| i.display?(context) }.sort do |a,b|
+        @children.values.select{ |i| i.display?(context) }.sort do |a, b|
           result = a.priority       <=> b.priority
           result = a.label(context) <=> b.label(context) if result == 0
           result

data/lib/active_admin/namespace.rb

@@ -27,16 +27,20 @@ module ActiveAdmin
   class Namespace
     RegisterEvent = 'active_admin.namespace.register'.freeze
 
-    attr_reader :application, :resources, :name, :menus
+    attr_reader :application, :resources, :menus
 
     def initialize(application, name)
       @application = application
-      @name = name.to_s.underscore.to_sym
+      @name = name.to_s.underscore
       @resources = ResourceCollection.new
       register_module unless root?
       build_menu_collection
     end
 
+    def name
+      @name.to_sym
+    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
     # namespace instance.
@@ -45,7 +49,7 @@ module ActiveAdmin
 
       # Register the resource
       register_resource_controller(config)
-      parse_registration_block(config, resource_class, &block) if block_given?
+      parse_registration_block(config, &block) if block_given?
       reset_menu!
 
       # Dispatch a registration event
@@ -78,8 +82,11 @@ module ActiveAdmin
     #   Namespace.new(:root).module_name # => nil
     #
     def module_name
-      return nil if root?
-      @module_name ||= name.to_s.camelize
+      root? ? nil : @name.camelize
+    end
+
+    def route_prefix
+      root? ? nil : @name
     end
 
     # Unload all the registered resources for this namespace
@@ -218,8 +225,8 @@ module ActiveAdmin
       config.controller.active_admin_config = config
     end
 
-    def parse_registration_block(config, resource_class, &block)
-      config.dsl = ResourceDSL.new(config, resource_class)
+    def parse_registration_block(config, &block)
+      config.dsl = ResourceDSL.new(config)
       config.dsl.run_registration_block(&block)
     end
 

data/lib/active_admin/orm/active_record/comments.rb

@@ -46,10 +46,7 @@ ActiveAdmin.after_load do |app|
       controller do
         # Prevent N+1 queries
         def scoped_collection
-          super.includes *( # rails/rails#14734
-            ActiveAdmin::Dependency.rails?('>= 4.1.0', '<= 4.1.1') ?
-              [:author] : [:author, :resource]
-          )
+          super.includes(:author, :resource)
         end
 
         # Redirect to the resource show page after comment creation
@@ -77,9 +74,7 @@ ActiveAdmin.after_load do |app|
         end
       end
 
-      if ActiveAdmin::Dependency.rails.strong_parameters?
-        permit_params :body, :namespace, :resource_id, :resource_type
-      end
+      permit_params :body, :namespace, :resource_id, :resource_type
 
       index do
         column I18n.t('active_admin.comments.resource_type'), :resource_type

data/lib/active_admin/orm/active_record/comments/comment.rb

@@ -6,7 +6,7 @@ module ActiveAdmin
     belongs_to :resource, polymorphic: true
     belongs_to :author,   polymorphic: true
 
-    unless Rails::VERSION::MAJOR > 3 && !defined? ProtectedAttributes
+    if defined? ProtectedAttributes
       attr_accessible :resource, :resource_id, :resource_type, :body, :namespace
     end
 
@@ -19,27 +19,17 @@ module ActiveAdmin
       ResourceController::Decorators.undecorate(resource).class.base_class.name.to_s
     end
 
-    # Postgres adapters won't compare strings to numbers (issue 34)
-    def self.resource_id_cast(record)
-      resource_id_type == :string ? record.id.to_s : record.id
-    end
-
     def self.find_for_resource_in_namespace(resource, namespace)
       where(
         resource_type: resource_type(resource),
-        resource_id:   resource_id_cast(resource),
+        resource_id:   resource,
         namespace:     namespace.to_s
       ).order(ActiveAdmin.application.namespaces[namespace.to_sym].comments_order)
     end
 
-    def self.resource_id_type
-      columns.detect{ |i| i.name == "resource_id" }.type
-    end
-
     def set_resource_type
       self.resource_type = self.class.resource_type(resource)
     end
 
   end
 end
-

data/lib/active_admin/page.rb

@@ -102,5 +102,10 @@ module ActiveAdmin
     def breadcrumb
       instance_variable_defined?(:@breadcrumb) ? @breadcrumb : namespace.breadcrumb
     end
+
+    def order_clause
+      @order_clause || namespace.order_clause
+    end
+
   end
 end

data/lib/active_admin/page_controller.rb

@@ -8,11 +8,7 @@ module ActiveAdmin
 
     actions :index
 
-    if ActiveAdmin::Dependency.rails >= 4
-      before_action :authorize_access!
-    else
-      before_filter :authorize_access!
-    end
+    before_action :authorize_access!
 
     def index(options={}, &block)
       render "active_admin/page/index"

data/lib/active_admin/resource.rb

@@ -1,4 +1,5 @@
 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'
@@ -53,6 +54,9 @@ module ActiveAdmin
 
     #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
@@ -87,6 +91,7 @@ module ActiveAdmin
     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
@@ -126,7 +131,7 @@ 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?
       controller.send :belongs_to, target, options.dup
     end
 
@@ -158,25 +163,43 @@ module ActiveAdmin
       @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 && 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(id)
       if finder = resources_configuration[:self][:finder]
         [finder, id]
-      elsif Rails::VERSION::MAJOR >= 4
-        [:find_by, { resource_class.primary_key => id }]
       else
-        [:"find_by_#{resource_class.primary_key}", id]
+        [: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
 
   end # class Resource

data/lib/active_admin/resource/attributes.rb

@@ -0,0 +1,44 @@
+module ActiveAdmin
+
+  class Resource
+    module Attributes
+
+      def default_attributes
+        resource_class.columns.each_with_object({}) do |c, attrs|
+          unless reject_col?(c)
+            name = c.name.to_sym
+            attrs[name] = (method_for_column(name) || name)
+          end
+        end
+      end
+
+      def method_for_column(c)
+        resource_class.respond_to?(:reflect_on_all_associations) && foreign_methods.has_key?(c) && foreign_methods[c].name.to_sym
+      end
+
+      def foreign_methods
+        @foreign_methods ||= resource_class.reflect_on_all_associations.
+          select{ |r| r.macro == :belongs_to }.
+          reject{ |r| r.chain.length > 2 && !r.options[:polymorphic] }.
+          index_by{ |r| r.foreign_key.to_sym }
+      end
+
+      def reject_col?(c)
+        primary_col?(c) || sti_col?(c) || counter_cache_col?(c)
+      end
+
+      def primary_col?(c)
+        c.name == resource_class.primary_key
+      end
+
+      def sti_col?(c)
+        c.name == resource_class.inheritance_column
+      end
+
+      def counter_cache_col?(c)
+        c.name.end_with?('_count')
+      end
+
+    end
+  end
+end

data/lib/active_admin/resource/menu.rb

@@ -10,6 +10,7 @@ module ActiveAdmin
           @include_in_menu   = false
           @menu_item_options = {}
         else
+          @include_in_menu = true
           @navigation_menu_name = options[:menu_name]
           @menu_item_options    = default_menu_options.merge options
         end
@@ -31,7 +32,9 @@ module ActiveAdmin
         }
       end
 
-      attr_writer :navigation_menu_name
+      def navigation_menu_name=(menu_name)
+        self.menu_item_options = { menu_name: menu_name }
+      end
 
       def navigation_menu_name
         case @navigation_menu_name ||= DEFAULT_MENU

data/lib/active_admin/resource/routes.rb

@@ -25,7 +25,7 @@ module ActiveAdmin
 
       # Returns the routes prefix for this config
       def route_prefix
-        namespace.module_name.try(:underscore)
+        namespace.route_prefix
       end
 
       def route_builder
@@ -62,8 +62,7 @@ module ActiveAdmin
           )
 
           query = params.slice(:q, :scope)
-          query = query.permit! if query.respond_to? :permit!
-          query = query.to_h if Rails::VERSION::MAJOR >= 5
+          query = query.permit!.to_h
           routes.public_send route_name, *route_collection_params(params), additional_params.merge(query)
         end
 

data/lib/active_admin/resource_controller.rb

@@ -21,6 +21,7 @@ module ActiveAdmin
     include Scoping
     include Streaming
     include Sidebars
+    include ViewHelpers::DownloadFormatLinksHelper
     extend  ResourceClassMethods
 
     def self.active_admin_config=(config)
@@ -45,7 +46,19 @@ module ActiveAdmin
     def renderer_for(action)
       active_admin_namespace.view_factory["#{action}_page"]
     end
+
     helper_method :renderer_for
 
+    def restrict_format_access!
+      unless request.format.html?
+        presenter = active_admin_config.get_page_presenter(:index)
+        download_formats  = (presenter || {}).fetch(:download_links, active_admin_config.namespace.download_links)
+        unless build_download_formats(download_formats).include?(request.format.symbol)
+          raise ActiveAdmin::AccessDenied.new(current_active_admin_user, :index)
+        end
+      end
+    end
+
+    before_action :restrict_format_access!, only: [:index, :show]
   end
 end