flok 0.0.62 → 0.0.63

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49ad16aaf0fca2dc27529ae8cb71c1d99e2282ed
-  data.tar.gz: 95b619eb6df458626fe286555b6e5804768ba20e
+  metadata.gz: d369b592a35b8b2c078db3ac85240d1757cbe365
+  data.tar.gz: bf82891bcedf8b23edafcea1a06dc4876043535c
 SHA512:
-  metadata.gz: 8131bb471d419d201ce16aa42c2114277443cbb02a9075ce555c3da2af2a18ef1b973d949c541aadd67c91cf63c7ba8d49eaeb3d46065787d7095c4ec7c78488
-  data.tar.gz: 22b1c150cecfca9215bbabbf2e4038f9f390359070e6f268fca445300a29f7dbf6060709ed1cc31d03b098beca05f882cc68bfe8bb222b640d12f4e52f720364
+  metadata.gz: e58ba2e2620c41ee3e70960076766a63955219cd6fad8deebeaf5e067e10d38c053da078327b7b39a1e9d00a8b56af6e07858cacc60839bc7c9917f504a40eab
+  data.tar.gz: 4ad97f13b5ed4da7a63dd15366d0507ece1cf43aa3379183e8ee1b48c707f0a61a59fe04552ccd94aba645b650d122600cfabedc62e86966196c86cd72515bef

data/docs/client_api.md

@@ -4,6 +4,7 @@ Client API covers controller action event handlers.
 ### Controller MACROS
   * Embed(view_controller_name, spot_name, context) - Embed a view controller with the name `view_controller_name` inside the current view controller at the spot with a context
   * Goto(action_name) - Change actions
+  * Push(action_name) - This works just like `Goto` except that `Pop` will restore the last action
   * Request(service_insatnce_name, ename, params) Initiate a service.  See [Services](./services.md) for more info.  
   * Send(event_name, info) - Send a custom event on the main queue.
   * Raise(event_name, info) - Will send an event to the parent view controller (and it will bubble up, following `event_gw` which is set in `Embed` as the parent controller

data/docs/datatypes.md

@@ -10,7 +10,7 @@ be looked up as `ctable[controller_name]`.
 ctable_entry {
   root_view,     //A constant string of the name of the view this controller sets as it's root view.
   actions,       //A dictionary [String:action_info] that corresponds to a dictionary of action_info object's based on the action's name.
-  spots,         //An array fo spot names for this controller
+  spots,         //An array fo spot names for this controller, by default, the 'main' spot is counted as 1 spot.
   name,          //The name of the controller, useful for certain lookup operations, this is also the ctable key
   __init__,      //A function that is called when this controller is created. Signals service connection and the controller on_entry bits.
   Additionally, all interval timers are configured here based on their unique names. Actions that are not active will not receive these events (they

data/lib/flok/user_compiler.rb

@@ -208,6 +208,50 @@ module Flok
             }]);
           }
           out.puts res
+        elsif l =~ /Push/
+          l.strip!
+          l.gsub!(/Push\(/, "")
+          l.gsub! /\)$/, ""
+          l.gsub! /\);$/, ""
+          o = l.split(",").map{|e| e.strip}
+
+          action_name = o.shift.gsub(/"/, "")
+
+          #Switch the actions, reset embeds, and call on_entry
+          res = %{
+            var old_action = __info__.action;
+            __info__.action = "#{action_name}";
+
+            //Prep embeds array, embeds[0] refers to the spot bp+2 (bp is vc, bp+1 is main)
+            __info__.embeds = [];
+            for (var i = 1; i < #{@controller.spots.count}; ++i) {
+              __info__.embeds.push([]);
+            }
+
+            //Call on_entry for the new action via the singleton on_entry
+            //located in ctable
+            __info__.cte.actions[__info__.action].on_entry(__base__)
+
+            //'choose_action' pseudo-action will be sent as 'null' as it's the initial state
+            if (old_action === "choose_action") {
+              old_action = null;
+            }
+
+            //Send off event for action change
+            main_q.push([3, "if_event", __base__, "action", {
+              from: old_action,
+              to: "#{action_name}"
+            }]);
+          }
+          out.puts res
+        elsif l =~ /Pop/
+          l.strip!
+          l.gsub!(/Pop\(/, "")
+          l.gsub! /\)$/, ""
+          l.gsub! /\);$/, ""
+          o = l.split(",").map{|e| e.strip}
+
+          #out.puts res
         #Request(service_instance_name, ename, info)
         elsif l =~ /Request/
           l.strip!

data/lib/flok/version.rb

@@ -1,3 +1,3 @@
 module Flok
-  VERSION = "0.0.62"
+  VERSION = "0.0.63"
 end

data/spec/env/kern.rb

@@ -192,6 +192,46 @@ shared_context "kern" do
       end
     end
 
+    #Expect the queue to not contain a message matching
+    def expect_not_to_contain msg_name, &block
+      original_q = JSON.parse(@q.to_json)
+
+      loop do
+        if @q.count == 0 and @cq.count == 0
+          #Good
+          @q = original_q
+          @cq = nil
+          return
+        end
+        #Dequeue from multi-priority queue if possible
+        if @cq.nil? or @cq.count == 0
+          @cq = @q.shift
+          @cp = @cq.shift #save priority
+        end
+
+        #Check to see if it's the correct item
+        arg_len = @cq.shift
+        name = @cq.shift
+        if arg_len.class == String
+          $stderr.puts "Arg len is: #{arg_len.inspect}"
+          $stderr.puts "Name is #{name.inspect}"
+        end
+        args = @cq.shift(arg_len)
+
+        #Matches message name
+        if name == msg_name
+          #Optional test block
+          if block
+            next unless block.call(args)
+          end
+
+          #Uh oh, we found one!
+          block_info = block ? " You gave a block to filter... check the code to see what it's checking for, it's more than just the message name" : ""
+          raise "Expected not to find a message matching #{msg_name.inspect} in the queue, but found one!#{block_info}"
+        end
+      end
+    end
+
     #Retrieve a message, we at least expect a name and priority
     def get msg_name, priority=0
       #Dequeue from multi-priority queue if possible

data/spec/etc/user_compiler_spec.rb

@@ -11,6 +11,7 @@ RSpec.describe "User compiler" do
     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

data/spec/kern/assets/push.rb

@@ -0,0 +1,26 @@
+controller :my_controller do
+  spots "hello", "world"
+
+  action :my_action do
+    on_entry %{
+      Embed("my_controller2", "hello", {});
+    }
+
+    on "test_event", %{
+      Push("my_other_action")
+    }
+  end
+
+  action :my_other_action do
+    on_entry %{
+      my_other_action_on_entry_called = true;
+    }
+  end
+end
+
+controller :my_controller2 do
+  action :my_action do
+    on_entry %{
+    }
+  end
+end

data/spec/kern/assets/push_pop.rb

@@ -0,0 +1,30 @@
+controller :my_controller do
+  spots "hello", "world"
+
+  action :my_action do
+    on_entry %{
+      Embed("my_controller2", "hello", {});
+    }
+
+    on "test_event", %{
+      Push("my_other_action")
+    }
+  end
+
+  action :my_other_action do
+    on_entry %{
+      my_other_action_on_entry_called = true;
+    }
+
+    on "back", %{
+      Pop();
+    }
+  end
+end
+
+controller :my_controller2 do
+  action :my_action do
+    on_entry %{
+    }
+  end
+end

data/spec/kern/controller_spec.rb

@@ -75,7 +75,7 @@ RSpec.describe "kern:controller_spec" do
   end
 
   #Can initialize a controller via embed and the sub-controller has the correct info
-  it "Can initiate a controller via _embed" do
+  it "Can initiate a controller with a sub-controller via _embed" do
     #Compile the controller
     ctx = flok_new_user File.read('./spec/kern/assets/embed_info.rb')
 
@@ -287,7 +287,7 @@ RSpec.describe "kern:controller_spec" do
     expect(embeds).to eq([[base+4], []])
   end
 
-  it "Can receive 'test_event' and change actions" do
+  it "Can receive 'test_event' and change actions via Goto" do
     #Compile the controller
     ctx = flok_new_user File.read('./spec/kern/assets/goto.rb')
 
@@ -305,6 +305,66 @@ RSpec.describe "kern:controller_spec" do
     expect(ctx.eval("my_other_action_on_entry_called")).not_to eq(nil)
   end
 
+  it "Can receive 'test_event' and change actions via Push" do
+    #Compile the controller
+    ctx = flok_new_user File.read('./spec/kern/assets/push.rb')
+
+    #Run the embed function
+    dump = ctx.evald %{
+      //Call embed on main root view
+      base = _embed("my_controller", 0, {}, null);
+
+      //Drain queue with test event
+      int_dispatch([3, "int_event", base, "test_event", {}]);
+
+      //The second action was entered
+      dump["my_other_action_on_entry_called"] = my_other_action_on_entry_called; 
+
+      //The controller's info
+      dump["controller_info"] = tel_deref(base);
+      dump["ctable_entry"] = dump["controller_info"]["cte"];
+    }
+
+    #The controller's instance info `action` field was changed to the new action
+    expect(dump["controller_info"]["action"]).to eq("my_other_action")
+
+    #The controller's instance embeds array is the correct blank version
+    #Each blank array in embeds refers to one spot (not including the main spot)
+    spot_count = dump["ctable_entry"]["spots"].count-1
+    expect(dump["controller_info"]["embeds"]).to eq((1..spot_count).map{|e| []})
+
+    #Does not dealloc the controller (and kill views)
+    @driver.expect_not_to_contain "if_free_view"
+
+    #Controller's action was called
+    expect(dump["my_other_action_on_entry_called"]).to eq(true)
+
+    #Got a notification for the view hierarchy about the change
+    @driver.ignore_up_to "if_event" do |e|
+      next e[2] == {"from" => "my_action", "to" => "my_other_action"}
+    end
+    @driver.mexpect("if_event", [Integer, "action", {"from" => "my_action", "to" => "my_other_action"}])
+  end
+
+  it "Can receive 'test_event' and change actions via Push and then back with Pop" do
+    #Compile the controller
+    ctx = flok_new_user File.read('./spec/kern/assets/push_pop.rb')
+
+    #Run the embed function
+    ctx.eval %{
+      //Call embed on main root view
+      base = _embed("my_controller", 0, {}, null);
+
+      //Drain queue with test event
+      int_dispatch([3, "int_event", base, "test_event", {}]);
+    }
+
+    #Now we expect the action for the controller to be 'my_other_action' and for it's on_entry
+    #to be called
+    expect(ctx.eval("my_other_action_on_entry_called")).not_to eq(nil)
+  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')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flok
 version: !ruby/object:Gem::Version
-  version: 0.0.62
+  version: 0.0.63
 platform: ruby
 authors:
 - seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-16 00:00:00.000000000 Z
+date: 2015-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
@@ -1159,6 +1159,8 @@ files:
 - spec/kern/assets/interval3.rb
 - spec/kern/assets/lower_event.rb
 - spec/kern/assets/no_choose_action.rb
+- spec/kern/assets/push.rb
+- spec/kern/assets/push_pop.rb
 - spec/kern/assets/raise_event.rb
 - spec/kern/assets/rest_service/config0.rb
 - spec/kern/assets/rest_service/controller0.rb
@@ -2086,6 +2088,8 @@ test_files:
 - spec/kern/assets/interval3.rb
 - spec/kern/assets/lower_event.rb
 - spec/kern/assets/no_choose_action.rb
+- spec/kern/assets/push.rb
+- spec/kern/assets/push_pop.rb
 - spec/kern/assets/raise_event.rb
 - spec/kern/assets/rest_service/config0.rb
 - spec/kern/assets/rest_service/controller0.rb