no_fly_list 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5faaa3eaa7a8bc8f8186f8ee0dd10971f0c187963a4b9ef93cf2ef00963bedc0
-  data.tar.gz: 575274c475a0a13b4b94194f904aeec4e4d6d7795cd36db6b12ad6eff28a64f3
+  metadata.gz: 7a4d0bb308f36212383e565010061a086173ddbd9105fad575193d7abca8ffa5
+  data.tar.gz: 92772d14d0351c3a7a0d1e631d81590fb0a87e49460773cd68e78368ef55906b
 SHA512:
-  metadata.gz: a98397336ebfc91db71338a108df13b48af0fdc1287c2c3e9ce98569394fc05cfe8b4450d1ef2272c15b7a077966b21671c6817c4aa2ae55972f4683545f5032
-  data.tar.gz: 1cb1ec3ffcfb380fd616dabf5e5551e5ec5c5f52f24ab966aa68542c6f60f4770b293bdba8ee5841583e93b7a9d8a20a7ef25a02627473382ad2c84baaa9f88c
+  metadata.gz: 793849ef8f48b2ced0c5547187fa02cc704b05bb6ebad05b65c2d7e21780ab6b2efa6349a97ef74af310ef49afa28c79506ee431f45b74613bc9038482ebf970
+  data.tar.gz: 963dd7b6d64a7b159bc4085a6ea80f3641730a108dc820a91bb9201b8e636ac5705e07f4a561a6fa1089d377866ef9fbf0c55d2018796f1bd8a9750573584c85

data/lib/no_fly_list/taggable_record/configuration.rb

@@ -82,8 +82,6 @@ module NoFlyList
 
       # Creates a new tagging class with appropriate configuration
       def create_tagging_class(setup, base_class)
-        setup.context.to_s.singularize
-
         Class.new(base_class) do
           self.table_name = "#{setup.taggable_klass.table_name.singularize}_taggings"
 
@@ -173,21 +171,26 @@ module NoFlyList
         end
 
         # Set up tagging class associations
-        setup.tagging_class_name.constantize.class_eval do
-          belongs_to :tag,
-                     class_name: setup.tag_class_name,
-                     foreign_key: "tag_id"
-
-          # For local tags, we use a simple belongs_to without polymorphic
-          belongs_to :taggable,
-                     class_name: setup.taggable_klass.name,
-                     foreign_key: "taggable_id"
-
-          validates :tag, :taggable, :context, presence: true
-          validates :tag_id, uniqueness: {
-            scope: %i[taggable_id context],
-            message: "has already been tagged on this record in this context"
-          }
+        # Guard belongs_to to prevent STI subclasses from overwriting
+        # the base class association on a shared tagging class
+        tagging_klass = setup.tagging_class_name.constantize
+        existing_taggable = tagging_klass.reflect_on_association(:taggable)
+        if existing_taggable.nil? || existing_taggable.class_name == setup.taggable_klass.name
+          tagging_klass.class_eval do
+            belongs_to :tag,
+                       class_name: setup.tag_class_name,
+                       foreign_key: "tag_id"
+
+            belongs_to :taggable,
+                       class_name: setup.taggable_klass.name,
+                       foreign_key: "taggable_id"
+
+            validates :tag, :taggable, :context, presence: true
+            validates :tag_id, uniqueness: {
+              scope: %i[taggable_id context],
+              message: "has already been tagged on this record in this context"
+            }
+          end
         end
       end
 
@@ -238,11 +241,7 @@ module NoFlyList
         # Define helper methods module for this context
         helper_module = Module.new do
           define_method :create_and_set_proxy do |instance_variable_name, setup|
-            tag_model = if setup.polymorphic
-                          setup.tag_class_name.constantize
-            else
-                          self.class.const_get("#{self.class.name}Tag")
-            end
+            tag_model = setup.tag_class_name.constantize
 
             proxy = TaggingProxy.new(
               self,

data/lib/no_fly_list/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NoFlyList
-  VERSION = "0.7.3"
+  VERSION = "0.7.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: no_fly_list
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Abdelkader Boudih