reactive-record 0.7.32 → 0.7.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 280e751548b64eb27ab554fc761593cf55dbcf66
-  data.tar.gz: e066f2f6ccd9170f38b4b7c69d83a178dbf20113
+  metadata.gz: 6f071187fbe9b4f2c5a5ae000a389e429986e34d
+  data.tar.gz: 5c35aad8d66556df49791a83d05f0569e05adb98
 SHA512:
-  metadata.gz: 70e341c82153a5ace4a28ed200d6ab6b1c3cc153c8607de3ec4b2a8c2a718f99ecfeb5e1c1ec1fd2c493f4c4dca9afc699f1950c65c5001a17aea097f2d4bdff
-  data.tar.gz: 331576cc4d382ad6cf40ff1fb77705c2548c4af48007cfba2e644d60a4c83b79f997ff0cc44d8bfc5691278f8c6ba03521665125c0ac7391905949218c5eedc8
+  metadata.gz: bc6431f25bf37975dcf2f294e0cb0feb202730cca3742bff0dda4507058308e5fb48d6f0c677f445f0af58734983fcff093a230145d6db7bfca877e93d411b83
+  data.tar.gz: b194befb441790f8305e4c8909f7eaacb631978d8629a86691c8e0fb3e22085ee3b6230ef991059710fdd61e294dd416b222b893d7b9b9d4197b8a6468ed974c

data/lib/reactive_record/active_record/reactive_record/base.rb

@@ -234,7 +234,7 @@ module ReactiveRecord
     def update_attribute(attribute, *args)
       value = args[0]
       if args.count != 0 and data_loading?
-        if aggregation = model.reflect_on_aggregation(attribute) and !(aggregation.klass < ActiveRecord::Base)
+        if (aggregation = model.reflect_on_aggregation(attribute)) and !(aggregation.klass < ActiveRecord::Base)
           @synced_attributes[attribute] = aggregation.deserialize(aggregation.serialize(value))
         else
           @synced_attributes[attribute] = value
@@ -245,12 +245,12 @@ module ReactiveRecord
         return
       end
       changed = if args.count == 0
-        if association = @model.reflect_on_association(attribute) and association.collection?
+        if (association = @model.reflect_on_association(attribute)) and association.collection?
           attributes[attribute] != @synced_attributes[attribute]
         else
           !attributes[attribute].backing_record.changed_attributes.empty?
         end
-      elsif association = @model.reflect_on_association(attribute) and association.collection?
+      elsif (association = @model.reflect_on_association(attribute)) and association.collection?
         value != @synced_attributes[attribute]
       else
         !@synced_attributes.has_key?(attribute) or @synced_attributes[attribute] != value
@@ -324,10 +324,10 @@ module ReactiveRecord
     end
 
     def revert
-      @attributes.each do |attribute, value|
+      @changed_attributes.each do |attribute|
         @ar_instance.send("#{attribute}=", @synced_attributes[attribute])
+        @attributes.delete(attribute) unless @synced_attributes.has_key?(attribute)
       end
-      @attributes.delete_if { |attribute, value| !@synced_attributes.has_key?(attribute) }
       @changed_attributes = []
       @errors = nil
     end

data/lib/reactive_record/active_record/reactive_record/collection.rb

@@ -93,6 +93,7 @@ module ReactiveRecord
       all << item unless all.include? item # does this use == if so we are okay...
       if backing_record and @owner and @association and inverse_of = @association.inverse_of and item.attributes[inverse_of] != @owner
         current_association = item.attributes[inverse_of]
+        backing_record.virgin = false unless backing_record.data_loading?
         backing_record.update_attribute(inverse_of, @owner)
         current_association.attributes[@association.attribute].delete(item) if current_association and current_association.attributes[@association.attribute]
         @owner.backing_record.update_attribute(@association.attribute) # forces a check if association contents have changed from synced values

data/lib/reactive_record/version.rb

@@ -1,3 +1,3 @@
 module ReactiveRecord
-  VERSION = "0.7.32"
+  VERSION = "0.7.33"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reactive-record
 version: !ruby/object:Gem::Version
-  version: 0.7.32
+  version: 0.7.33
 platform: ruby
 authors:
 - Mitch VanDuyn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-29 00:00:00.000000000 Z
+date: 2015-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails