flok 0.0.75 → 0.0.76

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ebb7df87c6ad3bd41410cc2feb00b57ec31ce99
-  data.tar.gz: 690eb61b2fa1857439255f483f640697792b05c8
+  metadata.gz: 95e9915e21c598cac1138e92ac3e5f53463ec5fa
+  data.tar.gz: a299acf1cf525084c7e71dd937005827e969dc8a
 SHA512:
-  metadata.gz: 911ea2b457dad557faff40142fb337fea5d833b8d42bd5198e503b4c1850ddf38b003d5e02f78b830d6c546cec19f4548153184bd7f013244b227a0dba4e4b47
-  data.tar.gz: c77b2513cc8ee15c1f0569d402841ca09cbce328def48c2e2dc04db41f93a6fc48c37ffce6ef2fa6fbc7b699634a19892060e63494168cc35897fce45e292e98
+  metadata.gz: 19f42aa5778d4d4bdba0f13f8578b9c81e19d1c7c6dc0bb69be0d6312bc951bb87513c56c58a62f21a4caa1ef194c043b1efcd2d2f51ff2bcbc0eb6cf4456ad5
+  data.tar.gz: b2e796c961f4f9edb3cf698be3223b362867a6ba23e3ce7c1f7abf75374f81dde612a07d18eccd865c00eaf416fb8b076ab196c4fb0152563cd93c7faacc4815

data/app/kern/pagers/pg_net_sim.js

@@ -13,7 +13,9 @@ function pg_net_sim_init(ns, options) {
 function pg_net_sim_tick_handler(ep, ename, info) {
   while (pg_net_sim_waiting_for_response.length > 0) {
     var e = pg_net_sim_waiting_for_response.shift();
-    vm_cache_write(pg_net_sim_ns, pg_net_sim_stored_pages[e.id]);
+    vm_transaction_begin();
+      vm_cache_write(pg_net_sim_ns, pg_net_sim_stored_pages[e.id]);
+    vm_transaction_end();
   }
 }
 

data/lib/flok/version.rb

@@ -1,3 +1,3 @@
 module Flok
-  VERSION = "0.0.75"
+  VERSION = "0.0.76"
 end

data/spec/env/kern.rb

@@ -97,6 +97,10 @@ shared_context "kern" do
             if_dispatch_json(JSON.stringify(q));
           }
         }
+        $stderr.puts "env/kern File.read... dumping directory"
+        $stderr.puts "pwd = #{Dir.pwd}"
+        $stderr.puts Dir["**/*"].select{|e| e.split("/").length < 4}.inspect
+
         v8.eval File.read('./products/chrome/application_user.js')
         return v8
       end

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

@@ -3,14 +3,7 @@ controller :my_controller do
 
   action :my_action do
     on_entry %{
-      var entry = {
-        hello: "world"
-      }
-
-      page = NewPage("array", "test");
-      SetPageHead(page, "head");
-      SetPageNext(page, "next");
-      EntryInsert(page, 0, entry);
+      page = vm_create_page("test");
 
       var write_info = {
         ns: "local",
@@ -18,6 +11,7 @@ controller :my_controller do
       };
 
       Request("vm", "write", write_info);
+      kern_log("hey");
     }
   end
 end

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

@@ -12,18 +12,14 @@ controller :my_controller do
       }
 
 
-      page = NewPage("array", "test");
-      SetPageHead(page, "head");
-      SetPageNext(page, "next");
-      EntryInsert(page, 0, entry);
+      page = vm_create_page("test");
 
       var write_info = {
         ns: "local0",
         page: page
       };
 
-      page2 = CopyPage(page);
-      EntryInsert(page2, 0, entry);
+      page2 = vm_copy_page(page);
 
       var write_info2 = {
         ns: "local1",

data/spec/kern/rest_service_spec.rb

@@ -18,11 +18,7 @@ RSpec.describe "kern:rest_service" do
 
       //Drain queue
       int_dispatch([]);
-
-      dump["rest_base_url"] = rest_base_url;
     }
-
-    expect(dump["rest_base_url"]).to eq("http://localhost:8080/")
   end
 
   it "Can make a request on the rest service" do

