property_sets 3.5.6 → 3.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b451948a4cd57b5387dcd5cd4869b07d0fca6b6107cc9a9ee3ca8cfdd63af8cd
-  data.tar.gz: d40876f744ec7d356173ec010f197e3252986bfc80679fbe9212ab847b15fe73
+  metadata.gz: '08caa288aeb6e948f670a9d93176e7899952b3a62df76493e33918de4c4e52ab'
+  data.tar.gz: d46e8b42e761deb230eebaa3ee64e8b24115c82c9913fb3927a97cacc8ebcb50
 SHA512:
-  metadata.gz: bc88f6195a44c5da452f19652cfa0ca5c2e59c315ebc95933182c286d03553779f0f8a8bd3fbe5d11ce7a27d0dc3702619dc2c5662556b874604cccb7635c202
-  data.tar.gz: db1a33e34e8ba06d0a0db052b0fb08fafd6d644acfbbb13fcada92471f7a2cae90801855cc815608b99471dbf65e68ece98c0bc4fca20ff18b2f0dac1195c184
+  metadata.gz: 574137f6c3004b8eca710df7784a7089f0a76791ea6afcb059ca6a9ae0d7c7495c3b452934cebdc43b40c2b60f5726495707b4990efc728172ae3dfa2fd7e838
+  data.tar.gz: 5e366367388d47381ce6566916a1a59588142daeb3523c1c479ad2657d476bf08f4725a2d8fa2e41d354b1eb69ada4c26bb9165a0b80b871a709afd0d96e606b

data/lib/property_sets/active_record_extension.rb

@@ -6,6 +6,8 @@ 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)
@@ -14,51 +16,83 @@ module PropertySets
         end
 
         raise "Invalid association name, letters only" unless association.to_s =~ /[a-z]+/
+        exists = property_set_index.include?(association)
+
         self.property_set_index << association
 
+        # eg AccountSetting - this IS idempotent
         property_class = PropertySets.ensure_property_set_class(
           association,
           options.delete(:owner_class_name) || self.name
         )
-        property_class.instance_eval(&block)
-
-        hash_opts = {:class_name => property_class.name, :autosave => true, :dependent => :destroy}.merge(options)
-
-        silence_warnings do
-          has_many association, hash_opts do
-            include PropertySets::ActiveRecordExtension::AssociationExtensions
-
-            property_class.keys.each do |key|
-              raise "Invalid property key #{key}" if self.respond_to?(key)
-
-              # Reports the coerced truth value of the property
-              define_method "#{key}?" do
-                type  = property_class.type(key)
-                value = lookup_value(type, key)
-                ![ "false", "0", "", "off", "n" ].member?(value.to_s.downcase)
-              end
-
-              # Returns the value of the property
-              define_method "#{key}" do
-                type = property_class.type(key)
-                lookup_value(type, key)
-              end
-
-              # Assigns a new value to the property
-              define_method "#{key}=" do |value|
-                instance = lookup(key)
-                instance.value = PropertySets::Casting.write(property_class.type(key), value)
-                instance.value
-              end
-
-              define_method "#{key}_record" do
-                lookup(key)
-              end
+
+        # eg property :is_awesome
+        property_class.instance_eval(&block) if block
+
+        tb_name = options.delete :table_name
+        property_class.table_name = tb_name if tb_name
+
+        hash_opts = {
+          :class_name => property_class.name,
+          :autosave => true,
+          :dependent => :destroy,
+          :inverse_of => self.name.underscore.to_sym,
+        }.merge(options)
+
+        # TODO: should check options are compatible? warn? raise?
+        reflection = self.reflections[association.to_s] # => ActiveRecord::Reflection::HasManyReflection
+        reflection.options.merge! options if reflection && !options.empty?
+
+        unless exists then # makes has_many idempotent...
+          has_many association, **hash_opts do
+            # keep this damn block! -- creates association_module below
+          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.module_eval do
+          include PropertySets::ActiveRecordExtension::AssociationExtensions
+
+          property_class.keys.each do |key|
+            raise "Invalid property key #{key}" if self.respond_to?(key)
+
+            # Reports the coerced truth value of the property
+            define_method "#{key}?" do
+              type  = property_class.type(key)
+              value = lookup_value(type, key)
+              ![ "false", "0", "", "off", "n" ].member?(value.to_s.downcase)
             end
 
-            define_method :property_serialized? do |key|
-              property_class.type(key) == :serialized
+            # Returns the value of the property
+            define_method "#{key}" do
+              type = property_class.type(key)
+              lookup_value(type, key)
             end
+
+            # Assigns a new value to the property
+            define_method "#{key}=" do |value|
+              instance = lookup(key)
+              instance.value = PropertySets::Casting.write(property_class.type(key), value)
+              instance.value
+            end
+
+            define_method "#{key}_record" do
+              lookup(key)
+            end
+          end
+
+          define_method :property_serialized? do |key|
+            property_class.type(key) == :serialized
           end
         end
       end

data/lib/property_sets/property_set_model.rb

@@ -108,13 +108,16 @@ module PropertySets
         base.attr_accessible :name, :value if defined?(ProtectedAttributes)
       end
 
-      def property(key, options = nil)
+      def properties
         @properties ||= HashWithIndifferentAccess.new
-        @properties[key] = options
+      end
+
+      def property(key, options = nil)
+        properties[key] = options
       end
 
       def keys
-        @properties.keys
+        properties.keys
       end
 
       def default(key)
@@ -122,15 +125,15 @@ module PropertySets
       end
 
       def raw_default(key)
-        @properties[key].try(:[], :default)
+        properties[key].try(:[], :default)
       end
 
       def type(key)
-        @properties[key].try(:[], :type) || :string
+        properties[key].try(:[], :type) || :string
       end
 
       def protected?(key)
-        @properties[key].try(:[], :protected) || false
+        properties[key].try(:[], :protected) || false
       end
 
       def owner_class=(owner_class_name)

data/lib/property_sets/version.rb

@@ -1,3 +1,3 @@
 module PropertySets
-  VERSION = "3.5.6"
+  VERSION = "3.7.1"
 end

data/lib/property_sets.rb

@@ -10,16 +10,19 @@ 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
+
     unless Object.const_defined?(const_name)
-      property_class = Object.const_set(const_name, Class.new(ActiveRecord::Base))
-      property_class.class_eval do
+      property_class = Class.new(ActiveRecord::Base) do
         include PropertySets::PropertySetModel::InstanceMethods
         extend  PropertySets::PropertySetModel::ClassMethods
       end
 
+      Object.const_set(const_name, property_class)
+
       property_class.owner_class = owner_class_name
       property_class.owner_assoc = association
     end
+
     Object.const_get(const_name)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: property_sets
 version: !ruby/object:Gem::Version
-  version: 3.5.6
+  version: 3.7.1
 platform: ruby
 authors:
 - Morten Primdahl
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-29 00:00:00.000000000 Z
+date: 2022-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -100,20 +100,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: wwtd
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.3
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -161,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Property sets for ActiveRecord.