activeadmin 2.1.0 → 2.5.0

data/lib/active_admin/resource_controller.rb

@@ -1,6 +1,7 @@
 require 'active_admin/resource_controller/action_builder'
 require 'active_admin/resource_controller/data_access'
 require 'active_admin/resource_controller/decorators'
+require 'active_admin/resource_controller/polymorphic_routes'
 require 'active_admin/resource_controller/scoping'
 require 'active_admin/resource_controller/streaming'
 require 'active_admin/resource_controller/sidebars'
@@ -18,6 +19,7 @@ module ActiveAdmin
     include ActionBuilder
     include Decorators
     include DataAccess
+    include PolymorphicRoutes
     include Scoping
     include Streaming
     include Sidebars

data/lib/active_admin/resource_controller/decorators.rb

@@ -67,8 +67,8 @@ module ActiveAdmin
         def self.wrap!(parent, name)
           ::Class.new parent do
             delegate :reorder, :page, :current_page, :total_pages, :limit_value,
-                     :total_count, :total_pages, :to_key, :group_values, :except,
-                     :find_each, :ransack
+                     :total_count, :total_pages, :offset, :to_key, :group_values,
+                     :except, :find_each, :ransack
 
             define_singleton_method(:name) { name }
           end

data/lib/active_admin/resource_controller/polymorphic_routes.rb

@@ -0,0 +1,37 @@
+require "active_admin/resource"
+require "active_admin/resource/model"
+
+module ActiveAdmin
+  class ResourceController < BaseController
+    module PolymorphicRoutes
+      def polymorphic_url(record_or_hash_or_array, options = {})
+        super(map_named_resources_for(record_or_hash_or_array), options)
+      end
+
+      def polymorphic_path(record_or_hash_or_array, options = {})
+        super(map_named_resources_for(record_or_hash_or_array), options)
+      end
+
+      private
+
+      def map_named_resources_for(record_or_hash_or_array)
+        return record_or_hash_or_array unless record_or_hash_or_array.is_a?(Array)
+
+        record_or_hash_or_array.map { |record| to_named_resource(record) }
+      end
+
+      def to_named_resource(record)
+        if record.is_a?(resource_class)
+          return ActiveAdmin::Model.new(active_admin_config, record)
+        end
+
+        belongs_to_resource = active_admin_config.belongs_to_config.try(:resource)
+        if belongs_to_resource && record.is_a?(belongs_to_resource.resource_class)
+          return ActiveAdmin::Model.new(belongs_to_resource, record)
+        end
+
+        record
+      end
+    end
+  end
+end

data/lib/active_admin/router.rb

@@ -4,7 +4,8 @@ module ActiveAdmin
     attr_reader :namespaces, :router
 
     def initialize(router:, namespaces:)
-      @router, @namespaces = router, namespaces
+      @router = router
+      @namespaces = namespaces
     end
 
     def apply

data/lib/active_admin/scope.rb

@@ -28,7 +28,8 @@ module ActiveAdmin
     #   # => Scope with the group :status
     #
     def initialize(name, method = nil, options = {}, &block)
-      @name, @scope_method = name, method.try(:to_sym)
+      @name = name
+      @scope_method = method.try(:to_sym)
 
       if name.is_a? Proc
         raise "A string/symbol is required as the second argument if your label is a proc." unless method
@@ -38,8 +39,11 @@ module ActiveAdmin
         @id = name.to_s.parameterize(separator: "_")
       end
 
-      @scope_method               = nil        if @scope_method == :all
-      @scope_method, @scope_block = nil, block if block_given?
+      @scope_method = nil if @scope_method == :all
+      if block_given?
+        @scope_method = nil
+        @scope_block = block
+      end
 
       @localizer        = options[:localizer]
       @show_count       = options.fetch(:show_count, true)

data/lib/active_admin/sidebar_section.rb

@@ -6,7 +6,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,3 @@
 module ActiveAdmin
-  VERSION = '2.1.0'
+  VERSION = '2.5.0'
 end

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

