activeadmin 1.4.3 → 2.0.0.rc1

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

@@ -102,7 +102,7 @@ module ActiveAdmin
           # 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

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

@@ -1,11 +1,8 @@
-require 'active_admin/helpers/output_safety_helper'
-
 module ActiveAdmin
   module Views
 
     class SidebarSection < Panel
       builder_method :sidebar_section
-      include OutputSafetyHelper
 
       # Takes a ActiveAdmin::SidebarSection instance
       def build(section)

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
 

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]

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

@@ -15,7 +15,8 @@ module ActiveAdmin
       end
 
       def build_menu_item(title, options, &block)
-        fragment = options.fetch(:id, title.parameterize)
+        fragment = options.fetch(:id, fragmentize(title))
+
         html_options = options.fetch(:html_options, {})
         li html_options do
           link_to title, "##{fragment}"
@@ -23,9 +24,17 @@ module ActiveAdmin
       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

@@ -21,7 +21,7 @@ module ActiveAdmin
 
       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/index_as_table.rb

@@ -365,15 +365,16 @@ module ActiveAdmin
         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,6 +4,7 @@ module ActiveAdmin
       class Base < Arbre::HTML::Document
 
         def build(*args)
+          set_attribute :lang, I18n.locale
           build_active_admin_head
           build_page
         end
@@ -25,6 +26,8 @@ module ActiveAdmin
           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

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

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

@@ -69,6 +69,11 @@ ActiveAdmin.setup do |config|
   # case when Pundit is unable to find suitable policy.
   # config.pundit_default_policy = "MyDefaultPunditPolicy"
 
+  # If you wish to maintain a separate set of Pundit policies for admin
+  # resources, you may set a namespace here that Pundit will search
+  # within when looking for a resource's policy.
+  # config.pundit_policy_namespace = :admin
+
   # You can customize your CanCan Ability class name here.
   # config.cancan_ability_class = "Ability"
 
@@ -119,7 +124,7 @@ ActiveAdmin.setup do |config|
   # This allows your users to comment on any resource registered with Active Admin.
   #
   # You can completely disable comments:
-  # config.comments = false
+  <% unless @skip_comments %># <% end %>config.comments = false
   #
   # You can change the name under which comments are registered:
   # config.comments_registration_name = 'AdminComment'
@@ -147,6 +152,13 @@ ActiveAdmin.setup do |config|
   #
   # config.before_action :do_something_awesome
 
+  # == Attribute Filters
+  #
+  # You can exclude possibly sensitive model attributes from being displayed,
+  # added to forms, or exported by default by ActiveAdmin
+  #
+  config.filter_attributes = [:encrypted_password, :password, :password_confirmation]
+
   # == Localize Date/Time Format
   #
   # Set the localize format to display dates and times.
@@ -277,6 +289,13 @@ ActiveAdmin.setup do |config|
   #
   # config.include_default_association_filters = true
 
+  # == Head
+  #
+  # You can add your own content to the site head like analytics. Make sure
+  # you only pass content you trust.
+  #
+  # config.head = ''.html_safe
+
   # == Footer
   #
   # By default, the footer shows the current Active Admin version. You can

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

@@ -1,8 +1,7 @@
 ActiveAdmin.register_page "Dashboard" do
+  menu priority: 1, label: proc { I18n.t("active_admin.dashboard") }
 
-  menu priority: 1, label: proc{ I18n.t("active_admin.dashboard") }
-
-  content title: proc{ I18n.t("active_admin.dashboard") } do
+  content title: proc { I18n.t("active_admin.dashboard") } do
     div class: "blank_slate_container", id: "dashboard_default_message" do
       span class: "blank_slate" do
         span I18n.t("active_admin.dashboard_welcome.welcome")

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

@@ -1,27 +1,13 @@
-<%
-  parent_class = ActiveRecord::Migration
-  parent_class = parent_class[parent_class.current_version] if Rails::VERSION::MAJOR >= 5
--%>
-class CreateActiveAdminComments < <%= parent_class.to_s %>
+class CreateActiveAdminComments < ActiveRecord::Migration[<%= ActiveRecord::Migration.current_version.to_s %>]
   def self.up
     create_table :active_admin_comments do |t|
       t.string :namespace
       t.text   :body
       t.references :resource, polymorphic: true
       t.references :author, polymorphic: true
-      <%- if Rails::VERSION::MAJOR >= 5 -%>
       t.timestamps
-      <%- else -%>
-      t.timestamps null: false
-      <%- end -%>
     end
     add_index :active_admin_comments, [:namespace]
-    <%- unless Rails::VERSION::MAJOR >= 5 -%>
-
-    add_index :active_admin_comments, [:author_type, :author_id]
-    add_index :active_admin_comments, [:resource_type, :resource_id]
-    <%- end -%>
-
   end
 
   def self.down

data/lib/generators/active_admin/page/page_generator.rb

@@ -1,7 +1,7 @@
 module ActiveAdmin
   module Generators
     class PageGenerator < Rails::Generators::NamedBase
-      source_root File.expand_path('../templates', __FILE__)
+      source_root File.expand_path('templates', __dir__)
 
       def generate_config_file
         template "page.rb", "app/admin/#{file_path.tr('/', '_')}.rb"

data/lib/generators/active_admin/resource/resource_generator.rb

