flok 0.0.63 → 0.0.64

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d369b592a35b8b2c078db3ac85240d1757cbe365
-  data.tar.gz: bf82891bcedf8b23edafcea1a06dc4876043535c
+  metadata.gz: 23c9159d75fdda332b781181b9f67d2ac27ce050
+  data.tar.gz: c8708185f49d5971598bc07223b3dd826a74357c
 SHA512:
-  metadata.gz: e58ba2e2620c41ee3e70960076766a63955219cd6fad8deebeaf5e067e10d38c053da078327b7b39a1e9d00a8b56af6e07858cacc60839bc7c9917f504a40eab
-  data.tar.gz: 4ad97f13b5ed4da7a63dd15366d0507ece1cf43aa3379183e8ee1b48c707f0a61a59fe04552ccd94aba645b650d122600cfabedc62e86966196c86cd72515bef
+  metadata.gz: 89a25a47703e48edb20ec062af27290f28cd4029fa15ebc48b2faaf4a01a8c5559f5db93d525191d77c1491954e9d1edfe813a14e654dd8447df77992b25ba18
+  data.tar.gz: 4af82d9ce8f48639b99e4b710b5771da4129c3bd792b6b7a67bf0966ac4bf994456ab4eefaed0b2e1c84ff17309fc55e101b7564fc4586d5fae74dcd2d4b67b9

data/app/kern/controller.js

@@ -78,7 +78,8 @@ function _embed(vc_name, sp, context, event_gw) {
     action: "choose_action",
     cte: cte,
     embeds: embeds,
-    event_gw: event_gw
+    event_gw: event_gw,
+    stack: [],
   };
 
   //Register controller base with the struct, we already requested base

data/docs/client_api.md

@@ -5,6 +5,7 @@ Client API covers controller action event handlers.
   * Embed(view_controller_name, spot_name, context) - Embed a view controller with the name `view_controller_name` inside the current view controller at the spot with a context
   * Goto(action_name) - Change actions
   * Push(action_name) - This works just like `Goto` except that `Pop` will restore the last action