data/spec/kern/vm_service_mem_pagers_spec.rb

@@ -35,9 +35,15 @@ RSpec.describe "kern:vm_service_mem_pagers" do
       int_dispatch([]);
     }
 
-    page = ctx.dump "page"
-    vm_cache = ctx.dump("vm_cache")
-    expect(page).to eq(vm_cache["local"]["test"])
+    #Disk must return cache copy
+    @driver.int "int_per_get_res", [
+      Integer,
+      "local",
+      "test",
+      nil
+    ]
+
+    expect(ctx.dump("vm_cache")["local"]["test"]).not_to eq(nil)
   end
 
   it "Can initialize the pg_mem1 pager" do
@@ -54,50 +60,6 @@ RSpec.describe "kern:vm_service_mem_pagers" do
     expect(res).to eq(true)
   end
 
-  it "Can make a write request to pg_mem1 and have that written in cache" do
-    ctx = flok_new_user File.read('./spec/kern/assets/vm/pg_mem/write.rb'), File.read("./spec/kern/assets/vm/pg_mem/config1.rb") 
-    ctx.eval %{
-      //Call embed on main root view
-      base = _embed("my_controller", 0, {}, null);
-
-      //Drain queue
-      int_dispatch([]);
-    }
-
-    page = ctx.dump "page"
-    vm_cache = ctx.dump("vm_cache")
-    expect(page).to eq(vm_cache["local"]["test"])
-  end
-
-  it "Can initialize the pg_mem2 pager" do
-    ctx = flok_new_user File.read('./spec/kern/assets/vm/controller0.rb'), File.read("./spec/kern/assets/vm/pg_mem/config2.rb") 
-    ctx.eval %{
-      //Call embed on main root view
-      base = _embed("my_controller", 0, {}, null);
-
-      //Drain queue
-      int_dispatch([]);
-    }
-
-    res = ctx.eval("pg_mem2_spec_did_init")
-    expect(res).to eq(true)
-  end
-
-  it "Can make a write request to pg_mem2 and have that written in cache" do
-    ctx = flok_new_user File.read('./spec/kern/assets/vm/pg_mem/write.rb'), File.read("./spec/kern/assets/vm/pg_mem/config2.rb") 
-    ctx.eval %{
-      //Call embed on main root view
-      base = _embed("my_controller", 0, {}, null);
-
-      //Drain queue
-      int_dispatch([]);
-    }
-
-    page = ctx.dump "page"
-    vm_cache = ctx.dump("vm_cache")
-    expect(page).to eq(vm_cache["local"]["test"])
-  end
-
   it "Can use pg_mem0 and pg_mem1 at the same time" do
     ctx = flok_new_user File.read('./spec/kern/assets/vm/pg_mem/write2.rb'), File.read("./spec/kern/assets/vm/pg_mem/config3.rb") 
     ctx.eval %{
@@ -108,6 +70,22 @@ RSpec.describe "kern:vm_service_mem_pagers" do
       int_dispatch([]);
     }
 
+    #Disk must return cache copy
+    @driver.int "int_per_get_res", [
+      Integer,
+      "local0",
+      "test",
+      nil
+    ]
+
+    #Disk must return cache copy
+    @driver.int "int_per_get_res", [
+      Integer,
+      "local1",
+      "test",
+      nil
+    ]
+
     page = ctx.dump "page"
     page2 = ctx.dump "page2"
     vm_cache = ctx.dump("vm_cache")

data/spec/kern/vm_sockio_pager_spec.rb

@@ -460,26 +460,22 @@ RSpec.describe "kern:sockio_pager" do
 
       //Drain queue
       int_dispatch([]);
-
-      dump.vm_cache = vm_cache;
     }
 
     #Driver response
     @driver.int "int_per_get_res", [
       "vm",
       "sockio",
-      "test"
-    ], 2
+      "test",
+      nil
+    ]
 
     #The vm_cache should now contain an entry for the page
-    expect(dump["vm_cache"]["sockio"]["test"]).not_to eq(nil)
+    expect(ctx.dump("vm_cache")["sockio"]["test"]).not_to eq(nil)
 
     @driver.ignore_up_to "if_sockio_send", 1
-    @driver.mexpect "if_sockio_send", [
-      Integer,
-      "page_write",
-       dump["vm_cache"]["sockio"]["test"] 
-    ], 1
+    res = @driver.get "if_sockio_send", 1
+    expect(res[1]).to eq("write")
   end
 
   it "Does accept writes of pages that **do** currently exist in cache; they go into vm_cache commited" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flok
 version: !ruby/object:Gem::Version
-  version: 0.0.75
+  version: 0.0.76
 platform: ruby
 authors:
 - seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-30 00:00:00.000000000 Z
+date: 2015-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
@@ -263,35 +263,35 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- app/drivers/CHROME/README.md
-- app/drivers/CHROME/Rakefile
-- app/drivers/CHROME/build_context.rb
-- app/drivers/CHROME/cakery/spec.js.erb
-- app/drivers/CHROME/config.yml
-- app/drivers/CHROME/pipe.rb
-- app/drivers/CHROME/spec/config/config.js
-- app/drivers/CHROME/spec/init/qunit.js
-- app/drivers/CHROME/spec/spec/controller_debug_spec.js
-- app/drivers/CHROME/spec/spec/debug_spec.js
-- app/drivers/CHROME/spec/spec/dom_helpers_spec.js
-- app/drivers/CHROME/spec/spec/sel_scope_spec.js
-- app/drivers/CHROME/spec/spec/vars_spec.js
-- app/drivers/CHROME/src/bench.js
-- app/drivers/CHROME/src/config0.js
-- app/drivers/CHROME/src/controller.js
-- app/drivers/CHROME/src/debug.js
-- app/drivers/CHROME/src/dispatch.js
-- app/drivers/CHROME/src/event.js
-- app/drivers/CHROME/src/helpers.js
-- app/drivers/CHROME/src/net.js
-- app/drivers/CHROME/src/persist.js
-- app/drivers/CHROME/src/segue.js
-- app/drivers/CHROME/src/sockio.js
-- app/drivers/CHROME/src/timer.js
-- app/drivers/CHROME/src/ui.js
-- app/drivers/CHROME/src/vendor/jquery.js
-- app/drivers/CHROME/src/vendor/socket.io.js
-- app/drivers/CHROME/src/vendor/store2.js
+- app/drivers/chrome/README.md
+- app/drivers/chrome/Rakefile
+- app/drivers/chrome/build_context.rb
+- app/drivers/chrome/cakery/spec.js.erb
+- app/drivers/chrome/config.yml
+- app/drivers/chrome/pipe.rb
+- app/drivers/chrome/spec/config/config.js
+- app/drivers/chrome/spec/init/qunit.js
+- app/drivers/chrome/spec/spec/controller_debug_spec.js
+- app/drivers/chrome/spec/spec/debug_spec.js
+- app/drivers/chrome/spec/spec/dom_helpers_spec.js
+- app/drivers/chrome/spec/spec/sel_scope_spec.js
+- app/drivers/chrome/spec/spec/vars_spec.js
+- app/drivers/chrome/src/bench.js
+- app/drivers/chrome/src/config0.js
+- app/drivers/chrome/src/controller.js
+- app/drivers/chrome/src/debug.js
+- app/drivers/chrome/src/dispatch.js
+- app/drivers/chrome/src/event.js
+- app/drivers/chrome/src/helpers.js
+- app/drivers/chrome/src/net.js
+- app/drivers/chrome/src/persist.js
+- app/drivers/chrome/src/segue.js
+- app/drivers/chrome/src/sockio.js
+- app/drivers/chrome/src/timer.js
+- app/drivers/chrome/src/ui.js
+- app/drivers/chrome/src/vendor/jquery.js
+- app/drivers/chrome/src/vendor/socket.io.js
+- app/drivers/chrome/src/vendor/store2.js
 - app/kern/callout.js
 - app/kern/controller.js
 - app/kern/crc32.js
@@ -407,7 +407,6 @@ files:
 - spec/etc/service_compiler/service1.rb
 - spec/etc/service_compiler/service3.rb
 - spec/etc/service_compiler/service_bad_type.rb
-- spec/etc/services_compiler_spec.rb
 - spec/etc/transition_compiler/trans0.rb
 - spec/etc/transition_complier_spec.rb
 - spec/etc/user_compiler/controller0.rb
@@ -415,7 +414,6 @@ files:
 - spec/etc/user_compiler/controller0bg.rb
 - spec/etc/user_compiler/controller0timer.rb
 - spec/etc/user_compiler/data.js
-- spec/etc/user_compiler_spec.rb
 - spec/iface/driver/assets/debug_socket_server.js
 - spec/iface/driver/assets/node_modules/socket.io/.npmignore
 - spec/iface/driver/assets/node_modules/socket.io/.travis.yml
@@ -1356,7 +1354,6 @@ test_files:
 - spec/etc/service_compiler/service1.rb
 - spec/etc/service_compiler/service3.rb
 - spec/etc/service_compiler/service_bad_type.rb
-- spec/etc/services_compiler_spec.rb
 - spec/etc/transition_compiler/trans0.rb
 - spec/etc/transition_complier_spec.rb
 - spec/etc/user_compiler/controller0.rb
@@ -1364,7 +1361,6 @@ test_files:
 - spec/etc/user_compiler/controller0bg.rb
 - spec/etc/user_compiler/controller0timer.rb
 - spec/etc/user_compiler/data.js
-- spec/etc/user_compiler_spec.rb
 - spec/iface/driver/assets/debug_socket_server.js
 - spec/iface/driver/assets/node_modules/socket.io/.npmignore
 - spec/iface/driver/assets/node_modules/socket.io/.travis.yml

data/spec/etc/services_compiler_spec.rb

@@ -1,68 +0,0 @@
-Dir.chdir File.join File.dirname(__FILE__), '../../'
-require './lib/flok'
-require './spec/env/etc'
-
-RSpec.describe "lib/services_compiler" do
-  #Return a v8 instance of a compiled js file
-  def compile fn, config
-    compiler = Flok::ServicesCompiler
-    js_src(fn)
-    js_res = compiler.compile(js_src(fn), js_src(config))
-    ctx = V8::Context.new
-    ctx.eval js_res
-
-    return ctx, js_res
-  end
-
-  #Get the source for a file in  ./service_compiler/*.rb
-  def js_src fn
-    Dir.chdir File.join(File.dirname(__FILE__), "service_compiler") do
-      return File.read(fn+'.rb')
-    end
-  end
-
-  it "Does fail to compile a controller with a non-existant type" do
-    expect { compile "service_bad_type" }.to raise_exception
-  end
-
-  it "Can call compile method and get a copy of all the functions" do
-     ctx, _  = compile "service0", "config0b"
-
-    #on_wakeup
-    res = ctx.eval("test_on_wakeup")
-    expect(res).not_to eq(nil)
-
-    #on_sleep
-    res = ctx.eval("test_on_sleep")
-    expect(res).not_to eq(nil)
-
-    #on_connect
-    res = ctx.eval("test_on_connect");
-    expect(res).not_to eq(nil)
-
-    #on_disconnect
-    res = ctx.eval("test_on_disconnect")
-    expect(res).not_to eq(nil)
-
-    #on_event
-    res = ctx.eval("test_on_hello");
-    expect(res).not_to eq(nil)
-
-    #on_handle_timer_events
-    res = ctx.eval("test_handle_timer_events");
-    expect(res).not_to eq(nil)
-  end
-
-  it "Can call compile method with options" do
-    ctx, js = compile "service1", "config2"
-    expect(js).to include("23rntoheuh3nthoeunthn23th");
-  end
-
-  #If SEND works, then all kernel macros should work
-  it "Can compile with a SEND macro" do
-     ctx, src  = compile "service3", "config0b"
-
-     expect(src).not_to include("SEND")
-     expect(src).to include("_q.push")
-  end
-end

data/spec/etc/user_compiler_spec.rb

