avo 2.51.0 → 2.53.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47e343f6db0d2739fc03fcf0969f1f4a315d3d79502ce7c8179ff3e373820ce9
-  data.tar.gz: 58fd4554a1f1bc28a3ead98ce1ee0350a2665b8778835a9dda7747bb855e814c
+  metadata.gz: b7c443e49863a73766cc92d676614d0bfe854f53fa9f72d1ee4913bb736753e0
+  data.tar.gz: 76c3b161d5c0d26665ac35dadc6d0429f4f075cb519eadd280427e8ad78608d3
 SHA512:
-  metadata.gz: 343a36a7b481bf9c42729b849e9aafd2409809ce7ae740f670d491aa5409b40d39a6523babf73e0ef4cb843d027eecb8c6ba438752545c9e7b78d8823cd540a3
-  data.tar.gz: f7f1df73690020c4584b375754b08381e4174b39a911c8daf02980df2d1f8c679106e6f350404c6a56bf7ea82c63200c9ddf3b3147454e1246d3ceccad6708b0
+  metadata.gz: 309e09c4271214c5bbcbdfd10a9f90617825c19ca93accb7c52db17e38fcce0e5761572f824aee98c5a7059e5e4be575776002df7592c5bd2cd833fc387b5157
+  data.tar.gz: 2d905a0da113e8e010fe639d258864a91b1ced97755d5a3ce03448c3921e943235ef3cc56aca88ffcb2396147868e10256dbec3124c7e574e1484c44699ddeb6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.51.0)
+    avo (2.53.0)
       actionview (>= 6.0)
       active_link_to
       activerecord (>= 6.0)

data/app/components/avo/fields/belongs_to_field/autocomplete_component.rb

@@ -41,7 +41,7 @@ class Avo::Fields::BelongsToField::AutocompleteComponent < ViewComponent::Base
   end
 
   def reflection_class
-    has_polymorphic_association? ? polymorphic_class : @resource.model_class._reflections[@field.id.to_s].klass
+    has_polymorphic_association? ? polymorphic_class : @resource.model_class.reflect_on_association(@field.id).klass
   end
 
   private

data/app/components/avo/fields/has_one_field/show_component.rb

@@ -36,7 +36,7 @@ class Avo::Fields::HasOneField::ShowComponent < Avo::Fields::ShowComponent
   end
 
   def create_path
