avo 2.26.0 → 2.26.1.pr1584.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b61c2b5a2648aa08f89b080fe7f8a8c982ef10c51cb361aa24aa53f979dd060
-  data.tar.gz: 723c552907d3c861383006edea41a9b73da6c609bc87add39f4349569e427b9e
+  metadata.gz: 7a5ed608bd7bb2383b9d541e6628cd09ae0f59c074fc01a809c48ad9c8286fb5
+  data.tar.gz: 2bea6d2082fb7d5c991ea7a948c3530566752d9d386987b15da6c718339b0ed8
 SHA512:
-  metadata.gz: dfbeee5e9548d1c94fee23facf94685393e0cd58fd0079e980ef67707ac52b0545d5aebd7f4e6b3b6b44962d1a3ca540f966c3586660b4582e92484159ac8a3d
-  data.tar.gz: eebb9b58090526d78af41e3736985788dc69aabe53b0fd9cc02e4b926a7c8debb7daf5b4a9d17e91b357b126500804ef8cf72152d834cfe1b68a04303c1bda88
+  metadata.gz: 7216406691593c3219f9a8977ff4c9fdc4520afac0280dd006e28e1b7ad7bf018813434cff06f91f1eaccb96f54e98a29f2932e7e6f892e8e2400d19cfce152e
+  data.tar.gz: ff1c08ce8d21d27ad23421298f03fc35cb16f3cfefb21c04fc82a6842c2f2b90083cfb185ae5b40b918c415201bf58dc59f0c5d28af5f61c9f49be54544b5162

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.26.0)
+    avo (2.26.1.pr1584.pre.1)
       actionview (>= 6.0)
       active_link_to
       activerecord (>= 6.0)

data/config/master.key

@@ -0,0 +1 @@
+2aeb23d82b909d9c6b5abb62f7058c2a

data/lib/avo/app.rb

@@ -115,8 +115,45 @@ module Avo
         end
       end
 
+      # Fetches the resources available to the application.
+      # We have two ways of doing that.
+      #
+      # 1. Through eager loading.
+      # We automatically eager load the resources directory and fetch the descendants from the scanned files.
+      # This is the simple way to get started.
+      #
+      # 2. Manually, declared by the user.
+      # We have this option to load the resources because when they are loaded automatically through eager loading,
+      # those Resource classes and their methods may trigger loading other classes. And that may disrupt Rails booting process.
+      # Ex: AdminResource may use self.model_class = User. That will trigger Ruby to load the User class and itself load
+      # other classes in a chain reaction.
+      # The scenario that comes up most often is when Rails boots, the routes are being computed which eager loads the resource files.
+      # At that boot time some migration might have not been run yet, but Rails tries to access them through model associations,
+      # and they are not available.
+      #
+      # To enable this feature add a `resources` array config in your Avo initializer.
+      # config.resources = [
+      #   "UserResource",
+      #   "FishResource",
+      # ]
+      def fetch_resources
+        resources = if Avo.configuration.resources.nil?
+          BaseResource.descendants
+        else
+          Avo.configuration.resources
+        end
+
+        resources.map do |resource|
+          if resource.is_a?(Class)
+            resource
+          else
+            resource.to_s.safe_constantize
+          end
+        end
+      end
+
       def init_resources
-        self.resources = BaseResource.descendants
+        self.resources = fetch_resources
           .select do |resource|
             # Remove the BaseResource. We only need the descendants
             resource != BaseResource

data/lib/avo/configuration.rb

@@ -41,6 +41,7 @@ module Avo
     attr_accessor :authorization_client
     attr_accessor :field_wrapper_layout
     attr_accessor :sign_out_path_name
+    attr_accessor :resources
     attr_writer :branding
 
     def initialize
@@ -92,6 +93,7 @@ module Avo
       @resource_default_view = :show
       @authorization_client = :pundit
       @field_wrapper_layout = :inline
+      @resources = nil
     end
 
     def current_user_method(&block)

data/lib/avo/dynamic_router.rb

@@ -3,9 +3,13 @@ module Avo
     def self.routes
       Avo::Engine.routes.draw do
         scope "resources", as: "resources" do
-          Avo::App.eager_load(:resources) unless Rails.application.config.eager_load
+          # Check if the user chose to manually register the resource files.
+          # If so, eager_load the resources dir.
+          if Avo.configuration.resources.nil?
+            Avo::App.eager_load(:resources) unless Rails.application.config.eager_load
+          end
 
-          BaseResource.descendants
+          Avo::App.fetch_resources
             .select do |resource|
               resource != :BaseResource
             end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.26.0" unless const_defined?(:VERSION)
+  VERSION = "2.26.1.pr1584.pre.1" unless const_defined?(:VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 2.26.0
+  version: 2.26.1.pr1584.pre.1
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-14 00:00:00.000000000 Z
+date: 2023-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -1695,6 +1695,7 @@ files:
 - config/credentials.yml.enc
 - config/i18n-tasks.yml
 - config/initializers/pagy.rb
+- config/master.key
 - config/routes.rb
 - config/spring.rb
 - db/factories.rb
@@ -1950,9 +1951,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.3.3
 signing_key: