rails_admin 3.0.0.rc → 3.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5dbfec366d5d5bdfd29d652fb12b08631ac61984d67b770e82ccdb863e08e5c
-  data.tar.gz: 79bad15a57aea48250afd9257354caaac639767d794c7fe0dadc893c25b34cd4
+  metadata.gz: 142382cf0987b581cb64996e716ad77cf9ae76dab5aa1bf019b8ca38fb7daed0
+  data.tar.gz: 58a52e67fc458713f0245ea244e2a129f370309edc91511678ba06bbc756e9cc
 SHA512:
-  metadata.gz: e152b02c903442a40d247078958dca2d762c60476e9ce374e37085b11a9419925dbaa0d6f834b3f13c38e12a4e832ab5ea437f465fc6e71f7a1fa206efec28a6
-  data.tar.gz: 5abb152ffd68f269badf7805e08e328a68b97efbc40030736ebaf45b1fe81de3005694004e3d7526fdd4139ee4beaf66154013b2bee71b3ca8e8402be7f9e17f
+  metadata.gz: 55fce15b0a7bf4f168b042ab7415fd24f0cefdb509d61efdb2f3f15de42b657bbbe24b62e686a359f18239f0c9ad36436bbd229c22b35c28be17d8f27fb5ef7f
+  data.tar.gz: 9d076ac618ecdbb0680e7d8e7dd3472b7d0e47d10d5d12b4bdfc260c43297ded2e430a410926d0a680cbe120406e20da3678b5adb5ef2050efebe9aa8e2f8e12

data/README.md

