flok 0.0.71 → 0.0.72

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a7905b48da7599f5f6f62357affb30856c22cf7
-  data.tar.gz: 340d2d3ddf2cf4d564959a0b9d553dd9fb6eb7f2
+  metadata.gz: d06f92c68324984f4e293390562ef487283971fd
+  data.tar.gz: 40c7e7f381e3a6630c1bac4935ce0c660adb183b
 SHA512:
-  metadata.gz: 48ac928647f77627085badb6eb35d7b419e4bd523b9772a146476a95f6cd4571f723cd986d105643b79d4c12d2b5c1fa62c09c186bc5a3288f5402c8d5d5b682
-  data.tar.gz: ba8832ae43f3fa6855036ce0a273041826d7eb30db5ebd843472190da32df5db0537072487d9fbe9f1489325de891254aff6c2faf119fc54664256b44081fdc6
+  metadata.gz: a15900ee9f4ef22c576c48ab195f1669495450e211ec2b2c8791cc845fca3208e30513b08cb8878064ef75eaca787f34c6c8c621040b2824c65a494ce8da663e
+  data.tar.gz: 45edc71adc819e2d0b994e7ee746aa6d4da654b57fbcd5e5bbcdbd49cd3731303342a885a5df5781aa91473878089b8f43b4d65a8a02fc9f4591585ca65a3e97

data/app/kern/pagers/pg_sockio.js

@@ -28,7 +28,7 @@
     pg_sockio<%= i %>_bp = tels(1);
     reg_evt(pg_sockio<%= i %>_bp, pg_sockio<%= i %>_xevent_handler);
 
-    SEND("net", "if_sockio_init", options.url, pg_sockio<%= i %>_bp);
+    SEND("main", "if_sockio_init", options.url, pg_sockio<%= i %>_bp);
 
     //Signal that the socket.io driver should forward all events to the socket defined by pg_sockio{N}_bp
     //to the endpoint (with the same reference)

data/app/kern/services/vm.rb

@@ -487,7 +487,6 @@ service :vm do
       vm_did_wakeup = true;
     <% end %>
 
-
     //Call init functions
     <% @options[:pagers].each do |p| %>
       <%= p[:name] %>_init("<%= p[:namespace] %>", <%= (p[:options] || {}).to_json %>);

data/docs/mod/sockio.md

@@ -1,7 +1,8 @@
 #Socket.io (sockio.js)
 
 ##Driver Functions
-`if_sockio_init(url, sp)` - Initialize a socketio socket with the given `url` and refer to it with `sp`.
+`if_sockio_init(url, sp)` - Initialize a socketio socket with the given `url` and refer to it with `sp`. Any messages received relating to this
+socket, like `if_sockio_fwd` or `if_sockio_send` should be queued if the socket is not instantly created and dispatched when the socket is created.
 
 `if_sockio_fwd(sp, event_name, ep)` - A request to forward messages from a socket.io socket that represents `id` to the `ep` address as an `if_event` where the event
 name is the same as the `socket.io` `event_name` and the information is passed as the `event` field for the `if_event`. Only forward messages matching

data/lib/flok/version.rb

@@ -1,3 +1,3 @@
 module Flok
-  VERSION = "0.0.71"
+  VERSION = "0.0.72"
 end

data/spec/kern/vm_sockio_pager_spec.rb

@@ -41,7 +41,7 @@ RSpec.describe "kern:sockio_pager" do
 
   it "Does initialize a socketio connection" do
     ctx = flok_new_user File.read('./spec/kern/assets/vm/pg_sockio/nothing.rb'), File.read("./spec/kern/assets/vm/pg_sockio/config.rb") 
-    ctx.evald %{
+    dump = ctx.evald %{
       //Call embed on main root view
       dump.base = _embed("my_controller", 0, {}, null);
 
@@ -52,8 +52,8 @@ RSpec.describe "kern:sockio_pager" do
     }
 
     #URL is specified in the config
-    @driver.ignore_up_to "if_sockio_init", 1
-    @driver.mexpect "if_sockio_init", ["http://localhost", Integer], 1
+    @driver.ignore_up_to "if_sockio_init", 0
+    @driver.mexpect "if_sockio_init", ["http://localhost", Integer], 0
 
     #Forward the update event
     @driver.ignore_up_to "if_sockio_fwd", 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flok
 version: !ruby/object:Gem::Version
-  version: 0.0.71
+  version: 0.0.72
 platform: ruby
 authors:
 - seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-21 00:00:00.000000000 Z
+date: 2015-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
@@ -299,7 +299,6 @@ files:
 - app/kern/pagers/pg_net_sim.js
 - app/kern/pagers/pg_sockio.js
 - app/kern/pagers/pg_spec.js
-- app/kern/pagers/sockio_pager.js
 - app/kern/pagers/spec0.js
 - app/kern/pagers/spec1.js
 - app/kern/pagers/spec2.js

data/app/kern/pagers/sockio_pager.js

@@ -1,66 +0,0 @@
-<% if @defines['sockio_pager'] %>
-  sockio_pager_data = {};
-
-  sockio_pager_sp = null;
-  sockio_pager_bp = null;
-  waiting_bp = null;
-  function sockio_pager_init(options) {
-    sockio_pager_sp = tels(1);
-    sockio_pager_bp = tels(1);
-    SEND("main", "if_sockio_init", options.url, sockio_pager_sp);
-    reg_evt(sockio_pager_bp, sockio_pager_sp_endpoint);
-    SEND("async", "if_sockio_fwd", sockio_pager_sp, "read_res", sockio_pager_bp);
-    SEND("async", "if_sockio_fwd", sockio_pager_sp, "notify", sockio_pager_bp);
-  }
-
-  function sockio_pager_read_sync(ns, bp, key) {
-    throw "sockio_pager does not support read_sync"
-  }
-
-  function sockio_pager_read(ns, bp, key) {
-    var info = {
-      key: key,
-      bp: bp
-    }
-
-    SEND("async", "if_sockio_send", sockio_pager_sp, "read", info);
-
-    waiting_bp = bp;
-  }
-
-  function sockio_pager_write(key, value) {
-    throw "sockio_pager does not support write"
-  }
-
-  //Where socket.io data comes in
-  function sockio_pager_sp_endpoint(ep, ename, info) {
-    if (ename === "read_res") {
-      var bp = info.bp;
-      var key = info.key;
-      var value = info.value;
-      int_event(waiting_bp, "read_res", info);
-      vm_cache_write("net", key, value);
-    } else if (ename === "notify") {
-      var key = info.key;
-      vm_notify("net", key);
-    }
-  }
-
-  function sockio_pager_watch(ns, key) {
-    var info = {
-      ns: ns,
-      key: key
-    }
-    SEND("async", "if_sockio_send", sockio_pager_sp, "watch", info);
-  }
-
-  function sockio_pager_unwatch(ns, key) {
-    var info = {
-      ns: ns,
-      key: key
-    }
-    SEND("async", "if_sockio_send", sockio_pager_sp, "unwatch", info);
-  }
-
-
-<% end %>