flok 0.0.68 → 0.0.69

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e09750f387fa38a5f2ee1d68e48e0969f2062c3
-  data.tar.gz: 00faaf93c9f481243b2eb0ea86694224e5268d63
+  metadata.gz: 287f1f518fcf5f7c25b591d19c81246499091a07
+  data.tar.gz: 027fc95d97fd69b2765f4159709a46d3c7bc7282
 SHA512:
-  metadata.gz: 9bb1425add869ca9f8c40c845d0ab8f32adc8dcfcc0529c391194ddb2a4021cf81ec9976a0ad832e8afb0960bb2d2fe79b4c882cef8542620c9b6aa613bb7ecb
-  data.tar.gz: 91e6e7cb8949138edc82544064cfa9005c5c6e93ad085a3b13832c9d5cd5a2bc5e3bd9bad3067a8741c8b17d6963c20dacf6d8bc31f5eb389c77fb21abc19e75
+  metadata.gz: d09bc22ecf0daf4d829e9e7ad297cfabdb47cd44d9ef591801d0e534eeee2c3168ca4c207cd135ea9960fa2706cd88e34922943ba3d793ee14d2f11c7b4c09a3
+  data.tar.gz: 9782cd1e8bd0b95b01e803d1f96ac35046ff7f64f7163a34dca09664316562ce377ee27660ec19dcced1c239e2687e2a981b26bcaab415df24e43d19b751cfcb

data/app/drivers/CHROME/src/persist.js

@@ -16,5 +16,9 @@ function if_per_del_ns(ns) {
 function if_per_get(s, ns, key) {
   var _ns = store.namespace(ns);
   var res = _ns.get(key);
+  if (res === undefined) {
+    throw "This should never be reached. if_per_get returned undefined, it should return null";
+  }
+
   int_dispatch([4, "int_per_get_res", s, ns, key, res]);
 }

data/lib/flok/version.rb

@@ -1,3 +1,3 @@
 module Flok
-  VERSION = "0.0.68"
+  VERSION = "0.0.69"
 end

data/spec/kern/assets/vm/controller8ws.rb

@@ -2,6 +2,10 @@ controller :my_controller do
   spots "content"
   services :vm
 
+  on_entry %{
+      read_res_params = [];
+  }
+
   action :my_action do
     on_entry %{
       page0 = {
@@ -14,7 +18,7 @@ controller :my_controller do
     }
 
     on "read_res", %{
-      read_res_params = params;
+      read_res_params.push(params);
     }
   end
 end

data/spec/kern/vm_service_spec.rb

@@ -971,7 +971,7 @@ RSpec.describe "kern:vm_service" do
     @driver.int "int_per_get_res", ["vm", "spec", "my_key", nil]
 
     read_res_params = ctx.dump "read_res_params"
-    expect(read_res_params).to eq({})
+    expect(read_res_params).to eq([{}])
   end
 
   it "A watch request with the sync flag enabled does not send two read_res back after int_dispatch" do
@@ -990,8 +990,50 @@ RSpec.describe "kern:vm_service" do
     #Send back a blank page
     @driver.int "int_per_get_res", ["vm", "spec", "my_key", nil]
 
+    #Dispatch any pending async
+    #should not do anything here
+    @ctx.eval %{
+      for (var i = 0; i < 100; ++i) {
+        int_dispatch([]);
+      }
+    }
+
     read_res_params = ctx.dump "read_res_params"
-    expect(read_res_params).to eq({})
+    expect(read_res_params).to eq([{}])
+  end
+
+  it "A watch request with the sync flag enabled does return the page to read_res" do
+    ctx = flok_new_user File.read('./spec/kern/assets/vm/controller8ws.rb'), File.read("./spec/kern/assets/vm/config4.rb") 
+
+    ctx.eval %{
+      base = _embed("my_controller", 1, {}, null);
+
+      //Drain queue
+      int_dispatch([]);
+    }
+
+    @driver.ignore_up_to "if_per_get", 0
+    @driver.mexpect("if_per_get", ["vm", "spec", "my_key"], 0)
+
+    #Send back a real page
+    @driver.int "int_per_get_res", ["vm", "spec", "my_key", {
+      "_id" => "my_key",
+      "entries" => [],
+      "_head" => nil,
+      "_next" => nil
+    }]
+
+    #Dispatch any pending async
+    #should not do anything here
+    @ctx.eval %{
+      for (var i = 0; i < 100; ++i) {
+        int_dispatch([]);
+      }
+    }
+
+    read_res_params = ctx.dump "read_res_params"
+    expect(read_res_params[0]["_id"]).to eq("my_key")
+    expect(read_res_params.length).to eq(1)
   end
 
   it "Clears the dirty page when pageout runs" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flok
 version: !ruby/object:Gem::Version
-  version: 0.0.68
+  version: 0.0.69
 platform: ruby
 authors:
 - seo