activeadmin 1.3.0 → 2.13.1

data/lib/active_admin/settings_node.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+module ActiveAdmin
+
+  class SettingsNode
+    class << self
+      # Never instantiated.  Variables are stored in the singleton_class.
+      private_class_method :new
+
+      # @return anonymous class with same accessors as the superclass.
+      def build(superclass = self)
+        Class.new(superclass)
+      end
+
+      def register(name, value)
+        class_attribute name
+        send "#{name}=", value
+      end
+    end
+  end
+end

data/lib/active_admin/sidebar_section.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
 
   class SidebarSection
@@ -6,7 +7,9 @@ module ActiveAdmin
     attr_accessor :name, :options, :block
 
     def initialize(name, options = {}, &block)
-      @name, @options, @block = name.to_s, options, block
+      @name = name.to_s
+      @options = options
+      @block = block
       normalize_display_options!
     end
 

data/lib/active_admin/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
-  VERSION = '1.3.0'
+  VERSION = "2.13.1"
 end

data/lib/active_admin/view_factory.rb

@@ -1,27 +1,28 @@
-require 'active_admin/abstract_view_factory'
+# frozen_string_literal: true
+require "active_admin/abstract_view_factory"
 
 module ActiveAdmin
   class ViewFactory < AbstractViewFactory
 
     # Register Helper Renderers
-    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
+    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
 
     # Register All The Pages
-    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
+    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/active_admin_application_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module ViewHelpers
     module ActiveAdminApplicationHelper

data/lib/active_admin/view_helpers/auto_link_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module ViewHelpers
     module AutoLinkHelper

data/lib/active_admin/view_helpers/breadcrumb_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module ViewHelpers
     module BreadcrumbHelper
@@ -6,22 +7,22 @@ module ActiveAdmin
       def breadcrumb_links(path = request.path)
         # 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 = 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
           # 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
-            name   = display_name config.find_resource part
+            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
 
           # Don't create a link if the resource's show action is disabled
           if !config || config.defined_actions.include?(:show)
-            link_to name, '/' + parts[0..index].join('/')
+            link_to name, "/" + parts[0..index].join("/")
           else
             name
           end

data/lib/active_admin/view_helpers/display_helper.rb

@@ -1,21 +1,30 @@
+# frozen_string_literal: true
 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
+      DISPLAY_NAME_FALLBACK = -> {
+        klass = self.class
+        name = if klass.respond_to?(:model_name)
+                 if klass.respond_to?(:primary_key)
+                   "#{klass.model_name.human} ##{send(klass.primary_key)}"
+                 else
+                   klass.model_name.human
+                 end
+               elsif klass.respond_to?(:primary_key)
+                 " ##{send(klass.primary_key)}"
+               end
         name.present? ? name : to_s
       }
+
       def DISPLAY_NAME_FALLBACK.inspect
-        'DISPLAY_NAME_FALLBACK'
+        "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)
-        sanitize(render_in_context(resource, display_name_method_for(resource)).to_s) 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 +34,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 +78,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)
+             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,8 @@
+# frozen_string_literal: true
 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)
@@ -17,7 +19,7 @@ module ActiveAdmin
       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')
+          span I18n.t("active_admin.download")
           formats.each do |format|
             a format.upcase, href: url_for(params: params, format: format)
           end

data/lib/active_admin/view_helpers/fields_for.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module ViewHelpers
     module FormHelper
@@ -15,7 +16,7 @@ module ActiveAdmin
       #
       def fields_for_params(params, options = {})
         namespace = options[:namespace]
-        except    = Array.wrap(options[:except]).map &:to_s
+        except = Array.wrap(options[:except]).map &:to_s
 
         params.flat_map do |k, v|
           next if namespace.nil? && %w(controller action commit utf8).include?(k.to_s)
@@ -37,7 +38,7 @@ module ActiveAdmin
               { "#{k}[]" => v }
             end
           when nil
-            { k => '' }
+            { k => "" }
           when TrueClass, FalseClass
             { k => v }
           else

data/lib/active_admin/view_helpers/flash_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module ViewHelpers
     module FlashHelper

data/lib/active_admin/view_helpers/form_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module ViewHelpers
     module FormHelper

data/lib/active_admin/view_helpers/method_or_proc_helper.rb

@@ -1,4 +1,8 @@
+# frozen_string_literal: true
+# 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/scope_name_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module ViewHelpers
     module ScopeNameHelper

data/lib/active_admin/view_helpers/sidebar_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module ViewHelpers
     module SidebarHelper

data/lib/active_admin/view_helpers/title_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module ViewHelpers
     module TitleHelper

data/lib/active_admin/view_helpers/view_factory_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module ViewHelpers
     module ViewFactoryHelper

data/lib/active_admin/view_helpers.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
 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/action_items.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Views
 

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Views
     class FormtasticProxy < ::Arbre::Rails::Forms::FormBuilderProxy
@@ -16,7 +17,7 @@ module ActiveAdmin
       end
 
       def to_s
-        opening_tag << children.to_s << closing_tag
+        opening_tag + children.to_s + closing_tag
       end
     end
 
@@ -57,6 +58,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,15 +112,14 @@ 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',
+              id: "create_another",
+              name: "create_another",
+              type: "checkbox"
             )
-            label(I18n.t('active_admin.create_another', model: label), for: 'create_another')
+            label(I18n.t("active_admin.create_another", model: label), for: "create_another")
           end
         end
       end