@@ -1,17 +1,15 @@
 # RailsAdmin
 
 [![Gem Version](https://img.shields.io/gem/v/rails_admin.svg)][gem]
-[![Build Status](https://img.shields.io/github/workflow/status/sferik/rails_admin/Test)][ghactions]
-[![Coverage Status](https://img.shields.io/coveralls/sferik/rails_admin.svg)][coveralls]
-[![Inline docs](http://inch-ci.org/github/sferik/rails_admin.svg)][inch]
-[![Code Climate](https://codeclimate.com/github/sferik/rails_admin.svg)][codeclimate]
+[![Build Status](https://img.shields.io/github/workflow/status/railsadminteam/rails_admin/Test)][ghactions]
+[![Coverage Status](https://img.shields.io/coveralls/railsadminteam/rails_admin.svg)][coveralls]
+[![Code Climate](https://codeclimate.com/github/railsadminteam/rails_admin.svg)][codeclimate]
 [![SemVer](https://api.dependabot.com/badges/compatibility_score?dependency-name=rails_admin&package-manager=bundler&version-scheme=semver)][semver]
 
 [gem]: https://rubygems.org/gems/rails_admin
 [ghactions]: https://github.com/railsadminteam/rails_admin/actions
-[coveralls]: https://coveralls.io/r/sferik/rails_admin
-[inch]: http://inch-ci.org/github/sferik/rails_admin
-[codeclimate]: https://codeclimate.com/github/sferik/rails_admin
+[coveralls]: https://coveralls.io/r/railsadminteam/rails_admin
+[codeclimate]: https://codeclimate.com/github/railsadminteam/rails_admin
 [semver]: https://dependabot.com/compatibility-score.html?dependency-name=rails_admin&package-manager=bundler&version-scheme=semver
 
 RailsAdmin is a Rails engine that provides an easy-to-use interface for managing your data.
@@ -47,7 +45,7 @@ RailsAdmin is a Rails engine that provides an easy-to-use interface for managing
 
 ## Installation
 
-1. On your gemfile: `gem 'rails_admin', ['>= 3.0.0.rc', '< 4']`
+1. On your gemfile: `gem 'rails_admin', ['>= 3.0.0.rc2', '< 4']`
 2. Run `bundle install`
 3. Run `rails g rails_admin:install`
 4. Provide a namespace for the routes when asked

data/app/views/layouts/rails_admin/_head.html.erb

@@ -9,8 +9,8 @@
   <%= javascript_pack_tag "rails_admin", async: true %>
 <% when :webpack, :sprockets %>
   <% handle_asset_dependency_error do %>
-    <%= stylesheet_link_tag "rails_admin.css", media: :all %>
-    <%= javascript_include_tag "rails_admin.js", async: true %>
+    <%= stylesheet_link_tag "rails_admin/application.css", media: :all %>
+    <%= javascript_include_tag "rails_admin/application.js", async: true %>
   <% end %>
 <% else
      raise "Unknown asset_source: #{RailsAdmin::config.asset_source}"

data/lib/generators/rails_admin/install_generator.rb

@@ -12,8 +12,12 @@ module RailsAdmin
     desc 'RailsAdmin installation generator'
 
     def install
-      namespace = ask_for('Where do you want to mount rails_admin?', 'admin', _namespace)
-      route("mount RailsAdmin::Engine => '/#{namespace}', as: 'rails_admin'")
+      if File.read(File.join(destination_root, 'config/routes.rb')).include?('mount RailsAdmin::Engine')
+        display "Skipped route addition, since it's already there"
+      else
+        namespace = ask_for('Where do you want to mount rails_admin?', 'admin', _namespace)
+        route("mount RailsAdmin::Engine => '/#{namespace}', as: 'rails_admin'")
+      end
       if File.exist? File.join(destination_root, 'config/initializers/rails_admin.rb')
         insert_into_file 'config/initializers/rails_admin.rb', "  config.asset_source = :#{asset}\n", after: "RailsAdmin.config do |config|\n"
       else

data/lib/rails_admin/abstract_model.rb

@@ -19,7 +19,7 @@ module RailsAdmin
       def new(m)
         m = m.constantize unless m.is_a?(Class)
         (am = old_new(m)).model && am.adapter ? am : nil
-      rescue *([LoadError, NameError] + (defined?(ActiveRecord) ? ['ActiveRecord::NoDatabaseError'.constantize] : []))
+      rescue *([LoadError, NameError] + (defined?(ActiveRecord) ? ['ActiveRecord::NoDatabaseError'.constantize, 'ActiveRecord::ConnectionNotEstablished'.constantize] : []))
         puts "[RailsAdmin] Could not load model #{m}, assuming model is non existing. (#{$ERROR_INFO})" unless Rails.env.test?
         nil
       end

data/lib/rails_admin/config.rb

@@ -81,7 +81,7 @@ module RailsAdmin
       attr_accessor :navigation_static_label
 
       # Set where RailsAdmin fetches JS/CSS from, defaults to :sprockets
-      attr_accessor :asset_source
+      attr_writer :asset_source
 
       # Finish initialization by executing deferred configuration blocks
       def initialize!
@@ -257,6 +257,17 @@ module RailsAdmin
         @registry[key]
       end
 
+      def asset_source
+        @asset_source ||=
+          begin
+            warn <<-MSG.gsub(/^ +/, '').freeze
+              [Warning] After upgrading RailsAdmin to 3.x you haven't set asset_source yet, using :sprockets as the default.
+              To suppress this message, run 'rails rails_admin:install' to setup the asset delivery method suitable to you.
+            MSG
+            :sprockets
+          end
+      end
+
       def default_hidden_fields=(fields)
         if fields.is_a?(Array)
           @default_hidden_fields = {}
@@ -326,7 +337,7 @@ module RailsAdmin
         @show_gravatar = true
         @navigation_static_links = {}
         @navigation_static_label = nil
-        @asset_source = (defined?(Webpacker) ? :webpacker : :sprockets)
+        @asset_source = nil
         @parent_controller = '::ActionController::Base'
         @forgery_protection_settings = {with: :exception}
         RailsAdmin::Config::Actions.reset

data/lib/rails_admin/engine.rb

@@ -13,8 +13,8 @@ module RailsAdmin
     initializer 'RailsAdmin precompile hook', group: :all do |app|
       if app.config.respond_to?(:assets)
         app.config.assets.precompile += %w[
-          rails_admin.js
-          rails_admin.css
+          rails_admin/application.js
+          rails_admin/application.css
         ]
         app.config.assets.paths << RailsAdmin::Engine.root.join('src')
         require 'rails_admin/support/esmodule_preprocessor'

data/lib/rails_admin/version.rb

@@ -3,7 +3,7 @@ module RailsAdmin
     MAJOR = 3
     MINOR = 0
     PATCH = 0
-    PRE = 'rc'.freeze
+    PRE = 'rc2'.freeze
 
     class << self
       # @return [String]

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rails_admin",
-  "version": "3.0.0-rc",
+  "version": "3.0.0-rc2",
   "description": "RailsAdmin is a Rails engine that provides an easy-to-use interface for managing your data.",
   "homepage": "https://github.com/railsadminteam/rails_admin",
   "license": "MIT",

data/src/rails_admin/ui.js

@@ -80,9 +80,21 @@ import I18n from "./i18n";
       .each(function () {
         $(this).siblings(".control-group").hide();
       });
-    $("[formnovalidate]").on("click", function () {
-      $(this).closest("form").attr("novalidate", true);
-    });
+    $(".form-actions .extra_buttons button")
+      .attr("type", "button")
+      .on("click", function () {
+        var form = $(this).closest("form");
+        form.append(
+          $("<input />")
+            .attr("type", "hidden")
+            .attr("name", $(this).attr("name"))
+            .attr("value", true)
+        );
+        if ($(this).is("[formnovalidate]")) {
+          form.attr("novalidate", true);
+        }
+        form.trigger("submit");
+      });
     $.each($("#filters_box").data("options"), function () {
       $.filters.append(this);
     });

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc
+  version: 3.0.0.rc2
 platform: ruby
 authors:
 - Erik Michaels-Ober
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-06 00:00:00.000000000 Z
+date: 2022-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel-serializers-xml
@@ -124,9 +124,9 @@ files:
 - LICENSE.md
 - README.md
 - Rakefile
-- app/assets/javascripts/rails_admin.js
+- app/assets/javascripts/rails_admin/application.js
 - app/assets/javascripts/rails_admin/custom/ui.js
-- app/assets/stylesheets/rails_admin.scss
+- app/assets/stylesheets/rails_admin/application.scss
 - app/assets/stylesheets/rails_admin/custom/mixins.scss
 - app/assets/stylesheets/rails_admin/custom/theming.scss
 - app/assets/stylesheets/rails_admin/custom/variables.scss
@@ -444,7 +444,12 @@ homepage: https://github.com/railsadminteam/rails_admin
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: "\n    ### Upgrading RailsAdmin from 2.x.x to 3.x.x ###\n\n
+  \   Due to introduction of Webpack/Webpacker support, some additional dependencies
+  and configuration will be needed.\n    Running `bin/rails g rails_admin:install`
+  will suggest required changes, based on the current setup of your app.\n\n    For
+  a complete list of changes, see https://github.com/railsadminteam/rails_admin/blob/master/CHANGELOG.md\n
+  \ "
 rdoc_options: []
 require_paths:
 - lib