activeadmin 2.4.0 → 2.9.0

data/lib/active_admin/views/tabbed_navigation.rb

@@ -1,10 +1,10 @@
-require_relative 'components/menu'
+require_relative "components/menu"
 
 module ActiveAdmin
   module Views
     class TabbedNavigation < Menu
       def build(menu, options = {})
-        super(menu, options.reverse_merge(id: 'tabs'))
+        super(menu, options.reverse_merge(id: "tabs"))
       end
     end
   end

data/lib/active_admin/views/title_bar.rb

@@ -43,7 +43,7 @@ module ActiveAdmin
       end
 
       def build_title_tag
-        h2(@title, id: 'page_title')
+        h2(@title, id: "page_title")
       end
 
       def build_action_items

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', __dir__) + "/**/*.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

@@ -1,59 +1,57 @@
-require 'active_support/core_ext'
-require 'set'
-
-require 'ransack'
-require 'ransack_ext'
-require 'kaminari'
-require 'formtastic'
-require 'formtastic_i18n'
-require 'inherited_resources'
-require 'jquery-rails'
-require 'sassc-rails'
-require 'arbre'
-require 'sprockets/es6'
-
-require 'active_admin/helpers/i18n'
+require "active_support/core_ext"
+require "set"
+
+require "ransack"
+require "ransack_ext"
+require "kaminari"
+require "formtastic"
+require "formtastic_i18n"
+require "inherited_resources"
+require "jquery-rails"
+require "arbre"
+
+require "active_admin/helpers/i18n"
 
 module ActiveAdmin
 
-  autoload :VERSION,                  'active_admin/version'
-  autoload :Application,              'active_admin/application'
-  autoload :AssetRegistration,        'active_admin/asset_registration'
-  autoload :Authorization,            'active_admin/authorization_adapter'
-  autoload :AuthorizationAdapter,     'active_admin/authorization_adapter'
-  autoload :Callbacks,                'active_admin/callbacks'
-  autoload :Component,                'active_admin/component'
-  autoload :BaseController,           'active_admin/base_controller'
-  autoload :CanCanAdapter,            'active_admin/cancan_adapter'
-  autoload :ControllerAction,         'active_admin/controller_action'
-  autoload :CSVBuilder,               'active_admin/csv_builder'
-  autoload :Dependency,               'active_admin/dependency'
-  autoload :Deprecation,              'active_admin/deprecation'
-  autoload :Devise,                   'active_admin/devise'
-  autoload :DSL,                      'active_admin/dsl'
-  autoload :FormBuilder,              'active_admin/form_builder'
-  autoload :Inputs,                   'active_admin/inputs'
-  autoload :Localizers,               'active_admin/localizers'
-  autoload :Menu,                     'active_admin/menu'
-  autoload :MenuCollection,           'active_admin/menu_collection'
-  autoload :MenuItem,                 'active_admin/menu_item'
-  autoload :Namespace,                'active_admin/namespace'
-  autoload :OrderClause,              'active_admin/order_clause'
-  autoload :Page,                     'active_admin/page'
-  autoload :PagePresenter,            'active_admin/page_presenter'
-  autoload :PageController,           'active_admin/page_controller'
-  autoload :PageDSL,                  'active_admin/page_dsl'
-  autoload :PunditAdapter,            'active_admin/pundit_adapter'
-  autoload :Resource,                 'active_admin/resource'
-  autoload :ResourceController,       'active_admin/resource_controller'
-  autoload :ResourceDSL,              'active_admin/resource_dsl'
-  autoload :Scope,                    'active_admin/scope'
-  autoload :ScopeChain,               'active_admin/helpers/scope_chain'
-  autoload :SidebarSection,           'active_admin/sidebar_section'
-  autoload :TableBuilder,             'active_admin/table_builder'
-  autoload :ViewFactory,              'active_admin/view_factory'
-  autoload :ViewHelpers,              'active_admin/view_helpers'
-  autoload :Views,                    'active_admin/views'
+  autoload :VERSION, "active_admin/version"
+  autoload :Application, "active_admin/application"
+  autoload :AssetRegistration, "active_admin/asset_registration"
+  autoload :Authorization, "active_admin/authorization_adapter"
+  autoload :AuthorizationAdapter, "active_admin/authorization_adapter"
+  autoload :Callbacks, "active_admin/callbacks"
+  autoload :Component, "active_admin/component"
+  autoload :BaseController, "active_admin/base_controller"
+  autoload :CanCanAdapter, "active_admin/cancan_adapter"
+  autoload :ControllerAction, "active_admin/controller_action"
+  autoload :CSVBuilder, "active_admin/csv_builder"
+  autoload :Dependency, "active_admin/dependency"
+  autoload :Deprecation, "active_admin/deprecation"
+  autoload :Devise, "active_admin/devise"
+  autoload :DSL, "active_admin/dsl"
+  autoload :FormBuilder, "active_admin/form_builder"
+  autoload :Inputs, "active_admin/inputs"
+  autoload :Localizers, "active_admin/localizers"
+  autoload :Menu, "active_admin/menu"
+  autoload :MenuCollection, "active_admin/menu_collection"
+  autoload :MenuItem, "active_admin/menu_item"
+  autoload :Namespace, "active_admin/namespace"
+  autoload :OrderClause, "active_admin/order_clause"
+  autoload :Page, "active_admin/page"
+  autoload :PagePresenter, "active_admin/page_presenter"
+  autoload :PageController, "active_admin/page_controller"
+  autoload :PageDSL, "active_admin/page_dsl"
+  autoload :PunditAdapter, "active_admin/pundit_adapter"
+  autoload :Resource, "active_admin/resource"
+  autoload :ResourceController, "active_admin/resource_controller"
+  autoload :ResourceDSL, "active_admin/resource_dsl"
+  autoload :Scope, "active_admin/scope"
+  autoload :ScopeChain, "active_admin/helpers/scope_chain"
+  autoload :SidebarSection, "active_admin/sidebar_section"
+  autoload :TableBuilder, "active_admin/table_builder"
+  autoload :ViewFactory, "active_admin/view_factory"
+  autoload :ViewHelpers, "active_admin/view_helpers"
+  autoload :Views, "active_admin/views"
 
   class << self
 
