flok 0.0.78 → 0.0.79

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 643d6a1724b1aedb183f9cbd43c65d591d61676a
-  data.tar.gz: d12f16b669ea1daf652cb8290a8e7c2327d8f539
+  metadata.gz: aca1d7de35bb76f6ca3adf9142e6ba509161a5de
+  data.tar.gz: 07984726091817ae868f9a864ad38108510f26e5
 SHA512:
-  metadata.gz: 688cb125e1c43ae4ef30f598247fd6c5d61c194d53e5a03f2f783370af2e0af4a56b5d6f76f5c3f9674a623556c3a1def3d3bc29d9742d4278995a4280204d8e
-  data.tar.gz: df70bbefccb28bf756fae5b224e22f2d03b60f509828017fbd5e502b8b3910ed572230d95f6ba0758388e002b34d32534b50ad4a22e9f85e5ebaa85e81659f2b
+  metadata.gz: 5eec59b970ba96dda10d87394323839c35ed7dba250be6c250d03c289c4e1ee7f0a2f909cd09c9da1c2137d2d6da8cfbd1e4c1d8ff4afa4d18f1a00ba9541252
+  data.tar.gz: 57f42e576fe8cb437f5d01df8e07dda29df8093d248abb90d3aedfaa7284b52904a9881f6feb47903720df2a247f7e75610fdbfd6908dc496d3186dea7f910a4

data/lib/flok/user_compiler.rb

@@ -494,7 +494,7 @@ module Flok
   end
 
   class UserCompilerAction
-    attr_accessor :controller, :name, :ons, :every_handlers
+    attr_accessor :controller, :name, :ons, :every_handlers, :on_entry_has_goto
     include UserCompilerMacro
 
     def initialize controller, name, ctx, &block
@@ -504,6 +504,7 @@ module Flok
       @_on_entry_src = ""
       @ons = [] #Event handlers
       @every_handlers = []
+      @on_entry_has_goto = false
 
       self.instance_eval(&block)
     end
@@ -511,6 +512,8 @@ module Flok
     def on_entry js_src
       #returns a string
       @_on_entry_src = _macro(js_src)
+
+      @on_entry_has_goto = (js_src =~ /Goto/) != nil
     end
 
     def on_entry_src
@@ -582,6 +585,8 @@ module Flok
 
     def choose_action &block
       @ctx.action self, :choose_action, &block
+
+      raise "choose_action must contain Goto" unless @ctx.actions.detect{|e| e.name == :choose_action}.on_entry_has_goto
     end
 
     #Names of spots

data/lib/flok/version.rb

@@ -1,3 +1,3 @@
 module Flok
-  VERSION = "0.0.78"
+  VERSION = "0.0.79"
 end

data/spec/kern/assets/global_on_entry5.rb

@@ -1,5 +1,5 @@
 controller :my_controller do
-  services "vm"
+  services "test"
 
   on_entry %{
     context.secret = "foo";

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

@@ -0,0 +1,19 @@
+controller :my_controller do
+  services :test
+
+  on_entry %{
+      var info = {
+        foo: "bar"
+      }
+      Request("test", "test_async", info);
+  }
+
+  action :my_action do
+    on_entry %{
+    }
+
+    on "test_async_res", %{
+      test_async_res_params = params;
+    }
+  end
+end

data/spec/kern/controller_spec.rb

@@ -732,20 +732,20 @@ RSpec.describe "kern:controller_spec" do
 
   it "Does allow service macros in the global on_entry function" do
     #Compile the controller
-    ctx = flok_new_user File.read('./spec/kern/assets/global_on_entry5.rb'), File.read("./spec/kern/assets/vm/config5.rb") 
+    ctx = flok_new_user File.read('./spec/kern/assets/test_service/controller1b.rb'), File.read("./spec/kern/assets/test_service/config0.rb") 
 
     #Run the embed function
-    secret = SecureRandom.hex
-    ctx.eval %{
+    dump = ctx.evald %{
       global_on_entry_called_count = 0;
 
       //Call embed on main root view
       base = _embed("my_controller", 0, {}, null);
 
       int_dispatch([]);
+      dump.test_async_res_params = test_async_res_params;
     }
 
-    expect(ctx.eval("read_res_called")).to eq(true)
+    expect(dump["test_async_res_params"]).to eq({"foo" => "bar"})
   end
 
   it "Does allow interval (every) events" do
@@ -980,8 +980,8 @@ RSpec.describe "kern:controller_spec" do
   end
 
   it "Not setting a Goto will result in an exception" do
-    ctx = flok_new_user File.read('./spec/kern/assets/choose_action_sync_no_goto.rb'), File.read("./spec/kern/assets/test_service/config0.rb") 
     expect {
+      ctx = flok_new_user File.read('./spec/kern/assets/choose_action_sync_no_goto.rb'), File.read("./spec/kern/assets/test_service/config0.rb") 
       ctx.evald %{
         base = _embed("my_controller", 0, {}, null);
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flok
 version: !ruby/object:Gem::Version
-  version: 0.0.78
+  version: 0.0.79
 platform: ruby
 authors:
 - seo
@@ -1197,6 +1197,7 @@ files:
 - spec/kern/assets/test_service/config0.rb
 - spec/kern/assets/test_service/controller0.rb
 - spec/kern/assets/test_service/controller1.rb
+- spec/kern/assets/test_service/controller1b.rb
 - spec/kern/assets/test_service/controller2.rb
 - spec/kern/assets/test_service/controller3.rb
 - spec/kern/assets/test_service_config.rb
@@ -2144,6 +2145,7 @@ test_files:
 - spec/kern/assets/test_service/config0.rb
 - spec/kern/assets/test_service/controller0.rb
 - spec/kern/assets/test_service/controller1.rb
+- spec/kern/assets/test_service/controller1b.rb
 - spec/kern/assets/test_service/controller2.rb
 - spec/kern/assets/test_service/controller3.rb
 - spec/kern/assets/test_service_config.rb