@@ -126,7 +132,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/active_filters_sidebar_content.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+require "active_admin/filters/active"
+
+module ActiveAdmin
+  module Views
+
+    class ActiveFiltersSidebarContent < ActiveAdmin::Component
+      builder_method :active_filters_sidebar_content
+
+      def build
+        active_filters = ActiveAdmin::Filters::Active.new(active_admin_config, assigns[:search])
+        active_scopes = assigns[:search].instance_variable_get("@scope_args")
+
+        scope_block(current_scope)
+        filters_list(active_filters, active_scopes)
+      end
+
+      def scope_block(current_scope)
+        return unless current_scope
+
+        h4 I18n.t("active_admin.search_status.current_scope"), style: "display: inline"
+        b scope_name(current_scope), class: "current_scope_name"
+      end
+
+      def filters_list(active_filters, active_scopes)
+        div style: "margin-top: 10px" do
+          h4 I18n.t("active_admin.search_status.current_filters"), style: "margin-bottom: 10px"
+          ul do
+            if active_filters.filters.blank? && active_scopes.blank?
+              li I18n.t("active_admin.search_status.no_current_filters")
+            else
+              active_filters.filters.each { |filter| filter_item(filter) }
+              active_scopes.each { |name, value| scope_item(name, value) }
+            end
+          end
+        end
+      end
+
+      def filter_item(filter)
+        li filter.html_options do
+          span filter.label
+          b to_sentence(filter.values.map { |v| pretty_format(v) })
+        end
+      end
+
+      def scope_item(name, value)
+        filter_name = name.gsub(/_eq$/, "")
+        filter = active_admin_config.filters[filter_name.to_sym]
+        label = filter.try(:[], :label) || filter_name.titleize
+
+        li class: "current_filter_#{name}" do
+          span "#{label} #{Ransack::Translate.predicate('eq')}"
+          b value
+        end
+      end
+    end
+
+  end
+end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Views
 
@@ -5,9 +6,9 @@ module ActiveAdmin
       builder_method :attributes_table_for
 
       def build(obj, *attrs)
-        @collection     = Array.wrap(obj)
+        @collection = Array.wrap(obj)
         @resource_class = @collection.first.class
-        options = { }
+        options = {}
         options[:for] = @collection.first if single_record?
         super(options)
         @table = table
@@ -16,19 +17,19 @@ module ActiveAdmin
       end
 
       def rows(*attrs)
-        attrs.each {|attr| row(attr) }
+        attrs.each { |attr| row(attr) }
       end
 
       def row(*args, &block)
-        title   = args[0]
+        title = args[0]
         options = args.extract_options!
         classes = [:row]
         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(' ')
+        options[:class] = classes.join(" ")
 
         @table << tr(options) do
           th do
@@ -45,7 +46,7 @@ module ActiveAdmin
       protected
 
       def default_id_for_prefix
-        'attributes_table'
+        "attributes_table"
       end
 
       # Build Colgroups
@@ -75,7 +76,7 @@ module ActiveAdmin
       end
 
       def empty_value
-        span I18n.t('active_admin.empty'), class: "empty"
+        span I18n.t("active_admin.empty"), class: "empty"
       end
 
       def content_for(record, attr)

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Views
     # Build a Blank Slate
@@ -5,7 +6,7 @@ module ActiveAdmin
       builder_method :blank_slate
 
       def default_class_name
-        'blank_slate_container'
+        "blank_slate_container"
       end
 
       def build(content)

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Views
 

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveAdmin
   module Views
 
@@ -35,30 +36,27 @@ module ActiveAdmin
         super(options)
       end
 
-      def item(*args)
+      def item(*args, **kwargs)
         within @menu do
-          li link_to(*args)
+          li link_to(*args, **kwargs)
         end
       end
 
       private
 
       def build_button(name, button_options)
-        button_options[:class] ||= ''
-        button_options[:class] << ' dropdown_menu_button'
-
-        button_options[:href] = '#'
+        button_options[:class] = "#{button_options[:class]} dropdown_menu_button"
+        button_options[:href] = "#"
 
         a name, button_options
       end
 
       def build_menu(options)
-        options[:class] ||= ''
-        options[:class] << ' dropdown_menu_list'
+        options[:class] = "#{options[:class]} dropdown_menu_list"
 
         menu_list = nil
 
-        div class: 'dropdown_menu_list_wrapper' do
+        div class: "dropdown_menu_list_wrapper" do
           menu_list = ul(options)
         end
 

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

@@ -1,4 +1,5 @@
-require 'active_admin/helpers/collection'
+# frozen_string_literal: true
+require "active_admin/helpers/collection"
 
 module ActiveAdmin
   module Views
@@ -15,7 +16,7 @@ module ActiveAdmin
       end
 
       def tag_name
-        'ul'
+        "ul"
       end
 
       # Builds the links for presenting different index views to the user
@@ -37,7 +38,7 @@ module ActiveAdmin
       def build_index_list(index_class)
         li class: classes_for_index(index_class) do
           params = request.query_parameters.except :page, :commit, :format
-          url_with_params = url_for(params.merge(as: index_class.index_name.to_sym))
+          url_with_params = url_for(**params.merge(as: index_class.index_name.to_sym).symbolize_keys)
 
           a href: url_with_params, class: "table_tools_button" do
             name = index_class.index_name

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

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+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