@@ -70,11 +68,11 @@ module ActiveAdmin
       application.prepare!
     end
 
-    delegate :register,      to: :application
+    delegate :register, to: :application
     delegate :register_page, to: :application
-    delegate :unload!,       to: :application
-    delegate :load!,         to: :application
-    delegate :routes,        to: :application
+    delegate :unload!, to: :application
+    delegate :load!, to: :application
+    delegate :routes, to: :application
 
     # A callback is triggered each time (before) Active Admin loads the configuration files.
     # In development mode, this will happen whenever the user changes files. In production
@@ -122,13 +120,13 @@ module ActiveAdmin
 end
 
 # Require things that don't support autoload
-require 'active_admin/engine'
-require 'active_admin/error'
+require "active_admin/engine"
+require "active_admin/error"
 
 # Require internal plugins
-require 'active_admin/batch_actions'
-require 'active_admin/filters'
+require "active_admin/batch_actions"
+require "active_admin/filters"
 
 # Require ORM-specific plugins
-require 'active_admin/orm/active_record' if defined? ActiveRecord
-require 'active_admin/orm/mongoid'       if defined? Mongoid
+require "active_admin/orm/active_record" if defined? ActiveRecord
+require "active_admin/orm/mongoid" if defined? Mongoid

data/lib/activeadmin.rb

@@ -1 +1 @@
-require 'active_admin'
+require "active_admin"

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', __dir__)
+      source_root File.expand_path("templates", __dir__)
 
       def install_assets
-        template 'active_admin.js', 'app/assets/javascripts/active_admin.js'
+        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.scss

@@ -1,4 +1,4 @@
-// SASS variable overrides must be declared before loading up Active Admin's styles.
+// Sass variable overrides must be declared before loading up Active Admin's styles.
 //
 // To view the variables that Active Admin provides, take a look at
 // `app/assets/stylesheets/active_admin/mixins/_variables.scss` in the
@@ -11,7 +11,7 @@
 @import "active_admin/mixins";
 @import "active_admin/base";
 
-// Overriding any non-variable SASS must be done after the fact.
+// Overriding any non-variable Sass must be done after the fact.
 // For example, to change the default status-tag color:
 //
 //   .status_tag { background: #6090DB; }

data/lib/generators/active_admin/devise/devise_generator.rb

@@ -7,13 +7,13 @@ module ActiveAdmin
       desc "Creates an admin user and uses Devise for authentication"
       argument :name, type: :string, default: "AdminUser"
 
-      class_option  :registerable, type: :boolean, default: false,
-                    desc: "Should the generated resource be registerable?"
+      class_option :registerable, type: :boolean, default: false,
+                                  desc: "Should the generated resource be registerable?"
 
       RESERVED_NAMES = [:active_admin_user]
 
-      class_option  :default_user, type: :boolean, default: true,
-                    desc: "Should a default user be created inside the migration?"
+      class_option :default_user, type: :boolean, default: true,
+                                  desc: "Should a default user be created inside the migration?"
 
       def install_devise
         begin
@@ -22,7 +22,7 @@ module ActiveAdmin
           raise ActiveAdmin::GeneratorError, "#{e.message} If you don't want to use devise, run the generator with --skip-users."
         end
 
-        require 'devise'
+        require "devise"
 
         initializer_file =
           File.join(destination_root, "config", "initializers", "devise.rb")

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

@@ -1,4 +1,4 @@
-require 'rails/generators/active_record'
+require "rails/generators/active_record"
 
 module ActiveAdmin
   module Generators
@@ -8,22 +8,24 @@ module ActiveAdmin
 
       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"
+      class_option :use_webpacker, type: :boolean, default: false, desc: "Use Webpacker assets instead of Sprockets"
 
-      source_root File.expand_path('templates', __dir__)
+      source_root File.expand_path("templates", __dir__)
 
       def copy_initializer
-        @underscored_user_name = name.underscore.gsub('/', '_')
+        @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'
+        @use_webpacker = options[:use_webpacker]
+        template "active_admin.rb.erb", "config/initializers/active_admin.rb"
       end
 
       def setup_directory
         empty_directory "app/admin"
-        template 'dashboard.rb', 'app/admin/dashboard.rb'
+        template "dashboard.rb", "app/admin/dashboard.rb"
         if options[:users].present?
           @user_class = name
-          template 'admin_users.rb.erb', "app/admin/#{name.underscore.pluralize}.rb"
+          template "admin_users.rb.erb", "app/admin/#{name.underscore.pluralize}.rb"
         end
       end
 
@@ -36,12 +38,16 @@ module ActiveAdmin
       end
 
       def create_assets
-        generate "active_admin:assets"
+        if options[:use_webpacker]
+          generate "active_admin:webpacker"
+        else
+          generate "active_admin:assets"
+        end
       end
 
       def create_migrations
         unless options[:skip_comments]
-          migration_template 'migrations/create_active_admin_comments.rb.erb', 'db/migrate/create_active_admin_comments.rb'
+          migration_template "migrations/create_active_admin_comments.rb.erb", "db/migrate/create_active_admin_comments.rb"
         end
       end
     end

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

@@ -294,7 +294,7 @@ ActiveAdmin.setup do |config|
   # 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, [
+  # config.filter_columns_for_large_association = [
   #    :display_name,
   #    :full_name,
   #    :name,
@@ -303,7 +303,7 @@ ActiveAdmin.setup do |config|
   #    :title,
   #    :email,
   #  ]
-  # config.filter_method_for_large_association, '_starts_with'
+  # config.filter_method_for_large_association = '_starts_with'
 
   # == Head
   #
@@ -325,4 +325,11 @@ ActiveAdmin.setup do |config|
   # You can inherit it with own class and inject it for all resources
   #
   # config.order_clause = MyOrderClause
+
+  # == Webpacker
+  #
+  # By default, Active Admin uses Sprocket's asset pipeline.
+  # You can switch to using Webpacker here.
+  #
+  <% unless @use_webpacker %># <% end %>config.use_webpacker = true
 end

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', __dir__)
+      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

