flok 0.0.57 → 0.0.60

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cecb7632c1464b7d9b8a55ed9d08f5eb4263d310
-  data.tar.gz: 578139d4896e901f26be711a8db1ed757f19c916
+  metadata.gz: 4bd11ac051bc4621d21cdad6ad4ed89aa3a75ec8
+  data.tar.gz: 46df13c26bd3569e367ed09075271d5151ba88ea
 SHA512:
-  metadata.gz: 0b927b5dd005df16cb2e8b909892e9779b5b8966112c94b53cfa3cd0823225c646ac92a5111611099fb79e12b8eed14ecd0c6028665732916e8d5494fd189213
-  data.tar.gz: 47a932f03f912ab6c601f75c6fc6a8d5d0a9c7f99028d315ca31ce93bb3f3114161e7effe9202baa585ca8af095b7c5e035d26e8c7357dd0e19a9e3580b1d647
+  metadata.gz: cc1553107062ccc60ab610da94d63d0550fd2d96ed8fc9665bc1b3a9e122ad59deb08c9b65fdc1cc31a484be77e1753afe9a28733bdc9b73bf38f16f1b765d5e
+  data.tar.gz: b0902d76d7626b552d4909f572375810cc3eee34d6dee014908d3812c62850c665737a222644b8b6562f49ba811bd01d7b902711379b65addf08ac630517ed87

data/app/kern/services/vm.rb

@@ -15,7 +15,7 @@ service :vm do
 
     vm_bp_to_nmap = {};
 
-    read_sync_in_progress = false;
+    vm_read_sync_in_progress = [];
 
     //Notification listeners, converts ns+key to an array of base pointers
     vm_notify_map = {
@@ -84,10 +84,8 @@ service :vm do
     //res is page
     function int_per_get_res(s, ns, res) {
       //Controller made a read_sync request, fulfull it
-      if (read_sync_in_progress !== false) {
-
-        int_event(read_sync_in_progress, "read_sync_res", {page: res, ns: ns});
-        read_sync_in_progress = false;
+      if (vm_read_sync_in_progress.length > 0) {
+        int_event(vm_read_sync_in_progress.pop(), "read_sync_res", {page: res, ns: ns});
       }
 
       //If the key didn't exist, ignore it
@@ -599,11 +597,11 @@ service :vm do
       }
     <% end %>
 
-    read_sync_in_progress = bp;
     var cache_entry = vm_cache[params.ns][params.id];
     if (cache_entry !== undefined) {
       int_event(bp, "read_sync_res", {ns: params.ns, page: cache_entry});
     } else {
+      vm_read_sync_in_progress.unshift(bp);
       SEND("main", "if_per_get", "vm", params.ns, params.id);
     }
   }

data/docs/controllers.md

@@ -33,12 +33,29 @@ controller "tab_controller" do
   }
 
   #You can also define macros for shared action traits
-  macro "my_macro" do
-    on "shared_clicked" do
+  macro :my_macro do
+    on "shared_clicked", %{
       Goto("home")
-    end
+    }
   end
 
+  #More advanced macros can use the `current_action` to check
+  #which action you are on
+  macro :my_nav_macro do
+    on "home_clicked", %{
+      if (current_action !== "home") {
+        Goto("home")
+      }
+    }
+
+    on "about_clicked", %{
+      if (current_action !== "home") {
+        Goto("about")
+      }
+    }
+  end
+
+
   #Optional
   #Called after on_entry, but before any action is entered. This is a pseudo
   #action and assumes that everything you do inside will be performed fully

data/docs/services/vm.md

@@ -151,7 +151,9 @@ use the modification helpers. These modification helpers implement copy on write
     * If in `@debug` mode, the variable `vm_write_list` contains an array dictionary of the last page passed to the pager (tail is latest).
 
 ###`read_sync`
-Read from the disk synchronously, or memory if it exists, and return the value in `read_sync_res`. This will not watch the page.
+Read from the disk synchronously, or memory if it exists, and return the value in `read_sync_res`. This will not watch the page. Multiple read_syncs
+in the same frame are allowed but discouraged as the order that pages are received back may not necessarily be the order they were synhronously
+requested. This is because a cached page will be returned by the call stack while a synchronous read has to go through the event queue.
   * Parameters
     * `ns` - Namespace of the page
     * `id` - id of the page
@@ -174,6 +176,12 @@ Pageout is embodied in the function named `vm_pageout()`. This will asynchronous
   * `vm_notify_map` - The dictionary used to lookup what controllers need to be notified about changes. Stored in `vm_notify_map[ns][id]` which yields an array of controller base pointers.
   * `vm_bp_to_nmap` - A dictionary that maps a `bp` key (usually from a controller) to a dictionary. This dictionary contains a mapping of `bp => ns => id` to an array that contains `[node, index]` where `node` is a reference to `vm_notify_map[ns][id]`. This inverted map must (a) provide a way for `unwatch` to quickly remove entries from itself and (b) provide a way for all entries in `vm_notify_map` to be removed when something (usually a controller) disconrnects.
     must support `unwatch` removal which we only receive the `bp`, `ns`, and `key`.
+  * `vm_read_sync_in_progress` - A queue of controller base pointers that are awaiting a response from `read_sync`. This may contain multiple
+      controllers if one controller makes multiple `read_sync` requests within one *frame* as `int_event` only queues the outbounds events
+      and dosen't immediately send them. Not that this makes it not synchronous, just the order of execution is not like a call stack and more
+      like a synchronous high priority deferred queue. The *frontmost* of the array is the lowest index, and the *backmost* is the highest index. In
+      javascript, this means that new requests are placed via `vm_read_sync_in_progress.unshift(new_bp)` and when requests are serviced, they are
+      serviced via the `var bp = vm_read_sync_in_progress.pop()`.
 
 ##Helper Methods
 

data/lib/flok/user_compiler.rb

@@ -462,7 +462,9 @@ module Flok
     def method_missing method, *args, &block
       if macro = @controller.macros[method]
         #Call the macro in our context
-        self.instance_eval(&macro)
+        @current_action = name
+          self.instance_eval(&macro)
+        @current_action = nil
       else
         raise "No macro found named: #{method}"
       end

data/lib/flok/user_compiler_templates/ctable.js.erb

@@ -61,6 +61,7 @@ ctable = {
                     <%= e[:name] %>: function(__base__, params) {
                       var __info__ = tel_deref(__base__);
                       var context = __info__.context;
+                      var current_action = __info__.action;
 
                       <%= e[:src] %>
                     },

data/lib/flok/version.rb

@@ -1,3 +1,3 @@
 module Flok
-  VERSION = "0.0.57"
+  VERSION = "0.0.60"
 end

data/spec/env/kern.rb

@@ -137,7 +137,7 @@ shared_context "kern" do
         end
       end
 
-      expect(name).to eq(msg_name)
+      expect(name).to eq(msg_name), "name: #{name.inspect} of message received did not match #{msg_name.inspect}, args where #{args.inspect}"
       expect(args).to eq(msg_args)
       expect(priority).to eq(@cp)
 

data/spec/kern/assets/current_action_nav.rb

@@ -0,0 +1,31 @@
+controller :my_controller do
+  macro :nav do
+    #This one should only go to home if we are
+    #not on home already
+    on "home_clicked", %{
+      if (current_action !== "home") {
+        Goto("home");
+      }
+    }
+
+    #This one should always go home, even if we are
+    #on home already
+    on "home_reload_clicked", %{
+      Goto("home");
+    }
+
+    on "about_clicked", %{
+      if (current_action !== "about") {
+        Goto("about");
+      }
+    }
+  end
+
+  action :home do
+    nav
+  end
+
+  action :about do
+    nav
+  end
+end

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

@@ -17,8 +17,8 @@ controller :my_controller do
         id: "test2"
       }
 
+      //requesting 'test' and 'test2'
       Request("vm", "read_sync", info);
-
       Request("vm", "read_sync", info2);
     }
 

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

@@ -0,0 +1,35 @@
+controller :my_controller do
+  services :vm
+
+  on_entry %{
+  }
+
+  action :my_action do
+    on_entry %{
+      var info = {
+        ns: "spec",
+        id: "test"
+      }
+
+      Request("vm", "read_sync", info);
+    }
+
+    on "read_sync_res", %{
+      Goto("other");
+    }
+  end
+
+  action :other do
+    on_entry %{
+    }
+
+    on "get_test", %{
+      //Second request should not trigger disk read as by this point, the cache would have been written
+      var infox = {
+        ns: "spec",
+        id: "test"
+      }
+      Request("vm", "read_sync", infox);
+    }
+  end
+end

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

@@ -0,0 +1,51 @@
+#Multiple controllers making a sync_read request of two different pages
+#Not that the same page wouldn't trigger two sync reads, (because it will),
+#but because we want to avoid any issues in the future.
+controller :my_controller do
+  services :vm
+  spots "content"
+
+  on_entry %{
+  }
+
+  action :my_action do
+    on_entry %{
+      var info = {
+        ns: "spec",
+        id: "test1"
+      }
+
+      //request page with id:test1
+      Request("vm", "read_sync", info);
+
+      Embed("my_other_controller", "content", {});
+    }
+
+    on "read_sync_res", %{
+      my_controller_read_sync_res = params;
+    }
+  end
+end
+
+controller :my_other_controller do
+  services :vm
+
+  on_entry %{
+  }
+
+  action :my_action do
+    on_entry %{
+      var info = {
+        ns: "spec",
+        id: "test2"
+      }
+
+      //request page with id:test2
+      Request("vm", "read_sync", info);
+    }
+
+    on "read_sync_res", %{
+      my_other_controller_read_sync_res = params;
+    }
+  end
+end

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

@@ -0,0 +1,75 @@
+controller :controller0 do
+  services :vm
+  spots "first", "second"
+
+  action :index do
+    on_entry %{
+      //request page 'A' on frame0 of controller0
+      var info = {
+        ns: "spec",
+        id: "A"
+      }
+      //get page A
+      Request("vm", "read_sync", info);
+
+      //embed controller1 & controler2
+      Embed("controller1", "first", {});
+      Embed("controller2", "second", {});
+    }
+
+    on "read_sync_res", %{
+      controller0_read_sync_res = params;
+    }
+  end
+end
+
+controller :controller1 do
+  services :vm
+
+  action :index do
+    on_entry %{
+      controller1_base = __base__;
+    }
+
+    #action is dispatched on frame1
+    on "get", %{
+      //request page 'A' on frame1 of controller1
+      var info = {
+        ns: "spec",
+        id: "A"
+      }
+      //get page A (again, read from cache)
+      Request("vm", "read_sync", info);
+    }
+
+    on "read_sync_res", %{
+      controller1_read_sync_res = params;
+    }
+  end
+end
+
+controller :controller2 do
+  services :vm
+
+  action :index do
+    on_entry %{
+      controller2_base = __base__;
+    }
+
+    #action is dispatched on frame1
+    on "get", %{
+      //request page 'B' on frame1 of controller2
+      var info = {
+        ns: "spec",
+        id: "B"
+      }
+
+      //get page B
+      Request("vm", "read_sync", info);
+    }
+
+    on "read_sync_res", %{
+      controller2_read_sync_res = params;
+    }
+  end
+end

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

@@ -0,0 +1,75 @@
+controller :controller0 do
+  services :vm
+  spots "first", "second"
+
+  action :index do
+    on_entry %{
+      //request page 'B' on frame0 of controller0
+      var info = {
+        ns: "spec",
+        id: "B"
+      }
+      //get page B
+      Request("vm", "read_sync", info);
+
+      //embed controller1 & controler2
+      Embed("controller1", "first", {});
+      Embed("controller2", "second", {});
+    }
+
+    on "read_sync_res", %{
+      controller0_read_sync_res = params;
+    }
+  end
+end
+
+controller :controller1 do
+  services :vm
+
+  action :index do
+    on_entry %{
+      controller1_base = __base__;
+    }
+
+    #action is dispatched on frame1
+    on "get", %{
+      //request page 'A' on frame1 of controller1
+      var info = {
+        ns: "spec",
+        id: "A"
+      }
+      //get page A (again, read from cache)
+      Request("vm", "read_sync", info);
+    }
+
+    on "read_sync_res", %{
+      controller1_read_sync_res = params;
+    }
+  end
+end
+
+controller :controller2 do
+  services :vm
+
+  action :index do
+    on_entry %{
+      controller2_base = __base__;
+    }
+
+    #action is dispatched on frame1
+    on "get", %{
+      //request page 'B' on frame1 of controller2
+      var info = {
+        ns: "spec",
+        id: "B"
+      }
+
+      //get page B
+      Request("vm", "read_sync", info);
+    }
+
+    on "read_sync_res", %{
+      controller2_read_sync_res = params;
+    }
+  end
+end

data/spec/kern/controller_spec.rb

@@ -868,4 +868,27 @@ RSpec.describe "kern:controller_spec" do
       }
     }.to raise_error(/choose_action.*Goto/)
   end
+
+  it "Does support using a macro that contains current_action" do
+    ctx = flok_new_user File.read('./spec/kern/assets/current_action_nav.rb')
+    dump = ctx.evald %{
+      base = _embed("my_controller", 0, {}, null);
+
+      int_dispatch([3, "int_event", base, "about_clicked", {}]);
+      int_dispatch([3, "int_event", base, "home_clicked", {}]);
+      int_dispatch([3, "int_event", base, "home_clicked", {}]);
+      int_dispatch([3, "int_event", base, "home_reload_clicked", {}]);
+      int_dispatch([3, "int_event", base, "about_clicked", {}]);
+      int_dispatch([3, "int_event", base, "home_reload_clicked", {}]);
+    }
+
+    #Expect not to get an event from the choose_action
+    @driver.ignore_up_to "if_event"
+    @driver.mexpect("if_event", [Integer, "action", {"from" => nil, "to" => "home"}])
+    @driver.mexpect("if_event", [Integer, "action", {"from" => "home", "to" => "about"}])
+    @driver.mexpect("if_event", [Integer, "action", {"from" => "about", "to" => "home"}])
+    @driver.mexpect("if_event", [Integer, "action", {"from" => "home", "to" => "home"}])
+    @driver.mexpect("if_event", [Integer, "action", {"from" => "home", "to" => "about"}])
+    @driver.mexpect("if_event", [Integer, "action", {"from" => "about", "to" => "home"}])
+  end
 end

data/spec/kern/vm_service_spec.rb

@@ -655,7 +655,7 @@ RSpec.describe "kern:vm_service" do
     @driver.mexpect("if_per_get", ["vm", "spec", "test"], 2)
   end
 
-  it "Does send a read request from disk cache when synchronously reading a key for the first time" do
+  it "Does send a read request from disk cache when synchronously reading a key for the first time via read_sync" do
     ctx = flok_new_user File.read('./spec/kern/assets/vm/controller19c.rb'), File.read("./spec/kern/assets/vm/config4.rb") 
 
     ctx.eval %{
@@ -678,17 +678,205 @@ RSpec.describe "kern:vm_service" do
       "entries" => [],
     }]
 
-    @driver.ignore_up_to "if_per_get", 0
     @driver.mexpect("if_per_get", ["vm", "spec", "test2"], 0)
 
+    @driver.int "int_per_get_res", ["vm", "spec", {
+      "_id" => "default",
+      "_hash" => nil,
+      "_next" => nil,
+      "entries" => [],
+    }]
+
     dump = ctx.evald %{
-      dump.read_sync_in_progress = read_sync_in_progress;
+      dump.vm_read_sync_in_progress = vm_read_sync_in_progress;
       dump.read_sync_res_params = read_sync_res_params;
     }
 
-    expect(dump["read_sync_in_progress"]).to eq(nil)
+    expect(dump["vm_read_sync_in_progress"]).to eq([])
+    expect(dump["read_sync_res_params"].length).to eq(2)
     expect(dump["read_sync_res_params"][0]["ns"]).to eq("spec")
     expect(dump["read_sync_res_params"][0]["page"]["_id"]).to eq("default")
+    expect(dump["read_sync_res_params"][1]["ns"]).to eq("spec")
+    expect(dump["read_sync_res_params"][1]["page"]["_id"]).to eq("default")
+  end
+
+  it "Calling read_sync on an entry that already exists in cache will not trigger a disk read" do
+    ctx = flok_new_user File.read('./spec/kern/assets/vm/controller19d.rb'), File.read("./spec/kern/assets/vm/config4.rb") 
+
+    ctx.eval %{
+      base = _embed("my_controller", 1, {}, null);
+
+      //Call pageout *now*
+      vm_pageout();
+
+      //Drain queue
+      int_dispatch([]);
+    }
+
+    #Expect to have gotten one disk read request
+    @driver.ignore_up_to "if_per_get", 0
+    @driver.mexpect("if_per_get", ["vm", "spec", "test"], 0)
+
+    #Send the disk read response back controller19d:14
+    @driver.int "int_per_get_res", ["vm", "spec", {
+      "_id" => "test",
+      "_hash" => nil,
+      "_next" => nil,
+      "entries" => [],
+    }]
+
+    #Send the 'get_test' event which should trigger a disk read
+    ctx.eval %{
+      int_dispatch([3, "int_event", base, "get_test", {}])
+    }
+
+    #We should not get second if_per_get request because the data was already cached
+    #by the first request
+    expect {
+      @driver.ignore_up_to "if_per_get", 0
+    }.to raise_exception
+  end
+
+  it "Calling read_sync on two consecutive controllers within the same frame (i.e no change for int_dispatch to be invoked to drain queue), will result in both controllers getting correct copy of data and not out of order sync_reads as they have to be pulled from the vm_read_sync_in_progress queue to discover the read_sync request base pointer" do
+    ctx = flok_new_user File.read('./spec/kern/assets/vm/controller19e.rb'), File.read("./spec/kern/assets/vm/config4.rb") 
+
+    ctx.eval %{
+      base = _embed("my_controller", 1, {}, null);
+
+      //Drain queue
+      int_dispatch([]);
+    }
+
+    #Expect to have gotten two disk read request, one for test1 and one for test2
+    @driver.ignore_up_to "if_per_get", 0
+    @driver.mexpect("if_per_get", ["vm", "spec", "test1"], 0)
+    @driver.ignore_up_to "if_per_get", 0
+    @driver.mexpect("if_per_get", ["vm", "spec", "test2"], 0)
+
+    #Send the disk read response back for the first controller (my_controller)
+    @driver.int "int_per_get_res", ["vm", "spec", {
+      "_id" => "test1",
+      "_hash" => nil,
+      "_next" => nil,
+      "entries" => [],
+    }]
+
+    #Send the disk read response back for the second controller (my_other_controller)
+    @driver.int "int_per_get_res", ["vm", "spec", {
+      "_id" => "test2",
+      "_hash" => nil,
+      "_next" => nil,
+      "entries" => [],
+    }]
+
+    #The read_sync of each controller should match up with the page it requested
+    dump = @ctx.evald %{
+      dump.my_controller_read_sync_res = my_controller_read_sync_res;
+      dump.my_other_controller_read_sync_res = my_other_controller_read_sync_res;
+    }
+
+    expect(dump["my_controller_read_sync_res"]["page"]["_id"]).to eq("test1")
+    expect(dump["my_other_controller_read_sync_res"]["page"]["_id"]).to eq("test2")
+  end
+
+  it "Calling read_sync on frame0 for page 'A' on controller0 and then on frame1 for page 'A' on controller1 and page 'B' on controller2 will result in all controllers receiving the correct pages" do
+    ctx = flok_new_user File.read('./spec/kern/assets/vm/controller19f.rb'), File.read("./spec/kern/assets/vm/config4.rb") 
+
+    dump = ctx.evald %{
+      dump.controller0_base = _embed("controller0", 1, {}, null);
+      dump.controller1_base = controller1_base; 
+      dump.controller2_base = controller2_base; 
+
+      //Drain queue
+      int_dispatch([]);
+    }
+
+    #Expect the first request for controller0 for pageA
+    @driver.ignore_up_to "if_per_get", 0
+    @driver.mexpect("if_per_get", ["vm", "spec", "A"], 0)
+
+    #Send the disk read response back for controller0 pageA
+    @driver.int "int_per_get_res", ["vm", "spec", {
+      "_id" => "A",
+      "_hash" => nil,
+      "_next" => nil,
+      "entries" => [],
+    }]
+
+    #Now signal to controller1 & controller2 to grab their pages
+    @driver.int "int_event", [dump["controller1_base"], "get", {}]
+    @driver.int "int_event", [dump["controller2_base"], "get", {}]
+
+    #We shouldn't receive 'A' because it will be retrieved by the cache read
+    @driver.ignore_up_to "if_per_get", 0
+    @driver.mexpect("if_per_get", ["vm", "spec", "B"], 0)
+
+    #Send the disk read response back for frame1 'B' for controller2
+    @driver.int "int_per_get_res", ["vm", "spec", {
+      "_id" => "B",
+      "_hash" => nil,
+      "_next" => nil,
+      "entries" => [],
+    }]
+
+    #The read_sync of each controller should match up with the page it requested
+    dump = @ctx.evald %{
+      dump.controller1_read_sync_res = controller1_read_sync_res;
+      dump.controller2_read_sync_res = controller2_read_sync_res;
+    }
+
+    expect(dump["controller1_read_sync_res"]["page"]["_id"]).to eq("A")
+    expect(dump["controller2_read_sync_res"]["page"]["_id"]).to eq("B")
+  end
+
+  it "Calling read_sync on frame0 for page 'B' on controller0 and then on frame1 for page 'A' on controller1 and page 'B' on controller2 will result in all controllers receiving the correct pages (reversed order from above)" do
+    ctx = flok_new_user File.read('./spec/kern/assets/vm/controller19g.rb'), File.read("./spec/kern/assets/vm/config4.rb") 
+
+    dump = ctx.evald %{
+      dump.controller0_base = _embed("controller0", 1, {}, null);
+      dump.controller1_base = controller1_base; 
+      dump.controller2_base = controller2_base; 
+
+      //Drain queue
+      int_dispatch([]);
+    }
+
+    #Expect the first request for controller0 for pageB
+    @driver.ignore_up_to "if_per_get", 0
+    @driver.mexpect("if_per_get", ["vm", "spec", "B"], 0)
+
+    #Send the disk read response back for controller0 pageB
+    @driver.int "int_per_get_res", ["vm", "spec", {
+      "_id" => "B",
+      "_hash" => nil,
+      "_next" => nil,
+      "entries" => [],
+    }]
+
+    #Now signal to controller1 & controller2 to grab their pages
+    @driver.int "int_event", [dump["controller1_base"], "get", {}]
+    @driver.int "int_event", [dump["controller2_base"], "get", {}]
+
+    #We shouldn't receive 'B' because it will be retrieved by the cache read
+    @driver.ignore_up_to "if_per_get", 0
+    @driver.mexpect("if_per_get", ["vm", "spec", "A"], 0)
+
+    #Send the disk read response back for frame1 'A' for controller2
+    @driver.int "int_per_get_res", ["vm", "spec", {
+      "_id" => "A",
+      "_hash" => nil,
+      "_next" => nil,
+      "entries" => [],
+    }]
+
+    #The read_sync of each controller should match up with the page it requested
+    dump = @ctx.evald %{
+      dump.controller1_read_sync_res = controller1_read_sync_res;
+      dump.controller2_read_sync_res = controller2_read_sync_res;
+    }
+
+    expect(dump["controller1_read_sync_res"]["page"]["_id"]).to eq("A")
+    expect(dump["controller2_read_sync_res"]["page"]["_id"]).to eq("B")
   end
 
   it "Does send a sync read request from disk cache when watching a key for the first time with sync: true" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flok
 version: !ruby/object:Gem::Version
-  version: 0.0.57
+  version: 0.0.60
 platform: ruby
 authors:
 - seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-15 00:00:00.000000000 Z
+date: 2015-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
@@ -1144,6 +1144,7 @@ files:
 - spec/kern/assets/controller_spots.rb
 - spec/kern/assets/controller_spots_embed.rb
 - spec/kern/assets/controller_spots_embed_removed.rb
+- spec/kern/assets/current_action_nav.rb
 - spec/kern/assets/embed_info.rb
 - spec/kern/assets/event_gw.rb
 - spec/kern/assets/forward_and_back.rb
@@ -1206,6 +1207,10 @@ files:
 - spec/kern/assets/vm/controller19.rb
 - spec/kern/assets/vm/controller19b.rb
 - spec/kern/assets/vm/controller19c.rb
+- spec/kern/assets/vm/controller19d.rb
+- spec/kern/assets/vm/controller19e.rb
+- spec/kern/assets/vm/controller19f.rb
+- spec/kern/assets/vm/controller19g.rb
 - spec/kern/assets/vm/controller2.rb
 - spec/kern/assets/vm/controller20.rb
 - spec/kern/assets/vm/controller21.rb
@@ -2067,6 +2072,7 @@ test_files:
 - spec/kern/assets/controller_spots.rb
 - spec/kern/assets/controller_spots_embed.rb
 - spec/kern/assets/controller_spots_embed_removed.rb
+- spec/kern/assets/current_action_nav.rb
 - spec/kern/assets/embed_info.rb
 - spec/kern/assets/event_gw.rb
 - spec/kern/assets/forward_and_back.rb
@@ -2129,6 +2135,10 @@ test_files:
 - spec/kern/assets/vm/controller19.rb
 - spec/kern/assets/vm/controller19b.rb
 - spec/kern/assets/vm/controller19c.rb
+- spec/kern/assets/vm/controller19d.rb
+- spec/kern/assets/vm/controller19e.rb
+- spec/kern/assets/vm/controller19f.rb
+- spec/kern/assets/vm/controller19g.rb
 - spec/kern/assets/vm/controller2.rb
 - spec/kern/assets/vm/controller20.rb
 - spec/kern/assets/vm/controller21.rb