flok 0.0.41 → 0.0.42

data/spec/kern/vm_service_spec.rb

@@ -1,4 +1,4 @@
-#Anything and everything to do with view controllers (not directly UI) above the driver level
+#The vm service
 
 Dir.chdir File.join File.dirname(__FILE__), '../../'
 require './spec/env/kern.rb'
@@ -34,132 +34,6 @@ RSpec.describe "kern:vm_service" do
     expect(vm_notify_map).to eq(res)
   end
 
-  it "vm_rehash_page can calculate the hash correctly for arrays" do
-    ctx = flok_new_user File.read('./spec/kern/assets/vm/controller0.rb'), File.read("./spec/kern/assets/vm/config3.rb") 
-
-    #Run the check
-    res = ctx.eval %{
-      //Manually construct a page
-      var page = {
-        _head: null,
-        _type: "array",
-        _next: null,
-        _id: "hello",
-        entries: [
-          {_id: "hello2", _sig: "nohteunth"},
-        ]
-      }
-
-      vm_rehash_page(page);
-    }
-
-    #Calculate hash ourselves
-    hash = crc32("hello")
-    hash = crc32("nohteunth", hash)
-    page = JSON.parse(ctx.eval("JSON.stringify(page)"))
-    page = JSON.parse(ctx.eval("JSON.stringify(page)"))
-
-    #Expect the same hash
-    expect(page).to eq({
-      "_head" => nil,
-      "_type" => "array",
-      "_next" => nil,
-      "_id" => "hello",
-      "entries" => [
-        {"_id" => "hello2", "_sig" => "nohteunth"}
-      ],
-      "_hash" => hash.to_s
-    })
-  end
-
-  it "vm_rehash_page can calculate the hash correctly for hashes" do
-    ctx = flok_new_user File.read('./spec/kern/assets/vm/controller0.rb'), File.read("./spec/kern/assets/vm/config3.rb") 
-
-    #Run the check
-    res = ctx.eval %{
-      //Manually construct a page
-      var page = {
-        _head: null,
-        "_type": "hash",
-        _next: null,
-        _id: "hello",
-        entries: {
-          "my_key": {_sig: "a"},
-          "my_key2": {_sig: "b"},
-          "my_key3": {_sig: "c"},
-        }
-      }
-
-      vm_rehash_page(page);
-    }
-
-    #Calculate hash ourselves
-    hash = crc32("hello")
-
-    #XOR the _sigs for the hash calculations
-    a = crc32("a", 0)
-    b = crc32("b", 0)
-    c = crc32("c", 0)
-    hash = crc32((a + b + c).to_s, hash)
-
-    page = JSON.parse(ctx.eval("JSON.stringify(page)"))
-    page = JSON.parse(ctx.eval("JSON.stringify(page)"))
-
-    #Expect the same hash
-    expect(page).to eq({
-      "_head" => nil,
-      "_next" => nil,
-      "_type" => "hash",
-      "_id" => "hello",
-      "entries" => {
-        "my_key" => {"_sig" => "a"},
-        "my_key2" => {"_sig" => "b"},
-        "my_key3" => {"_sig" => "c"},
-      },
-      "_hash" => hash.to_s
-    })
-  end
-
-
-  it "vm_rehash_page can calculate the hash correctly with head and next for an array" do
-    ctx = flok_new_user File.read('./spec/kern/assets/vm/controller0.rb'), File.read("./spec/kern/assets/vm/config3.rb") 
-
-    #Run the check
-    res = ctx.eval %{
-      //Manually construct a page
-      var page = {
-        _type: "array",
-        _head: "a",
-        _next: "b",
-        _id: "hello",
-        entries: [
-          {_id: "hello2", _sig: "nohteunth"},
-        ]
-      }
-
-      vm_rehash_page(page);
-    }
-
-    #Calculate hash ourselves
-    hash = crc32("a")
-    hash = crc32("b", hash)
-    hash = crc32("hello", hash)
-    hash = crc32("nohteunth", hash)
-    page = JSON.parse(ctx.eval("JSON.stringify(page)"))
-
-    #Expect the same hash
-    expect(page).to eq({
-      "_head" => "a",
-      "_type" => "array",
-      "_next" => "b",
-      "_id" => "hello",
-      "entries" => [
-        {"_id" => "hello2", "_sig" => "nohteunth"}
-      ],
-      "_hash" => hash.to_s
-    })
-  end
-
   it "Can call vm_cache_write and save it to vm_cache[ns][id]" do 
     ctx = flok_new_user File.read('./spec/kern/assets/vm/controller0.rb'), File.read("./spec/kern/assets/vm/config3.rb") 
 
