activeadmin 1.1.0 → 2.4.0

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

@@ -22,7 +22,7 @@ module ActiveAdmin
       end
 
       def columns(*attrs)
-        attrs.each {|attr| column(attr) }
+        attrs.each { |attr| column(attr) }
       end
 
       def column(*args, &block)
@@ -147,7 +147,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 +176,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?

data/lib/active_admin/views/index_as_table.rb

@@ -110,7 +110,8 @@ module ActiveAdmin
     # end
     # ```
     #
-    # In addition, you can insert the position of the row in the greater collection by using the index_column special command:
+    # In addition, you can insert the position of the row in the greater
+    # collection by using the index_column special command:
     #
     # ```ruby
     # index do
@@ -120,7 +121,8 @@ module ActiveAdmin
     # end
     # ```
     #
-    # index_column take an optional offset parameter to allow a developer to set the starting number for the index (default is 1).
+    # index_column take an optional offset parameter to allow a developer to set
+    # the starting number for the index (default is 1).
     #
     # ## Sorting
     #
@@ -128,9 +130,7 @@ module ActiveAdmin
     # sortable by default. If you are creating a custom column, you may need to give
     # Active Admin a hint for how to sort the table.
     #
-    # If a column is defined using a block, you must pass the key to turn on sorting. The key
-    # is the attribute which gets used to sort objects using Active Record.
-    #
+    # You can pass the key specifying the attribute which gets used to sort objects using Active Record.
     # By default, this is the column on the resource's table that the attribute corresponds to.
     # Otherwise, any attribute that the resource collection responds to can be used.
     #
@@ -192,6 +192,13 @@ module ActiveAdmin
     # end
     # ```
     #
+    # You can also define associated objects to include outside of the
+    # `scoped_collection` method:
+    #
+    # ```ruby
+    # includes :publisher
+    # ```
+    #
     # Then it's simple to sort by any Publisher attribute from within the index table:
     #
     # ```ruby
@@ -362,18 +369,19 @@ module ActiveAdmin
           end
         end
 
-      private
+        private
 
         def defaults(resource, options = {})
+          localizer = ActiveAdmin::Localizers.resource(active_admin_config)
           if controller.action_methods.include?('show') && authorized?(ActiveAdmin::Auth::READ, resource)
-            item I18n.t('active_admin.view'), resource_path(resource), class: "view_link #{options[:css_class]}", title: I18n.t('active_admin.view')
+            item localizer.t(:view), resource_path(resource), class: "view_link #{options[:css_class]}", title: localizer.t(:view)
           end
           if controller.action_methods.include?('edit') && authorized?(ActiveAdmin::Auth::UPDATE, resource)
-            item I18n.t('active_admin.edit'), edit_resource_path(resource), class: "edit_link #{options[:css_class]}", title: I18n.t('active_admin.edit')
+            item localizer.t(:edit), edit_resource_path(resource), class: "edit_link #{options[:css_class]}", title: localizer.t(:edit)
           end
           if controller.action_methods.include?('destroy') && authorized?(ActiveAdmin::Auth::DESTROY, resource)
-            item I18n.t('active_admin.delete'), resource_path(resource), class: "delete_link #{options[:css_class]}", title: I18n.t('active_admin.delete'),
-              method: :delete, data: {confirm: I18n.t('active_admin.delete_confirmation')}
+            item localizer.t(:delete), resource_path(resource), class: "delete_link #{options[:css_class]}", title: localizer.t(:delete),
+              method: :delete, data: { confirm: localizer.t(:delete_confirmation) }
           end
         end
 

data/lib/active_admin/views/pages/base.rb

@@ -4,27 +4,30 @@ module ActiveAdmin
       class Base < Arbre::HTML::Document
 
         def build(*args)
-          super
-          add_classes_to_body
+          set_attribute :lang, I18n.locale
           build_active_admin_head
           build_page
         end
 
+        alias_method :html_title, :title # Arbre::HTML::Title
+        def title
+          self.class.name
+        end
+
+        def main_content
+          I18n.t('active_admin.main_content', model: title).html_safe
+        end
+
         private
 
         delegate :active_admin_config, :controller, :params, to: :helpers
 
-        def add_classes_to_body
-          @body.add_class(params[:action])
-          @body.add_class(params[:controller].tr('/', '_'))
-          @body.add_class("active_admin")
-          @body.add_class("logged_in")
-          @body.add_class(active_admin_namespace.name.to_s + "_namespace")
-        end
-
         def build_active_admin_head
-          within @head do
-            insert_tag Arbre::HTML::Title, [title, render_or_call_method_or_proc_on(self, active_admin_namespace.site_title)].compact.join(" | ")
+          within head do
+            html_title [title, helpers.active_admin_namespace.site_title(self)].compact.join(" | ")
+
+            text_node(active_admin_namespace.head)
+
             active_admin_application.stylesheets.each do |style, options|
               text_node stylesheet_link_tag(style, options).html_safe
             end
@@ -46,36 +49,37 @@ module ActiveAdmin
         end
 
         def build_page
-          within @body do
+          within body(class: body_classes) do
             div id: "wrapper" do
               build_unsupported_browser
-              build_header
-              build_title_bar
+              header active_admin_namespace, current_menu
+              title_bar title, action_items_for_action
               build_page_content
-              build_footer
+              footer active_admin_namespace
             end
           end
         end
 
+        def body_classes
+          Arbre::HTML::ClassList.new [
+            params[:action],
+            params[:controller].tr('/', '_'),
+            'active_admin', 'logged_in',
+            active_admin_namespace.name.to_s + '_namespace'
+          ]
+        end
+
         def build_unsupported_browser
           if active_admin_namespace.unsupported_browser_matcher =~ controller.request.user_agent
-            insert_tag view_factory.unsupported_browser
+            unsupported_browser
           end
         end
 
-        def build_header
-          insert_tag view_factory.header, active_admin_namespace, current_menu
-        end
-
-        def build_title_bar
-          insert_tag view_factory.title_bar, title, action_items_for_action
-        end
-
         def build_page_content
           build_flash_messages
           div id: "active_admin_content", class: (skip_sidebar? ? "without_sidebar" : "with_sidebar") do
             build_main_content_wrapper
-            build_sidebar unless skip_sidebar?
+            sidebar sidebar_sections_for_action, id: 'sidebar' unless skip_sidebar?
           end
         end
 
@@ -95,19 +99,6 @@ module ActiveAdmin
           end
         end
 
-        def main_content
-          I18n.t('active_admin.main_content', model: title).html_safe
-        end
-
-        def title
-          self.class.name
-        end
-
-        # Set's the page title for the layout to render
-        def set_page_title
-          set_ivar_on_view "@page_title", title
-        end
-
         # Returns the sidebar sections to render for the current action
         def sidebar_sections_for_action
           if active_admin_config && active_admin_config.sidebar_sections?
@@ -125,24 +116,10 @@ module ActiveAdmin
           end
         end
 
-        # Renders the sidebar
-        def build_sidebar
-          div id: "sidebar" do
-            sidebar_sections_for_action.collect do |section|
-              sidebar_section(section)
-            end
-          end
-        end
-
         def skip_sidebar?
           sidebar_sections_for_action.empty? || assigns[:skip_sidebar] == true
         end
 
-        # Renders the content for the footer
-        def build_footer
-          insert_tag view_factory.footer, active_admin_namespace
-        end
-
       end
     end
   end

data/lib/active_admin/views/tabbed_navigation.rb

@@ -1,65 +1,10 @@
+require_relative 'components/menu'
+
 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 TabbedNavigation < Component
-
-      attr_reader :menu
-
-      # Build a new tabbed navigation component.
-      #
-      # @param [ActiveAdmin::Menu] menu the Menu to render
-      # @param [Hash] options the options as passed to the underlying ul element.
-      #
+    class TabbedNavigation < Menu
       def build(menu, options = {})
-        @menu = menu
-        super(default_options.merge(options))
-        build_menu
-      end
-
-      # The top-level menu items that should be displayed.
-      def menu_items
-        menu.items(self)
-      end
-
-      def tag_name
-        'ul'
-      end
-
-      private
-
-      def build_menu
-        menu_items.each do |item|
-          build_menu_item(item)
-        end
-      end
-
-      def build_menu_item(item)
-        li id: item.id do |li|
-          li.add_class "current" if item.current? assigns[:current_tab]
-
-          if url = item.url(self)
-            text_node link_to item.label(self), url, item.html_options
-          else
-            span item.label(self), item.html_options
-          end
-
-          if children = item.items(self).presence
-            li.add_class "has_nested"
-            ul do
-              children.each{ |child| build_menu_item child }
-            end
-          end
-        end
-      end
-
-      def default_options
-        { id: "tabs" }
+        super(menu, options.reverse_merge(id: 'tabs'))
       end
     end
   end

data/lib/active_admin/views.rb

@@ -2,7 +2,7 @@ module ActiveAdmin
   module Views
 
     # Loads all the classes in views/*.rb
-    Dir[File.expand_path('../views', __FILE__) + "/**/*.rb"].sort.each{ |f| require f }
+    Dir[File.expand_path('views', __dir__) + "/**/*.rb"].sort.each { |f| require f }
 
   end
 end

data/lib/active_admin.rb

@@ -8,8 +8,9 @@ require 'formtastic'
 require 'formtastic_i18n'
 require 'inherited_resources'
 require 'jquery-rails'
-require 'coffee-rails'
+require 'sassc-rails'
 require 'arbre'
+require 'sprockets/es6'
 
 require 'active_admin/helpers/i18n'
 
@@ -30,7 +31,6 @@ module ActiveAdmin
   autoload :Deprecation,              'active_admin/deprecation'
   autoload :Devise,                   'active_admin/devise'
   autoload :DSL,                      'active_admin/dsl'
-  autoload :Event,                    'active_admin/event'
   autoload :FormBuilder,              'active_admin/form_builder'
   autoload :Inputs,                   'active_admin/inputs'
   autoload :Localizers,               'active_admin/localizers'
@@ -90,7 +90,7 @@ module ActiveAdmin
     #
     # @param [Block] block A block to call each time (before) AA loads resources
     def before_load(&block)
-      ActiveSupport::Notifications.subscribe ActiveAdmin::Application::BeforeLoadEvent, &ActiveAdmin::Event.wrap_block_for_active_support_notifications(block)
+      ActiveSupport::Notifications.subscribe ActiveAdmin::Application::BeforeLoadEvent, &wrap_block_for_active_support_notifications(block)
     end
 
     # A callback is triggered each time (after) Active Admin loads the configuration files. This
@@ -108,7 +108,13 @@ module ActiveAdmin
     #
     # @param [Block] block A block to call each time (after) AA loads resources
     def after_load(&block)
-      ActiveSupport::Notifications.subscribe ActiveAdmin::Application::AfterLoadEvent, &ActiveAdmin::Event.wrap_block_for_active_support_notifications(block)
+      ActiveSupport::Notifications.subscribe ActiveAdmin::Application::AfterLoadEvent, &wrap_block_for_active_support_notifications(block)
+    end
+
+    private
+
+    def wrap_block_for_active_support_notifications block
+      proc { |event, *args| block.call *args }
     end
 
   end

data/lib/generators/active_admin/assets/assets_generator.rb

@@ -2,10 +2,10 @@ module ActiveAdmin
   module Generators
     class AssetsGenerator < Rails::Generators::Base
 
-      source_root File.expand_path("../templates", __FILE__)
+      source_root File.expand_path('templates', __dir__)
 
       def install_assets
-        template 'active_admin.js.coffee', 'app/assets/javascripts/active_admin.js.coffee'
+        template 'active_admin.js', 'app/assets/javascripts/active_admin.js'
         template "active_admin.scss", "app/assets/stylesheets/active_admin.scss"
       end
 

data/lib/generators/active_admin/assets/templates/active_admin.js

@@ -0,0 +1 @@
+//= require active_admin/base

data/lib/generators/active_admin/install/install_generator.rb

@@ -7,12 +7,14 @@ module ActiveAdmin
       argument :name, type: :string, default: "AdminUser"
 
       hook_for :users, default: "devise", desc: "Admin user generator to run. Skip with --skip-users"
+      class_option :skip_comments, type: :boolean, default: false, desc: "Skip installation of comments"
 
-      source_root File.expand_path("../templates", __FILE__)
+      source_root File.expand_path('templates', __dir__)
 
       def copy_initializer
         @underscored_user_name = name.underscore.gsub('/', '_')
         @use_authentication_method = options[:users].present?
+        @skip_comments = options[:skip_comments]
         template 'active_admin.rb.erb', 'config/initializers/active_admin.rb'
       end
 
@@ -21,7 +23,7 @@ module ActiveAdmin
         template 'dashboard.rb', 'app/admin/dashboard.rb'
         if options[:users].present?
           @user_class = name
-          template 'admin_user.rb.erb', "app/admin/#{name.underscore}.rb"
+          template 'admin_users.rb.erb', "app/admin/#{name.underscore.pluralize}.rb"
         end
       end
 
@@ -38,7 +40,9 @@ module ActiveAdmin
       end
 
       def create_migrations
-        migration_template 'migrations/create_active_admin_comments.rb.erb', 'db/migrate/create_active_admin_comments.rb'
+        unless options[:skip_comments]
+          migration_template 'migrations/create_active_admin_comments.rb.erb', 'db/migrate/create_active_admin_comments.rb'
+        end
       end
     end
   end