avo 2.9.1.pre1 → 2.9.1.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b6ce5aac2f8a3f263f31ec99550e1d09d98dec31fac4852affb0f387ec3eb45
-  data.tar.gz: e8b7d4c9db66b852abec3593830e7053f2e472459548f9c6a60e3eca1838517a
+  metadata.gz: 9401cff40f8b21f28409534ff2540ef6deb94620952b75ede2df8c2a38dfd81f
+  data.tar.gz: 20c4c6e211d46e6818879d26e82619d96eb8639804c84fe35e1a94c168655e5f
 SHA512:
-  metadata.gz: 18a93629ab488cf5c9b80eb21fb80c4e1289a031417937de0fd8434e73f206ebc1cd6254dd1fde9f423894b76ebdc04390d03088c4b2a685d9371f54440fd3ff
-  data.tar.gz: 9e1073af2957a468ea098e42d726fc49c96ec7a1b5866d6585f7ed318cab674a6e2dc4f80170c409e5153764eb44fc9f676c79658b9d26d3062f63ac5b7e264e
+  metadata.gz: b053e8998efda171728723c33b725098962df7b64a4b62d2d59c4f6f094039e96bb9eb38d848a076d3cf4df8faa6dbe6f97d2e9de58f81b8601158441178c0dc
+  data.tar.gz: 9d65eb151f122ddd4b34fbc775e9dc9765efc30364c49d6ba2b079f4435d8d062b2181b927dc8d7f22cb84a1d808d31f9b4c49ced3c612b566a363e1e45b6b1c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.9.1.pre1)
+    avo (2.9.1.pre2)
       active_link_to
       addressable
       breadcrumbs_on_rails

data/lib/avo/base_resource.rb

@@ -8,6 +8,7 @@ module Avo
     include Avo::Concerns::HasModel
     include Avo::Concerns::HasFields
     include Avo::Concerns::HasStimulusControllers
+    include Avo::Concerns::ModelClassConstantized
 
     delegate :view_context, to: ::Avo::App
     delegate :simple_format, :content_tag, to: :view_context
@@ -29,7 +30,6 @@ module Avo
     class_attribute :search_query, default: nil
     class_attribute :search_query_help, default: ""
     class_attribute :includes, default: []
-    class_attribute :model_class
     class_attribute :translation_key
     class_attribute :default_view_type, default: :table
     class_attribute :devise_password_optional, default: false
@@ -78,14 +78,14 @@ module Avo
 
       # This resolves the scope when doing "where" queries (not find queries)
       def query_scope
-        final_scope = resolve_query_scope.present? ? resolve_query_scope.call(model_class: get_model_class) : get_model_class
+        final_scope = resolve_query_scope.present? ? resolve_query_scope.call(model_class: model_class) : model_class
 
         authorization.apply_policy final_scope
       end
 
       # This resolves the scope when finding records (not "where" queries)
       def find_scope
-        final_scope = resolve_find_scope.present? ? resolve_find_scope.call(model_class: get_model_class) : get_model_class
+        final_scope = resolve_find_scope.present? ? resolve_find_scope.call(model_class: model_class) : model_class
 
         authorization.apply_policy final_scope
       end
@@ -99,14 +99,6 @@ module Avo
 
         ordering.dig(:actions) || {}
       end
-
-      def get_model_class
-        if model_class.is_a? String
-          model_class.safe_constantize
-        else
-          model_class
-        end
-      end
     end
 
     def initialize
@@ -260,7 +252,7 @@ module Avo
 
     def model_class
       # get the model class off of the static property
-      return self.class.get_model_class if self.class.get_model_class.present?
+      return self.class.model_class if self.class.model_class.present?
 
       # get the model class off of the model
       return @model.base_class if @model.present?

data/lib/avo/concerns/model_class_constantized.rb

@@ -0,0 +1,23 @@
+module Avo
+  module Concerns
+    module ModelClassConstantized
+      extend ActiveSupport::Concern
+
+      class_methods do
+        attr_reader :model_class
+
+        # Cast the model class to a constantized version and memoize it like that
+        def model_class=(value)
+          @model_class = case value
+          when Class
+            value
+          when String, Symbol
+            value.to_s.safe_constantize
+          else
+            raise ArgumentError.new "Failed to find a proper model class for #{self.to_s}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.9.1.pre1" unless const_defined?(:VERSION)
+  VERSION = "2.9.1.pre2" unless const_defined?(:VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 2.9.1.pre1
+  version: 2.9.1.pre2
 platform: ruby
 authors:
 - Adrian Marin
@@ -1179,6 +1179,7 @@ files:
 - lib/avo/concerns/has_model.rb
 - lib/avo/concerns/has_stimulus_controllers.rb
 - lib/avo/concerns/has_tools.rb
+- lib/avo/concerns/model_class_constantized.rb
 - lib/avo/configuration.rb
 - lib/avo/dashboards/base_dashboard.rb
 - lib/avo/dashboards/base_divider.rb