property_sets 3.3.1 → 3.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 544c3dde6d1cf4cec71b1f53bb63643aeff012e9
-  data.tar.gz: dcfc9fa1cd448ef8f69ced0383f95644bf0c9c54
+SHA256:
+  metadata.gz: f4e1af4d793c11242f869c3c17e1d25044d301623d1a2f37570c522df9b3b2cf
+  data.tar.gz: 6001e124fb8cded395d58d07176a7ff39c14ce8c02e4f97b57a109f3bda0074b
 SHA512:
-  metadata.gz: e317e200d56ed62a090bbdd982e541706c53b677e6467a4e7ea39811d47c82c1f4394dc55df8f7a2951006c248b18ecd3ac65a0079b085d5c228a1a9a1cde5b0
-  data.tar.gz: 0cb3723d334d2c7904a31cbd8fb76b41630160975a47907779ae5cefafd030eb742fb2445a5871bbbebae7ca132196b4cac8b650348d9a37a1bc3eb7c3567ff7
+  metadata.gz: 91a32d9e89753106a977eb19637ca509b821e8630dcfbd882ef9ac648c6c9043f3dfab4feeb25fe192a946072940efaecf26a50cf014b8fec9ddd6d03ab81ef9
+  data.tar.gz: f498e7fab65d9fa4abbcbdce0ea16fe6051ea1d07d41504de521243d032cca7f75ca53c1f51550001fee2a27db43612c9d4869d1a6d86bbb46b18af88b28d805

data/lib/property_sets/active_record_extension.rb

@@ -158,26 +158,22 @@ module PropertySets
       end
 
       def association_class
-        @association_class ||= begin
-          if ActiveRecord::VERSION::STRING >= "3.1.0"
-            proxy_association.klass
-          else
-            @reflection.klass
-          end
-        end
+        @association_class ||= proxy_association.klass
       end
     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?
@@ -188,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,27 @@ 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|
-          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 +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/property_set_model.rb

@@ -105,7 +105,7 @@ module PropertySets
         base.validate        :validate_format_of_name
         base.validate        :validate_length_of_serialized_data
         base.before_create   :coerce_value
-        base.attr_accessible :name, :value if ActiveRecord::VERSION::MAJOR == 3 || defined?(ProtectedAttributes)
+        base.attr_accessible :name, :value if defined?(ProtectedAttributes)
       end
 
       def property(key, options = nil)
@@ -137,8 +137,8 @@ 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
-        attr_accessible         owner_class_key_sym, owner_class_sym if ActiveRecord::VERSION::MAJOR == 3 || defined?(ProtectedAttributes)
+        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
 
       def owner_assoc=(association)

data/lib/property_sets/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: property_sets
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.5.4
 platform: ruby
 authors:
 - Morten Primdahl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-24 00:00:00.000000000 Z
+date: 2020-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        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.6.14
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Property sets for ActiveRecord.