flok 0.0.31 → 0.0.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d2381d87fc2df1592fba24b3c253c1306483a27
-  data.tar.gz: d8b34fdcf810a4751a6586219933d2fd8b43bd54
+  metadata.gz: 00cd49da5335192729606171ad9984480b369ebe
+  data.tar.gz: 9a7bc120ce65ee6203b56cbd0c05eaf3437ff9a2
 SHA512:
-  metadata.gz: db14dc64d1c11300b4f60f45a4f5c87e84f1ad3483dc31d3e98f351eedf7d707cfb80fd1843df555c9c02265a6d38a610f18dfd1d1039cdca020f195335cfe2d
-  data.tar.gz: 58b581c57eb5b27cec7cbcc2f82c2535ffb54d9916ead0bdd50fc0872d72640910680f6c80f122bb2e7a06b874b1d0074e0c4289173dcfe1078c78509ccbf826
+  metadata.gz: 1fdfc40123d710b11c1ec8d5d57d8de48d1855b70d1a479198e9fe49a6e24ae0759daa1c813515f4a38d16025e5aee0cb26e522d71a6a902807de38401e0499d
+  data.tar.gz: 699c0f41acff97be48740a378bcaf89f6bac7c4eebf13f7de22999d23d54bd48d17e58e64e9c4e56f678020e3139b71db6368a7a8e84cd1e168aabef4ee95a3a

data/app/drivers/chrome/src/event.js

