property_sets 3.5.1 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86b08edc1a23424fd3989657070dcac3482dbc8ade56a6a08b36c06c99a55582
-  data.tar.gz: b43f0741456a6d62c670110a47e052680d5edc188af2d81175eb7beb3e85e2ff
+  metadata.gz: 83bde37b6c1a385dc5372f75424eda44a32211093219e2aa793dc6a42e8a40b6
+  data.tar.gz: 33689e9a2946082c6acf3681de60101cd0c1c8e728500fa891adfa91347c6257
 SHA512:
-  metadata.gz: 8ac2a0df812e4e43ea688c5997dacc73cb02e2abf10274e2f4c170b32fa0a53ccd36594f1e34fff4154723b4a8e31c5c7701e3a5c59e838b8496dc8a39489f11
-  data.tar.gz: 74c4b2bc22b462723ade10c4886b85e188ae06c33ea8605b8f12d0b95f22e684672a2e1e3e6b5884345d75d029ab044df4ccae744ea08119e535940ec9b9d17c
+  metadata.gz: d5937f372c44d22aee6647680c98be68a1506720e7115b49be0b29e8bdaf85f3f0e80afa2ee3d246875fe2cf076283255101a5d3bc9e34f6aed8643259f9a725
+  data.tar.gz: a477ec210da5626275ca6eca932f56d382f68c3f3aca1a74082522cd6614afb48b113cf822948a11c52008f643edca24e71f01c6f34fdc8f5682ed718a8e79de

data/lib/property_sets/active_record_extension.rb

@@ -163,15 +163,17 @@ module PropertySets
     end
 
     module InstanceMethods
-      def update_attributes(attributes)
+      def update(attributes)
         update_property_set_attributes(attributes)
         super
       end
+      alias update_attributes update
 
-      def update_attributes!(attributes)
+      def update!(attributes)
         update_property_set_attributes(attributes)
         super
       end
+      alias update_attributes! update!
 
       def update_property_set_attributes(attributes)
         if attributes && self.class.property_set_index.any?
@@ -182,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,11 +20,36 @@ 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|
-          define_method(old_attr) { send(setname).send(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) {
+            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}=") { |value| send(setname).send("#{new_attr}=", value) }
+          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) 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
             collection_proxy = send(setname)
@@ -40,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/version.rb

@@ -1,3 +1,3 @@
 module PropertySets
-  VERSION = "3.5.1"
+  VERSION = "3.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: property_sets
 version: !ruby/object:Gem::Version
-  version: 3.5.1
+  version: 3.6.0
 platform: ruby
 authors:
 - Morten Primdahl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-25 00:00:00.000000000 Z
+date: 2021-01-14 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.4
 signing_key: 
 specification_version: 4
 summary: Property sets for ActiveRecord.