property_sets 2.7.0 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 922f8ba1f096e2acbdaca1c1306c45ae85dee3f7
-  data.tar.gz: affb41af60814521310b3647628be982ae5a107c
+  metadata.gz: 9d4b2d253e7158b77c84e26addaa5b677b842e56
+  data.tar.gz: 7e306e74ae2ab092896997bd081384555d2f3ef4
 SHA512:
-  metadata.gz: d1995e3d9882e48331dc115f198e2fe1fb9526c5166d56e324e190d39076a5b5b90784105ed7cd91c7556fa5f0899dbddba21a779e426411e48f923e45916812
-  data.tar.gz: acb0c651d10ab7c8283d46861b06306e635c43f542e17e5a4608df0220a631ea291280d61aec4e706620a48db9235333a0458c561edda513477c7721c636a274
+  metadata.gz: 3c51d22c6ab9fbc8c62dea9ae73915db6c712bf7bbe4128e73112835181bcd345ebb0c621130aca9efca1a76aba56157a68f243adaf78ca82be21f441d6d937d
+  data.tar.gz: 81251ba42e291441fa592c12c8dcbc709ba7d746a6b22680d9efe1f27af1cf13acdbade150e0ec426e3aa1176b1d9df63e8eea3a6911442421181c8feb319217

data/lib/property_sets/active_record_extension.rb

@@ -22,139 +22,146 @@ module PropertySets
         property_class.instance_eval(&block)
 
         hash_opts = {:class_name => property_class.name, :autosave => true, :dependent => :destroy}.merge(options)
-        has_many association, hash_opts do
-          # Accepts an array of names as strings or symbols and returns a hash.
-          def get(keys = [])
-            property_keys = if keys.empty?
-              association_class.keys
-            else
-              association_class.keys & keys.map(&:to_s)
-            end
 
-            property_pairs = property_keys.map do |name|
-              value = lookup_value(association_class.type(name), name)
-              [name, value]
-            end.flatten(1)
-            HashWithIndifferentAccess[*property_pairs]
-          end
+        silence_warnings do
+          has_many association, hash_opts do
+            include PropertySets::ActiveRecordExtension::AssociationExtensions
 
-          # Accepts a name value pair hash { :name => 'value', :pairs => true } and builds a property for each key
-          def set(property_pairs, with_protection = false)
-            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]}")
-              else
-                send("#{name}=", property_pairs[name])
-              end
-            end
-          end
+            property_class.keys.each do |key|
+              raise "Invalid property key #{key}" if self.respond_to?(key)
 
-          property_class.keys.each do |key|
-            raise "Invalid property key #{key}" if self.respond_to?(key)
+              # Reports the coerced truth value of the property
+              define_method "#{key}?" do
+                type  = property_class.type(key)
+                value = lookup_value(type, key)
+                ![ "false", "0", "", "off", "n" ].member?(value.to_s.downcase)
+              end
 
-            # Reports the coerced truth value of the property
-            define_method "#{key}?" do
-              type  = property_class.type(key)
-              value = lookup_value(type, key)
-              ![ "false", "0", "", "off", "n" ].member?(value.to_s.downcase)
-            end
+              # Returns the value of the property
+              define_method "#{key}" do
+                type = property_class.type(key)
+                lookup_value(type, key)
+              end
 
-            # Returns the value of the property
-            define_method "#{key}" do
-              type = property_class.type(key)
-              lookup_value(type, key)
-            end
+              # Assigns a new value to the property
+              define_method "#{key}=" do |value|
+                instance = lookup(key)
+                instance.value = PropertySets::Casting.write(property_class.type(key), value)
+                instance.value
+              end
 
-            # Assigns a new value to the property
-            define_method "#{key}=" do |value|
-              instance = lookup(key)
-              instance.value = PropertySets::Casting.write(property_class.type(key), value)
-              instance.value
+              define_method "#{key}_record" do
+                lookup(key)
+              end
             end
 
-            define_method "#{key}_record" do
-              lookup(key)
+            define_method :property_serialized? do |key|
+              property_class.type(key) == :serialized
             end
           end
+        end
+      end
+    end
 
-          define_method :property_serialized? do |key|
-            property_class.type(key) == :serialized
-          end
+    module AssociationExtensions
+      # Accepts an array of names as strings or symbols and returns a hash.
+      def get(keys = [])
+        property_keys = if keys.empty?
+          association_class.keys
+        else
+          association_class.keys & keys.map(&:to_s)
+        end
 
-          def save(*args)
-            each { |p| p.save(*args) }
-          end
+        property_pairs = property_keys.map do |name|
+          value = lookup_value(association_class.type(name), name)
+          [name, value]
+        end.flatten(1)
+        HashWithIndifferentAccess[*property_pairs]
+      end
 
-          def save!(*args)
-            each { |p| p.save!(*args) }
+      # Accepts a name value pair hash { :name => 'value', :pairs => true } and builds a property for each key
+      def set(property_pairs, with_protection = false)
+        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]}")
+          else
+            send("#{name}=", property_pairs[name])
           end
+        end
+      end
 
-          def protected?(arg)
-            lookup(arg).protected?
-          end
+      def save(*args)
+        each { |p| p.save(*args) }
+      end
 
-          def enable(arg)
-            send("#{arg}=", "1")
-          end
+      def save!(*args)
+        each { |p| p.save!(*args) }
+      end
 
-          def disable(arg)
-            send("#{arg}=", "0")
-          end
+      def protected?(arg)
+        lookup(arg).protected?
+      end
 
-          def build_default(arg)
-            build(:name => arg.to_s, :value => raw_default(arg))
-          end
+      def enable(arg)
+        send("#{arg}=", "1")
+      end
 
-          def lookup_without_default(arg)
-            detect { |property| property.name.to_sym == arg.to_sym }
-          end
+      def disable(arg)
+        send("#{arg}=", "0")
+      end
 
-          def lookup_value(type, key)
-            serialized = property_serialized?(key)
-
-            if instance = lookup_without_default(key)
-              instance.value_serialized = serialized
-              PropertySets::Casting.read(type, instance.value)
-            else
-              value = default(key)
-              if serialized
-                PropertySets::Casting.deserialize(value)
-              else
-                PropertySets::Casting.read(type, value)
-              end
-            end
-          end
+      def build_default(arg)
+        build(:name => arg.to_s, :value => raw_default(arg))
+      end
 
-          # The finder method which returns the property if present, otherwise a new instance with defaults
-          def lookup(arg)
-            instance   = lookup_without_default(arg)
-            instance ||= build_default(arg)
-            instance.value_serialized = property_serialized?(arg)
+      def lookup_without_default(arg)
+        detect { |property| property.name.to_sym == arg.to_sym }
+      end
 
-            owner = proxy_association.owner
+      def lookup_value(type, key)
+        serialized = property_serialized?(key)
 
-            instance.send("#{owner_class_sym}=", owner) if owner.new_record?
-            instance
+        if instance = lookup_without_default(key)
+          instance.value_serialized = serialized
+          PropertySets::Casting.read(type, instance.value)
+        else
+          value = default(key)
+          if serialized
+            PropertySets::Casting.deserialize(value)
+          else
+            PropertySets::Casting.read(type, value)
           end
+        end
+      end
 
-          # This finder method returns the property if present, otherwise a new instance with the default value.
-          # 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.value_serialized = property_serialized?(arg)
-            instance
-          end
+      # The finder method which returns the property if present, otherwise a new instance with defaults
+      def lookup(arg)
+        instance   = lookup_without_default(arg)
+        instance ||= build_default(arg)
+        instance.value_serialized = property_serialized?(arg)
 
-          def association_class
-            @association_class ||= begin
-              if ActiveRecord::VERSION::STRING >= "3.1.0"
-                proxy_association.klass
-              else
-                @reflection.klass
-              end
-            end
+        owner = proxy_association.owner
+
+        instance.send("#{owner_class_sym}=", owner) if owner.new_record?
+        instance
+      end
+
+      # This finder method returns the property if present, otherwise a new instance with the default value.
+      # 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.value_serialized = property_serialized?(arg)
+        instance
+      end
+
+      def association_class
+        @association_class ||= begin
+          if ActiveRecord::VERSION::STRING >= "3.1.0"
+            proxy_association.klass
+          else
+            @reflection.klass
           end
         end
       end

data/lib/property_sets/version.rb

@@ -1,3 +1,3 @@
 module PropertySets
-  VERSION = "2.7.0"
+  VERSION = "2.8.0"
 end

metadata

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