activeadmin 1.1.0 → 2.5.0

data/lib/active_admin/view_helpers/breadcrumb_helper.rb

@@ -12,9 +12,9 @@ module ActiveAdmin
           # 1. try using `display_name` if we can locate a DB object
           # 2. try using the model name translation
           # 3. default to calling `titlecase` on the URL fragment
-          if part =~ /\A(\d+|[a-f0-9]{24}|(?:[a-f0-9]{8}-(?:[a-f0-9]{4}-){3}[a-f0-9]{12}))\z/ && parts[index-1]
+          if part =~ /\A(\d+|[a-f0-9]{24}|(?:[a-f0-9]{8}-(?:[a-f0-9]{4}-){3}[a-f0-9]{12}))\z/ && parts[index - 1]
             parent = active_admin_config.belongs_to_config.try :target
-            config = parent && parent.resource_name.route_key == parts[index-1] ? parent : active_admin_config
+            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: ::ActiveAdmin::Helpers::I18n::PLURAL_MANY_COUNT, default: part.titlecase

data/lib/active_admin/view_helpers/display_helper.rb

@@ -2,8 +2,9 @@ module ActiveAdmin
   module ViewHelpers
     module DisplayHelper
 
-      DISPLAY_NAME_FALLBACK = ->{
-        name, klass = "", self.class
+      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
@@ -15,7 +16,7 @@ module ActiveAdmin
       # 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)
-        render_in_context resource, display_name_method_for(resource) unless resource.nil?
+        ERB::Util.html_escape(render_in_context(resource, display_name_method_for(resource))) unless resource.nil?
       end
 
       # Looks up and caches the first available display name method.
@@ -25,7 +26,7 @@ module ActiveAdmin
         @@display_name_methods_cache ||= {}
         @@display_name_methods_cache[resource.class] ||= begin
           methods = active_admin_application.display_name_methods - association_methods_for(resource)
-          method  = 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
@@ -69,16 +70,24 @@ module ActiveAdmin
           object.to_s
         when Date, Time
           I18n.localize object, format: active_admin_application.localize_format
+        when Array
+          format_collection(object)
         else
           if defined?(::ActiveRecord) && object.is_a?(ActiveRecord::Base) ||
              defined?(::Mongoid)      && object.class.include?(Mongoid::Document)
             auto_link object
+          elsif defined?(::ActiveRecord) && object.is_a?(ActiveRecord::Relation)
+            format_collection(object)
           else
             display_name object
           end
         end
       end
 
+      def format_collection(collection)
+        safe_join(collection.map { |item| pretty_format(item) }, ', ')
+      end
+
       def boolean_attr?(resource, attr, value)
         case value
         when TrueClass, FalseClass

data/lib/active_admin/view_helpers/download_format_links_helper.rb

@@ -1,6 +1,7 @@
 module ActiveAdmin
   module ViewHelpers
     module DownloadFormatLinksHelper
+      private
 
       def build_download_formats(download_links)
         download_links = instance_exec(&download_links) if download_links.is_a?(Proc)

data/lib/active_admin/view_helpers/method_or_proc_helper.rb

@@ -1,4 +1,7 @@
+# Utility methods for internal use.
+# @private
 module MethodOrProcHelper
+  extend self
 
   # This method will either call the symbol on self or instance_exec the Proc
   # within self. Any args will be passed along to the method dispatch.

data/lib/active_admin/view_helpers.rb

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

data/lib/active_admin/views/components/active_admin_form.rb

@@ -57,6 +57,12 @@ module ActiveAdmin
           end
           insert_tag(SemanticInputsProxy, form_builder, *args, &wrapped_block)
         else
+          # Set except option to prevent sensitive fields from being shown in forms by default.
+          opts = args.extract_options!
+          opts[:except] ||= []
+          ActiveAdmin.application.filter_attributes.each { |e| opts[:except] << e }
+          args << opts
+
           proxy_call_to_form(:inputs, *args, &block)
         end
       end
@@ -105,13 +111,12 @@ module ActiveAdmin
         create_another = params[:create_another]
         label = @resource.class.model_name.human
         Arbre::Context.new do
-          li do
+          li class: 'create_another' do
             input(
               checked: create_another,
               id: 'create_another',
-              class: 'create_another',
               name: 'create_another',
-              type: 'checkbox',
+              type: 'checkbox'
             )
             label(I18n.t('active_admin.create_another', model: label), for: 'create_another')
           end
@@ -126,7 +131,7 @@ module ActiveAdmin
         legend = args.shift if args.first.is_a?(::String)
         legend = html_options.delete(:name) if html_options.key?(:name)
         legend_tag = legend ? "<legend><span>#{legend}</span></legend>" : ""
-        fieldset_attrs = html_options.map {|k, v| %Q{#{k}="#{v}"} }.join(" ")
+        fieldset_attrs = html_options.map { |k, v| %Q{#{k}="#{v}"} }.join(" ")
         @opening_tag = "<fieldset #{fieldset_attrs}>#{legend_tag}<ol>"
         @closing_tag = "</ol></fieldset>"
         super(*(args << html_options), &block)

data/lib/active_admin/views/components/attributes_table.rb

@@ -7,7 +7,7 @@ module ActiveAdmin
       def build(obj, *attrs)
         @collection     = Array.wrap(obj)
         @resource_class = @collection.first.class
-        options = { }
+        options = {}
         options[:for] = @collection.first if single_record?
         super(options)
         @table = table
@@ -16,7 +16,7 @@ module ActiveAdmin
       end
 
       def rows(*attrs)
-        attrs.each {|attr| row(attr) }
+        attrs.each { |attr| row(attr) }
       end
 
       def row(*args, &block)
@@ -26,7 +26,7 @@ module ActiveAdmin
         if options[:class]
           classes << options[:class]
         elsif title.present?
-          classes << "row-#{ActiveAdmin::Dependency.rails.parameterize(title.to_s)}"
+          classes << "row-#{title.to_s.parameterize(separator: "_")}"
         end
         options[:class] = classes.join(' ')
 

data/lib/active_admin/views/components/menu.rb

@@ -0,0 +1,32 @@
+module ActiveAdmin
+  module Views
+
+    # Renders an ActiveAdmin::Menu as a set of unordered list items.
+    #
+    # This component takes cares of deciding which items should be
+    # displayed given the current context and renders them appropriately.
+    #
+    # The entire component is rendered within one ul element.
+    class Menu < Component
+      attr_reader :menu
+      builder_method :menu
+
+      # @param [ActiveAdmin::Menu] menu the Menu to render
+      # @param [Hash] options the options as passed to the underlying ul element.
+      #
+      def build(menu, options = {})
+        @menu = menu
+        super(options)
+
+        menu.items.each do |item|
+          menu_item(item) if helpers.render_in_context self, item.should_display
+        end
+        children.sort!
+      end
+
+      def tag_name
+        'ul'
+      end
+    end
+  end
+end

data/lib/active_admin/views/components/menu_item.rb

@@ -0,0 +1,58 @@
+module ActiveAdmin
+  module Views
+
+    # Arbre component used to render ActiveAdmin::MenuItem
+    class MenuItem < Component
+      builder_method :menu_item
+      attr_reader :label
+      attr_reader :url
+      attr_reader :priority
+
+      def build(item, options = {})
+        super(options.merge(id: item.id))
+        @label = helpers.render_in_context self, item.label
+        @url = helpers.render_in_context self, item.url
+        @priority = item.priority
+        @submenu = nil
+
+        add_class "current" if item.current? assigns[:current_tab]
+
+        if url
+          text_node link_to label, url, item.html_options
+        else
+          span label, item.html_options
+        end
+
+        if item.items.any?
+          add_class "has_nested"
+          @submenu = menu(item)
+        end
+      end
+
+      def tag_name
+        'li'
+      end
+
+      # Sorts by priority first, then alphabetically by label if needed.
+      def <=>(other)
+        result = priority <=> other.priority
+        result == 0 ? label <=> other.label : result
+      end
+
+      def visible?
+        url.nil? || real_url? || @submenu && @submenu.children.any?
+      end
+
+      def to_s
+        visible? ? super : ''
+      end
+
+      private
+
+      # URL is not nil, empty, or '#'
+      def real_url?
+        url && url.present? && url != '#'
+      end
+    end
+  end
+end

data/lib/active_admin/views/components/paginated_collection.rb

@@ -92,17 +92,17 @@ module ActiveAdmin
       end
 
       def build_pagination
-        options = { theme: 'active_admin' }
+        options = { theme: @display_total ? 'active_admin' : 'active_admin_countless' }
         options[:params]     = @params     if @params
         options[:param_name] = @param_name if @param_name
 
-        if !@display_total && collection.respond_to?(:offset)
+        if !@display_total
           # The #paginate method in kaminari will query the resource with a
           # count(*) to determine how many pages there should be unless
           # you pass in the :total_pages option. We issue a query to determine
           # if there is another page or not, but the limit/offset make this
           # query fast.
-          offset = collection.offset(collection.current_page * @per_page.to_i).limit(1).count
+          offset = collection.offset(collection.current_page * collection.limit_value).limit(1).count
           options[:total_pages] = collection.current_page + offset
           options[:right] = 0
         end
@@ -123,6 +123,7 @@ module ActiveAdmin
           entries_name = I18n.t "active_admin.pagination.entry", count: 2, default: 'entries'
         else
           key = "activerecord.models." + collection.first.class.model_name.i18n_key.to_s
+
           entry_name   = I18n.translate key, count: 1,               default: collection.first.class.name.underscore.sub('_', ' ')
           entries_name = I18n.translate key, count: collection.size, default: entry_name.pluralize
         end

data/lib/active_admin/views/components/scopes.rb

@@ -13,16 +13,20 @@ module ActiveAdmin
       include ::ActiveAdmin::Helpers::Collection
 
       def default_class_name
-        "scopes table_tools_segmented_control"
+        "scopes"
       end
 
       def tag_name
-        'ul'
+        'div'
       end
 
       def build(scopes, options = {})
-        scopes.each do |scope|
-          build_scope(scope, options) if call_method_or_proc_on(self, scope.display_if_block)
+        scopes.group_by(&:group).each do |group, group_scopes|
+          ul class: "table_tools_segmented_control #{group_class(group)}" do
+            group_scopes.each do |scope|
+              build_scope(scope, options) if call_method_or_exec_proc(scope.display_if_block)
+            end
+          end
         end
       end
 
@@ -60,6 +64,9 @@ module ActiveAdmin
         collection_size(scope_chain(scope, collection_before_scope))
       end
 
+      def group_class(group)
+        group.present? ? "scope-group-#{group}" : "scope-default-group"
+      end
     end
   end
 end

data/lib/active_admin/views/components/sidebar.rb

@@ -0,0 +1,13 @@
+module ActiveAdmin
+  module Views
+
+    class Sidebar < Component
+      builder_method :sidebar
+
+      def build(sections, attributes = {})
+        super(attributes)
+        sections.map(&method(:sidebar_section))
+      end
+    end
+  end
+end

data/lib/active_admin/views/components/site_title.rb

@@ -22,8 +22,8 @@ module ActiveAdmin
         @namespace.site_title_link.present?
       end
 
-      def site_title_image?
-        @namespace.site_title_image.present?
+      def site_title_image
+        @site_title_image ||= @namespace.site_title_image(helpers)
       end
 
       private
@@ -33,7 +33,7 @@ module ActiveAdmin
       end
 
       def site_title_content
-        if site_title_image?
+        if site_title_image.present?
           title_image
         else
           title_text
@@ -41,12 +41,11 @@ module ActiveAdmin
       end
 
       def title_text
-        helpers.render_or_call_method_or_proc_on(helpers, @namespace.site_title)
+        @title_text ||= @namespace.site_title(helpers)
       end
 
       def title_image
-        path = helpers.render_or_call_method_or_proc_on(helpers, @namespace.site_title_image)
-        helpers.image_tag(path, id: "site_title_image", alt: title_text)
+        helpers.image_tag(site_title_image, id: "site_title_image", alt: title_text)
       end
 
     end

data/lib/active_admin/views/components/status_tag.rb

@@ -28,11 +28,7 @@ module ActiveAdmin
       #   status_tag('active', class: 'important', id: 'status_123', label: 'on')
       #   # => <span class='status_tag active important' id='status_123'>on</span>
       #
-      def build(*args)
-        options = args.extract_options!
-        status = args[0]
-        type = args[1]
-
+      def build(status, options = {})
         label = options.delete(:label)
         classes = options.delete(:class)
         status = convert_to_boolean_status(status)
@@ -46,19 +42,6 @@ module ActiveAdmin
         super(content, options)
 
         add_class(status_to_class(status)) if status
-
-        if type
-          Deprecation.warn <<-MSG.strip_heredoc
-            The `type` parameter has been deprecated. Provide the "#{type}" type as
-            a class instead. For example, `status_tag(status, :#{type}, class: "abc")`
-            would change to `status_tag(status, class: "#{type} abc")`. Also note that
-            the "#{type}" CSS rule will be removed too, so you'll have to provide
-            the styles yourself. See https://github.com/activeadmin/activeadmin/blob/master/CHANGELOG.md#110-
-            for more information.
-          MSG
-          add_class(type.to_s)
-        end
-
         add_class(classes) if classes
       end
 
@@ -68,8 +51,10 @@ module ActiveAdmin
         case status
         when true, 'true'
           'Yes'
-        when false, 'false', nil
+        when false, 'false'
           'No'
+        when nil
+          'Unset'
         else
           status
         end
@@ -77,6 +62,8 @@ module ActiveAdmin
 
       def status_to_class(status)
         case status
+        when 'Unset'
+          'unset no'
         when String, Symbol
           status.to_s.titleize.gsub(/\s/, '').underscore
         else

data/lib/active_admin/views/components/table_for.rb

@@ -13,6 +13,7 @@ module ActiveAdmin
         @collection     = obj.respond_to?(:each) && !obj.is_a?(Hash) ? obj : [obj]
         @resource_class = options.delete(:i18n)
         @resource_class ||= @collection.klass if @collection.respond_to? :klass
+
         @columns        = []
         @row_class      = options.delete(:row_class)
 
@@ -22,7 +23,7 @@ module ActiveAdmin
       end
 
       def columns(*attrs)
-        attrs.each {|attr| column(attr) }
+        attrs.each { |attr| column(attr) }
       end
 
       def column(*args, &block)
@@ -147,7 +148,7 @@ module ActiveAdmin
           if @options.has_key?(:class)
             html_classes << @options.delete(:class)
           elsif @title.present?
-            html_classes << "col-#{ActiveAdmin::Dependency.rails.parameterize(@title.to_s)}"
+            html_classes << "col-#{@title.to_s.parameterize(separator: "_")}"
           end
           @html_class = html_classes.join(' ')
           @data = args[1] || args[0]
@@ -176,18 +177,9 @@ module ActiveAdmin
         # to the sortable option:
         #   column :username, sortable: 'other_column_to_sort_on'
         #
-        # If you pass a block to be rendered for this column, the column
-        # will not be sortable unless you pass a string to sortable to
-        # sort the column on:
-        #
-        #   column('Username', sortable: 'login'){ @user.pretty_name }
-        #   # => Sort key will be 'login'
-        #
         def sort_key
           # If boolean or nil, use the default sort key.
-          if @options[:sortable] == true || @options[:sortable] == false
-            @data.to_s
-          elsif @options[:sortable].nil?
+          if @options[:sortable].nil? || @options[:sortable] == true || @options[:sortable] == false
             sort_column_name
           else
             @options[:sortable].to_s

data/lib/active_admin/views/components/tabs.rb

@@ -15,14 +15,26 @@ module ActiveAdmin
       end
 
       def build_menu_item(title, options, &block)
-        fragment = options.fetch(:id, title.parameterize)
-        li { link_to title, "##{fragment}" }
+        fragment = options.fetch(:id, fragmentize(title))
+
+        html_options = options.fetch(:html_options, {})
+        li html_options do
+          link_to title, "##{fragment}"
+        end
       end
 
       def build_content_item(title, options, &block)
-        options = options.reverse_merge(id: title.parameterize)
+        options = options.reverse_merge(id: fragmentize(title))
         div(options, &block)
       end
+
+      private
+
+      def fragmentize(string)
+        result = string.parameterize
+        result = URI.encode(string) if result.blank?
+        result
+      end
     end
   end
 end

data/lib/active_admin/views/footer.rb

@@ -6,26 +6,22 @@ module ActiveAdmin
         super id: "footer"
         @namespace = namespace
 
-        if footer?
+        if footer_text.present?
           para footer_text
         else
           para powered_by_message
         end
       end
 
-      def footer?
-        @namespace.footer.present?
-      end
-
       private
 
       def footer_text
-        helpers.render_or_call_method_or_proc_on(self, @namespace.footer)
+        @footer_text ||= @namespace.footer(self)
       end
 
       def powered_by_message
         I18n.t('active_admin.powered_by',
-          active_admin: link_to("Active Admin", "http://www.activeadmin.info"),
+          active_admin: link_to("Active Admin", "https://activeadmin.info"),
           version: ActiveAdmin::VERSION).html_safe
       end
 

data/lib/active_admin/views/header.rb

@@ -9,21 +9,9 @@ module ActiveAdmin
         @menu = menu
         @utility_menu = @namespace.fetch_menu(:utility_navigation)
 
-        build_site_title
-        build_global_navigation
-        build_utility_navigation
-      end
-
-      def build_site_title
-        insert_tag view_factory.site_title, @namespace
-      end
-
-      def build_global_navigation
-        insert_tag view_factory.global_navigation, @menu, class: 'header-item tabs'
-      end
-
-      def build_utility_navigation
-        insert_tag view_factory.utility_navigation, @utility_menu, id: "utility_nav", class: 'header-item tabs'
+        site_title @namespace
+        global_navigation @menu, class: 'header-item tabs'
+        utility_navigation @utility_menu, id: "utility_nav", class: 'header-item tabs'
       end
 
     end

data/lib/active_admin/views/index_as_blog.rb

@@ -27,7 +27,7 @@ module ActiveAdmin
     # ```
     #
     # Second, you can pass a block to the tile option which will then be
-    # used as the contents fo the title. The resource being rendered
+    # used as the contents of the title. The resource being rendered
     # is passed in to the block. For Example:
     #
     # ```ruby

data/lib/active_admin/views/index_as_grid.rb

@@ -1,30 +1,30 @@
 module ActiveAdmin
   module Views
 
-     # # Index as a Grid
-     #
-     # Sometimes you want to display the index screen for a set of resources as a grid
-     # (possibly a grid of thumbnail images). To do so, use the :grid option for the
-     # index block.
-     #
-     # ```ruby
-     # index as: :grid do |product|
-     #   link_to image_tag(product.image_path), admin_product_path(product)
-     # end
-     # ```
-     #
-     # The block is rendered within a cell in the grid once for each resource in the
-     # collection. The resource is passed into the block for you to use in the view.
-     #
-     # You can customize the number of columns that are rendered using the columns
-     # option:
-     #
-     # ```ruby
-     # index as: :grid, columns: 5 do |product|
-     #   link_to image_tag(product.image_path), admin_product_path(product)
-     # end
-     # ```
-     #
+    # # Index as a Grid
+    #
+    # Sometimes you want to display the index screen for a set of resources as a grid
+    # (possibly a grid of thumbnail images). To do so, use the :grid option for the
+    # index block.
+    #
+    # ```ruby
+    # index as: :grid do |product|
+    #   link_to image_tag(product.image_path), admin_product_path(product)
+    # end
+    # ```
+    #
+    # The block is rendered within a cell in the grid once for each resource in the
+    # collection. The resource is passed into the block for you to use in the view.
+    #
+    # You can customize the number of columns that are rendered using the columns
+    # option:
+    #
+    # ```ruby
+    # index as: :grid, columns: 5 do |product|
+    #   link_to image_tag(product.image_path), admin_product_path(product)
+    # end
+    # ```
+    #
     class IndexAsGrid < ActiveAdmin::Component
 
       def build(page_presenter, collection)
@@ -42,7 +42,7 @@ module ActiveAdmin
         "grid"
       end
 
-     protected
+      protected
 
       def build_table
         resource_selection_toggle_panel if active_admin_config.batch_actions.any?