activeadmin 0.6.6 → 1.0.0.pre1

data/lib/active_admin/resource_dsl.rb

@@ -1,6 +1,11 @@
 module ActiveAdmin
-  # This is the class where all the register blocks are instance eval'd
+  # This is the class where all the register blocks are evaluated.
   class ResourceDSL < DSL
+    def initialize(config, resource_class)
+      @resource = resource_class
+      super(config)
+    end
+
     private
 
     def belongs_to(target, options = {})
@@ -17,6 +22,42 @@ module ActiveAdmin
       config.scope(*args, &block)
     end
 
+    # Store relations that should be included
+    def includes(*args)
+      config.includes.push *args
+    end
+
+    #
+    # Rails 4 Strong Parameters Support
+    #
+    # Either
+    #
+    #   permit_params :title, :author, :body, tags: []
+    #
+    # Or
+    #
+    #   permit_params do
+    #     defaults = [:title, :body]
+    #     if current_user.admin?
+    #       defaults + [:author]
+    #     else
+    #       defaults
+    #     end
+    #   end
+    #
+    # Keys included in the `permitted_params` setting are automatically whitelisted.
+    #
+    def permit_params(*args, &block)
+      param_key = config.param_key.to_sym
+
+      controller do
+        define_method :permitted_params do
+          params.permit *active_admin_namespace.permitted_params,
+            param_key => block ? instance_exec(&block) : args
+        end
+      end
+    end
+
     # Configure the index page for the resource
     def index(options = {}, &block)
       options[:as] ||= :table
@@ -41,11 +82,13 @@ module ActiveAdmin
     #     column("Author") { |post| post.author.full_name }
     #   end
     #
-    #   csv :col_sep => ";", :force_quotes => true do
+    #   csv col_sep: ";", force_quotes: true do
     #     column :name
     #   end
     #
     def csv(options={}, &block)
+      options[:resource] = @resource
+
       config.csv_builder = CSVBuilder.new(options, &block)
     end
 
@@ -73,7 +116,7 @@ module ActiveAdmin
       title = options.delete(:title)
 
       controller do
-        before_filter(:only => [name]) { @page_title = title } if title
+        before_filter(only: [name]) { @page_title = title } if title
         define_method(name, &block || Proc.new{})
       end
     end
@@ -110,15 +153,15 @@ module ActiveAdmin
     # == Before / After Destroy
     # Called before and after the object is destroyed from the database.
     #
-    delegate :before_build,   :after_build,   :to => :controller
-    delegate :before_create,  :after_create,  :to => :controller
-    delegate :before_update,  :after_update,  :to => :controller
-    delegate :before_save,    :after_save,    :to => :controller
-    delegate :before_destroy, :after_destroy, :to => :controller
+    delegate :before_build,   :after_build,   to: :controller
+    delegate :before_create,  :after_create,  to: :controller
+    delegate :before_update,  :after_update,  to: :controller
+    delegate :before_save,    :after_save,    to: :controller
+    delegate :before_destroy, :after_destroy, to: :controller
 
     # Standard rails filters
     delegate :before_filter, :skip_before_filter, :after_filter, :skip_after_filter, :around_filter, :skip_filter,
-             :to => :controller
+             to: :controller
 
     # Specify which actions to create in the controller
     #
@@ -129,7 +172,7 @@ module ActiveAdmin
     #   end
     #
     # Will only create the index and show actions (no create, update or delete)
-    delegate :actions, :to => :controller
+    delegate :actions, to: :controller
 
   end
 end

data/lib/active_admin/router.rb

@@ -18,13 +18,13 @@ module ActiveAdmin
     end
 
     def define_root_routes(router)
-      router.instance_exec @application.namespaces.values do |namespaces|
+      router.instance_exec @application.namespaces do |namespaces|
         namespaces.each do |namespace|
           if namespace.root?
-            root :to => namespace.root_to
+            root namespace.root_to_options.merge(to: namespace.root_to)
           else
             namespace namespace.name do
-              root :to => namespace.root_to
+              root namespace.root_to_options.merge(to: namespace.root_to)
             end
           end
         end
@@ -34,7 +34,7 @@ module ActiveAdmin
     # Defines the routes for each resource
     def define_resource_routes(router)
       router.instance_exec @application.namespaces, self do |namespaces, aa_router|
-        resources = namespaces.values.map{ |n| n.resources.values }.flatten
+        resources = namespaces.flat_map{ |n| n.resources.values }
         resources.each do |config|
           routes = aa_router.resource_routes(config)
 
@@ -47,7 +47,7 @@ module ActiveAdmin
 
               # Make the nested belongs_to routes
               # :only is set to nothing so that we don't clobber any existing routes on the resource
