property_sets 3.2.1 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 537a0d1bb242604cbcc56a1ca36e470f2a6b801e
-  data.tar.gz: d845adb423d5ce5607217b1cbf8410fbb7e15680
+  metadata.gz: 3ac3f25a9d664d3c11c22b27fcc295998bfa1ded
+  data.tar.gz: 6a46c42e0ec6ab7b07b750ea09660291c21a8735
 SHA512:
-  metadata.gz: a8f469c438491d9b2670fe1553067db729960de8b5560be99ef16f0acb49acd10ea0bf84381170f3d25be47f702fb326d186c92f41c1b6bd59379868f21f17ff
-  data.tar.gz: ecd439b869a49c327efa2f358bccdd1fd4f24b49a45ecbd6275c421d84bb6168450cef26fc8c4ee2f85903a6a8ef4ec1fc5cc19faac94800b3bfced04fd01e75
+  metadata.gz: a1eed5ef6c30432eedc454135c98463a3577f239c9f1b08de2af588133529eddf19c70e17625ca7091f8e1a5715069a52b4ef53eb4713bb6404a4aa2ee01bf72
+  data.tar.gz: 7e7d583269e88e7dd746f526bad20dfcbeec7c0af76cc9aa49d5e31692ceec41c4943a563e3bd08d2aad2c95b1a73088d691e63831d46b30e1b263d56675b4b6

data/lib/property_sets/active_record_extension.rb

@@ -85,7 +85,7 @@ module PropertySets
         property_pairs.keys.each do |name|
           record = lookup(name)
           if with_protection && record.protected?
-            logger.warn("Someone tried to update the protected #{name} property to #{property_pairs[name]}")
+            association_class.logger.warn("Someone tried to update the protected #{name} property to #{property_pairs[name]}")
           else
             send("#{name}=", property_pairs[name])
           end
@@ -113,7 +113,7 @@ module PropertySets
       end
 
       def build_default(arg)
-        build(:name => arg.to_s, :value => raw_default(arg))
+        build(:name => arg.to_s, :value => association_class.raw_default(arg))
       end
 
       def lookup_without_default(arg)
@@ -127,7 +127,7 @@ module PropertySets
           instance.value_serialized = serialized
           PropertySets::Casting.read(type, instance.value)
         else
-          value = default(key)
+          value = association_class.default(key)
           if serialized
             PropertySets::Casting.deserialize(value)
           else
@@ -144,7 +144,7 @@ module PropertySets
 
         owner = proxy_association.owner
 
-        instance.send("#{owner_class_sym}=", owner) if owner.new_record?
+        instance.send("#{association_class.owner_class_sym}=", owner) if owner.new_record?
         instance
       end
 
@@ -152,7 +152,7 @@ module PropertySets
       # It does not have the side effect of adding a new setting object.
       def lookup_or_default(arg)
         instance = lookup_without_default(arg)
-        instance ||= association_class.new(:value => raw_default(arg))
+        instance ||= association_class.new(:value => association_class.raw_default(arg))
         instance.value_serialized = property_serialized?(arg)
         instance
       end

data/lib/property_sets/delegator.rb

@@ -27,14 +27,14 @@ module PropertySets
           define_method("#{old_attr}=") { |value| send(setname).send("#{new_attr}=", value) }
 
           define_method("#{old_attr}_changed?") do
-            assoc = send(setname)
-            return false unless assoc.loaded?
-            setting = assoc.lookup_without_default(new_attr)
+            collection_proxy = send(setname)
+            return false unless collection_proxy.loaded?
+            setting = collection_proxy.lookup_without_default(new_attr)
 
             if !setting
               false # Nothing has been set which means that the attribute hasn't changed
             elsif setting.new_record?
-              assoc.default(new_attr) != setting.value
+              collection_proxy.association_class.default(new_attr) != setting.value
             else
               setting.value_changed?
             end

data/lib/property_sets/version.rb

@@ -1,3 +1,3 @@
 module PropertySets
-  VERSION = "3.2.1"
+  VERSION = "3.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: property_sets
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.3.0
 platform: ruby
 authors:
 - Morten Primdahl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-10 00:00:00.000000000 Z
+date: 2017-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord