property_sets 3.4.0 → 3.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4adbd4a6e5648ea09c07f3c918edafdd15ed92bd5fb1b465fde7746d052e265
-  data.tar.gz: 8939ce9a79e6d13614760e29d605e6225b9ffce09fdd4856d20345de3fe06b85
+  metadata.gz: 7ec20448b7611d9a88bad99dd6054acb756b53b4a1245566140c1c69d9fddf83
+  data.tar.gz: 2f1f2ba401def86c3c0b417002c02f7242b44150d4f98ee329b0d0cc816d0030
 SHA512:
-  metadata.gz: 561dbe595c2cb2f12d21ba70234c1cdfa0f4e9bfcaffa360d12b89e59891b342c10c80ddec6485f5efa63b51b181d5397f9abbbc32062922eec5dd8d0f8175c3
-  data.tar.gz: 24dff7a83adec282ea69016a4657f084d77b56afa801e44b31bb7eb925f97f5e15d8c8b86dfe8a75e151ee0349a1cfd64049e9c248f6ed71918be66fa24f421c
+  metadata.gz: 9da8220c3444cd8f71daafa64172bffcd17efb0f7b60b98ced8f4e8a5193ad7defbcbb8e13be1c914fc01c756c4f147316fe42af833e9edd85eb80032ff86144
+  data.tar.gz: 1e70f7eb188f60600ff770b5b0034e43de5575b471b88194b6c736d3eeabe13319c1281e65c6512ab12958e0c31079f4961fe0d1b976666ceccc12a1bbdbfd3b

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,30 @@ 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|
+            attribute_will_change!(old_attr) if old_attr != value && !defined?(super)
+            send(setname).send("#{new_attr}=", value)
+            super(value) if defined?(super)
+          end
 
           define_method("#{old_attr}_changed?") do
             collection_proxy = send(setname)
@@ -40,6 +59,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.4.0"
+  VERSION = "3.5.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: property_sets
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.5.5
 platform: ruby
 authors:
 - Morten Primdahl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-07 00:00:00.000000000 Z
+date: 2020-07-18 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.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -154,7 +154,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -162,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Property sets for ActiveRecord.