property_sets 3.8.0 → 3.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddab71bb5879d419307ca07fda5be61c6cacfb3dd3e5881457a9eaa88bf94888
-  data.tar.gz: 1b5b98ff2a14ef8797ae7a1b45ee8f6e6c7b2ccfd0dc65bbcfb27cde59ea28e3
+  metadata.gz: 57d3eda9c41c2ac64bad8a55e313d58bd3918d9e61ff2be28283a9662c554a6e
+  data.tar.gz: e806ef107a1d4e21211658a40c829b2ffa553b05216e72a924932229b301d011
 SHA512:
-  metadata.gz: ae6d4df148fdb6d1743abbd9986a33a8392064d45aa6ce36d871c64b16383c1d8279b3c29c1b627fef429d36cd0cabecba19b56b61b20ab3b6647716190faf40
-  data.tar.gz: 7a4834b04e57c715883aa6bc27080820b8d4f74101cf7385df506800ead33f3944f6c9106fde57ded468107ced9cfa40ba33ea8151665076e689a13ef23e3e5d
+  metadata.gz: a2447f302325286caf0d5c2e48060e35f419e6e881369072bb4ed5485b1eda4640aec4223d0dbff1cdd7c0ddce241b252eec2f032517e95bb2ef1e80cf4154e1
+  data.tar.gz: 60e7ab51f65d11aca4c42a3e775ae2f17913927f002bb542c347d3bbc085dacdca76913bba406a2cb496336cfbcf812d1d6614330cdda97822dc99826fbb234d

data/lib/property_sets/active_record_extension.rb

@@ -5,9 +5,6 @@ require 'set'
 module PropertySets
   module ActiveRecordExtension
     module ClassMethods
-
-      RAILS6 = ActiveRecord::VERSION::MAJOR >= 6
-
       def property_set(association, options = {}, &block)
         unless include?(PropertySets::ActiveRecordExtension::InstanceMethods)
           self.send(:prepend, PropertySets::ActiveRecordExtension::InstanceMethods)
@@ -36,7 +33,7 @@ module PropertySets
           :class_name => property_class.name,
           :autosave => true,
           :dependent => :destroy,
-          :inverse_of => self.name.underscore.to_sym,
+          :inverse_of => self.name.demodulize.underscore.to_sym,
         }.merge(options)
 
         # TODO: should check options are compatible? warn? raise?
@@ -49,16 +46,10 @@ module PropertySets
           end
         end
 
-        # eg 5: AccountSettingsAssociationExtension
-        # eg 6: Account::SettingsAssociationExtension
-
         # stolen/adapted from AR's collection_association.rb #define_extensions
 
         module_name = "#{association.to_s.camelize}AssociationExtension"
-        module_name = name.demodulize + module_name unless RAILS6
-
-        target = RAILS6 ? self : self.parent
-        association_module = target.const_get module_name
+        association_module = self.const_get module_name
 
         association_module.module_eval do
           include PropertySets::ActiveRecordExtension::AssociationExtensions
@@ -126,12 +117,12 @@ module PropertySets
         end
       end
 
-      def save(*args)
-        each { |p| p.save(*args) }
+      def save(...)
+        each { |p| p.save(...) }
       end
 
-      def save!(*args)
-        each { |p| p.save!(*args) }
+      def save!(...)
+        each { |p| p.save!(...) }
       end
 
       def protected?(arg)

data/lib/property_sets/delegator.rb

@@ -27,11 +27,7 @@ module PropertySets
 
         mappings.each do |old_attr, new_attr|
           self.delegated_property_set_attributes << old_attr.to_s
-          if ActiveRecord.version < Gem::Version.new("5.0")
-            attribute old_attr, ActiveRecord::Type::Value.new
-          else
-            attribute old_attr, ActiveModel::Type::Value.new
-          end
+          attribute old_attr, ActiveModel::Type::Value.new
           define_method(old_attr) {
             association = send(setname)
             type = association.association_class.type(new_attr)
@@ -44,7 +40,7 @@ module PropertySets
               send("#{old_attr}_will_change!")
             end
             send(setname).send("#{new_attr}=", value)
-            super(value) if defined?(super) # Rails 4 does not define this
+            super(value)
           end
 
           define_method("#{old_attr}_will_change!") do

data/lib/property_sets/property_set_model.rb

@@ -137,9 +137,10 @@ module PropertySets
       end
 
       def owner_class=(owner_class_name)
-        @owner_class_sym = owner_class_name.underscore.to_sym
-        belongs_to              owner_class_sym
-        validates_presence_of   owner_class_sym
+        @owner_class_sym = owner_class_name.to_s.demodulize.underscore.to_sym
+
+        belongs_to              owner_class_sym, class_name: owner_class_name
+        validates_presence_of   owner_class_sym, class_name: owner_class_name
         validates_uniqueness_of :name, :scope => owner_class_key_sym, :case_sensitive => false
         attr_accessible         owner_class_key_sym, owner_class_sym if defined?(ProtectedAttributes)
       end

data/lib/property_sets/version.rb

@@ -1,3 +1,3 @@
 module PropertySets
-  VERSION = "3.8.0"
+  VERSION = "3.10.0"
 end

data/lib/property_sets.rb

@@ -7,22 +7,33 @@ begin
 rescue LoadError
 end
 
+if "#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}" == "6.1"
+  ActiveRecord::Base.singleton_class.alias_method :connection_class_for_self, :connection_classes
+end
+
 module PropertySets
   def self.ensure_property_set_class(association, owner_class_name)
-    const_name = "#{owner_class_name}#{association.to_s.singularize.camelcase}".to_sym
+    const_name = "#{owner_class_name.demodulize}#{association.to_s.singularize.camelcase}"
+    namespace = owner_class_name.deconstantize.safe_constantize || Object
 
-    unless Object.const_defined?(const_name)
-      property_class = Class.new(ActiveRecord::Base) do
+    unless namespace.const_defined?(const_name, false)
+      property_class = Class.new(parent_for_property_class(namespace, owner_class_name)) do
         include PropertySets::PropertySetModel::InstanceMethods
         extend  PropertySets::PropertySetModel::ClassMethods
       end
 
-      Object.const_set(const_name, property_class)
+      namespace.const_set(const_name, property_class)
 
       property_class.owner_class = owner_class_name
       property_class.owner_assoc = association
     end
 
-    Object.const_get(const_name)
+    namespace.const_get(const_name.to_s)
+  end
+
+  def self.parent_for_property_class(namespace, owner_class_name)
+    namespace.const_get(owner_class_name).connection_class_for_self
+  rescue NameError
+    ::ActiveRecord::Base
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: property_sets
 version: !ruby/object:Gem::Version
-  version: 3.8.0
+  version: 3.10.0
 platform: ruby
 authors:
 - Morten Primdahl
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-17 00:00:00.000000000 Z
+date: 2023-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.1'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.1'
@@ -132,7 +132,7 @@ homepage: http://github.com/zendesk/property_sets
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -140,15 +140,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key: 
 specification_version: 4
 summary: Property sets for ActiveRecord.
 test_files: []