@@ -8,7 +8,7 @@ module ActiveAdmin
       class_option :include_boilerplate, type: :boolean, default: false,
         desc: "Generate boilerplate code for your resource."
 
-      source_root File.expand_path("../templates", __FILE__)
+      source_root File.expand_path('templates', __dir__)
 
       def generate_config_file
         @boilerplate = ActiveAdmin::Generators::Boilerplate.new(class_name)

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|
-    config.add_predicate old, Ransack::Constants::DERIVED_PREDICATES.detect{ |q, _| q == current }[1]
+  { '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
 

data/vendor/assets/javascripts/jquery-ui/form-reset-mixin.js

@@ -0,0 +1,80 @@
+//= require jquery-ui/form
+//= require jquery-ui/version
+
+/*!
+ * jQuery UI Form Reset Mixin 1.12.1
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Form Reset Mixin
+//>>group: Core
+//>>description: Refresh input widgets when their form is reset
+//>>docs: http://api.jqueryui.com/form-reset-mixin/
+
+( function( factory ) {
+  if ( typeof define === "function" && define.amd ) {
+
+    // AMD. Register as an anonymous module.
+    define( [
+      "jquery",
+      "./form",
+      "./version"
+    ], factory );
+  } else {
+
+    // Browser globals
+    factory( jQuery );
+  }
+}( function( $ ) {
+
+  return $.ui.formResetMixin = {
+    _formResetHandler: function() {
+      var form = $( this );
+
+      // Wait for the form reset to actually happen before refreshing
+      setTimeout( function() {
+        var instances = form.data( "ui-form-reset-instances" );
+        $.each( instances, function() {
+          this.refresh();
+        } );
+      } );
+    },
+
+    _bindFormResetHandler: function() {
+      this.form = this.element.form();
+      if ( !this.form.length ) {
+        return;
+      }
+
+      var instances = this.form.data( "ui-form-reset-instances" ) || [];
+      if ( !instances.length ) {
+
+        // We don't use _on() here because we use a single event handler per form
+        this.form.on( "reset.ui-form-reset", this._formResetHandler );
+      }
+      instances.push( this );
+      this.form.data( "ui-form-reset-instances", instances );
+    },
+
+    _unbindFormResetHandler: function() {
+      if ( !this.form.length ) {
+        return;
+      }
+
+      var instances = this.form.data( "ui-form-reset-instances" );
+      instances.splice( $.inArray( this, instances ), 1 );
+      if ( instances.length ) {
+        this.form.data( "ui-form-reset-instances", instances );
+      } else {
+        this.form
+            .removeData( "ui-form-reset-instances" )
+            .off( "reset.ui-form-reset" );
+      }
+    }
+  };
+
+} ) );

data/vendor/assets/javascripts/jquery-ui/form.js

@@ -0,0 +1,22 @@
+//= require jquery-ui/version
+
+( function( factory ) {
+  if ( typeof define === "function" && define.amd ) {
+
+    // AMD. Register as an anonymous module.
+    define( [ "jquery", "./version" ], factory );
+  } else {
+
+    // Browser globals
+    factory( jQuery );
+  }
+} ( function( $ ) {
+
+// Support: IE8 Only
+// IE8 does not support the form attribute and when it is supplied. It overwrites the form prop
+// with a string, so we need to find the proper form.
+  return $.fn.form = function() {
+    return typeof this[ 0 ].form === "string" ? this.closest( "form" ) : $( this[ 0 ].form );
+  };
+
+} ) );

data/vendor/assets/javascripts/jquery-ui/labels.js

@@ -0,0 +1,65 @@
+//= require jquery-ui/version
+//= require jquery-ui/escape-selector
+
+/*!
+ * jQuery UI Labels 1.12.1
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: labels
+//>>group: Core
+//>>description: Find all the labels associated with a given input
+//>>docs: http://api.jqueryui.com/labels/
+
+( function( factory ) {
+  if ( typeof define === "function" && define.amd ) {
+
+    // AMD. Register as an anonymous module.
+    define( [ "jquery", "./version", "./escape-selector" ], factory );
+  } else {
+
+    // Browser globals
+    factory( jQuery );
+  }
+} ( function( $ ) {
+
+  return $.fn.labels = function() {
+    var ancestor, selector, id, labels, ancestors;
+
+    // Check control.labels first
+    if ( this[ 0 ].labels && this[ 0 ].labels.length ) {
+      return this.pushStack( this[ 0 ].labels );
+    }
+
+    // Support: IE <= 11, FF <= 37, Android <= 2.3 only
+    // Above browsers do not support control.labels. Everything below is to support them
+    // as well as document fragments. control.labels does not work on document fragments
+    labels = this.eq( 0 ).parents( "label" );
+
+    // Look for the label based on the id
+    id = this.attr( "id" );
+    if ( id ) {
+
+      // We don't search against the document in case the element
+      // is disconnected from the DOM
+      ancestor = this.eq( 0 ).parents().last();
+
+      // Get a full set of top level ancestors
+      ancestors = ancestor.add( ancestor.length ? ancestor.siblings() : this.siblings() );
+
+      // Create a selector for the label based on the id
+      selector = "label[for='" + $.ui.escapeSelector( id ) + "']";
+
+      labels = labels.add( ancestors.find( selector ).addBack( selector ) );
+
+    }
+
+    // Return whatever we have found for labels
+    return this.pushStack( labels );
+  };
+
+} ) );