flok 0.0.73 → 0.0.74

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c9f17f929ac1f53925b9f3a7f1d8eb69db61d3f
-  data.tar.gz: c156cf2897629e2d04a2a368eb3d0685ed3ceb29
+  metadata.gz: ca8fea6b0e7252ab3f9a892389bde94e80014ce4
+  data.tar.gz: 5e23aecfc89a9d7ebd4ad4f3615c0bd6bd7ac071
 SHA512:
-  metadata.gz: 11bdbc991e2c88768af5b24e0c23471029f9f797ba139b3eabf84367d16fa9cc6c3ae185c2c3eaae870afca42244cd3a63687bb1a7acdc95ac31ab771cb96104
-  data.tar.gz: 876fb2e35de2c656e9f53e9d503ee9f44d7ee4cfc091c848d4e4101be853b2afcef22b4c4a55ef7067ca542908b51d5e47ada3b29083bc3b1ac298cbac92f0de
+  metadata.gz: fb6efe7e84308d32c0672d618891c7b45b0b66b33b3bd2517833cbdae5853027696042204d5bef1a23da13c945d2821923b82d792e2059391ad9b94c623dd76b
+  data.tar.gz: 346bc274195f9a5b6b8d44b52961cefe133f51b0ef1b5dbaa322ac6a0b3d41dd8dd4269d214f54fac1012acafd699fbfb07a48fd81d5cb41e498cb4046acbbfd

data/app/kern/kern_log.js

@@ -0,0 +1,14 @@
+<% if @debug %>
+kern_log_stdout = [];
+function kern_log(str) {
+  kern_log_stdout.push(str);
+}
+
+function kern_log_json(json) {
+  //We don't want to capture a reference
+  kern_log_stdout.push(
+      JSON.parse(JSON.stringify(json))
+  );
+}
+
+<% end %>

data/app/kern/pagers/pg_sockio.js

@@ -59,5 +59,14 @@
   }
 
   function pg_sockio<%= i %>_write(page) {
+    vm_transaction_begin();
+      //If page exists in cache, then commit changes into the page
+      var cached_page = vm_cache[pg_sockio<%= i %>_ns][page._id];
+      if (cached_page !== undefined) {
+        vm_commit(cached_page, page);
+      }
+
+      vm_cache_write(pg_sockio<%= i %>_ns, page); 
+    vm_transaction_end();
   }
 <% end %>

data/app/kern/services/test.rb

@@ -1,10 +1,20 @@
 service :test do
   global %{
+    test_service_connected = {};
+
     function <%= @name %>_function(x) {
       <%= @name %>_function_args = x;
     }
   }
 
+  on_connect %{
+    test_service_connected[bp] = true;
+  }
+
+  on_disconnect %{
+    delete test_service_connected[bp];
+  }
+
   on "test_sync", %{
     int_event(bp, "test_sync_res", params);
   }

data/app/kern/services/vm.rb

@@ -535,7 +535,8 @@ service :vm do
   on "write", %{
     <% raise "No pagers given in options for vm" unless @options[:pagers] %>
 
-    //We are going to fix the _hash on the page
+    //We are going to fix the _hash on the page and __index
+    vm_reindex_page(params.page);
     vm_rehash_page(params.page);
 
     <% if @debug %>

data/docs/kernel_api.md

@@ -1,5 +1,16 @@
 #Kernel API
 
+##Debugging (only enabled in DEBUG)
+  * kernel logging
+      All kernel logging goes to `kern_log_stdout`, an array of values.
+      array
+      * Based on `type` field:
+          * `string`
+            * `kern_log(str)` - Writes an entry to `kern_log_stdout` like `"string"`
+          * `json`
+            * `kern_log_json(json)` - Writes an entry to `kern_log_stdout` like `{"foo": "bar"}` which has been serialized and deserialized (to
+                prevent reference)
+
 ##Telepointer (Mapped I/O)
   * `tels(n)` - Returns one number that represents the base index of the telepointer.  See [Messaging](Messaging.md) for details on telepointers.
   * `tel_reg(f)` - Returns a number that represents the base pointer of a function callback.

data/docs/services/test.md

@@ -1,6 +1,9 @@
 #Test Service
 This is the test service. Used for various specs
 
+#Useful variables
+  * `test_service_connected` - A hash containing all the base pointers of *connected* controllers `{bp => true, ...}`.
+
 #Requests
   * `test_sync` - Will send you a synchronous response via the event `test_sync_res` that contains
     the same parameters that you sent

data/flok.gemspec

@@ -33,6 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "thor", "~> 0.19"
   spec.add_runtime_dependency "rake", "~> 10.3"
   spec.add_runtime_dependency 'naturalsort', "~> 1.0"
+  spec.add_runtime_dependency 'awesome_print', "~> 1.6"
   spec.add_development_dependency "therubyracer", "~> 0.12"
   spec.executables << 'flok'
 end

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

@@ -28,9 +28,19 @@ ctable = {
           var __info__ = tel_deref(__base__);
 
           //Recursively call dealloc
-          for (var i = 0; i < __info__.embeds.length; ++i) {
-            for (var x = 0; x < __info__.embeds[i].length; ++x) {
-              tel_deref(__info__.embeds[i][x]).cte.__dealloc__(__info__.embeds[i][x]);
+          var embeds = __info__.embeds;
+          while (true) {
+            for (var i = 0; i < embeds.length; ++i) {
+              for (var x = 0; x < embeds[i].length; ++x) {
+                tel_deref(embeds[i][x]).cte.__dealloc__(embeds[i][x]);
+              }
+            }
+
+            if (__info__.stack.length > 0) {
+              var slice = __info__.stack.pop();
+              embeds = slice.embeds;
+            } else {
+              break;
             }
           }
 

data/lib/flok/version.rb

@@ -1,3 +1,3 @@
 module Flok
-  VERSION = "0.0.73"
+  VERSION = "0.0.74"
 end

data/spec/env/kern.rb

@@ -1,6 +1,7 @@
-require './spec/env/global.rb'
 require 'therubyracer'
+require 'awesome_print'
 require './spec/lib/temp_dir'
+require './spec/env/global.rb'
 
 shared_context "kern" do
   before(:each) do
@@ -36,6 +37,14 @@ shared_context "kern" do
 
       return DumpHelper.new(_dump)
     end
+
+    def dump_log
+      out = self.dump "kern_log_stdout"
+      self.eval "kern_log_stdout = []"
+      out.each_with_index do |e, i|
+        ap e
+      end
+    end
   end
 
   class DumpHelper

data/spec/kern/assets/multi_level_dealloc.rb

@@ -0,0 +1,63 @@
+controller :nav do
+  spots "content"
+
+  action :index do
+    on_entry %{
+      Embed("my_controller", "content", {});
+    }
+
+    on "next_nav", %{
+      Goto("other_action");
+    }
+  end
+
+  action :other_action do
+
+  end
+end
+
+controller :my_controller do
+  spots "content"
+
+  action :my_action do
+    on_entry %{
+      my_controller_bp = __base__;
+      Embed("other", "content", {});
+    }
+
+    on "next", %{
+      Push("my_other_action")
+    }
+  end
+
+  action :my_other_action do
+    on_entry %{
+      Embed("other2", "content", {});
+    }
+
+    on "back", %{
+      Pop();
+    }
+  end
+end
+
+controller :other do
+  services :test
+
+  action :index do
+    on_entry %{
+      other_bp = __base__;
+    }
+  end
+end
+
+controller :other2 do
+  services :test
+
+  action :index do
+    on_entry %{
+      other_bp2 = __base__;
+    }
+  end
+end
+

data/spec/kern/assets/test_service/controller3.rb

@@ -0,0 +1,42 @@
+controller :my_controller do
+  services :test
+  spots "content"
+
+  action :my_action do
+    on_entry %{
+      Embed("other", "content", {});
+    }
+
+    on "next", %{
+      Goto("my_other_action")
+    }
+  end
+
+  action :my_other_action do
+    on_entry %{
+      Embed("other2", "content", {});
+    }
+  end
+end
+
+controller :other do
+  services :test
+
+  action :index do
+    on_entry %{
+      other_bp = __base__;
+      kern_log("My bp is: " + __base__)
+    }
+  end
+end
+
+controller :other2 do
+  services :test
+
+  action :index do
+    on_entry %{
+      other_bp2 = __base__;
+    }
+  end
+end
+

data/spec/kern/assets/vm/pg_sockio/write.rb

@@ -0,0 +1,24 @@
+controller :my_controller do
+  services :vm
+
+  on_entry %{
+    read_res_params = [];
+  }
+
+  action :my_action do
+    on_entry %{
+      var page = vm_create_page("test");
+
+      var info = {
+        ns: "sockio",
+        page: page,
+      };
+
+      Request("vm", "write", info);
+    }
+
+    on "read_res", %{
+      read_res_params.push(JSON.parse(JSON.stringify(params)));
+    }
+  end
+end

data/spec/kern/assets/vm/pg_sockio/write2.rb

@@ -0,0 +1,33 @@
+controller :my_controller do
+  services :vm
+
+  on_entry %{
+    read_res_params = [];
+
+    //Create a page and commit it to the sockio cache (cheating)
+    var page = vm_create_page("test");
+    page.entries.push(
+      {"_id": "test", "_sig": "test", "val": "test"}
+    );
+    vm_reindex_page(page);
+    vm_rehash_page(page);
+    vm_cache["sockio"]["test"] = page;
+  }
+
+  action :my_action do
+    on_entry %{
+      var page = vm_create_page("test");
+
+      var info = {
+        ns: "sockio",
+        page: page,
+      };
+
+      Request("vm", "write", info);
+    }
+
+    on "read_res", %{
+      read_res_params.push(JSON.parse(JSON.stringify(params)));
+    }
+  end
+end

data/spec/kern/controller_spec.rb

@@ -403,6 +403,42 @@ RSpec.describe "kern:controller_spec" do
     end
   end
 
+  it "Does call __dealloc__ on all controllers within a multi-level controller hierarchy when that view hierarchy is dismissed" do
+    ctx = flok_new_user File.read('./spec/kern/assets/multi_level_dealloc.rb'), File.read("./spec/kern/assets/test_service/config0.rb") 
+    dump = ctx.evald %{
+      base = _embed("nav", 0, {}, null);
+
+      //Drain queue
+      int_dispatch([]);
+
+      //This is the nav controller
+      dump.bp = base;
+
+      //This is the 'content' controller of nav
+      dump.my_controller_bp = my_controller_bp;
+
+      //This is the 'pushed' controller of the content's controller
+      dump.other_bp = other_bp;
+    }
+
+    #This is like the controller embedded in a nav pushing a dialog ontop of itself
+    @driver.int "int_event", [
+      dump["my_controller_bp"], "next", {}
+    ]
+
+    #This is like the nav moving to another action (while the 'content' controller has something pushed on it)
+    @driver.int "int_event", [
+      dump["bp"], "next_nav", {}
+    ]
+
+    test_service_connected = ctx.dump "test_service_connected"
+
+    ctx.dump_log
+    expect(test_service_connected).to eq({
+    })
+  end
+
+
   it "Does tear down the old embedded view from the embedded view controller when switching actions" do
     #Compile the controller
     ctx = flok_new_user File.read('./spec/kern/assets/goto.rb')

data/spec/kern/global_functions_spec.rb

@@ -0,0 +1,42 @@
+Dir.chdir File.join File.dirname(__FILE__), '../../'
+require './spec/env/kern.rb'
+require './spec/lib/helpers.rb'
+require './spec/lib/io_extensions.rb'
+require './spec/lib/rspec_extensions.rb'
+
+#Any global kernel API functions go here
+
+RSpec.describe "kern:global_function_spec" do
+  include_context "kern"
+
+  it "Can use the kern_log function which writes to kern_log_stdout" do
+    #Compile the controller
+    ctx = flok_new_user File.read('./spec/kern/assets/controller0.rb')
+
+    dump = ctx.evald %{
+      kern_log("foo");
+      kern_log("bar");
+
+      dump.kern_log_stdout = kern_log_stdout;
+    }
+
+    expect(dump["kern_log_stdout"][0]).to eq("foo")
+    expect(dump["kern_log_stdout"][1]).to eq("bar")
+  end
+
+  it "Can use the kern_log_json function which writes to kern_log_stdout" do
+    #Compile the controller
+    ctx = flok_new_user File.read('./spec/kern/assets/controller0.rb')
+
+    dump = ctx.evald %{
+      kern_log_json({
+        "foo": "bar"
+      })
+
+      dump.kern_log_stdout = kern_log_stdout;
+    }
+
+    expect(dump["kern_log_stdout"][0]).to eq({"foo" => "bar"})
+  end
+
+end

data/spec/kern/test_service_spec.rb

@@ -1,11 +1,11 @@
 #The test service
 
 Dir.chdir File.join File.dirname(__FILE__), '../../'
+require 'zlib'
 require './spec/env/kern.rb'
 require './spec/lib/helpers.rb'
 require './spec/lib/io_extensions.rb'
 require './spec/lib/rspec_extensions.rb'
-require 'zlib'
 
 RSpec.describe "kern:test_service" do
   include Zlib
@@ -80,4 +80,28 @@ RSpec.describe "kern:test_service" do
     })
   end
 
+  it "Does keep track of connected clients via test_service_bp" do
+    ctx = flok_new_user File.read('./spec/kern/assets/test_service/controller3.rb'), File.read("./spec/kern/assets/test_service/config0.rb") 
+    dump = ctx.evald %{
+      base = _embed("my_controller", 0, {}, null);
+
+      //Drain queue
+      int_dispatch([]);
+
+      dump.bp = base;
+      dump.other_bp = other_bp;
+    }
+
+    @driver.int "int_event", [
+      dump["bp"], "next", {}
+    ]
+    other_bp2 = ctx.eval "other_bp2"
+    test_service_connected = ctx.dump "test_service_connected"
+
+    ctx.dump_log
+    expect(test_service_connected).to eq({
+      dump["bp"].to_s => true,
+      other_bp2.to_s => true,
+    })
+  end
 end

data/spec/kern/vm_sockio_pager_spec.rb

@@ -451,4 +451,40 @@ RSpec.describe "kern:sockio_pager" do
       {"_id" => "foo", "_sig" => "foo", "value" => "bar"}
     ])
   end
+
+  it "Does accept writes of pages that don't currently exist in cache; they go into vm_cache as-is" do
+    ctx = flok_new_user File.read('./spec/kern/assets/vm/pg_sockio/write.rb'), File.read("./spec/kern/assets/vm/pg_sockio/config.rb") 
+    dump = ctx.evald %{
+      //Call embed on main root view
+      dump.base = _embed("my_controller", 0, {}, null);
+
+      //Drain queue
+      int_dispatch([]);
+
+      dump.vm_cache = vm_cache;
+    }
+
+    #The vm_cache should now contain an entry for the page
+    expect(dump["vm_cache"]["sockio"]["test"]).not_to eq(nil)
+  end
+
+  it "Does accept writes of pages that **do** currently exist in cache; they go into vm_cache commited" do
+    ctx = flok_new_user File.read('./spec/kern/assets/vm/pg_sockio/write2.rb'), File.read("./spec/kern/assets/vm/pg_sockio/config.rb") 
+    dump = ctx.evald %{
+      //Call embed on main root view
+      dump.base = _embed("my_controller", 0, {}, null);
+
+      //Drain queue
+      int_dispatch([]);
+
+      dump.vm_cache = vm_cache;
+    }
+
+    #The vm_cache should now contain an entry for the page
+    expect(dump["vm_cache"]["sockio"]["test"]).not_to eq(nil)
+
+    #And that entry contains commits
+    expect(dump["vm_cache"]["sockio"]["test"]["__changes"]).not_to eq(nil)
+    expect(dump["vm_cache"]["sockio"]["test"]["__changes_id"]).not_to eq(nil)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flok
 version: !ruby/object:Gem::Version
-  version: 0.0.73
+  version: 0.0.74
 platform: ruby
 authors:
 - seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-23 00:00:00.000000000 Z
+date: 2015-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
@@ -220,6 +220,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: therubyracer
   requirement: !ruby/object:Gem::Requirement
@@ -283,6 +297,7 @@ files:
 - app/kern/crc32.js
 - app/kern/dispatch.js
 - app/kern/gen_id.js
+- app/kern/kern_log.js
 - app/kern/macro.rb
 - app/kern/mod/controller.js
 - app/kern/mod/debug.js
@@ -1158,6 +1173,7 @@ files:
 - spec/kern/assets/interval2.rb
 - spec/kern/assets/interval3.rb
 - spec/kern/assets/lower_event.rb
+- spec/kern/assets/multi_level_dealloc.rb
 - spec/kern/assets/no_choose_action.rb
 - spec/kern/assets/push.rb
 - spec/kern/assets/push_pop.rb
@@ -1184,6 +1200,7 @@ files:
 - spec/kern/assets/test_service/controller0.rb
 - spec/kern/assets/test_service/controller1.rb
 - spec/kern/assets/test_service/controller2.rb
+- spec/kern/assets/test_service/controller3.rb
 - spec/kern/assets/test_service_config.rb
 - spec/kern/assets/vm/config0.rb
 - spec/kern/assets/vm/config1.rb
