property_sets 3.5.3 → 3.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5b1904f990b0edf7d1a91f1ac6b703f9bddc428d280e031ae4daaa6983f6835
-  data.tar.gz: cea92b99f11a508d543d9ff4f812e9326ae30aefa06e448619b19ab6dc1dbe02
+  metadata.gz: f4e1af4d793c11242f869c3c17e1d25044d301623d1a2f37570c522df9b3b2cf
+  data.tar.gz: 6001e124fb8cded395d58d07176a7ff39c14ce8c02e4f97b57a109f3bda0074b
 SHA512:
-  metadata.gz: bc1e1b4afd64f05275f2123fb05e9614009eb3ecfb4e8d4940fc74811300a15c2cd7dc13db75ec9d5883d66f81aa2ec4ae637e7039f10ffedbadcb198190c499
-  data.tar.gz: 976d4c41225d97445c1c9ebf78b19d55d97465c1dce1731fb648d81b1d4e9a35b3446cbfb2e3a5491a6e63c3a1b7172c92533303cc239853c409cb558f951323
+  metadata.gz: 91a32d9e89753106a977eb19637ca509b821e8630dcfbd882ef9ac648c6c9043f3dfab4feeb25fe192a946072940efaecf26a50cf014b8fec9ddd6d03ab81ef9
+  data.tar.gz: f498e7fab65d9fa4abbcbdce0ea16fe6051ea1d07d41504de521243d032cca7f75ca53c1f51550001fee2a27db43612c9d4869d1a6d86bbb46b18af88b28d805

data/lib/property_sets/active_record_extension.rb

@@ -184,6 +184,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,26 @@ module PropertySets
       def delegate_to_property_set(setname, mappings)
         raise "Second argument must be a Hash" unless mappings.is_a?(Hash)
 
+        @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|
+            attribute_will_change!(old_attr) if old_attr != value && !defined?(super)
             send(setname).send("#{new_attr}=", value)
-            super(value)
+            super(value) if defined?(super)
           end
 
           define_method("#{old_attr}_changed?") do
@@ -48,6 +56,16 @@ 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
+
+      def delegated_property_set_attributes
+        @delegated_property_set_attributes
       end
     end
   end

data/lib/property_sets/version.rb

@@ -1,3 +1,3 @@
 module PropertySets
-  VERSION = "3.5.3"
+  VERSION = "3.5.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: property_sets
 version: !ruby/object:Gem::Version
-  version: 3.5.3
+  version: 3.5.4
 platform: ruby
 authors:
 - Morten Primdahl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-02 00:00:00.000000000 Z
+date: 2020-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -161,7 +161,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Property sets for ActiveRecord.