flok 0.0.102 → 0.0.103

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9638b060e87d9e0e19a63fdbeb014c4955a3c55
-  data.tar.gz: 5f040e2f1eb8ed097787120bd32c77a31d756d47
+  metadata.gz: 6d3dd5275337abe10712fa3347a698c60819ff78
+  data.tar.gz: e126f18d24e069176e485f6db5327c407dafad71
 SHA512:
-  metadata.gz: 285f33c37d3768ec61720d91e0ea690cd4dee909aeeb9bdabf1f783b6c50dc48b09472aa72070d63a5d8c6942f33e5a09f7ca5c2e4c7faf35fbbdf71de348abb
-  data.tar.gz: c95c3272086f6aed12b5b302bd94f408dbfcd468e9e028f661d7f1b61c6bf1ca3a9f40aecc051004508b22a7cf932222b226fb02ddae40824cf56ab3c4200562
+  metadata.gz: baaa0fb3c2b68b3460e892d0f8d1c084e2d20eea45baaf29ff1ed8232bacd67cbd1aa0362a6fc725fd57be77519593c56021042c48d17a6b22c3b1d52ae2f1e3
+  data.tar.gz: ee1f06e6d0210adf94dbb9a7780945a4f9a9c37a1b39ac15d1b85512c2cecb678fdb064f9248da5406e49ccf9f5071383e32b7c60ceda860d86705cd93adc42e

data/.gitmodules

@@ -0,0 +1,3 @@
+[submodule "app/drivers/apple"]
+	path = app/drivers/apple
+	url = git@github.com:sotownsend/flok-apple.git

data/app/drivers/chrome/pipe.rb

@@ -15,69 +15,84 @@ class InteractiveServer
 
   #Will take over any remaining IO
   def begin_pipe
-    tmp = Tempfile.new(SecureRandom.hex)
-    path = tmp.path
-    tmp.close!
-    File.write path, @app_js
+    puts "LOADED"
 
-    p = Open3.popen3 "boojs #{path}" do |inp, out, err, t|
-      pid = t[:pid]
-      begin
-        loop do
-          results = select([out, err, STDIN], [])
-          if results[0].include? err
-            err_msg = err.readline
-            $stderr.puts err_msg
-            #exit 1 unless err_msg =~ /[debug]/
-          end
+    _begin_pipe
+  end
+
+  def _begin_pipe
+    catch(:is_restarting) do
+      tmp = Tempfile.new(SecureRandom.hex)
+      path = tmp.path
+      tmp.close!
+      File.write path, @app_js
+
+      p = Open3.popen3 "boojs #{path}" do |inp, out, err, t|
+        pid = t[:pid]
+        begin
+          loop do
+            results = select([out, err, STDIN], [])
+            if results[0].include? err
+              err_msg = err.readline
+              $stderr.puts err_msg
+              #exit 1 unless err_msg =~ /[debug]/
+            end
+
+            if results[0].include? STDIN
+              begin
+                q = gets.strip
+
+                if q == "HARD_RESTART"
+                  throw :is_restarting
+                elsif q == "RESTART"
+                  inp.puts "$__RESTART__"
 
-          if results[0].include? STDIN
-            begin
-              q = gets.strip
-              if q == "RESTART"
-                inp.puts "$__RESTART__"
+                  begin
+                    #Wait for restart to respond 'ok'
+                    Timeout::timeout(10) do
+                      restart_res = out.readline
+                      raise "Restart of phantomjs did not return '__RESTART_OK__' like expected, returned: #{restart_res.inspect}" unless restart_res == "$__RESTART_OK__\n"
 
-                begin
-                  #Wait for restart to respond 'ok'
-                  Timeout::timeout(10) do
-                    restart_res = out.readline
-                    raise "Restart of phantomjs did not return '__RESTART_OK__' like expected, returned: #{restart_res.inspect}" unless restart_res == "$__RESTART_OK__\n"
+                      puts "RESTART OK"
+                    end
+                  rescue Timeout::Error
+                    raise "Restart of boojs did not happen within 5 seconds"
+                  rescue EOFError
+                    #Sleep for a second to let the error pipe fill up from boojs, this error
+                    #will then be displayed and then we will crash
+                    sleep 3
+                    $stderr.puts err.read
+                    raise "boojs encountered an error"
                   end
