reactive-record 0.7.8 → 0.7.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cf9494b1346a998d25e757a2753208692fde69b
-  data.tar.gz: 46ab8888020d0076cd9f53fea513519f8eba9910
+  metadata.gz: 870be529a755c9588ae0f02b65dd10ee67c8d21b
+  data.tar.gz: 561c75ec7f9243d9ae106b733aa5356f57e93829
 SHA512:
-  metadata.gz: 0910cbdc2a1a2fb315b0ebcc055d6f6be39ad8091ffb428f72e5898417f81a0a8e14fbaf83c49e39e9d6dc6dafc1c46fd4e6f22495ff9dbd1ab1fa26f642a495
-  data.tar.gz: 0361491939e7ae8af1a226f4e59db7f6345a16f9237be03b5cda683919b1a0657c338600649d5891a0c3108236e33de29a505e283e8d09e838018c0a41a772f6
+  metadata.gz: 5c502888fcd4ef5ea988a3a20a639b4d2bf3b3bdf4df0248b479162772b8ab073d234004697e79b0d121b6eb25209412344401ba1c4b0a0a1ef20cca98aa9f33
+  data.tar.gz: 57f3139aeaaab187cd2c30dbae45884a44920a7b6162679e02e573fd99f2074933a7c4b24da87969f9a967fb86d442a04242154c8b2702141ec8f553fe16ed82

data/lib/reactive_record/active_record/instance_methods.rb

@@ -73,6 +73,10 @@ module ActiveRecord
       @backing_record.destroy &block
     end
     
+    def new?
+      @backing_record.new?
+    end
+    
   end
   
 end

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

@@ -209,12 +209,11 @@ module ReactiveRecord
       false
     end
   
-    def sync!(hash = {})
+    def sync!(hash = {})  # does NOT notify (see saved! for notification)
       @attributes.merge! hash
       @synced_attributes = @attributes.dup
       @synced_attributes.each { |key, value| @synced_attributes[key] = value.dup_for_sync if value.is_a? Collection }
       @saving = false
-      React::State.set_state(self, self, :synced) unless data_loading?
       self
     end
   
@@ -236,10 +235,20 @@ module ReactiveRecord
       @saving = true
     end
     
+    def saved!(failed = nil)  # sets saving to false AND notifies
+      @saving = false
+      React::State.set_state(self, self, :saved) unless data_loading? or failed
+      self
+    end
+    
     def saving?
       React::State.get_state(self, self)
       @saving
     end
+    
+    def new?
+      !id and !vector
+    end
   
     def find_association(association, id)
       inverse_of = association.inverse_of
@@ -265,7 +274,7 @@ module ReactiveRecord
         
     def apply_method(method)
       # Fills in the value returned by sending "method" to the corresponding server side db instance
-      if id or vector
+      if !new?
         sync_attribute(
           method, 
           if association = @model.reflect_on_association(method)

data/lib/reactive_record/active_record/reactive_record/isomorphic_base.rb

@@ -243,16 +243,24 @@ module ReactiveRecord
 
           HTTP.post(`window.ReactiveRecordEnginePath`+"/save", payload: {models: models, associations: associations}).then do |response|
             
-            response.json[:saved_models].each do |item|
-              internal_id, klass, attributes = item
-              backing_records[internal_id].sync!(attributes)
-            end
-            log("Reactive Record Save Failed: #{response.json[:message]}", :error) unless response.json[:success]
-            response.json[:saved_models].each do |model|
-              log("  Model: #{model[1]}  Attributes: #{model[2]}  Errors: #{model[3]}", :error) if model[3]
+            if response.json[:success]
+              response.json[:saved_models].each do |item|
+                internal_id, klass, attributes = item
+                backing_records[internal_id].sync!(attributes)
+              end
+            else
+              backing_records.each { |item| backing_records[item[0]].saved! false }
+              log("Reactive Record Save Failed: #{response.json[:message]}", :error) 
+              response.json[:saved_models].each do |model|
+                log("  Model: #{model[1]}  Attributes: #{model[2]}  Errors: #{model[3]}", :error) if model[3]
+              end
             end
+            
             yield response.json[:success], response.json[:message], response.json[:saved_models]  if block
             promise.resolve response.json
+            
+            backing_records.each { |item| backing_records[item[0]].saved! } if response.json(:success)
+            
           end
           promise
         else

data/lib/reactive_record/version.rb

@@ -1,3 +1,3 @@
 module ReactiveRecord
-  VERSION = "0.7.8"
+  VERSION = "0.7.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reactive-record
 version: !ruby/object:Gem::Version
-  version: 0.7.8
+  version: 0.7.9
 platform: ruby
 authors:
 - Mitch VanDuyn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-02 00:00:00.000000000 Z
+date: 2015-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails