property_sets 3.5.0 → 3.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e1c3a4e30c00baed16840748270a8f68eeafb00a8c374b9120656a00f6d0d1d
-  data.tar.gz: 7e5d7a31773710c676fcc28b4d856ad6287df21bdd2edc2c159eb49dd0b1af1c
+  metadata.gz: b451948a4cd57b5387dcd5cd4869b07d0fca6b6107cc9a9ee3ca8cfdd63af8cd
+  data.tar.gz: d40876f744ec7d356173ec010f197e3252986bfc80679fbe9212ab847b15fe73
 SHA512:
-  metadata.gz: 7722a65078468a5ddf43b62e9b9aee93b2b129f46e598e4cefca7024fdb58ed5ad520b93471de05ca719f935876820acd4960d2ff970e28f757c825c6624fd10
-  data.tar.gz: fcd4c0e5ad04e90d97fb3d8467c07e304f30f7e89e610c820a39f57342c011798e800e39f8d830fd8d0238e1c26ba47a510e77a8f24d97777d04c37ce3910e27
+  metadata.gz: bc88f6195a44c5da452f19652cfa0ca5c2e59c315ebc95933182c286d03553779f0f8a8bd3fbe5d11ce7a27d0dc3702619dc2c5662556b874604cccb7635c202
+  data.tar.gz: db1a33e34e8ba06d0a0db052b0fb08fafd6d644acfbbb13fcada92471f7a2cae90801855cc815608b99471dbf65e68ece98c0bc4fca20ff18b2f0dac1195c184

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/property_set_model.rb

@@ -137,7 +137,7 @@ module PropertySets
         @owner_class_sym = owner_class_name.underscore.to_sym
         belongs_to              owner_class_sym
         validates_presence_of   owner_class_sym
-        validates_uniqueness_of :name, :scope => owner_class_key_sym
+        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.5.0"
+  VERSION = "3.5.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: property_sets
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.5.6
 platform: ruby
 authors:
 - Morten Primdahl
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-17 00:00:00.000000000 Z
+date: 2020-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -146,7 +146,7 @@ homepage: http://github.com/zendesk/property_sets
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -162,7 +162,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: []