-                rescue Timeout::Error
-                  raise "Restart of boojs did not happen within 5 seconds"
-                rescue EOFError
-                  #Sleep for a second to let the error pipe fill up from boojs, this error
-                  #will then be displayed and then we will crash
-                  sleep 3
-                  $stderr.puts err.read
-                  raise "boojs encountered an error"
-                end
 
-                puts "RESTART OK"
-              else
-                inp.puts "if_dispatch(JSON.parse('#{q}'))"
+                else
+                  inp.puts "if_dispatch(JSON.parse('#{q}'))"
+                end
+              rescue Errno::EIO
+                #Can't say anything here, we don't have a pipe
+                exit 1
+              rescue NoMethodError
+                exit 1
               end
-            rescue Errno::EIO
-              #Can't say anything here, we don't have a pipe
-              exit 1
-            rescue NoMethodError
-              exit 1
             end
-          end
 
-          if results[0].include? out
-            res = out.readline
-            $stdout.puts res
-            $stdout.flush
+            if results[0].include? out
+              res = out.readline
+              $stdout.puts res
+              $stdout.flush
+            end
+          end
+        ensure
+          begin
+            Process.kill :INT, pid
+          rescue Errno::ESRCH
           end
-        end
-      ensure
-        begin
-          Process.kill :INT, pid
-        rescue Errno::ESRCH
         end
       end
     end
+
+    puts "RESTART OK"
+    _begin_pipe
   end
 
   #JS Functions#####################################################

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

@@ -159,9 +159,28 @@ function if_spec_controller_init() {
     }
   }
 
+  var TestControllerContext = function() {
+    this.base = FlokController; this.base(); self = this;
+
+    this.init = function() {
+      self.send("context", self.context)
+    }
+
+    self.action = function(from, to) {
+      self.send("action_rcv", {from: from, to:to});
+    }
+
+    self.event = function(name, info) {
+      self.send("custom_rcv", {name:name, info:info})
+    }
+  }
+
+
   //Register the new controller
   $(document).ready(function() {
-    regController("__test__", TestController);
+    regController("spec_blank", TestController);
+    regController("spec_one_spot", TestController);
+    regController("spec_blank_sends_context", TestControllerContext);
   });
 }
 

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

@@ -1,23 +1,11 @@
 //Driver side interface
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////
 function if_hook_event(name, info) {
-  <% if @debug %>
-    if_hook_spec_dump_rcvd_events_log.push({name: name, info: info});
-  <% end %>
-
   //Call the appropriate registered handler
   if (hookEventHandlers[name] !== undefined) {
     hookEventHandlers[name](info);
   }
 }
-
-<% if @debug %>
-  //Track all events sent to if_hook_event
-  var if_hook_spec_dump_rcvd_events_log = []
-  function if_hook_spec_dump_rcvd_events() {
-    int_dispatch([1, "if_hook_spec_dump_rcvd_events_res", if_hook_spec_dump_rcvd_events_log]);
-  }
-<% end %>
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 //User helpers
@@ -27,3 +15,13 @@ function onHookEvent(eventName, handler) {
   hookEventHandlers[eventName] = handler;
 }
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+<% if @debug %>
+  onHookEvent("test", function(info) {
+    int_dispatch([1, "hook_dump_res", {name: "test", info: info}]);
+  });
+
+  onHookEvent("test2", function(info) {
+    int_dispatch([1, "hook_dump_res", {name: "test2", info: info}]);
+  });
+<% end %>

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

@@ -11,8 +11,8 @@ if_net_req = function(verb, url, params, tp_base) {
     success: function(data) {
       int_dispatch([3, "int_net_cb", tp_base, true, data]);
     },
-    error: function(xhr, textStatus, err) {
-      int_dispatch([3, "int_net_cb", tp_base, false, textStatus]);
-    }
-  })
+  error: function(xhr, textStatus, err) {
+    int_dispatch([3, "int_net_cb", tp_base, false, textStatus]);
+  }
+})
 }

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

@@ -17,7 +17,7 @@ function if_sockio_fwd(sp, event_name, bp) {
     });
   } else {
     <% if @debug %>
-      console.error("Couldnt fwd sockio with sp: " + sp + " (It dspn't exist)");
+      console.error("Couldnt fwd sockio with sp: " + sp + " (It does not exist)");
     <% end %>
   }
 }
@@ -30,7 +30,7 @@ function if_sockio_send(sp, event_name, info) {
     socket.emit(event_name, info);
   } else {
     <% if @debug %>
-      console.error("Couldnt fwd sockio with sp: " + sp + " (It dspn't exist)");
+      console.error("Couldnt fwd sockio with sp: " + sp + " (It does not exist)");
     <% end %>
   }
 }

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

@@ -1,5 +1,6 @@
 //Create a new surface based on a prototype name and information.
 //Store that view in our own pointer table that uses selectors
+
 //Both spots and views
 if_ui_tp_to_selector = {};
 
@@ -113,21 +114,23 @@ function if_free_view(vp) {
 //Spec related////////////////////////////////////////////////
 function if_ui_spec_init() {
   //Set the body HTML
-  var body_html = "                                  \
-    <div id='root'></div>                            \
-                                                     \
-    <div id='prototypes' style='display: none'>      \
-      <div class='view' data-name='spec_blank'>      \
-      </div>                                         \
-      <div class='view' data-name='spec_one_spot'>   \
-        <div class='spot' data-name='content'></div> \
-      </div>                                         \
-      <div class='view' data-name='spec_two_spot'>   \
-        <div class='spot' data-name='a'></div>       \
-        <div class='spot' data-name='b'></div>       \
-      </div>                                         \
-    </div>                                           \
-                                                     \
+  var body_html = "                                           \
+    <div id='root'></div>                                     \
+                                                              \
+    <div id='prototypes' style='display: none'>               \
+      <div class='view' data-name='spec_blank'>               \
+      </div>                                                  \
+      <div class='view' data-name='spec_blank_sends_context'> \
+      </div>                                                  \
+      <div class='view' data-name='spec_one_spot'>            \
+        <div class='spot' data-name='content'></div>          \
+      </div>                                                  \
+      <div class='view' data-name='spec_two_spot'>            \
+        <div class='spot' data-name='a'></div>                \
+        <div class='spot' data-name='b'></div>                \
+      </div>                                                  \
+    </div>                                                    \
+                                                              \
   "
   $("body").html(body_html);
 }

data/app/kern/mod/event.js

@@ -6,7 +6,9 @@ edefer_q = [];
 
 function int_event(ep, event_name, info) {
   <% if @debug %>
-    if (ep.constructor !== String && ep.constructor !== Number) { throw "int_event was given either something that wasn't a string or number for ep: '" + (ep.constructor) + "' and the value was: '" + ep + "'"};
+    if (ep) {
+      if (ep.constructor !== String && ep.constructor !== Number) { throw "int_event was given either something that wasn't a string or number for ep: '" + (ep.constructor) + "' and the value was: '" + ep + "'"};
+    }
   <% end %>
 
   var f = evt[ep];

data/app/kern/mod/hook.js

@@ -1 +1,13 @@
-//Stub
+//goto hook generator expects this callback to be received usually for completion
+function hook_goto_completion_cb(ep, ename, info) {
+  var views_to_free_id = ep;
+  var our_views_to_free = views_to_free[ep];
+
+  delete views_to_free[ep];
+  dereg_evt(ep);
+
+  for (var key in our_views_to_free) {
+    var bp = our_views_to_free[key];
+    main_q.push([1, "if_free_view", bp]);
+  }
+}

data/app/kern/mod/ui.js

@@ -1,2 +1,73 @@
 function int_embed_surface(sp) {
 }
+
+function find_view(bp, spider) {
+  var res = {};
+  _find_view(bp, spider, res);
+
+  return res;
+}
+
+function _find_view(bp, spider, shared) {
+  var leaf = spider["__leaf__"];
+  if (leaf) {
+    shared[leaf] = bp
+  }
+
+  var ctable = tel_deref(bp);
+  var embeds = ctable.embeds;
+
+  for (var x = 0; x < embeds.length; ++x) {
+    for (var i = 0; i < embeds[x].length; ++i) {
+      //Pull info about the entry (subview)
+      var entry_bp = embeds[x][i];
+      var entry_cinfo = tel_deref(entry_bp); // The sub controller's info
+      var entry_ctable = entry_cinfo.cte;    // The sub controller's ctable static
+      var entry_name = entry_ctable.name;    // The sub controller's name
+
+      //Direct match found
+      var direct_match = spider[entry_name];
+      var dot_match = spider["."];
+      var plus_match = spider["+"];
+
+      if (direct_match) {
+        _find_view(entry_bp, direct_match, shared);
+      } 
+      
+      if (dot_match) {
+        _find_view(entry_bp, dot_match, shared);
+      } 
+      
+      if (plus_match) {
+        _find_view(entry_bp, plus_match, shared);
+        var partial_plus = {
+          "+": plus_match
+        }
+        _find_view(entry_bp, partial_plus, shared);
+      }
+    }
+  }
+
+  ////For all spots
+  //for (var x = 0; x < embeds.length; ++x) {
+    ////Search
+    //for (var i = 0; i < embeds[x].length; ++i) {
+      ////Lookup ctable for the embed
+      //var _ctable = tel_deref(embeds[x][i]);
+
+      ////Get it's name
+      //var name = _ctable.cte.name;
+
+      ////Does it match something in our spider?
+      //if (spider[_ctable.cte.name]) {
+        //output[spider[_ctable.cte.name].__leaf__] = embeds[x][i];
+      //} else if (spider["."]) {
+        //output[spider["."].__leaf__] = embeds[x][i];
+      //}
+    //}
+  //}
+  //return output;
+}
+
+//Used by the delayed free views typically for the GOTO hook specifically
+var views_to_free = {};

data/docs/controllers.md

@@ -55,6 +55,20 @@ controller "tab_controller" do
     }
   end
 
+  #Navigation stacks often have multiple entry points, 'back' may differ
+  #in action depending on whether it is the highest in the stack, you
+  #may use the 'push_count' variable to get the current level of the
+  #hierarchy you are on
+  macro :my_stack_macro do
+    on "back_clicked", %{
+      //If the push_level is 0, then we cannot Pop
+      if (push_count === 0) {
+        Raise("back_clicked");
+      } else {
+        Pop();
+      }
+    }
+  end
 
   #Optional
   #Called after on_entry, but before any action is entered. This is a pseudo

data/docs/dispatch.md

@@ -14,14 +14,16 @@ There are various stages of message processing so it can be confusing as to what
   1. The disptach mechanism, `int_dispatch`, is always called by the client synchronously, and the javascript core will always respond synchronously to `if_disptach`. 
   2. The client `if_dispatch` handler will then process the main queue on it's same synchronous thread and then dispatch, asynchronously, the remaining queues; the queues may either each dispatch messages asynchronously or synchronously w.r.t to the original queue. (out of order and parallel are supported)
 
-Additionally, it is **never** ok to downgrade an asynchronous request to a synchronous request.  Some functions, particularly the `vm` and
-`controller` systems rely on ordering. You can also **never** downgrade a synhcronous request to an asynchronous request. Synchronous requests must be done in order and on a single thread; additionally, they can be UI requests which are typically handled on the main thread.
+Additionally, it is **never** ok to upgrade a synchronous request to an asynchronous request.  Some functions, particularly the `vm` and
+`controller` systems rely on ordering. Synchronous requests must be done in order and on a single thread; additionally, they can be UI requests which are typically handled on the main thread.
 
 For example, if we dispatch on the `main` queue a disk read request, flok would expect that the disk read would block the javascript core and return execution as soon as the disk read completed. Flok would also presume that the disk read was done at the fastest
 and highest priority of IO and CPU.
 
 Flok would expect that same disk requets, dispatched on an asynhcronous queue, like `disk`, that the request would not execute on the same thread of execution and could execute out of order.
 
+**To re-iterate, `main` is the only synchronous queue; the other queues may be asynchronous but must be dispatched asynchronously; (they may also be asynchronous in nature)**
+
 ##The standard Flok queues (resources) are defined with the labels:
   0. `main` - User-interface displaying, etc.
   1. `net` - Downloading, Uploading, Get requests, etc.

data/docs/kernel_api.md

@@ -38,6 +38,7 @@ instead.
   * `_embed(vc_name, sp, context, event_gw)` - Embed a view controller in a surface-pointer. Following the rules of the ui device, embedded to a sp of
       0 is the master root view. Returns base pointer. `event_gw` is a pointer to a `vc`. If it is null, then any events coming in will not be sent to
       somewhere else if they do not match any 'on' for the current action.
+  * `find_view(bp, spider_payload)` - Traverses the hierarchy within some controller (`bp`) and returns the named entries. See [find_view_specifics](./kernel_handbook/find_view.md) for how this works.
 
 ##Timers
   * See [./callout.md](Callout) for how to register a timer