flok 0.0.40 → 0.0.41

data/spec/etc/service_compiler/config0.rb

@@ -1 +1 @@
-service_instance :test, :my_service
+service_instance :my_service, :test

data/spec/etc/service_compiler/config0b.rb

@@ -0,0 +1 @@
+service_instance :test, :my_service

data/spec/etc/services_compiler_spec.rb

@@ -21,46 +21,46 @@ RSpec.describe "lib/services_compiler" do
     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 "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", "config0"
+  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_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_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_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_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_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
+    #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
+  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", "config0"
+     ctx, src  = compile "service3", "config0b"
 
      expect(src).not_to include("SEND")
      expect(src).to include("_q.push")

data/spec/etc/user_compiler/controller0b.rb

@@ -0,0 +1,9 @@
+controller :my_controller do
+  spots "hello", "world"
+
+  action :my_action do
+    on "hello", %{
+      var x = 3;
+    }
+  end
+end

data/spec/etc/user_compiler/controller0timer.rb

@@ -0,0 +1,16 @@
+controller :my_controller do
+  spots "hello", "world"
+
+  action :my_action do
+    on_entry %{
+      var x = 4;
+    }
+
+    every 3.seconds, %{
+    }
+
+    on "hello", %{
+      var x = 3;
+    }
+  end
+end

data/spec/etc/user_compiler_spec.rb

@@ -46,13 +46,28 @@ RSpec.describe "User compiler" do
     expect(actions).not_to eq(nil)
   end
 
-
   it "Can compile a controller with an action that contains an on_entry" do
     ctx = 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 = compile "controller0b"
+    on_entry = ctx.eval "ctable.my_controller.actions.my_action.on_entry"
+    expect(on_entry).not_to eq(nil)
+  end
+
+  it "on_entry controller has more code than non on_entry controller" do
+    ctx = compile "controller0"
+    on_entry = ctx.eval "ctable.my_controller.actions.my_action.on_entry"
+
+    ctx2 = 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 = compile "controller0"
     on_entry = ctx.eval "ctable.my_controller.name"
@@ -72,4 +87,12 @@ RSpec.describe "User compiler" do
     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 = 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

data/spec/iface/driver/dispatch_spec.rb

@@ -4,12 +4,18 @@ require './spec/env/iface.rb'
 RSpec.describe "iface:driver:dispatch_spec" do
   include_context "iface:driver"
 
-  it "Does automatically dispatch a blank array (signaling int_disptach) when a bulk queue is received prefixed with 'r' indicating incomplete-ness" do
+  it "Does automatically dispatch a blank array (signaling int_disptach) when a bulk queue is received prefixed with 'i' indicating incomplete-ness" do
     @pipe.puts ['i', [0, 0, "ping_nothing"]].to_json
     expect(@pipe).to readline_and_equal_json_x_within_y_seconds([], 6.seconds)
   end
 
-  it "Does not dispatch a blank array (signaling int_disptach) when a bulk queue is received prefixed without 'r' indicating incomplete-ness" do
+  it "Does automatically dispatch a blank array (signaling int_disptach) when a blank queue is received prefixed with 'i' indicating incomplete-ness" do
+    @pipe.puts ['i'].to_json
+    expect(@pipe).to readline_and_equal_json_x_within_y_seconds([], 6.seconds)
+  end
+
+
+  it "Does not dispatch a blank array (signaling int_disptach) when a bulk queue is received prefixed without 'i' indicating incomplete-ness" do
     @pipe.puts [[0, 0, "ping_nothing"]].to_json
     expect(@pipe).not_to readline_and_equal_json_x_within_y_seconds([], 6.seconds)
   end

data/spec/iface/driver/persist_spec.rb

@@ -22,6 +22,17 @@ RSpec.describe "iface:driver:persist" do
     expect(@pipe).to readline_and_equal_json_x_within_y_seconds([0, "pong"], 5.seconds)
   end
 
+ it "retuns null when calling get on a blank key" do
+    key = SecureRandom.hex
+    value = SecureRandom.hex
+
+    @pipe.puts [[0, 3, "if_per_get", "session", "my_ns", key]].to_json
+
+    #Expect a response
+    res = [3, "int_per_get_res", "session", "my_ns", nil]
+    expect(@pipe).to readline_and_equal_json_x_within_y_seconds(res, 5.seconds)
+  end
+
   it "Can set a persist, and then get" do
     key = SecureRandom.hex
     value = SecureRandom.hex

data/spec/kern/assets/controller0defer.rb

@@ -0,0 +1,18 @@
+controller :my_controller do
+  action :my_action do
+    on_entry %{
+      //Queue up a deferred event
+      int_event_defer(__base__, "defer_res", {foo: "bar"});
+
+      int_event(__base__, "sync_res", {foo_sync: "bar"});
+    }
+
+    on "defer_res", %{
+      defer_res_params = params;
+    }
+
+    on "sync_res", %{
+      sync_res_params = params;
+    }
+  end
+end

data/spec/kern/assets/controller0defer0.rb

@@ -0,0 +1,13 @@
+controller :my_controller do
+  spots "hello", "world"
+
+  action :my_action do
+    on_entry %{
+      on_entry_base_pointer = __base__;
+    }
+
+    on "hello", %{
+      var x = 3;
+    }
+  end
+end

data/spec/kern/assets/controller0defer2.rb

@@ -0,0 +1,17 @@
+controller :my_controller do
+  action :my_action do
+    on_entry %{
+      //Queue up a deferred event
+      int_event_defer(__base__, "defer_res", {foo: "bar"});
+      int_event_defer(__base__, "defer_res2", {foo: "bar"});
+    }
+
+    on "defer_res", %{
+      defer_res_params = params;
+    }
+
+    on "defer_res2", %{
+      defer_res2_params = params;
+    }
+  end
+end

data/spec/kern/assets/global_on_entry.rb

@@ -0,0 +1,8 @@
+controller :my_controller do
+  on_entry %{
+    global_on_entry_called = true;
+  }
+
+  action :index do
+  end
+end

data/spec/kern/assets/global_on_entry2.rb

@@ -0,0 +1,16 @@
+controller :my_controller do
+  on_entry %{
+    global_on_entry_called_count += 1;
+  }
+
+  action :index do
+    on "next", %{
+      Goto("test")
+    }
+  end
+
+  action :test do
+    on_entry %{
+    }
+  end
+end

data/spec/kern/assets/global_on_entry3.rb

@@ -0,0 +1,17 @@
+controller :my_controller do
+  on_entry %{
+    global_on_entry_called_count += 1;
+    Send("test", {});
+  }
+
+  action :index do
+    on "next", %{
+      Goto("test")
+    }
+  end
+
+  action :test do
+    on_entry %{
+    }
+  end
+end

data/spec/kern/assets/global_on_entry4.rb

@@ -0,0 +1,12 @@
+controller :my_controller do
+  on_entry %{
+    context.secret = "foo";
+    context.base = __base__;
+  }
+
+  action :index do
+    on_entry %{
+      Send("context", context);
+    }
+  end
+end

data/spec/kern/assets/interval.rb

@@ -0,0 +1,29 @@
+controller :my_controller do
+  spots "hello", "world"
+
+  action :my_action do
+    on_entry %{
+      on_entry_base_pointer = __base__;
+      every_025_called_count = 0;
+      every_05_called_count = 0;
+      every_1_called_count = 0;
+    }
+
+    on "hello", %{
+      var x = 3;
+    }
+
+    every (0.25).seconds, %{
+      every_025_called_count += 1;
+      Send("025_message", {});
+    }
+
+    every (0.5).seconds, %{
+      every_05_called_count += 1;
+    }
+
+    every 1.seconds, %{
+      every_1_called_count += 1;
+    }
+  end
+end

data/spec/kern/assets/interval2.rb

@@ -0,0 +1,33 @@
+controller :my_controller do
+  spots "hello", "world"
+
+  on_entry %{
+      every_025_called_count = 0;
+      every_05_called_count = 0;
+      every_1_called_count = 0;
+  }
+
+  action :my_action do
+    on "next", %{
+      Goto("other");
+    }
+
+    every (0.25).seconds, %{
+      every_025_called_count += 1;
+    }
+  end
+  
+  action :other do
+    every (0.5).seconds, %{
+      every_05_called_count += 1;
+    }
+
+    every 1.seconds, %{
+      every_1_called_count += 1;
+    }
+
+    on "back", %{
+      Goto("my_action")
+    }
+  end
+end

data/spec/kern/assets/interval3.rb

@@ -0,0 +1,39 @@
+controller :my_controller do
+  spots "content"
+
+  on_entry %{
+    timer_called = 0;
+  }
+
+  action :my_action do
+    on_entry %{
+      Embed("alt1", "content", {});
+    }
+
+    on "next", %{
+      Goto("other");
+    }
+  end
+  
+  action :other do
+    on_entry %{
+    }
+      
+    on "back", %{
+      Goto("my_action")
+    }
+  end
+end
+
+controller :alt1 do
+
+  action :index do
+    on_entry %{
+    }
+
+    every (0.25).seconds, %{
+      timer_called += 1;
+    }
+
+  end
+end

data/spec/kern/assets/service1.rb

@@ -1,6 +1,9 @@
 service :my_service do
-  on_wakeup %{
+  global %{
     every_ticks = 0;
+  }
+
+  on_wakeup %{
     on_wakeup_called = true; 
   }
 

data/spec/kern/assets/service_controller1.rb

@@ -23,6 +23,17 @@ controller :my_controller do
 end
 
 controller :my_other_controller do
+  spots "content"
+  services :spec
+
+  action :my_action do
+    on_entry %{
+      Embed("my_other2_controller", "content", {});
+    }
+  end
+end
+
+controller :my_other2_controller do
   services :spec
 
   action :my_action do

data/spec/kern/assets/specimin/controller0.rb

@@ -0,0 +1,74 @@
+controller :workout_window_exercise do
+  spots "verb"
+
+  on_entry %{
+    context.ep = context.ep;
+    context.ui_title = context.ui_title;
+    context.image_url = context.image_url;
+  }
+
+  action :verb do
+    on_entry %{
+      var ctx = {
+        parent: context,
+      }
+
+      if (context.ep.verb_type == "seconds") {
+        Embed("exercise_verb_secs", "verb", ctx);
+      }
+    }
+
+    on "verb_secs_completed", %{
+      Goto("presay");
+    }
+  end
+
+  action :presay do
+    on_entry %{
+
+      var ctx = {
+        parent: context,
+      }
+      Embed("workout_window_exercise_presay", "verb", ctx);
+    }
+
+    on "start_clicked", %{
+      Goto("countdown");
+    }
+  end
+
+  action :countdown do
+    on_entry %{
+      Embed("workout_window_exercise_countdown", "verb", {});
+    }
+
+    on "countdown_finished", %{
+      Goto("verb");
+    }
+  end
+
+end
+
+#Verb Seconds
+####################################################################################################
+controller :exercise_verb_secs do
+  action :index do
+    on_entry %{
+      context.seconds = context.parent.ep.seconds;
+    }
+
+    every 1.seconds, %{
+      if (context.seconds == 0) {
+      debugger;
+        Raise("verb_secs_completed", {});
+        return;
+      }
+
+      context.seconds -= 1;
+
+      Send("seconds", context.seconds.toString());
+    }
+  end
+end
+####################################################################################################
+