-              resources config.belongs_to_config.target.resource_name.plural, :only => [] do
+              resources config.belongs_to_config.target.resource_name.plural, only: [] do
                 instance_exec &belongs_to
               end
             end
@@ -80,14 +80,14 @@ module ActiveAdmin
         }
         case config
         when ::ActiveAdmin::Resource
-          resources config.resource_name.route_key, :only => config.defined_actions do
+          resources config.resource_name.route_key, only: config.defined_actions do
             member do
               config.member_actions.each &build_action
             end
 
             collection do
               config.collection_actions.each &build_action
-              post :batch_action
+              post :batch_action if config.batch_actions_enabled?
             end
           end
         when ::ActiveAdmin::Page

data/lib/active_admin/scope.rb

@@ -13,12 +13,12 @@ module ActiveAdmin
     #   Scope.new('Published', :public)
     #   # => Scope with name 'Published' and scope method :public
     #
-    #   Scope.new 'Published', :public, :if => proc { current_admin_user.can? :manage, resource_class } do |articles|
-    #     articles.where :published => true
+    #   Scope.new 'Published', :public, if: proc { current_admin_user.can? :manage, resource_class } do |articles|
+    #     articles.where published: true
     #   end
     #   # => Scope with name 'Published' and scope method :public, optionally displaying the scope per the :if block
     #
-    #   Scope.new('Published') { |articles| articles.where(:published => true) }
+    #   Scope.new('Published') { |articles| articles.where(published: true) }
     #   # => Scope with name 'Published' using a block to scope
     #
     #   Scope.new ->{Date.today.strftime '%A'}, :published_today
@@ -29,16 +29,16 @@ module ActiveAdmin
 
       if name.is_a? Proc
         raise "A string/symbol is required as the second argument if your label is a proc." unless method
-        @id = method.to_s.gsub(' ', '').underscore
+        @id = method.to_s.parameterize("_")
       else
         @scope_method ||= name.to_sym
-        @id = name.to_s.gsub(' ', '').underscore
+        @id = name.to_s.parameterize("_")
       end
 
       @scope_method               = nil        if @scope_method == :all
       @scope_method, @scope_block = nil, block if block_given?
 
-      @show_count       = options[:show_count].nil? ? true : options[:show_count]
+      @show_count       = options.fetch(:show_count, true)
       @display_if_block = options[:if]      || proc{ true }
       @default_block    = options[:default] || proc{ false }
 

data/lib/active_admin/sidebar_section.rb

@@ -25,12 +25,20 @@ module ActiveAdmin
 
     # The title gets displayed within the section in the view
     def title
-      I18n.t("active_admin.sidebars.#{name.to_s}", :default => name.to_s.titlecase)
+      I18n.t("active_admin.sidebars.#{name.to_s}", default: name.to_s.titlecase)
     end
 
     # If a block is not passed in, the name of the partial to render
     def partial_name
-      options[:partial] || "#{name.to_s.downcase.gsub(' ', '_')}_sidebar"
+      options[:partial] || "#{name.to_s.downcase.tr(' ', '_')}_sidebar"
+    end
+
+    def custom_class
+      options[:class]
+    end
+
+    def priority
+      options[:priority] || 10
     end
   end
 

data/lib/active_admin/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdmin
-  VERSION = '0.6.6'
+  VERSION = '1.0.0.pre1'
 end

data/lib/active_admin/view_factory.rb

@@ -4,25 +4,25 @@ module ActiveAdmin
   class ViewFactory < AbstractViewFactory
 
     # Register Helper Renderers
-    register  :global_navigation    => ActiveAdmin::Views::TabbedNavigation,
-              :utility_navigation   => ActiveAdmin::Views::TabbedNavigation,
-              :site_title           => ActiveAdmin::Views::SiteTitle,
-              :action_items         => ActiveAdmin::Views::ActionItems,
-              :title_bar            => ActiveAdmin::Views::TitleBar,
-              :header               => ActiveAdmin::Views::Header,
-              :footer               => ActiveAdmin::Views::Footer,
-              :index_scopes         => ActiveAdmin::Views::Scopes,
-              :blank_slate          => ActiveAdmin::Views::BlankSlate,
-              :action_list_popover  => ActiveAdmin::Views::ActionListPopover
+    register  global_navigation:   ActiveAdmin::Views::TabbedNavigation,
+              utility_navigation:  ActiveAdmin::Views::TabbedNavigation,
+              site_title:          ActiveAdmin::Views::SiteTitle,
+              unsupported_browser: ActiveAdmin::Views::UnsupportedBrowser,
+              action_items:        ActiveAdmin::Views::ActionItems,
+              title_bar:           ActiveAdmin::Views::TitleBar,
+              header:              ActiveAdmin::Views::Header,
+              footer:              ActiveAdmin::Views::Footer,
+              index_scopes:        ActiveAdmin::Views::Scopes,
+              blank_slate:         ActiveAdmin::Views::BlankSlate,
+              action_list_popover: ActiveAdmin::Views::ActionListPopover
 
     # Register All The Pages
