activeadmin 2.6.0 → 2.8.0

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.8.0
 platform: ruby
 authors:
 - Charles Maresh
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-16 00:00:00.000000000 Z
+date: 2020-09-04 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,7 +118,7 @@ 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
@@ -394,6 +400,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
@@ -551,6 +558,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
@@ -592,14 +604,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.1
+rubygems_version: 3.2.0.rc.1
 signing_key: 
 specification_version: 4
 summary: Active Admin is a Ruby on Rails plugin for generating administration style