property_sets 3.5.3 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5b1904f990b0edf7d1a91f1ac6b703f9bddc428d280e031ae4daaa6983f6835
-  data.tar.gz: cea92b99f11a508d543d9ff4f812e9326ae30aefa06e448619b19ab6dc1dbe02
+  metadata.gz: d4202c89da527945bdf58692cdd2c99c98090b130b674605ad4d97d6938b48f7
+  data.tar.gz: c1ce9e1690953791c8325405ce6fe398b251acc2095868e238146d5e560fc173
 SHA512:
-  metadata.gz: bc1e1b4afd64f05275f2123fb05e9614009eb3ecfb4e8d4940fc74811300a15c2cd7dc13db75ec9d5883d66f81aa2ec4ae637e7039f10ffedbadcb198190c499
-  data.tar.gz: 976d4c41225d97445c1c9ebf78b19d55d97465c1dce1731fb648d81b1d4e9a35b3446cbfb2e3a5491a6e63c3a1b7172c92533303cc239853c409cb558f951323
+  metadata.gz: 6f62d70197d3fcb43434d5504187deb5667275f9a0a34d7884f2b57e23ab0e84122ed4f56c68f48a55ac74cd97ef9a7d59a042e9e1fa3e005592f09abe5c9bee
+  data.tar.gz: 3225b1bf41f59c63b43dd5ebce79f048b6933fc47345d2089a03bbcbf613b5e1c0877dbc508647a187f2ca999d88375263ec5e3bd9a660b469daf0fad669a027

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

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,52 +16,84 @@ 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)
+        # 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?
 
-        silence_warnings do
+        unless exists then # makes has_many idempotent...
           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
+            # 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
+
+            # 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 :property_serialized? do |key|
-              property_class.type(key) == :serialized
+            define_method "#{key}_record" do
+              lookup(key)
             end
           end
+
+          define_method :property_serialized? do |key|
+            property_class.type(key) == :serialized
+          end
         end
       end
     end
@@ -184,6 +218,35 @@ module PropertySets
           end
         end
       end
+
+      def update_columns(attributes)
+        if delegated_property_sets?
+          attributes = attributes.reject{|k,_| self.class.delegated_property_set_attributes.include?(k.to_s) }
+        end
+
+        super attributes
+      end
+
+      private
+
+      def delegated_property_sets?
+        self.class.respond_to?(:delegated_property_set_attributes)
+      end
+
+      def attributes_for_create(attribute_names)
+        super filter_delegated_property_set_attributes(attribute_names)
+      end
+
+      def attributes_for_update(attribute_names)
+        super filter_delegated_property_set_attributes(attribute_names)
+      end
+
+      def filter_delegated_property_set_attributes(attribute_names)
+        if delegated_property_sets?
+          return attribute_names - self.class.delegated_property_set_attributes.to_a
+        end
+        attribute_names
+      end
     end
 
   end

data/lib/property_sets/delegator.rb

@@ -20,18 +20,35 @@ module PropertySets
       def delegate_to_property_set(setname, mappings)
         raise "Second argument must be a Hash" unless mappings.is_a?(Hash)
 
+        unless respond_to?(:delegated_property_set_attributes)
+          class_attribute :delegated_property_set_attributes
+        end
+        self.delegated_property_set_attributes ||= []
+
         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
-          define_method(old_attr) { send(setname).send(new_attr) }
+          define_method(old_attr) {
+            association = send(setname)
+            type = association.association_class.type(new_attr)
+            association.lookup_value(type, new_attr)
+          }
           alias_method "#{old_attr}_before_type_cast", old_attr
           define_method("#{old_attr}?") { send(setname).send("#{new_attr}?") }
           define_method("#{old_attr}=") do |value|
+            if send(old_attr) != value
+              send("#{old_attr}_will_change!")
+            end
             send(setname).send("#{new_attr}=", value)
-            super(value)
+            super(value) if defined?(super) # Rails 4 does not define this
+          end
+
+          define_method("#{old_attr}_will_change!") do
+            attribute_will_change!(old_attr)
           end
 
           define_method("#{old_attr}_changed?") do
@@ -48,6 +65,12 @@ module PropertySets
             end
           end
         end
+
+        # These are not database columns and should not be included in queries but
+        # using the attributes API is the only way to track changes in the main model
+        if respond_to?(:user_provided_columns)
+          self.user_provided_columns.reject!{|k,_| delegated_property_set_attributes.include?(k.to_s) }
+        end
       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.3"
+  VERSION = "3.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: property_sets
 version: !ruby/object:Gem::Version
-  version: 3.5.3
+  version: 3.7.0
 platform: ruby
 authors:
 - Morten Primdahl
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-02 00:00:00.000000000 Z
+date: 2021-02-26 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
@@ -146,7 +132,7 @@ homepage: http://github.com/zendesk/property_sets
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -162,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Property sets for ActiveRecord.
 test_files: []