-    register  :dashboard_page     	=> ActiveAdmin::Views::Pages::Dashboard,
-              :index_page         	=> ActiveAdmin::Views::Pages::Index,
-              :show_page          	=> ActiveAdmin::Views::Pages::Show,
-              :new_page           	=> ActiveAdmin::Views::Pages::Form,
-              :edit_page          	=> ActiveAdmin::Views::Pages::Form,
-              :layout             	=> ActiveAdmin::Views::Pages::Layout,
-              :page               	=> ActiveAdmin::Views::Pages::Page
+    register  index_page: ActiveAdmin::Views::Pages::Index,
+              show_page:  ActiveAdmin::Views::Pages::Show,
+              new_page:   ActiveAdmin::Views::Pages::Form,
+              edit_page:  ActiveAdmin::Views::Pages::Form,
+              layout:     ActiveAdmin::Views::Pages::Layout,
+              page:       ActiveAdmin::Views::Pages::Page
 
   end
 end

data/lib/active_admin/view_helpers.rb

@@ -4,7 +4,6 @@ module ActiveAdmin
     # Require all ruby files in the view helpers dir
     Dir[File.expand_path('../view_helpers', __FILE__) + "/*.rb"].each{|f| require f }
 
-    include AssignsWithIndifferentAccessHelper
     include ActiveAdminApplicationHelper
     include AutoLinkHelper
     include BreadcrumbHelper

data/lib/active_admin/view_helpers/auto_link_helper.rb

@@ -9,24 +9,35 @@ module ActiveAdmin
       # The default content in the link is returned from ActiveAdmin::ViewHelpers::DisplayHelper#display_name
       #
       # You can pass in the content to display
-      #   eg: auto_link(@post, "My Link Content")
+      #   eg: auto_link(@post, "My Link")
       #
-      def auto_link(resource, link_content = nil)
-        content = link_content || display_name(resource)
-        if (registration = active_admin_resource_for(resource.class))
-          begin
-            content = link_to(content, registration.route_instance_path(resource))
-          rescue
-            # ignored
-          end
+      def auto_link(resource, content = display_name(resource))
+        if url = auto_url_for(resource)
+          link_to content, url
+        else
+          content
+        end
+      end
+
+      # Like `auto_link`, except that it only returns a URL instead of a full <a> tag
+      def auto_url_for(resource)
+        config = active_admin_resource_for(resource.class)
+        return unless config
+
+        if config.controller.action_methods.include?("show") &&
+          authorized?(ActiveAdmin::Auth::READ, resource)
+          url_for config.route_instance_path resource
+        elsif config.controller.action_methods.include?("edit") &&
+          authorized?(ActiveAdmin::Auth::UPDATE, resource)
+          url_for config.route_edit_instance_path resource
         end
-        content
       end
 
       # Returns the ActiveAdmin::Resource instance for a class
       def active_admin_resource_for(klass)
-        return nil unless respond_to?(:active_admin_namespace)
-        active_admin_namespace.resource_for(klass)
+        if respond_to? :active_admin_namespace
+          active_admin_namespace.resource_for klass
+        end
       end
 
     end

data/lib/active_admin/view_helpers/breadcrumb_helper.rb

@@ -4,8 +4,9 @@ module ActiveAdmin
 
       # Returns an array of links to use in a breadcrumb
       def breadcrumb_links(path = request.path)
-        parts = path[1..-1].split('/') # remove leading "/" and split up the URL
-        parts.pop                      # remove last since it's used as the page title
+        # remove leading "/" and split up the URL
+        # and remove last since it's used as the page title
+        parts = path.split('/').select(&:present?)[0..-2]
 
         parts.each_with_index.map do |part, index|
           # 1. try using `display_name` if we can locate a DB object
@@ -16,7 +17,7 @@ module ActiveAdmin
             config = parent && parent.resource_name.route_key == parts[index-1] ? parent : active_admin_config
             name   = display_name config.find_resource part
           end
-          name ||= I18n.t "activerecord.models.#{part.singularize}", :count => 1.1, :default => part.titlecase
+          name ||= I18n.t "activerecord.models.#{part.singularize}", count: ::ActiveAdmin::Helpers::I18n::PLURAL_MANY_COUNT, default: part.titlecase
 
           # Don't create a link if the resource's show action is disabled
           if !config || config.defined_actions.include?(:show)

data/lib/active_admin/view_helpers/display_helper.rb

@@ -2,43 +2,58 @@ module ActiveAdmin
   module ViewHelpers
     module DisplayHelper
 
+      DISPLAY_NAME_FALLBACK = ->{
+        name, klass = "", self.class
+        name << klass.model_name.human         if klass.respond_to? :model_name
+        name << " ##{send(klass.primary_key)}" if klass.respond_to? :primary_key
+        name.present? ? name : to_s
+      }
+      def DISPLAY_NAME_FALLBACK.inspect
+        'DISPLAY_NAME_FALLBACK'
+      end
+
       # Attempts to call any known display name methods on the resource.
       # See the setting in `application.rb` for the list of methods and their priority.
       def display_name(resource)
-        resource.send display_name_method_for resource if resource
+        render_in_context resource, display_name_method_for(resource) if resource
       end
 
       # Looks up and caches the first available display name method.
+      # To prevent conflicts, we exclude any methods that happen to be associations.
+      # If no methods are available and we're about to use the Kernel's `to_s`, provide our own.
       def display_name_method_for(resource)
         @@display_name_methods_cache ||= {}
         @@display_name_methods_cache[resource.class] ||= begin
           methods = active_admin_application.display_name_methods - association_methods_for(resource)
-          methods.detect{ |method| resource.respond_to? method }
+          method  = methods.detect{ |method| resource.respond_to? method }
+
+          if method != :to_s || resource.method(method).source_location
+            method
+          else
+            DISPLAY_NAME_FALLBACK
+          end
         end
       end
 
-      # To prevent conflicts, we exclude any methods that happen to be associations.
       def association_methods_for(resource)
         return [] unless resource.class.respond_to? :reflect_on_all_associations
         resource.class.reflect_on_all_associations.map(&:name)
       end
 
-      # Return a pretty string for any object
-      # Date Time are formatted via #localize with :format => :long
-      # ActiveRecord objects are formatted via #auto_link
-      # We attempt to #display_name of any other objects
+      # Attempts to create a human-readable string for any object
       def pretty_format(object)
         case object
-        when String
-          object
-        when Arbre::Element
-          object
+        when String, Numeric, Arbre::Element
+          object.to_s
         when Date, Time
-          localize(object, :format => :long)
-        when ActiveRecord::Base
-          auto_link(object)
+          localize object, format: :long
         else
-          display_name(object)
+          if defined?(::ActiveRecord) && object.is_a?(ActiveRecord::Base) ||
+             defined?(::Mongoid)      && object.class.include?(Mongoid::Document)
+            auto_link object
+          else
+            display_name object
+          end
         end
       end
 

data/lib/active_admin/view_helpers/download_format_links_helper.rb

@@ -2,6 +2,20 @@ module ActiveAdmin
   module ViewHelpers
     module DownloadFormatLinksHelper
 
+      def build_download_format_links(formats = self.class.formats)
+        params = request.query_parameters.except :format, :commit
+        div class: "download_links" do
+          span I18n.t('active_admin.download')
+          formats.each do |format|
+            a format.upcase, href: url_for(params: params, format: format)
+          end
+        end
+      end
+
+      def self.included base
+        base.extend ClassMethods
+      end
+
       module ClassMethods
 
         # A ready only of formats to make available in index/paginated
@@ -14,37 +28,19 @@ module ActiveAdmin
           @formats.clone
         end
 
-        # Adds a mime type extension to the list of available formats.
-        # You must register the extension prior to adding it to the list
-        # of avilable formats. This should be used by plugins that want
-        # to add additional formats to the download format links.
-        # @param [Symbol] extension the mime extension to add
+        # Adds a mime type to the list of available formats available for data
+        # export. You must register the extension prior to adding it here.
+        # @param [Symbol] format the mime type to add
         # @return [Array] A copy of the updated formats array.
-        def add_format extension
-          unless formats.include?(extension)
-            if Mime::Type.lookup_by_extension(extension).nil?
-              raise ArgumentError, "The mime extension you defined: #{extension} is not registered. Please register it via Mime::Type.register before adding it to the available formats."
-            end
-          @formats << extension
+        def add_format(format)
+          unless Mime::Type.lookup_by_extension format
+            raise ArgumentError, "Please register the #{format} mime type with `Mime::Type.register`"
           end
+          @formats << format unless formats.include? format
           formats
         end
       end
 
-      # TODO: Refactor to new HTML DSL
-      def build_download_format_links(formats = self.class.formats)
-        links = formats.collect do |format|
-          link_to format.to_s.upcase, { :format => format}.merge(request.query_parameters.except(:commit, :format))
-        end
-        div :class => "download_links" do
-          text_node [I18n.t('active_admin.download'), links].flatten.join("&nbsp;").html_safe
-        end
-      end
-
-      def self.included base
-        base.extend ClassMethods
-      end
     end
   end
 end
-