avo 2.26.2.pre.pr1579 → 2.26.3.pre.pr1601

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff9b60d0d2f1fc8e8f3536899e3559d78886342441ab558991dc2b374fbc45ac
-  data.tar.gz: 3bab366736547f5d041c5e1283b76b569d8ae788d25eafc4bf919ffb17d3a3e8
+  metadata.gz: 4bb91ab45ce78d6311390251a678a7d015f38834e702999e5073b8d537bf4342
+  data.tar.gz: 5ba8c4a46f6c6bdaebb1ce8a35790f7acb14c9b05e05b12cd60bf58521a7a991
 SHA512:
-  metadata.gz: b159c53be13567f56c149d7cf5d7c16af84dcf1f55f69662d09317c54b5151b628798fc26cf02175a6dd9b19b734e7a4fc3918cbf4b860aff50f53f82d1b9f46
-  data.tar.gz: e74aa9525374ede47f68c0ca70b0ecf4824ddaae4bb2430538462c4226d53a431f35dbfd54ed6dfbd8dad528e21174ada30f9dec34459a5480ad3dd0ebb71a23
+  metadata.gz: 9a9082834cd4f9b0de2382f60799c927901bead7775683438a714a6c05815f7f5bec1d758aab4f6cc76af15fbf9f1642f0161ee8183911973dfc931718a21122
+  data.tar.gz: 6e7754cb9fe3b4c723e1412b3804035a8b62c1e64bf568e5729ba17d68b989b76b33422918c4b09c3966e6107d616280439f7d0e48798f09b3a3ddaa8e10dac7

data/Gemfile

@@ -80,8 +80,9 @@ group :development do
   gem "brakeman"
 end
 
+gem "awesome_print"
+
 group :development, :test do
-  gem "awesome_print"
   gem "faker", require: false
   gem "i18n-tasks", "~> 1.0.12"
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.26.2.pre.pr1579)
+    avo (2.26.3.pre.pr1601)
       actionview (>= 6.0)
       active_link_to
       activerecord (>= 6.0)

data/bin/prod

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+PORT="${PORT:-3030}"
+export PORT
+
+if command -v overmind &> /dev/null; then
+  overmind start -f Procfile "$@"
+else
+  foreman start -f Procfile "$@"
+fi

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/concerns/has_fields.rb

@@ -264,6 +264,10 @@ module Avo
         panelfull_items = []
 
         items.each do |item|
+          if item.respond_to? :hydrate
+            item.hydrate(view: view)
+          end
+
           # fields and tabs can be hidden on some views
           if item.respond_to? :visible_on?
             next unless item.visible_on?(view)

data/lib/avo/concerns/visible_items.rb

@@ -13,6 +13,13 @@ module Avo
 
       def visible_items
         items
+          .map do |item|
+            if item.respond_to? :hydrate
+              item.hydrate(view: view)
+            end
+
+            item
+          end
           .map do |item|
             visible(item) ? item : nil
           end

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.2.pre.pr1579" unless const_defined?(:VERSION)
+  VERSION = "2.26.3.pre.pr1601" unless const_defined?(:VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 2.26.2.pre.pr1579
+  version: 2.26.3.pre.pr1601
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-26 00:00:00.000000000 Z
+date: 2023-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -1686,6 +1686,7 @@ files:
 - bin/dev
 - bin/helpers.rb
 - bin/init
+- bin/prod
 - bin/rails
 - bin/rspec
 - bin/spring