-    association_id = @field.resource.model_class._reflections[@field.id.to_s].inverse_of.name
+    association_id = @field.resource.model_class.reflect_on_association(@field.id).inverse_of.name
 
     args = {
       via_relation: association_id,

data/app/components/avo/index/resource_controls_component.rb

@@ -77,7 +77,11 @@ class Avo::Index::ResourceControlsComponent < Avo::ResourceComponent
   end
 
   def is_has_many_association?
-    @reflection.is_a?(::ActiveRecord::Reflection::HasManyReflection) || @reflection.is_a?(::ActiveRecord::Reflection::ThroughReflection)
+    @reflection.class.in? [
+      ActiveRecord::Reflection::HasManyReflection,
+      ActiveRecord::Reflection::HasAndBelongsToManyReflection,
+      ActiveRecord::Reflection::ThroughReflection
+    ]
   end
 
   def referrer_path

data/app/components/avo/views/resource_index_component.rb

@@ -62,10 +62,20 @@ class Avo::Views::ResourceIndexComponent < Avo::ResourceComponent
   end
 
   def can_attach?
-    klass = @reflection
-    klass = @reflection.through_reflection if klass.is_a? ::ActiveRecord::Reflection::ThroughReflection
+    return false if has_reflection_and_is_read_only
 
-    @reflection.present? && klass.is_a?(::ActiveRecord::Reflection::HasManyReflection) && !has_reflection_and_is_read_only && authorize_association_for(:attach)
+    reflection_class = if @reflection.is_a?(::ActiveRecord::Reflection::ThroughReflection)
+      @reflection.through_reflection.class
+    else
+      @reflection.class
+    end
+
+    return false unless reflection_class.in? [
+      ActiveRecord::Reflection::HasManyReflection,
+      ActiveRecord::Reflection::HasAndBelongsToManyReflection
+    ]
+
+    authorize_association_for(:attach)
   end
 
   def create_path

data/app/controllers/avo/application_controller.rb

@@ -226,7 +226,7 @@ module Avo
 
       return field.use_resource if field&.use_resource.present?
 
-      reflection = @model._reflections[params[:related_name]]
+      reflection = @model.class.reflect_on_association(params[:related_name])
 
       reflected_model = reflection.klass
 

data/app/controllers/avo/associations_controller.rb

@@ -62,7 +62,7 @@ module Avo
     def create
       association_name = BaseResource.valid_association_name(@model, params[:related_name])
 
-      if reflection_class == "HasManyReflection"
+      if has_many_reflection?
         @model.send(association_name) << @attachment_model
       else
         @model.send("#{association_name}=", @attachment_model)
@@ -80,7 +80,7 @@ module Avo
     def destroy
       association_name = BaseResource.valid_association_name(@model, params[:related_name])
 
-      if reflection_class == "HasManyReflection"
+      if has_many_reflection?
         @model.send(association_name).delete @attachment_model
       else
         @model.send("#{association_name}=", nil)
@@ -101,7 +101,7 @@ module Avo
     private
 
     def set_reflection
-      @reflection = @model._reflections[params[:related_name].to_s]
+      @reflection = @model.class.reflect_on_association(params[:related_name])
     end
 
     def set_attachment_class
@@ -127,12 +127,11 @@ module Avo
     end
 
     def reflection_class
-      reflection = @model._reflections[params[:related_name]]
-
-      klass = reflection.class.name.demodulize.to_s
-      klass = reflection.through_reflection.class.name.demodulize.to_s if klass == "ThroughReflection"
-
-      klass
+      if @reflection.is_a?(ActiveRecord::Reflection::ThroughReflection)
+        @reflection.through_reflection.class
+      else
+        @reflection.class
+      end
     end
 
     def authorize_if_defined(method)
@@ -155,8 +154,6 @@ module Avo
       authorize_if_defined "detach_#{@field.id}?"
     end
 
-    private
-
     def set_related_authorization
       @related_authorization = if related_resource
         related_resource.authorization(user: _current_user)
@@ -164,5 +161,12 @@ module Avo
         Services::AuthorizationService.new _current_user
       end
     end
+
+    def has_many_reflection?
+      reflection_class.in? [
+        ActiveRecord::Reflection::HasManyReflection,
+        ActiveRecord::Reflection::HasAndBelongsToManyReflection
+      ]
+    end
   end
 end

data/app/controllers/avo/base_controller.rb

@@ -134,7 +134,7 @@ module Avo
 
       # This means that the record has been created through another parent record and we need to attach it somehow.
       if params[:via_resource_id].present? && params[:via_belongs_to_resource_class].nil?
-        @reflection = @model._reflections[params[:via_relation]]
+        @reflection = @model.class.reflect_on_association(params[:via_relation])
         # Figure out what kind of association does the record have with the parent record
 
         # Fills in the required infor for belongs_to and has_many
@@ -148,7 +148,7 @@ module Avo
         end
 
         # For when working with has_one, has_one_through, has_many_through, has_and_belongs_to_many, polymorphic
-        if @reflection.is_a? ActiveRecord::Reflection::ThroughReflection
+        if @reflection.is_a?(ActiveRecord::Reflection::ThroughReflection) || @reflection.is_a?(ActiveRecord::Reflection::HasAndBelongsToManyReflection)
           # find the record
           via_resource = ::Avo::App.get_resource_by_model_name(params[:via_relation_class]).dup
           @related_record = via_resource.find_record params[:via_resource_id], params: params

data/lib/avo/base_resource.rb

@@ -114,7 +114,7 @@ module Avo
       end
 
       def get_record_associations(record)
-        record._reflections
+        record.class.reflections
       end
 
       def valid_association_name(record, association_name)
@@ -382,7 +382,7 @@ module Avo
 
           if field.type == "belongs_to"
 
-            reflection = @model._reflections[@params[:via_relation]]
+            reflection = @model.class.reflections[@params[:via_relation]]
 
             if field.polymorphic_as.present? && field.types.map(&:to_s).include?(@params[:via_relation_class])
               # set the value to the actual record

data/lib/avo/fields/belongs_to_field.rb

@@ -245,10 +245,10 @@ module Avo
 
         reflection_key = polymorphic_as || id
 
-        if @model._reflections[reflection_key.to_s].klass.present?
-          App.get_resource_by_model_name @model._reflections[reflection_key.to_s].klass.to_s
-        elsif @model._reflections[reflection_key.to_s].options[:class_name].present?
-          App.get_resource_by_model_name @model._reflections[reflection_key.to_s].options[:class_name]
+        if @model.class.reflect_on_association(reflection_key).klass.present?
+          App.get_resource_by_model_name @model.class.reflect_on_association(reflection_key).klass.to_s
+        elsif @model.class.reflect_on_association(reflection_key).options[:class_name].present?
+          App.get_resource_by_model_name @model.class.reflect_on_association(reflection_key).options[:class_name]
         else
           App.get_resource_by_name reflection_key.to_s
         end

data/lib/avo/fields/has_base_field.rb

@@ -59,10 +59,10 @@ module Avo
       end
 
       def target_resource
-        if @model._reflections[id.to_s].klass.present?
-          Avo::App.get_resource_by_model_name @model._reflections[id.to_s].klass.to_s
-        elsif @model._reflections[id.to_s].options[:class_name].present?
-          Avo::App.get_resource_by_model_name @model._reflections[id.to_s].options[:class_name]
+        if @model.class.reflect_on_association(id).klass.present?
+          Avo::App.get_resource_by_model_name @model.class.reflect_on_association(id).klass.to_s
+        elsif @model.class.reflect_on_association(id).options[:class_name].present?
+          Avo::App.get_resource_by_model_name @model.class.reflect_on_association(id).options[:class_name]
         else
           Avo::App.get_resource_by_name id.to_s
         end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.51.0" unless const_defined?(:VERSION)
+  VERSION = "2.53.0" unless const_defined?(:VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 2.51.0
+  version: 2.53.0
 platform: ruby
 authors:
 - Adrian Marin
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-09 00:00:00.000000000 Z
+date: 2024-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord