reactive-record 0.7.31 → 0.7.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b418800c8ef12fe914f24f8a948bc7a923ff944d
-  data.tar.gz: 93880104e8ae61b61f98f49d334fb2523f908274
+  metadata.gz: 280e751548b64eb27ab554fc761593cf55dbcf66
+  data.tar.gz: e066f2f6ccd9170f38b4b7c69d83a178dbf20113
 SHA512:
-  metadata.gz: 03c0edb07af6406c102deefbf5671f64be507ad6d92a81971eb0adfa2ce28a8542b48d3e63da6af219338225e961aa22e07b841e9e8412626df16d365552f7ce
-  data.tar.gz: 2dcefccee1f3b7deb11d4ef26736438dfc8fb30a1f6c28172d9927d1229a5a3834cb648abbc46bd1fc74ff9a3985c8c85a38ded7b07d66199f3257e80d69d765
+  metadata.gz: 70e341c82153a5ace4a28ed200d6ab6b1c3cc153c8607de3ec4b2a8c2a718f99ecfeb5e1c1ec1fd2c493f4c4dca9afc699f1950c65c5001a17aea097f2d4bdff
+  data.tar.gz: 331576cc4d382ad6cf40ff1fb77705c2548c4af48007cfba2e644d60a4c83b79f997ff0cc44d8bfc5691278f8c6ba03521665125c0ac7391905949218c5eedc8

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

@@ -187,9 +187,10 @@ module ReactiveRecord
     end
 
     def self.schedule_fetch
-      @fetch_scheduled ||= after(0.01) do
+      @fetch_scheduled ||= after(0) do
         if @pending_fetches.count > 0  # during testing we might reset the context while there are pending fetches otherwise this would never normally happen
           last_fetch_at = @last_fetch_at
+          @last_fetch_at = Time.now
           pending_fetches = @pending_fetches.uniq
           models, associations = gather_records(@pending_records, false, nil)
           log(["Server Fetching: %o", pending_fetches.to_n])
@@ -205,16 +206,15 @@ module ReactiveRecord
             end
             log("       Processed in: #{(Time.now-fetch_time).to_i}s")
             log(["       Returned: %o", response.json.to_n])
-            ReactiveRecord.run_blocks_to_load
+            ReactiveRecord.run_blocks_to_load last_fetch_at
             ReactiveRecord::WhileLoading.loaded_at last_fetch_at
             ReactiveRecord::WhileLoading.quiet! if @pending_fetches.empty?
           end.fail do |response|
             log("Fetch failed", :error)
-            ReactiveRecord.run_blocks_to_load(response.body)
+            ReactiveRecord.run_blocks_to_load(last_fetch_at, response.body)
           end
           @pending_fetches = []
           @pending_records = []
-          @last_fetch_at = Time.now
           @fetch_scheduled = nil
         end
       end

data/lib/reactive_record/active_record/reactive_record/while_loading.rb

@@ -11,7 +11,7 @@ module ReactiveRecord
     result = block.call
     if @loads_pending
       @blocks_to_load ||= []
-      @blocks_to_load << [promise, block]
+      @blocks_to_load << [Base.last_fetch_at, promise, block]
     else
       promise.resolve result
     end
@@ -37,19 +37,20 @@ module ReactiveRecord
     end
   end
 
-  def self.run_blocks_to_load(failure = nil)
+  def self.run_blocks_to_load(fetch_id, failure = nil)
     if @blocks_to_load
-      blocks_to_load = @blocks_to_load
-      @blocks_to_load = []
+      blocks_to_load_now = @blocks_to_load.select { |data| data.first == fetch_id }
+      @blocks_to_load = @blocks_to_load.reject { |data| data.first == fetch_id }
       @load_stack ||= []
-      blocks_to_load.each do |promise_and_block|
+      blocks_to_load_now.each do |data|
+        id, promise, block = data
         @load_stack << @loads_pending
         @loads_pending = nil
-        result = promise_and_block.last.call(failure)
+        result = block.call(failure)
         if check_loads_pending and !failure
-          @blocks_to_load << promise_and_block
+          @blocks_to_load << [Base.last_fetch_at, promise, block]
         else
-          promise_and_block.first.resolve result
+          promise.resolve result
         end
         @loads_pending = @load_stack.pop
       end

data/lib/reactive_record/version.rb

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

metadata

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