activeadmin 2.6.1 → 2.12.0

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/install/templates/dashboard.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ActiveAdmin.register_page "Dashboard" do
   menu priority: 1, label: proc { I18n.t("active_admin.dashboard") }
 

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

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ActiveAdmin.register_page "<%= class_name %>" do
   content do
     # your content

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

@@ -1,4 +1,5 @@
-require 'active_admin/generators/boilerplate'
+# frozen_string_literal: true
+require "active_admin/generators/boilerplate"
 
 module ActiveAdmin
   module Generators
@@ -6,9 +7,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,27 @@
+# frozen_string_literal: true
+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

@@ -1,20 +1,21 @@
+# frozen_string_literal: true
 # This sets up aliases for old Metasearch query methods so they behave
 # 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.12.0
 platform: ruby
 authors:
 - Charles Maresh
@@ -12,10 +12,10 @@ authors:
 - Piers C
 - Sean Linsley
 - Timo Schilling
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-03 00:00:00.000000000 Z
+date: 2022-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arbre
@@ -41,16 +41,22 @@ dependencies:
   name: formtastic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: formtastic_i18n
   requirement: !ruby/object:Gem::Requirement
@@ -102,7 +108,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -112,81 +118,47 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.1
-- !ruby/object:Gem::Dependency
-  name: sassc-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: sprockets
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 2.1.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4'
 description: The administration framework for Ruby on Rails.
 email:
 - deivid.rodriguez@riseup.net
@@ -209,6 +181,7 @@ files:
 - 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/_print.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
@@ -241,7 +214,6 @@ files:
 - app/assets/stylesheets/active_admin/mixins/_utilities.scss
 - app/assets/stylesheets/active_admin/mixins/_variables.scss
 - app/assets/stylesheets/active_admin/pages/_logged_out.scss
-- app/assets/stylesheets/active_admin/print.scss
 - 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
@@ -394,6 +366,7 @@ files:
 - lib/active_admin/batch_actions/views/selection_cells.rb
 - lib/active_admin/callbacks.rb
 - lib/active_admin/cancan_adapter.rb
+- lib/active_admin/collection_decorator.rb
 - lib/active_admin/component.rb
 - lib/active_admin/controller_action.rb
 - lib/active_admin/csv_builder.rb
@@ -505,6 +478,7 @@ files:
 - lib/active_admin/views.rb
 - lib/active_admin/views/action_items.rb
 - lib/active_admin/views/components/active_admin_form.rb
+- lib/active_admin/views/components/active_filters_sidebar_content.rb
 - lib/active_admin/views/components/attributes_table.rb
 - lib/active_admin/views/components/blank_slate.rb
 - lib/active_admin/views/components/columns.rb
@@ -551,6 +525,11 @@ files:
 - lib/generators/active_admin/page/templates/page.rb
 - lib/generators/active_admin/resource/resource_generator.rb
 - lib/generators/active_admin/resource/templates/admin.rb.erb
+- lib/generators/active_admin/webpacker/plugins/jquery.js
+- lib/generators/active_admin/webpacker/templates/active_admin.js
+- lib/generators/active_admin/webpacker/templates/active_admin.scss
+- lib/generators/active_admin/webpacker/templates/print.scss
+- lib/generators/active_admin/webpacker/webpacker_generator.rb
 - lib/ransack_ext.rb
 - vendor/assets/javascripts/jquery-ui/data.js
 - vendor/assets/javascripts/jquery-ui/disable-selection.js
@@ -584,7 +563,7 @@ homepage: https://activeadmin.info
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -592,15 +571,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.3.10
+signing_key:
 specification_version: 4
 summary: Active Admin is a Ruby on Rails plugin for generating administration style
   interfaces. It abstracts common business application patterns to make it simple