@@ -3,7 +3,8 @@ module ActiveAdmin
     module DisplayHelper
 
       DISPLAY_NAME_FALLBACK = -> {
-        name, klass = "", self.class
+        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)
-        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.

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

@@ -92,11 +92,11 @@ 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
@@ -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/status_tag.rb

@@ -51,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
@@ -60,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)
 

data/lib/active_admin/views/index_as_table.rb

@@ -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

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

@@ -33,7 +33,7 @@ module ActiveAdmin
             end
 
             active_admin_namespace.meta_tags.each do |name, content|
-              text_node(tag(:meta, name: name, content: content))
+              text_node(meta(name: name, content: content))
             end
 
             active_admin_application.javascripts.each do |path|

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

@@ -124,6 +124,7 @@ module ActiveAdmin
 
         def render_index
           renderer_class = find_index_renderer_class(config[:as])
+
           paginator        = config.fetch(:paginator, true)
           download_links   = config.fetch(:download_links, active_admin_config.namespace.download_links)
           pagination_total = config.fetch(:pagination_total, true)

data/lib/generators/active_admin/install/templates/active_admin.rb.erb

@@ -286,12 +286,25 @@ ActiveAdmin.setup do |config|
   # config.filters = true
   #
   # By default the filters include associations in a select, which means
-  # that every record will be loaded for each association.
+  # that every record will be loaded for each association (up
+  # to the value of config.maximum_association_filter_arity).
   # You can enabled or disable the inclusion
   # of those filters by default here.
   #
   # config.include_default_association_filters = true
 
+  # config.maximum_association_filter_arity = 256 # default value of :unlimited will change to 256 in a future version
+  # config.filter_columns_for_large_association, [
+  #    :display_name,
+  #    :full_name,
+  #    :name,
+  #    :username,
+  #    :login,
+  #    :title,
+  #    :email,
+  #  ]
+  # config.filter_method_for_large_association, '_starts_with'
+
   # == Head
   #
   # You can add your own content to the site head like analytics. Make sure

data/lib/generators/active_admin/resource/templates/admin.rb.erb

@@ -1,43 +1,46 @@
 ActiveAdmin.register <%= class_name %> do
-# See permitted parameters documentation:
-# https://github.com/activeadmin/activeadmin/blob/master/docs/2-resource-customization.md#setting-up-strong-parameters
-#
-# permit_params :list, :of, :attributes, :on, :model
-#
-# or
-#
-# permit_params do
-#   permitted = [:permitted, :attributes]
-#   permitted << :other if params[:action] == 'create' && current_user.admin?
-#   permitted
-# end
-<% if options.include_boilerplate? %>
-# Limit actions available to your users by adding them to the 'except' array
-# actions :all, except: []
 
-# Add or remove filters (you can use any ActiveRecord scope) to toggle their
-# visibility in the sidebar
-<%= @boilerplate.filters %>
+  # See permitted parameters documentation:
+  # https://github.com/activeadmin/activeadmin/blob/master/docs/2-resource-customization.md#setting-up-strong-parameters
+  #
+  # Uncomment all parameters which should be permitted for assignment
+  #
+  # permit_params <%= @boilerplate.permit_params %>
+  #
+  # or
+  #
+  # permit_params do
+  #   permitted = [<%= @boilerplate.permit_params %>]
+  #   permitted << :other if params[:action] == 'create' && current_user.admin?
+  #   permitted
+  # end
+  <% if options.include_boilerplate? %>
+  # Limit actions available to your users by adding them to the 'except' array
+  # actions :all, except: []
 
-# Add or remove columns to toggle their visiblity in the index action
-# index do
-#   selectable_column
-#   id_column
-<%= @boilerplate.columns %>
-#   actions
-# end
+  # Add or remove filters (you can use any ActiveRecord scope) to toggle their
+  # visibility in the sidebar
+  <%= @boilerplate.filters %>
 
-# Add or remove rows to toggle their visiblity in the show action
-# show do |<%= class_name.downcase %>|
-<%= @boilerplate.rows %>
-# end
+  # Add or remove columns to toggle their visiblity in the index action
+  # index do
+  #   selectable_column
+  #   id_column
+  <%= @boilerplate.columns %>
+  #   actions
+  # end
 