@@ -1,4 +1,4 @@
-require 'active_admin/generators/boilerplate'
+require "active_admin/generators/boilerplate"
 
 module ActiveAdmin
   module Generators
@@ -6,9 +6,9 @@ module ActiveAdmin
       desc "Registers resources with Active Admin"
 
       class_option :include_boilerplate, type: :boolean, default: false,
-        desc: "Generate boilerplate code for your resource."
+                                         desc: "Generate boilerplate code for your resource."
 
-      source_root File.expand_path('templates', __dir__)
+      source_root File.expand_path("templates", __dir__)
 
       def generate_config_file
         @boilerplate = ActiveAdmin::Generators::Boilerplate.new(class_name)

data/lib/generators/active_admin/webpacker/plugins/jquery.js

@@ -0,0 +1,7 @@
+const webpack = require('webpack')
+
+module.exports = new webpack.ProvidePlugin({
+  "$":"jquery",
+  "jQuery":"jquery",
+  "window.jQuery":"jquery"
+});

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

@@ -0,0 +1,5 @@
+// Load Active Admin's styles into Webpacker,
+// see `active_admin.scss` for customization.
+import "../stylesheets/active_admin";
+
+import "@activeadmin/activeadmin";

data/lib/generators/active_admin/webpacker/templates/active_admin.scss

@@ -0,0 +1,17 @@
+// Sass variable overrides must be declared before loading up Active Admin's styles.
+//
+// To view the variables that Active Admin provides, take a look at
+// `app/assets/stylesheets/active_admin/mixins/_variables.scss` in the
+// Active Admin source.
+//
+// For example, to change the sidebar width:
+// $sidebar-width: 242px;
+
+// Active Admin's got SASS!
+@import "~@activeadmin/activeadmin/src/scss/mixins";
+@import "~@activeadmin/activeadmin/src/scss/base";
+
+// Overriding any non-variable Sass must be done after the fact.
+// For example, to change the default status-tag color:
+//
+//   .status_tag { background: #6090DB; }

data/lib/generators/active_admin/webpacker/templates/print.scss

@@ -0,0 +1,2 @@
+/* Active Admin Print Stylesheet */
+@import "~@activeadmin/activeadmin/src/scss/print";

data/lib/generators/active_admin/webpacker/webpacker_generator.rb

@@ -0,0 +1,26 @@
+module ActiveAdmin
+  module Generators
+    class WebpackerGenerator < Rails::Generators::Base
+
+      source_root File.expand_path("templates", __dir__)
+
+      def install_assets
+        template "active_admin.js", "app/javascript/packs/active_admin.js"
+        template "active_admin.scss", "app/javascript/stylesheets/active_admin.scss"
+        template "print.scss", "app/javascript/packs/active_admin/print.scss"
+
+        copy_file "#{__dir__}/plugins/jquery.js", Rails.root.join("config/webpack/plugins/jquery.js").to_s
+
+        insert_into_file Rails.root.join("config/webpack/environment.js").to_s,
+                         "const jquery = require('./plugins/jquery')\n",
+                         after: /require\(('|")@rails\/webpacker\1\);?\n/
+
+        insert_into_file Rails.root.join("config/webpack/environment.js").to_s,
+                         "environment.plugins.prepend('jquery', jquery)\n",
+                         before: "module.exports"
+
+        run "yarn add @activeadmin/activeadmin"
+      end
+    end
+  end
+end

data/lib/ransack_ext.rb

@@ -2,19 +2,19 @@
 # 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
 
-  config.add_predicate 'gteq_datetime',
-    arel_predicate: 'gteq',
-    formatter: ->(v) { v.beginning_of_day }
+  config.add_predicate "gteq_datetime",
+                       arel_predicate: "gteq",
+                       formatter: ->(v) { v.beginning_of_day }
 
-  config.add_predicate 'lteq_datetime',
-  	arel_predicate: 'lt',
-  	formatter: ->(v) { v + 1.day }
+  config.add_predicate "lteq_datetime",
+                       arel_predicate: "lt",
+                       formatter: ->(v) { v + 1.day }
 end