@@ -1,4 +1,5 @@
 function if_event(ep, name, info) {
+  
   //Dispatch to controller if cinstances defines ep
   if (cinstances[ep] !== undefined) {
     if (name == "action") {

data/app/kern/controller.js

@@ -16,6 +16,7 @@
 //Embed a view-controller into a named spot. If spot is null, then it is assumed
 //you are referring to the root-spot.
 function _embed(vc_name, sp, context, event_gw) {
+  console.log("Eembed request for vc named: " + vc_name + " into spot: " + sp);
   //Lookup VC ctable entry
   var cte = ctable[vc_name];
 

data/app/kern/mod/debug.js

@@ -38,7 +38,6 @@ function int_debug_dump_ui() {
     payload.children.push(rvc);
   }
 
-  //Notify with the 'debug' pointer of -333
   SEND("main", "if_event", -333, "debug_dump_ui_res", payload);
 }
 
@@ -54,12 +53,17 @@ function dump_ui_recurse(ptr, node) {
 
     //Live controller instance
     var cinfo = tel_deref(ptr);
+    var cte = cinfo.cte;
 
     //Get action
-    node['action'] = cinfo.action;
+    var action = cinfo.action;
+    node['action'] = action;
 
     //Get name from the ctable reference
-    node['name'] = cinfo.cte.name;
+    node['name'] = cte.name;
+
+    //Get a list of events that this action responds to
+    node['events'] = Object.keys(cte.actions[action].handlers);
 
     //Recurse with the 'main' view (ptr+1) in this view controller's
     //first child slot. (there is only one view per view controller)
@@ -112,9 +116,16 @@ function dump_ui_recurse(ptr, node) {
 }
 
 ////////////////////////////////////////////////////////////
-//Controller context
+//Controller describe
 ////////////////////////////////////////////////////////////
-function int_debug_controller_context(bp) {
-  var payload = tel_deref(bp).context;
-  SEND("main", "if_event", -333, "debug_controller_context_res", payload);
+function int_debug_controller_describe(bp) {
+  //Grab the controller's instance and table entry
+  var cinfo = tel_deref(bp);
+  var cte = cinfo.cte;
+
+  var payload = {
+    context: cinfo.context,
+    events: Object.keys(cte.actions[cinfo.action].handlers) 
+  };
+  SEND("main", "if_event", -333, "debug_controller_describe_res", payload);
 }

data/app/kern/mod/event.js

@@ -2,6 +2,14 @@
 evt = {};
 
 function int_event(ep, event_name, info) {
+  <% if @debug %>
+    if (typeof ep == 'string' || ep instanceof String) {
+      console.log("WARN: received ep of '" + ep + "' that was a string!!!");
+      console.log("name: " + name);
+      console.log("info: " + JSON.stringify(info));
+    }
+  <% end %>
+
   var f = evt[ep];
   if (f != undefined) {
     f(ep, event_name, info);

data/docs/branches.md

@@ -0,0 +1,4 @@
+#Branches
+
+  * `test` - The development branch, this branch should *never* be broken.
+  * `master` - The production branch.

data/docs/controllers.md

@@ -18,11 +18,11 @@ event, the event is passed to the `event_gw` (event gateway) of the `controller_
 on the structure. If `event_gw` is `null`, then the event is ignored.
 
 ###Writing a `flok user controller (fuc)`
-Let's write a `fuc` controller for a view that has 2 tabs and a content area.
+Let's write a `fuc` controller that has 2 tabs and a content area. The view is implicitly the same name of the controller, in this case it would be
+`tab_controller`
 
 ```ruby
 controller "tab_controller" do
-  view "tab_container"
   spaces "content"
 
   #You can also define macros for shared action traits

data/docs/mod/debug.md

@@ -14,8 +14,11 @@ the port -333 with the message name `eval_res` and the info as `{info: res}` whe
 
 `int_debug_dump_ui` - See [Debug Dump UI](./debug/dump_ui.md) for specifics.
 
-`int_debug_controller_context(bp)` - Retreive a controller's context. Sends a `if_event` to port `-333` named `debug_controller_context_res` with the payload of the controller's
-context at `bp`
+`int_debug_controller_describe(bp)` - Retreive information about a controller. Sends a `if_event` to port `-333` named `debug_controller_describe_res` with the payload of the controller's
+describe at `bp`.
+  * describe returns
+    * `context` - The context of the controller which is `cinfo.context`
+    * `events` - The list of events the current controller action will respond to, **current action not the same as displayed if it's changed**
 
 ### Driver Spec related
   * `if_debug_spec_assoc(base, key)` - When this message is received, the client shall return a message called `spec` containing the value

data/docs/mod/debug/dump_ui.md

@@ -18,6 +18,7 @@ Ontop of the base node, the type defines a child class of the node:
     * `name` - The name of the view controller (human friendly)
     * `action` - Current action name (human friendly)
     * `ptr` - The base pointer of this view controller
+    * `events` - A list of events that the current action is capabable of handling
   * `view` - View
     * `name` - The name of the view
     * `ptr` - The pointer to the view

data/lib/flok/user_compiler.rb

@@ -114,6 +114,7 @@ module Flok
           #Calculate spot index as an offset from the base address using the index of the spot in the spots
           #address offset
           res = %{
+            
             var ptr = _embed("#{vc_name}", __base__+#{spot_index}+1, #{context}, __base__);
             __info__.embeds[#{spot_index-1}].push(ptr);
           }
@@ -210,20 +211,21 @@ module Flok
               }
             }
 
-            //Send off event for action change
-            main_q.push([3, "if_event", __base__, "action", {
-              from: old_action,
-              to: "#{action_name}"
-            }]);
-
-
             //Prep embeds array, embeds[0] refers to the spot bp+2 (bp is vc, bp+1 is main)
             __info__.embeds = [];
             for (var i = 1; i < #{@controller.spots.count}; ++i) {
               __info__.embeds.push([]);
             }
 
+            //Call on_entry for the new action via the singleton on_entry
+            //located in ctable
             __info__.cte.actions[__info__.action].on_entry(__base__)
+
+            //Send off event for action change
+            main_q.push([3, "if_event", __base__, "action", {
+              from: old_action,
+              to: "#{action_name}"
+            }]);
           }
           out.puts res
         #Request(service_name, payload, event_name_cb)
@@ -263,7 +265,7 @@ module Flok
   end
 
   class UserCompilerController
-    attr_accessor :root_view, :name, :spots, :macros
+    attr_accessor :name, :spots, :macros
     def initialize name, ctx, &block
       @name = name
       @ctx = ctx
@@ -273,10 +275,6 @@ module Flok
       self.instance_eval(&block)
     end
 
-    def view name
-      @root_view = name
-    end
-
     #Create an action macro
     def macro name, &block
       @macros[name] = block

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

@@ -2,7 +2,7 @@ ctable = {
   <% @controllers.each do |c| %>
       <%= c.name %>: {
         name: '<%= c.name %>',
-        root_view: '<%= c.root_view %>',
+        root_view: '<%= c.name %>',
         spots: <%= c.spots.to_json %>,
         actions: {
           <% actions_for_controller(c.name).each do |a| %>

data/lib/flok/version.rb

@@ -1,3 +1,3 @@
 module Flok
-  VERSION = "0.0.31"
+  VERSION = "0.0.32"
 end

data/spec/etc/cli_spec.rb

@@ -168,7 +168,6 @@ it "Can create a new project with correct directories" do
         #Now add a file
         File.write "./app/controllers/test2.rb", %{
           controller "my_controller" do
-            view "my_controller"
             action "my_action" do
               on_entry %{
               }
@@ -216,7 +215,6 @@ it "Can create a new project with correct directories" do
         #Now add a file
         File.write "./app/controllers/test2.rb", %{
           controller "my_controller" do
-            view "my_controller"
             action "my_action" do
               on_entry %{
               }

data/spec/etc/user_compiler/controller0.rb

@@ -1,5 +1,4 @@
 controller :my_controller do
-  view :test_view
   spots "hello", "world"
 
   action :my_action do

data/spec/etc/user_compiler_spec.rb

@@ -27,10 +27,11 @@ RSpec.describe "User compiler" do
     compiler = Flok::UserCompiler
   end
 
-  it "Can compile a controller and give up the root view" do
+  it "Can compile a controller and give up the root 
+  iew" do
     ctx = compile "controller0"
     root_view = ctx.eval "ctable.my_controller.root_view"
-    expect(root_view).to eq("test_view")
+    expect(root_view).to eq("my_controller")
   end
 
   it "Can compile a controller and contain a list of actions" do

data/spec/kern/assets/controller0.rb

@@ -1,5 +1,4 @@
 controller :my_controller do
-  view :test_view
   spots "hello", "world"
 
   action :my_action do

data/spec/kern/assets/controller1.rb

@@ -1,5 +1,4 @@
 controller :my_controller do
-  view :test_view
   spots "hello", "world"
 
   action :my_action do
@@ -14,7 +13,6 @@ controller :my_controller do
 end
 
 controller :my_sub_controller do
-  view :test_view2
   spots "hello", "world"
 
   action :my_action do

data/spec/kern/assets/controller_bare.rb

@@ -1,8 +1,9 @@
 controller :my_controller do
-  view "my_view"
-
   action :index do
     on_entry %{
     }
+
+    on "test", %{
+    }
   end
 end

data/spec/kern/assets/controller_def.rb

@@ -1,5 +1,4 @@
 controller :my_controller do
-  view :test_view
   spots "content"
 
   macro :my_macro do

data/spec/kern/assets/{controller_context.rb → controller_describe.rb}

@@ -1,9 +1,10 @@
 controller :my_controller do
-  view "my_view"
-
   action :index do
     on_entry %{
       context.hello = 'world';
     }
+
+    on "test", %{
+    }
   end
 end

data/spec/kern/assets/controller_spots.rb

@@ -1,9 +1,14 @@
 controller :my_controller do
-  view "my_view"
   spots "one", "two"
 
   action :index do
     on_entry %{
     }
+
+    on "test", %{
+    }
+
+    on "test2", %{
+    }
   end
 end

data/spec/kern/assets/controller_spots_embed.rb

@@ -1,19 +1,22 @@
 controller :my_controller do
-  view "my_view"
   spots "one", "two"
 
   action :index do
     on_entry %{
       Embed("my_other_controller", "one", {});
     }
+
+    on "test1", %{
+    }
   end
 end
 
 controller :my_other_controller do
-  view "my_other_view"
-
   action :index do
     on_entry %{
     }
+
+    on "test2", %{
+    }
   end
 end

data/spec/kern/assets/controller_spots_embed_removed.rb

@@ -1,5 +1,4 @@
 controller :my_controller do
-  view "my_view"
   spots "one", "two"
 
   action :index do
@@ -10,19 +9,26 @@ controller :my_controller do
     on "next", %{
       Goto("other");
     }
+
+    on "test1", %{
+    }
   end
 
   action :other do
     on_entry %{
     }
+
+    on "test2", %{
+    }
   end
 end
 
 controller :my_other_controller do
-  view "my_other_view"
-
   action :index do
     on_entry %{
     }
+
+    on "test3", %{
+    }
   end
 end

data/spec/kern/assets/embed_info.rb

@@ -1,5 +1,4 @@
 controller :my_controller do
-  view :test_view
   spots "hello", "world"
 
   action :my_action do
@@ -14,7 +13,6 @@ controller :my_controller do
 end
 
 controller :my_sub_controller do
-  view :test_view2
   spots "hello", "world"
 
   action :my_action do

data/spec/kern/assets/event_gw.rb

@@ -1,5 +1,4 @@
 controller :my_controller do
-  view :test_view
   spots "hello", "world"
 
   action :my_action do
@@ -10,7 +9,6 @@ controller :my_controller do
 end
 
 controller :my_sub_controller do
-  view :test_view2
   spots "hello", "world"
 
   action :my_action do

data/spec/kern/assets/forward_and_back.rb

@@ -0,0 +1,37 @@
+controller :fabric do
+  spots "content"
+
+  action "one" do
+    on_entry %{
+      Embed("one", "content", {});
+    }
+
+    on "next_clicked", %{
+      Goto("two");
+    }
+  end
+
+  action "two" do
+    on_entry %{
+      Embed("two", "content", {});
+    }
+
+    on "back_clicked", %{
+      Goto("one");
+    }
+  end
+end
+
+controller :one do
+  action "index" do
+    on_entry %{
+    }
+  end
+end
+
+controller :two do
+  action "index" do
+    on_entry %{
+    }
+  end
+end