@@ -928,62 +802,62 @@ RSpec.describe "kern:vm_service" do
   end
 
   #it "Responds twice to watch with a missing cache but where the disk has a copy and then the pager responds" do
-    #ctx = flok_new_user File.read('./spec/kern/assets/vm/controller20.rb'), File.read("./spec/kern/assets/vm/config4.rb") 
-
-    #ctx.eval %{
-      #base = _embed("my_controller", 1, {}, null);
-
-      #//Manually construct a page
-      #page = {
-        #_head: null,
-        #_next: null,
-        #_id: "hello",
-        #entries: [
-          #{_id: "hello2", _sig: "nohteunth"},
-        #]
-      #}
-
-      #//Manually construct another page that would normally be written
-      #//by a 'pager' to the cache
-      #page2 = {
-        #_head: null,
-        #_next: null,
-        #_id: "hello",
-        #entries: [
-          #{_id: "hello2", _sig: "nohteunth"},
-          #{_id: "hello3", _sig: "athoeuntz"}
-        #]
-      #}
-
-      #//Recalculate hashes
-      #vm_rehash_page(page);
-      #vm_rehash_page(page2);
-
-      #//Drain queue
-      #int_dispatch([]);
-    #}
-
-    ##Copies of JS pages in ruby dictionary format
-    #page = JSON.parse(ctx.eval("JSON.stringify(page)"))
-    #page2 = JSON.parse(ctx.eval("JSON.stringify(page2)"))
-
-    ##At this point, flok should have attempted to grab a page to fill
-    ##the *now* blank cache. We are going to send it the first page.
-    #@driver.ignore_up_to "if_per_get", 2
-    #@driver.get "if_per_get", 2
-    #@driver.int "int_per_get_res", ["vm", "spec", page]
-
-    ##Now, we pretend that a pager has written to the cache because it has
-    ##received data back
-    #ctx.eval(%{vm_cache_write("spec", page2)})
-
-    #res = JSON.parse(ctx.eval("JSON.stringify(read_res)"))
-    #expect(res).to eq([
-      #page, page2
-    #])
- #end
-
- it "Responds once to watch with a missing cache but where the pager responds before the disk for array" do
+  #ctx = flok_new_user File.read('./spec/kern/assets/vm/controller20.rb'), File.read("./spec/kern/assets/vm/config4.rb") 
+
+  #ctx.eval %{
+  #base = _embed("my_controller", 1, {}, null);
+
+  #//Manually construct a page
+  #page = {
+  #_head: null,
+  #_next: null,
+  #_id: "hello",
+  #entries: [
+  #{_id: "hello2", _sig: "nohteunth"},
+  #]
+  #}
+
+  #//Manually construct another page that would normally be written
+  #//by a 'pager' to the cache
+  #page2 = {
+  #_head: null,
+  #_next: null,
+  #_id: "hello",
+  #entries: [
+  #{_id: "hello2", _sig: "nohteunth"},
+  #{_id: "hello3", _sig: "athoeuntz"}
+  #]
+  #}
+
+  #//Recalculate hashes
+  #vm_rehash_page(page);
+  #vm_rehash_page(page2);
+
+  #//Drain queue
+  #int_dispatch([]);
+  #}
+
+  ##Copies of JS pages in ruby dictionary format
+  #page = JSON.parse(ctx.eval("JSON.stringify(page)"))
+  #page2 = JSON.parse(ctx.eval("JSON.stringify(page2)"))
+
+  ##At this point, flok should have attempted to grab a page to fill
+  ##the *now* blank cache. We are going to send it the first page.
+  #@driver.ignore_up_to "if_per_get", 2
+  #@driver.get "if_per_get", 2
+  #@driver.int "int_per_get_res", ["vm", "spec", page]
+
+  ##Now, we pretend that a pager has written to the cache because it has
+  ##received data back
+  #ctx.eval(%{vm_cache_write("spec", page2)})
+
+  #res = JSON.parse(ctx.eval("JSON.stringify(read_res)"))
+  #expect(res).to eq([
+  #page, page2
+  #])
+  #end
+
+  it "Responds once to watch with a missing cache but where the pager responds before the disk for array" do
     ctx = flok_new_user File.read('./spec/kern/assets/vm/controller20.rb'), File.read("./spec/kern/assets/vm/config4.rb") 
 
     ctx.eval %{
@@ -1044,7 +918,7 @@ RSpec.describe "kern:vm_service" do
     ])
   end
 