+  * Pop(action_name) - This is to be used after `Push` and will restore the state previous to the `Push`.
   * Request(service_insatnce_name, ename, params) Initiate a service.  See [Services](./services.md) for more info.  
   * Send(event_name, info) - Send a custom event on the main queue.
   * Raise(event_name, info) - Will send an event to the parent view controller (and it will bubble up, following `event_gw` which is set in `Embed` as the parent controller

data/docs/datatypes.md

@@ -43,5 +43,7 @@ controller_info {
   action: //The name of the current action that is active
   cte:    //The ctable entry pertaining to this controller
   embeds: //An array of arrays, where position 0 is the spot after `main`, each element in the array is a view controller base pointer.
+  stack: [{action:, embeds:}] //When pushing, the stack contains a copy of the controller_info's action's and a reference to the embeds from the previous layer. 
+  event_gw: //When an event cannot be serviced, it is given to the gateway to continue propogating
 }
 ```

data/lib/flok/user_compiler.rb

@@ -219,7 +219,11 @@ module Flok
 
           #Switch the actions, reset embeds, and call on_entry
           res = %{
+            //Save state
             var old_action = __info__.action;
+            var old_embeds = __info__.embeds;
+            __info__.stack.push({action: old_action, embeds: old_embeds});
+
             __info__.action = "#{action_name}";
 
             //Prep embeds array, embeds[0] refers to the spot bp+2 (bp is vc, bp+1 is main)
@@ -232,11 +236,6 @@ module Flok
             //located in ctable
             __info__.cte.actions[__info__.action].on_entry(__base__)
 
-            //'choose_action' pseudo-action will be sent as 'null' as it's the initial state
-            if (old_action === "choose_action") {
-              old_action = null;
-            }
-
             //Send off event for action change
             main_q.push([3, "if_event", __base__, "action", {
               from: old_action,
@@ -250,8 +249,38 @@ module Flok
           l.gsub! /\)$/, ""
           l.gsub! /\);$/, ""
           o = l.split(",").map{|e| e.strip}
+          #Switch the actions, reset embeds, and call on_entry
+          res = %{
+            var restore_info = __info__.stack.pop();
+
+            //Retrieve the original action info
+            var orig_action = restore_info.action;
+            var orig_embeds = restore_info.embeds;
+
+            //Save the old action
+            //var old_action = __info__.action;
+
+            //Restore the action we pushed from
+            __info__.action = orig_action;
 
-          #out.puts res
+            //Remove all views, we don't have to recurse because removal of a view
+            //is supposed to remove *all* view controllers of that tree as well.
+            var embeds = __info__.embeds;
+            for (var i = 0; i < __info__.embeds.length; ++i) {
+              for (var j = 0; j < __info__.embeds[i].length; ++j) {
+                //Free +1 because that will be the 'main' view
+                main_q.push([1, "if_free_view", embeds[i][j]+1]);
+
+                //Call dealloc on the controller
+                tel_deref(embeds[i][j]).cte.__dealloc__(embeds[i][j]);
+              }
+            }
+
+            //Restore embeds
+            __info__.embeds = orig_embeds;
+          }
+
+          out.puts res
         #Request(service_instance_name, ename, info)
         elsif l =~ /Request/
           l.strip!

data/lib/flok/version.rb

@@ -1,3 +1,3 @@
 module Flok
-  VERSION = "0.0.63"
+  VERSION = "0.0.64"
 end

data/spec/env/kern.rb

@@ -195,6 +195,7 @@ shared_context "kern" do
     #Expect the queue to not contain a message matching
     def expect_not_to_contain msg_name, &block
       original_q = JSON.parse(@q.to_json)
+      @cq = []
 
       loop do
         if @q.count == 0 and @cq.count == 0

data/spec/kern/assets/push_pop.rb

@@ -1,9 +1,14 @@
 controller :my_controller do
   spots "hello", "world"
 
+  on_entry %{
+    my_action_entered_count = 0;
+  }
+
   action :my_action do
     on_entry %{
       Embed("my_controller2", "hello", {});
+      my_action_entered_count += 1;
     }
 
     on "test_event", %{
@@ -13,6 +18,7 @@ controller :my_controller do
 
   action :my_other_action do
     on_entry %{
+      Embed("my_controller3", "hello", {});
       my_other_action_on_entry_called = true;
     }
 
@@ -28,3 +34,12 @@ controller :my_controller2 do
     }
   end
 end
+
+controller :my_controller3 do
+  action :my_action do
+    on_entry %{
+      my_controller3_main_view_bp = __base__+1;
+    }
+  end
+end
+

data/spec/kern/controller_spec.rb

@@ -127,12 +127,14 @@ RSpec.describe "kern:controller_spec" do
       action = info.action
       cte = info.cte
       event_gw = info.event_gw
+      stack = info.stack
     }
 
     expect(ctx.eval('context')).not_to eq(nil)
     expect(ctx.eval('action')).not_to eq(nil)
     expect(ctx.eval('cte')).not_to eq(nil)
     expect(ctx.eval('"event_gw" in info')).not_to eq(nil)
+    expect(ctx.eval('stack')).not_to eq(nil)
   end
 
  it "calls on_entry with the base pointer when a controller is embedded for the initial action" do
@@ -351,19 +353,52 @@ RSpec.describe "kern:controller_spec" do
     ctx = flok_new_user File.read('./spec/kern/assets/push_pop.rb')
 
     #Run the embed function
-    ctx.eval %{
+    dump = ctx.evald %{
       //Call embed on main root view
-      base = _embed("my_controller", 0, {}, null);
+      dump["base"] = _embed("my_controller", 0, {}, null);
 
-      //Drain queue with test event
-      int_dispatch([3, "int_event", base, "test_event", {}]);
+      //The controller's info
+      dump["controller_info"] = tel_deref(dump["base"]);
+      dump["ctable_entry"] = dump["controller_info"]["cte"];
+
+      //Dump the embeds array before we switch anything around, this is the embeds for `my_action`
+      dump["my_action_embeds_original_array"] = JSON.parse(JSON.stringify(dump["controller_info"]["embeds"]));
+
+      //Push the controller to 'my_other_action'
+      int_dispatch([3, "int_event", dump["base"], "test_event", {}]);
+
+      //Pop the controller back to 'my_action'
+      int_dispatch([3, "int_event", dump["base"], "back", {}]);
+
+      //The second action was entered
+      dump["my_other_action_on_entry_called"] = my_other_action_on_entry_called; 
+
+      //The first action was not entered twice
+      dump["my_action_entered_count"] = my_action_entered_count;
+
+      //The poped controller's base pointer for the main view
+      dump["my_controller3_main_view_bp"] = my_controller3_main_view_bp;
     }
 
-    #Now we expect the action for the controller to be 'my_other_action' and for it's on_entry
-    #to be called
-    expect(ctx.eval("my_other_action_on_entry_called")).not_to eq(nil)
-  end
+    #The controller's instance info `action` field was changed back to the old action
+    expect(dump["controller_info"]["action"]).to eq("my_action")
 
+    #The controller's embeds is now restored back to the original embeds from 'my_action'
+    expect(dump["controller_info"]["embeds"]).to eq(dump["my_action_embeds_original_array"])
+
+    #Does dealloc the pushed controller, we can check to see if the view was destroyed
+    @driver.ignore_up_to "if_free_view"
+    @driver.mexpect("if_free_view", [dump["my_controller3_main_view_bp"]])
+
+    #Do not get a notification for any more removals, or creations
+    @driver.expect_not_to_contain "if_free_view"
+    @driver.expect_not_to_contain "if_init_view"
+
+    #Do not get a notification for the view hierarchy about the change
+    @driver.expect_not_to_contain "if_event" do |e|
+      next e[2] == {"from" => "my_other_action", "to" => "my_action"}
+    end
+  end
 
   it "Does tear down the old embedded view from the embedded view controller when switching actions" do
     #Compile the controller

metadata

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