@@ -1261,6 +1278,8 @@ files:
 - spec/kern/assets/vm/pg_sockio/nothing.rb
 - spec/kern/assets/vm/pg_sockio/watch.rb
 - spec/kern/assets/vm/pg_sockio/watch2.rb
+- spec/kern/assets/vm/pg_sockio/write.rb
+- spec/kern/assets/vm/pg_sockio/write2.rb
 - spec/kern/assets/vm/service0.rb
 - spec/kern/assets/vm/service_controller0.rb
 - spec/kern/assets/vm/vm_commit_pages.js
@@ -1274,6 +1293,7 @@ files:
 - spec/kern/dispatch_spec.rb
 - spec/kern/event_spec.rb
 - spec/kern/functions_spec.rb
+- spec/kern/global_functions_spec.rb
 - spec/kern/rest_service_spec.rb
 - spec/kern/service_controller_spec.rb
 - spec/kern/test_service_spec.rb
@@ -2096,6 +2116,7 @@ test_files:
 - spec/kern/assets/interval2.rb
 - spec/kern/assets/interval3.rb
 - spec/kern/assets/lower_event.rb
+- spec/kern/assets/multi_level_dealloc.rb
 - spec/kern/assets/no_choose_action.rb
 - spec/kern/assets/push.rb
 - spec/kern/assets/push_pop.rb
@@ -2122,6 +2143,7 @@ test_files:
 - spec/kern/assets/test_service/controller0.rb
 - spec/kern/assets/test_service/controller1.rb
 - spec/kern/assets/test_service/controller2.rb
+- spec/kern/assets/test_service/controller3.rb
 - spec/kern/assets/test_service_config.rb
 - spec/kern/assets/vm/config0.rb
 - spec/kern/assets/vm/config1.rb
@@ -2199,6 +2221,8 @@ test_files:
 - spec/kern/assets/vm/pg_sockio/nothing.rb
 - spec/kern/assets/vm/pg_sockio/watch.rb
 - spec/kern/assets/vm/pg_sockio/watch2.rb
+- spec/kern/assets/vm/pg_sockio/write.rb
+- spec/kern/assets/vm/pg_sockio/write2.rb
 - spec/kern/assets/vm/service0.rb
 - spec/kern/assets/vm/service_controller0.rb
 - spec/kern/assets/vm/vm_commit_pages.js
@@ -2212,6 +2236,7 @@ test_files:
 - spec/kern/dispatch_spec.rb
 - spec/kern/event_spec.rb
 - spec/kern/functions_spec.rb
+- spec/kern/global_functions_spec.rb
 - spec/kern/rest_service_spec.rb
 - spec/kern/service_controller_spec.rb
 - spec/kern/test_service_spec.rb