@@ -1,106 +0,0 @@
-#Load all the test files in ./user_compiler/*.js
-
-Dir.chdir File.join File.dirname(__FILE__), '../../'
-require './lib/flok'
-
-
-#Testing the compilation of controller/action user files into javascript counterparts
-RSpec.describe "User compiler" do
-  #Return a v8 instance of a compiled js file
-  def compile fn
-    compiler = Flok::UserCompiler
-    js_src(fn)
-    js_res = compiler.compile(js_src(fn))
-    File.write "/Users/Seo/Desktop/js_src.js", js_res
-    ctx = V8::Context.new
-    ctx.eval js_res
-    return ctx, js_res
-  end
-
-  #Get the source for a file in  ./user_compiler/*.rb
-  def js_src fn
-    Dir.chdir File.join(File.dirname(__FILE__), "user_compiler") do
-      return File.read(fn+'.rb')
-    end
-  end
-
-  it "Can load the ruby module" do
-    compiler = Flok::UserCompiler
-  end
-
-  it "Can compile a controller and give up the root 
-  iew" do
-    ctx, js_src = compile "controller0"
-    root_view = ctx.eval "ctable.my_controller.root_view"
-    expect(root_view).to eq("my_controller")
-  end
-
-  it "Can compile a controller and contain a list of actions" do
-    ctx, js_src = compile "controller0"
-    actions = ctx.eval "Object.keys(ctable.my_controller.actions).length"
-    expect(actions).to eq(1)
-  end
-
-  it "Can compile a controller and contain an __init__ function" do
-    ctx, js_src = compile "controller0"
-    actions = ctx.eval "ctable.my_controller.__init__"
-    expect(actions).not_to eq(nil)
-  end
-
-  it "Can compile a controller with an action that contains an on_entry" do
-    ctx, js_src = compile "controller0"
-    on_entry = ctx.eval "ctable.my_controller.actions.my_action.on_entry"
-    expect(on_entry).not_to eq(nil)
-  end
-
-  it "Can compile a controller with an action that does not contains an on_entry" do
-    ctx, js_src = compile "controller0b"
-    on_entry = ctx.eval "ctable.my_controller.actions.my_action.on_entry"
-    expect(on_entry).not_to eq(nil)
-  end
-
-  it "Can compile a controller with a global on_entry" do
-    ctx, js_src = compile "controller0bg"
-    on_entry = ctx.eval "ctable.my_controller.on_entry"
-    expect(js_src).to include("global_on_entry")
-  end
-
-
-  it "on_entry controller has more code than non on_entry controller" do
-    ctx, js_src = compile "controller0"
-    on_entry = ctx.eval "ctable.my_controller.actions.my_action.on_entry"
-
-    ctx2, js_src = compile "controller0b"
-    on_entry2 = ctx2.eval "ctable.my_controller.actions.my_action.on_entry"
-    expect(on_entry2.to_s.length).to be < on_entry.to_s.length
-  end
-
-
-  it "Can compile a controller with an action that contains the name" do
-    ctx, js_src = compile "controller0"
-    on_entry = ctx.eval "ctable.my_controller.name"
-    expect(on_entry).to eq("my_controller")
-  end
-
-  it "Can compile a controller with an action that contains an event that responds to hello" do
-    ctx, js_src = compile "controller0"
-    hello_event_function = ctx.eval "ctable.my_controller.actions.my_action.handlers.hello"
-    expect(hello_event_function).not_to eq(nil)
-  end
-
-  it "Can compile a controller with spot names" do
-    ctx, js_src = compile "controller0"
-    spot_names = JSON.parse(ctx.eval "JSON.stringify(ctable.my_controller.spots)")
-    expect(spot_names).to include "hello"
-    expect(spot_names).to include "world"
-    expect(spot_names).to include "main" #Should be added by default
-  end
-
-  it "Can compile a controller with an action containing a timer and set the appropriate every_handlers key" do
-    ctx, js_src = compile "controller0timer"
-
-    function_names = JSON.parse(ctx.eval "JSON.stringify(Object.keys(ctable.my_controller.actions.my_action.handlers))")
-    expect(function_names).to include("hello")
-    expect(function_names.detect{|e| e =~ /_sec_/}).not_to eq(nil)
-  end
-end