-# Add or remove fields to toggle their visibility in the form
-# form do |f|
-#   f.inputs do
-<%= @boilerplate.form_inputs %>
-#   end
-#   f.actions
-# end
-<% end %>
+  # Add or remove rows to toggle their visiblity in the show action
+  # show do |<%= class_name.downcase %>|
+  <%= @boilerplate.rows %>
+  # end
+
+  # Add or remove fields to toggle their visibility in the form
+  # form do |f|
+  #   f.inputs do
+  <%= @boilerplate.form_inputs %>
+  #   end
+  #   f.actions
+  # end
+  <% end %>
 end

data/lib/ransack_ext.rb

@@ -2,11 +2,11 @@
 # identically to the versions given in Ransack.
 #
 Ransack.configure do |config|
-  { 'contains'=>'cont', 'starts_with'=>'start', 'ends_with'=>'end' }.each do |old, current|
+  { 'contains' => 'cont', 'starts_with' => 'start', 'ends_with' => 'end' }.each do |old, current|
     config.add_predicate old, Ransack::Constants::DERIVED_PREDICATES.detect { |q, _| q == current }[1]
   end
 
-  { 'equals'=>'eq', 'greater_than'=>'gt', 'less_than'=>'lt' }.each do |old, current|
+  { 'equals' => 'eq', 'greater_than' => 'gt', 'less_than' => 'lt' }.each do |old, current|
     config.add_predicate old, arel_predicate: current
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Charles Maresh
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-10 00:00:00.000000000 Z
+date: 2019-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arbre
@@ -119,20 +119,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
@@ -187,26 +187,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.1'
-- !ruby/object:Gem::Dependency
-  name: sprockets-es6
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.2
 description: The administration framework for Ruby on Rails.
 email:
 - deivid.rodriguez@riseup.net
@@ -223,27 +203,12 @@ files:
 - CONTRIBUTING.md
 - LICENSE
 - README.md
-- app/assets/images/active_admin/nested_menu_arrow.gif
-- app/assets/images/active_admin/nested_menu_arrow_dark.gif
-- app/assets/images/active_admin/orderable.png
-- app/assets/javascripts/active_admin/base.es6
-- app/assets/javascripts/active_admin/ext/jquery-ui.es6
-- app/assets/javascripts/active_admin/ext/jquery.es6
-- app/assets/javascripts/active_admin/initializers/datepicker.es6
-- app/assets/javascripts/active_admin/initializers/filters.es6
-- app/assets/javascripts/active_admin/initializers/tabs.es6
-- app/assets/javascripts/active_admin/lib/active_admin.es6
-- app/assets/javascripts/active_admin/lib/batch_actions.es6
-- app/assets/javascripts/active_admin/lib/checkbox-toggler.es6
-- app/assets/javascripts/active_admin/lib/dropdown-menu.es6
-- app/assets/javascripts/active_admin/lib/has_many.es6
-- app/assets/javascripts/active_admin/lib/modal_dialog.es6
-- app/assets/javascripts/active_admin/lib/per_page.es6
-- app/assets/javascripts/active_admin/lib/table-checkbox-toggler.es6
+- app/assets/javascripts/active_admin/base.js
 - app/assets/stylesheets/active_admin/_base.scss
 - app/assets/stylesheets/active_admin/_forms.scss
 - app/assets/stylesheets/active_admin/_header.scss
 - app/assets/stylesheets/active_admin/_mixins.scss
+- app/assets/stylesheets/active_admin/_normalize.scss
 - app/assets/stylesheets/active_admin/_typography.scss
 - app/assets/stylesheets/active_admin/components/_batch_actions.scss
 - app/assets/stylesheets/active_admin/components/_blank_slates.scss
@@ -280,6 +245,25 @@ files:
 - app/assets/stylesheets/active_admin/structure/_footer.scss
 - app/assets/stylesheets/active_admin/structure/_main_structure.scss
 - app/assets/stylesheets/active_admin/structure/_title_bar.scss
+- app/javascript/active_admin/base.js
+- app/javascript/active_admin/ext/jquery-ui.js
+- app/javascript/active_admin/ext/jquery.js
+- app/javascript/active_admin/initializers/batch-actions.js
+- app/javascript/active_admin/initializers/checkbox-toggler.js
+- app/javascript/active_admin/initializers/datepicker.js
+- app/javascript/active_admin/initializers/dropdown-menu.js
+- app/javascript/active_admin/initializers/filters.js
+- app/javascript/active_admin/initializers/has-many.js
+- app/javascript/active_admin/initializers/per-page.js
+- app/javascript/active_admin/initializers/table-checkbox-toggler.js
+- app/javascript/active_admin/initializers/tabs.js
+- app/javascript/active_admin/lib/checkbox-toggler.js
+- app/javascript/active_admin/lib/dropdown-menu.js
+- app/javascript/active_admin/lib/filters.js
+- app/javascript/active_admin/lib/modal-dialog.js
+- app/javascript/active_admin/lib/per-page.js
+- app/javascript/active_admin/lib/table-checkbox-toggler.js
+- app/javascript/active_admin/lib/utils.js
 - app/views/active_admin/devise/confirmations/new.html.erb
 - app/views/active_admin/devise/mailer/reset_password_instructions.html.erb
 - app/views/active_admin/devise/mailer/unlock_instructions.html.erb
@@ -302,9 +286,16 @@ files:
 - app/views/kaminari/active_admin/_page.html.erb
 - app/views/kaminari/active_admin/_paginator.html.erb
 - app/views/kaminari/active_admin/_prev_page.html.erb
+- app/views/kaminari/active_admin_countless/_first_page.html.erb
+- app/views/kaminari/active_admin_countless/_gap.html.erb
+- app/views/kaminari/active_admin_countless/_next_page.html.erb
+- app/views/kaminari/active_admin_countless/_page.html.erb
+- app/views/kaminari/active_admin_countless/_paginator.html.erb
+- app/views/kaminari/active_admin_countless/_prev_page.html.erb
 - app/views/layouts/active_admin.html.arb
 - app/views/layouts/active_admin_logged_out.html.erb
 - config/locales/ar.yml
+- config/locales/az.yml
 - config/locales/bg.yml
 - config/locales/bs.yml
 - config/locales/ca.yml
@@ -331,6 +322,7 @@ files:
 - config/locales/ko.yml
 - config/locales/lt.yml
 - config/locales/lv.yml
+- config/locales/mk.yml
 - config/locales/nb.yml
 - config/locales/nl.yml
 - config/locales/pl.yml
@@ -470,6 +462,7 @@ files:
 - lib/active_admin/resource/controllers.rb
 - lib/active_admin/resource/includes.rb
 - lib/active_admin/resource/menu.rb
+- lib/active_admin/resource/model.rb
 - lib/active_admin/resource/naming.rb
 - lib/active_admin/resource/ordering.rb
 - lib/active_admin/resource/page_presenters.rb
@@ -483,6 +476,7 @@ files:
 - lib/active_admin/resource_controller/action_builder.rb
 - lib/active_admin/resource_controller/data_access.rb
 - lib/active_admin/resource_controller/decorators.rb
+- lib/active_admin/resource_controller/polymorphic_routes.rb
 - lib/active_admin/resource_controller/resource_class_methods.rb
 - lib/active_admin/resource_controller/scoping.rb
 - lib/active_admin/resource_controller/sidebars.rb
@@ -586,7 +580,6 @@ files:
 - vendor/assets/javascripts/jquery-ui/widgets/resizable.js
 - vendor/assets/javascripts/jquery-ui/widgets/sortable.js
 - vendor/assets/javascripts/jquery-ui/widgets/tabs.js
-- vendor/assets/stylesheets/active_admin/_normalize.scss
 homepage: https://activeadmin.info
 licenses:
 - MIT
@@ -606,7 +599,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Active Admin is a Ruby on Rails plugin for generating administration style