- it "Responds once to watch with a missing cache but where the pager responds before the disk for hash" do
+  it "Responds once to watch with a missing cache but where the pager responds before the disk for hash" do
     ctx = flok_new_user File.read('./spec/kern/assets/vm/controller20.rb'), File.read("./spec/kern/assets/vm/config4.rb") 
 
     ctx.eval %{
@@ -1179,5 +1053,30 @@ RSpec.describe "kern:vm_service" do
 
     @driver.ignore_up_to "if_per_set", 2
     @driver.mexpect("if_per_set", ["spec", page2["_id"], page2], 2)
- end
+  end
+
+  it "Can create a copy of pg_spec0 and pg_spec1 and receive the correct things in it's initialization" do
+    ctx = flok_new_user File.read('./spec/kern/assets/vm/controller22.rb'), File.read("./spec/kern/assets/vm/config5.rb") 
+    ctx.eval %{
+      base = _embed("my_controller", 0, {}, null);
+
+      //Drain queue
+      int_dispatch([]);
+    }
+
+    pg_spec0_init_params = JSON.parse(ctx.eval("JSON.stringify(pg_spec0_init_params)"))
+    pg_spec1_init_params = JSON.parse(ctx.eval("JSON.stringify(pg_spec1_init_params)"))
+
+    #Expect options and ns to match in config5
+    expect(pg_spec0_init_params).to eq({
+      "ns" => "spec0",
+      "options" => {"hello" => "world"}
+    })
+
+    #Expect options and ns to match in config5
+    expect(pg_spec1_init_params).to eq({
+      "ns" => "spec1",
+      "options" => {"foo" => "bar"}
+    })
+  end
 end

data/spec/kern/vm_transaction_spec.rb

@@ -0,0 +1,375 @@
+#Spec for the transactional & diff of the vm service
+Dir.chdir File.join File.dirname(__FILE__), '../../'
+require './spec/env/kern.rb'
+require './spec/lib/helpers.rb'
+require './spec/lib/io_extensions.rb'
+require './spec/lib/rspec_extensions.rb'
+require 'zlib'
+
+RSpec.describe "kern:vm_transaction" do
+  include Zlib
+  include_context "kern"
+
+  #pg_dummy pager
+  ######################################################################
+  it "Can initialize the pg_dummy0 pager" do
+    ctx = flok_new_user File.read('./spec/kern/assets/vm/controller0.rb'), File.read("./spec/kern/assets/vm/pg_dummy/config.rb") 
+    ctx.eval %{
+      //Call embed on main root view
+      base = _embed("my_controller", 0, {}, null);
+
+      //Drain queue
+      int_dispatch([]);
+    }
+
+    res = ctx.eval("pg_dummy0_spec_did_init")
+    expect(res).to eq(true)
+  end
+  ######################################################################
+
+  #vm_transaction functions
+  ######################################################################
+  it "does throw exception when vm_cache_write is called before vm_transaction_begin" do
+    ctx = flok_new_user File.read('./spec/kern/assets/vm/controller0.rb'), File.read("./spec/kern/assets/vm/pg_dummy/config.rb") 
+    expect {
+      ctx.eval %{
+        //Call embed on main root view
+        base = _embed("my_controller", 0, {}, null);
+
+        //Drain queue
+        int_dispatch([]);
+
+        vm_cache_write("dummy", {});
+        vm_transaction_begin();
+      }
+    }.to raise_exception
+  end
+
+  it "does throw exception when vm_transaction_begin is called twice in a row without a vm_transaction_end" do
+    ctx = flok_new_user File.read('./spec/kern/assets/vm/controller0.rb'), File.read("./spec/kern/assets/vm/pg_dummy/config.rb") 
+    expect {
+      ctx.eval %{
+        //Call embed on main root view
+        base = _embed("my_controller", 0, {}, null);
+
+        //Drain queue
+        int_dispatch([]);
+
+        vm_transaction_begin();
+        vm_transaction_begin();
+      }
+    }.to raise_exception
+  end
+
+  it "does throw exception when vm_transaction_end is called without a vm_transaction_begin" do
+    ctx = flok_new_user File.read('./spec/kern/assets/vm/controller0.rb'), File.read("./spec/kern/assets/vm/pg_dummy/config.rb") 
+    expect {
+      ctx.eval %{
+        //Call embed on main root view
+        base = _embed("my_controller", 0, {}, null);
+
+        //Drain queue
+        int_dispatch([]);
+
+        vm_transaction_end();
+      }
+    }.to raise_exception
+  end
+
+
+  it "does not throw exception when vm_transaction_begin is called twice in a row with a vm_transaction_end in-between" do
+    ctx = flok_new_user File.read('./spec/kern/assets/vm/controller0.rb'), File.read("./spec/kern/assets/vm/pg_dummy/config.rb") 
+    ctx.eval %{
+      //Call embed on main root view
+      base = _embed("my_controller", 0, {}, null);
+
+      //Drain queue
+      int_dispatch([]);
+
+      vm_transaction_begin();
+      vm_transaction_end();
+      vm_transaction_begin();
+    }
+  end
+  ######################################################################
+
+  #vm_diff events to controller at the end of transactions
+  ######################################################################
+  def reload_vm_transaction_diff_pages(ctx)
+    pages_src = File.read("./spec/kern/assets/vm/vm_transaction_diff_pages.js")
+    ctx.eval pages_src
+  end
+
+  it "does send the controller the entry_modify when an entry is modified in the page" do
+    ctx = flok_new_user File.read('./spec/kern/assets/vm/controller0_diff.rb'), File.read("./spec/kern/assets/vm/pg_dummy/config.rb") 
+    reload_vm_transaction_diff_pages(ctx)
+    dump = ctx.evald %{
+      //Call embed on main root view
+      base = _embed("my_controller", 0, {}, null);
+
+      //Drain queue
+      int_dispatch([]);
+
+      //Write
+      vm_transaction_begin();
+        vm_cache_write("dummy", triangle_square_z_null);
+        vm_cache_write("dummy", p_circle_null_q);
+      vm_transaction_end();
+
+      for (var i = 0; i < 100; ++i) {
+        int_dispatch([]);
+      }
+
+      dump.entry_modify_params = entry_modify_params;
+      dump.entry_move_params = entry_move_params;
+      dump.entry_del_params = entry_del_params;
+      dump.entry_ins_params = entry_ins_params;
+    }
+
+    expect(dump["entry_modify_params"]).to eq([
+      {
+        "page_id" => "default",
+        "entry" => {"_id" => "id0", "_sig" => "P", "value" => "P"}
+      },
+      {
+        "page_id" => "default",
+        "entry" => {"_id" => "id1", "_sig" => "Circle", "value" => "Circle"}
+      }
+    ])
+  end
+
+  it "does send the controller the entry_del when an entry is deleted in the page" do
+    ctx = flok_new_user File.read('./spec/kern/assets/vm/controller0_diff.rb'), File.read("./spec/kern/assets/vm/pg_dummy/config.rb") 
+    reload_vm_transaction_diff_pages(ctx)
+    dump = ctx.evald %{
+      //Call embed on main root view
+      base = _embed("my_controller", 0, {}, null);
+
+      //Drain queue
+      int_dispatch([]);
+
+      //Write
+      vm_transaction_begin();
+        vm_cache_write("dummy", triangle_null_a_m);
+        vm_cache_write("dummy", triangle_square_null_null);
+      vm_transaction_end();
+
+      for (var i = 0; i < 100; ++i) {
+        int_dispatch([]);
+      }
+
+      dump.entry_modify_params = entry_modify_params;
+      dump.entry_move_params = entry_move_params;
+      dump.entry_del_params = entry_del_params;
+      dump.entry_ins_params = entry_ins_params;
+    }
+
+    expect(dump["entry_del_params"]).to eq([
+      {
+        "page_id" => "default",
+        "entry_id" => "id2"
+      },
+      {
+        "page_id" => "default",
+        "entry_id" => "id3"
+      },
+    ])
+  end
+
+  it "does send the controller the entry_move when an entry is moved within the same page" do
+    ctx = flok_new_user File.read('./spec/kern/assets/vm/controller0_diff.rb'), File.read("./spec/kern/assets/vm/pg_dummy/config.rb") 
+    reload_vm_transaction_diff_pages(ctx)
+    dump = ctx.evald %{
+      //Call embed on main root view
+      base = _embed("my_controller", 0, {}, null);
+
+      //Drain queue
+      int_dispatch([]);
+
+      //Write
+      vm_transaction_begin();
+        vm_cache_write("dummy", triangle_square_z_null);
+        vm_cache_write("dummy", triangle_square_z_null_moved_z_square_triangle);
+      vm_transaction_end();
+
+      for (var i = 0; i < 100; ++i) {
+        int_dispatch([]);
+      }
+
+      dump.entry_modify_params = entry_modify_params;
+      dump.entry_move_params = entry_move_params;
+      dump.entry_del_params = entry_del_params;
+      dump.entry_ins_params = entry_ins_params;
+    }
+
+    expect(dump["entry_move_params"]).to eq([
+      {
+        "entry_id" => "id0",
+        "from_page_id" => "default",
+        "to_page_id" => "default",
+        "to_page_index" => 2,
+      },
+      {
+        "entry_id" => "id1",
+        "from_page_id" => "default",
+        "to_page_id" => "default",
+        "to_page_index" => 1,
+      },
+    ])
+  end
+
+  it "does send the controller the entry_ins when an entry is inserted in the page" do
+    ctx = flok_new_user File.read('./spec/kern/assets/vm/controller0_diff.rb'), File.read("./spec/kern/assets/vm/pg_dummy/config.rb") 
+    reload_vm_transaction_diff_pages(ctx)
+    dump = ctx.evald %{
+      //Call embed on main root view
+      base = _embed("my_controller", 0, {}, null);
+
+      //Drain queue
+      int_dispatch([]);
+
+      //Write
+      vm_transaction_begin();
+        vm_cache_write("dummy", p_null_null_q);
+        vm_cache_write("dummy", triangle_square_z_null);
+      vm_transaction_end();
+
+      for (var i = 0; i < 100; ++i) {
+        int_dispatch([]);
+      }
+
+      dump.entry_modify_params = entry_modify_params;
+      dump.entry_move_params = entry_move_params;
+      dump.entry_del_params = entry_del_params;
+      dump.entry_ins_params = entry_ins_params;
+    }
+
+    expect(dump["entry_ins_params"]).to eq([
+      {
+        "page_id" => "default",
+        "index" => 1,
+        "entry" => {"_id" => "id1", "_sig" => "Square", "value" => "Square"}
+      },
+      {
+        "page_id" => "default",
+        "index" => 2,
+        "entry" => {"_id" => "id2", "_sig" => "Z", "value" => "Z"}
+      },
+    ])
+  end
+
+  it "does send the controller the next_changed when the page next changes" do
+    ctx = flok_new_user File.read('./spec/kern/assets/vm/controller0_diff.rb'), File.read("./spec/kern/assets/vm/pg_dummy/config.rb") 
+    reload_vm_transaction_diff_pages(ctx)
+    dump = ctx.evald %{
+      //Call embed on main root view
+      base = _embed("my_controller", 0, {}, null);
+
+      //Drain queue
+      int_dispatch([]);
+
+      //Write
+      vm_transaction_begin();
+        vm_cache_write("dummy", next_null);
+        vm_cache_write("dummy", next_world);
+      vm_transaction_end();
+
+      for (var i = 0; i < 100; ++i) {
+        int_dispatch([]);
+      }
+
+      dump.head_changed_params = head_changed_params;
+      dump.next_changed_params = next_changed_params;
+    }
+
+    expect(dump["next_changed_params"]).to eq([
+      {
+        "page_id" => "default",
+        "value" => "world"
+      },
+    ])
+  end
+
+
+  it "does send the controller the next_changed when the page head changes" do
+    ctx = flok_new_user File.read('./spec/kern/assets/vm/controller0_diff.rb'), File.read("./spec/kern/assets/vm/pg_dummy/config.rb") 
+    reload_vm_transaction_diff_pages(ctx)
+    dump = ctx.evald %{
+      //Call embed on main root view
+      base = _embed("my_controller", 0, {}, null);
+
+      //Drain queue
+      int_dispatch([]);
+
+      //Write
+      vm_transaction_begin();
+        vm_cache_write("dummy", head_null);
+        vm_cache_write("dummy", head_world);
+      vm_transaction_end();
+
+      for (var i = 0; i < 100; ++i) {
+        int_dispatch([]);
+      }
+
+      dump.head_changed_params = head_changed_params;
+      dump.next_changed_params = next_changed_params;
+    }
+
+    expect(dump["head_changed_params"]).to eq([
+      {
+        "page_id" => "default",
+        "value" => "world"
+      },
+    ])
+  end
+
+  it "does send the controller the correct events when a page is modified twice" do
+    ctx = flok_new_user File.read('./spec/kern/assets/vm/controller0_diff.rb'), File.read("./spec/kern/assets/vm/pg_dummy/config.rb") 
+    reload_vm_transaction_diff_pages(ctx)
+    dump = ctx.evald %{
+      //Call embed on main root view
+      base = _embed("my_controller", 0, {}, null);
+
+      //Drain queue
+      int_dispatch([]);
+
+      //Write
+      vm_transaction_begin();
+        vm_cache_write("dummy", triangle_square_z_null);
+      vm_transaction_end();
+
+      vm_transaction_begin();
+        vm_cache_write("dummy", p_circle_null_q);
+      vm_transaction_end();
+
+      vm_transaction_begin();
+        vm_cache_write("dummy", triangle_circle_null_q);
+      vm_transaction_end();
+
+      for (var i = 0; i < 100; ++i) {
+        int_dispatch([]);
+      }
+
+      dump.entry_modify_params = entry_modify_params;
+      dump.entry_move_params = entry_move_params;
+      dump.entry_del_params = entry_del_params;
+      dump.entry_ins_params = entry_ins_params;
+    }
+
+    expect(dump["entry_modify_params"]).to eq([
+      {
+        "page_id" => "default",
+        "entry" => {"_id" => "id0", "_sig" => "P", "value" => "P"}
+      },
+      {
+        "page_id" => "default",
+        "entry" => {"_id" => "id1", "_sig" => "Circle", "value" => "Circle"}
+      },
+      {
+        "page_id" => "default",
+        "entry" => {"_id" => "id0", "_sig" => "Triangle", "value" => "Triangle"}
+      },
+    ])
+  end
+  ######################################################################
+end