flok 0.0.103 → 0.0.105

data/spec/kern/{hook_user_generators_spec.rb → hook_goto_user_generators_spec.rb}

@@ -9,7 +9,7 @@ require './spec/lib/rspec_extensions.rb'
 require './lib/flok/hooks_compiler.rb'
 require 'zlib'
 
-RSpec.describe "kern:hook_user_geenrators_spec" do
+RSpec.describe "kern:hook_goto_user_generators_spec" do
   include Zlib
   include_context "kern"
 
@@ -58,6 +58,31 @@ RSpec.describe "kern:hook_user_geenrators_spec" do
     expect { @driver.ignore_up_to("if_hook_event", 0) }.to raise_error(/Waited for/)  # At this point, we should have not received any events for if_hook_event, as we are not selecting the embedded controller
   end
 
+  it "Can use the :goto hook generator for a controller with the triggered_by constraint for various actions" do
+    #Hook source code
+    hooks_src = %{
+      hook :goto => :goto do
+        triggered_by "back_clicked"
+      end
+    }
+
+    #Get a new js context with the controllers source and the hooks source
+    info = flok_new_user_with_src File.read('./spec/kern/assets/hook_entry_points/controller0.rb'), nil, nil, hooks_src
+    File.write File.expand_path("~/Downloads/src.txt"), info[:src]
+    ctx = info[:ctx]
+
+    #Run the embed function
+    dump = ctx.evald %{
+      dump.base = _embed("my_controller", 0, {}, null);         // Embed the controller
+      int_dispatch([]);                                         // Dispatch any events the are pending
+      dump.my_other_controller_base = my_other_controller_base; // Grab the base address of 'my_other_controller'
+    }
+
+    @driver.int "int_event", [ dump["my_other_controller_base"], "back_clicked", {} ] 
+    @driver.ignore_up_to("if_hook_event", 0)
+  end
+
+
   it "Can use the :goto hook generator for a controller with the to_action_responds_to constraint for various actions" do
     #Hook source code
     hooks_src = %{
@@ -136,6 +161,120 @@ RSpec.describe "kern:hook_user_geenrators_spec" do
     expect { @driver.ignore_up_to("if_hook_event", 0); @driver.get "if_hook_event", 0 }.not_to raise_error
   end
 
+  it "Can use the :goto hook generator for a controller with the to_action constraint for various actions" do
+    #Hook source code
+    hooks_src = %{
+      hook :goto => :goto do
+        to_action "other"
+      end
+    }
+
+    #Get a new js context with the controllers source and the hooks source
+    info = flok_new_user_with_src File.read('./spec/kern/assets/hook_entry_points/controller0bc.rb'), nil, nil, hooks_src
+    File.write File.expand_path("~/Downloads/src.txt"), info[:src]
+    ctx = info[:ctx]
+
+    #Run the embed function
+    dump = ctx.evald %{
+      dump.base = _embed("my_controller", 0, {}, null);         // Embed the controller
+      int_dispatch([]);                                         // Dispatch any events the are pending
+      dump.my_controller_base = my_controller_base;
+    }
+
+    #Should raise a hook at this time
+    expect { @driver.ignore_up_to("if_hook_event", 0) }.to raise_error(/Waited for/)
+    @driver.int "int_event", [ dump["my_controller_base"], "next_clicked", {} ] 
+    @driver.int "int_event", [ dump["my_controller_base"], "next_clicked", {} ] 
+
+    @driver.ignore_up_to("if_hook_event", 0); @driver.get "if_hook_event", 0
+    expect { @driver.ignore_up_to("if_hook_event", 0); @driver.get "if_hook_event", 0 }.to raise_error /Waited/
+  end
+
+  it "Can use the :goto hook generator for a controller with the to_action constraint for multiple actions" do
+    #Hook source code
+    hooks_src = %{
+      hook :goto => :goto do
+        to_action "other", "other2"
+      end
+    }
+
+    #Get a new js context with the controllers source and the hooks source
+    info = flok_new_user_with_src File.read('./spec/kern/assets/hook_entry_points/controller0bc.rb'), nil, nil, hooks_src
+    File.write File.expand_path("~/Downloads/src.txt"), info[:src]
+    ctx = info[:ctx]
+
+    #Run the embed function
+    dump = ctx.evald %{
+      dump.base = _embed("my_controller", 0, {}, null);         // Embed the controller
+      int_dispatch([]);                                         // Dispatch any events the are pending
+      dump.my_controller_base = my_controller_base;
+    }
+
+    #Should raise a hook at this time
+    expect { @driver.ignore_up_to("if_hook_event", 0) }.to raise_error(/Waited for/)
+    @driver.int "int_event", [ dump["my_controller_base"], "next_clicked", {} ] 
+    @driver.int "int_event", [ dump["my_controller_base"], "next_clicked", {} ] 
+
+    @driver.ignore_up_to("if_hook_event", 0); @driver.get "if_hook_event", 0
+    @driver.ignore_up_to("if_hook_event", 0); @driver.get "if_hook_event", 0
+  end
+
+
+  it "Can use the :goto hook generator for a controller with the from_action constraint for various actions" do
+    #Hook source code
+    hooks_src = %{
+      hook :goto => :goto do
+        from_action "index"
+      end
+    }
+
+    #Get a new js context with the controllers source and the hooks source
+    info = flok_new_user_with_src File.read('./spec/kern/assets/hook_entry_points/controller0b.rb'), nil, nil, hooks_src
+    File.write File.expand_path("~/Downloads/src.txt"), info[:src]
+    ctx = info[:ctx]
+
+    #Run the embed function
+    dump = ctx.evald %{
+      dump.base = _embed("my_controller", 0, {}, null);         // Embed the controller
+      int_dispatch([]);                                         // Dispatch any events the are pending
+      dump.my_controller_base = my_controller_base;
+    }
+
+    #Should raise a hook at this time
+    expect { @driver.ignore_up_to("if_hook_event", 0) }.to raise_error(/Waited for/)
+    @driver.int "int_event", [ dump["my_controller_base"], "next_clicked", {} ] 
+    expect { @driver.ignore_up_to("if_hook_event", 0); @driver.get "if_hook_event", 0 }.not_to raise_error
+  end
+
+  it "Can use the :goto hook generator for a controller with the from_action constraint for multiple actions" do
+    #Hook source code
+    hooks_src = %{
+      hook :goto => :goto do
+        from_action "index", "other"
+      end
+    }
+
+    #Get a new js context with the controllers source and the hooks source
+    info = flok_new_user_with_src File.read('./spec/kern/assets/hook_entry_points/controller0bc.rb'), nil, nil, hooks_src
+    File.write File.expand_path("~/Downloads/src.txt"), info[:src]
+    ctx = info[:ctx]
+
+    #Run the embed function
+    dump = ctx.evald %{
+      dump.base = _embed("my_controller", 0, {}, null);         // Embed the controller
+      int_dispatch([]);                                         // Dispatch any events the are pending
+      dump.my_controller_base = my_controller_base;
+    }
+
+    #Should raise a hook at this time
+    expect { @driver.ignore_up_to("if_hook_event", 0) }.to raise_error(/Waited for/)
+    @driver.int "int_event", [ dump["my_controller_base"], "next_clicked", {} ] 
+    @driver.int "int_event", [ dump["my_controller_base"], "next_clicked", {} ] 
+    @driver.ignore_up_to("if_hook_event", 0); @driver.get "if_hook_event", 0
+    @driver.ignore_up_to("if_hook_event", 0); @driver.get "if_hook_event", 0
+  end
+
+
   it "Can use goto to embed a pre and post selectors which will be returned in the hooking response" do
     #Hook source code
     hooks_src = %{
@@ -179,12 +318,11 @@ RSpec.describe "kern:hook_user_geenrators_spec" do
     @driver.ignore_up_to("if_hook_event", 0)
     hook_res = @driver.get "if_hook_event", 0
 
-    expect(hook_res[1]).to eq({
-      "views" => {
-        "foo" => my_other_controller_base,
-        "foo2" => new_controller_base
-      }
-    })
+    expect(hook_res[1]["views"]).to eq({
+      "foo" => my_other_controller_base,
+      "foo2" => new_controller_base
+    }
+    )
   end
 
   it "The goto does not free views via the module until after the completion event is received" do

data/spec/kern/hook_pop_user_generators_spec.rb

@@ -0,0 +1,292 @@
+#Relating to the conversion of the user's ./config/hooks.rb file into the equivalent HooksManifestEntrie(s) (This may cross-over into
+#the HooksCompiler itself because we need to test side-effects)
+
+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'
+require './lib/flok/hooks_compiler.rb'
+require 'zlib'
+
+RSpec.describe "kern:hook_pop_user_generators_spec" do
+  include Zlib
+  include_context "kern"
+
+  it "Can use the :pop hook generator for all controllers (no matchers)" do
+    hooks_src = %{
+      hook :pop => :pop do
+        #Select all
+      end
+    }
+
+    #Just expect this not to blow up
+    info = flok_new_user_with_src File.read('./spec/kern/assets/hook_entry_points/controller_0b_pop.rb'), nil, nil, hooks_src
+    ctx = info[:ctx]
+
+    #Run the embed function
+    dump = ctx.evald %{
+      dump.base = _embed("my_controller", 0, {}, null); // Embed the controller
+      int_dispatch([]);                                 // Dispatch any events the are pending
+      dump.on_entry_base_pointer = on_entry_base_pointer;
+    }
+
+    @driver.int "int_event", [ dump["on_entry_base_pointer"], "next_clicked", {} ] 
+    @driver.int "int_event", [ dump["on_entry_base_pointer"], "back_clicked", {} ] 
+
+    @driver.ignore_up_to("if_hook_event", 0)
+    @driver.get "if_hook_event", 0
+  end
+
+  it "Can use the :pop hook generator for one specific controller by name" do
+    hooks_src = %{
+      hook :pop => :pop do
+        controller "my_controller"
+      end
+    }
+
+    #Just expect this not to blow up
+    info = flok_new_user_with_src File.read('./spec/kern/assets/hook_entry_points/controller_0b_pop2.rb'), nil, nil, hooks_src
+    ctx = info[:ctx]
+
+    #Run the embed function
+    dump = ctx.evald %{
+      dump.base = _embed("my_controller", 0, {}, null); // Embed the controller
+      int_dispatch([]);                                 // Dispatch any events the are pending
+      dump.on_entry_base_pointer = on_entry_base_pointer;
+      dump.on_entry_base_pointer2 = on_entry_base_pointer2;
+    }
+
+    @driver.int "int_event", [ dump["on_entry_base_pointer"], "next_clicked", {} ] 
+    @driver.int "int_event", [ dump["on_entry_base_pointer2"], "next_clicked", {} ] 
+    @driver.int "int_event", [ dump["on_entry_base_pointer"], "back_clicked", {} ] 
+    @driver.int "int_event", [ dump["on_entry_base_pointer2"], "back_clicked", {} ] 
+
+    @driver.ignore_up_to("if_hook_event", 0)
+    @driver.get "if_hook_event", 0
+    expect {@driver.ignore_up_to("if_hook_event", 0)}.to raise_error /Waited/
+  end
+
+  it "Can use the :pop hook generator for one action that responds to something (coming from thing)" do
+    hooks_src = %{
+      hook :pop => :pop do
+        from_action_responds_to? "olah2"
+      end
+    }
+
+    #Just expect this not to blow up
+    info = flok_new_user_with_src File.read('./spec/kern/assets/hook_entry_points/controller_0b_pop2.rb'), nil, nil, hooks_src
+    ctx = info[:ctx]
+
+    #Run the embed function
+    dump = ctx.evald %{
+      dump.base = _embed("my_controller", 0, {}, null); // Embed the controller
+      int_dispatch([]);                                 // Dispatch any events the are pending
+      dump.on_entry_base_pointer = on_entry_base_pointer;
+      dump.on_entry_base_pointer2 = on_entry_base_pointer2;
+    }
+
+    @driver.int "int_event", [ dump["on_entry_base_pointer"], "next_clicked", {} ] 
+    @driver.int "int_event", [ dump["on_entry_base_pointer2"], "next_clicked", {} ] 
+    @driver.int "int_event", [ dump["on_entry_base_pointer"], "back_clicked", {} ] 
+    @driver.int "int_event", [ dump["on_entry_base_pointer2"], "back_clicked", {} ] 
+
+    @driver.ignore_up_to("if_hook_event", 0)
+    res = @driver.get "if_hook_event", 0
+    expect {@driver.ignore_up_to("if_hook_event", 0)}.to raise_error /Waited/
+  end
+
+  it "Can use the :pop hook generator for a controller with the triggered_by constraint for various actions" do
+    #Hook source code
+    hooks_src = %{
+      hook :pop => :pop do
+        triggered_by "back_clicked"
+      end
+    }
+
+    #Get a new js context with the controllers source and the hooks source
+    info = flok_new_user_with_src File.read('./spec/kern/assets/hook_entry_points/controller_0b_pop2.rb'), nil, nil, hooks_src
+    File.write File.expand_path("~/Downloads/src.txt"), info[:src]
+    ctx = info[:ctx]
+    #Run the embed function
+    dump = ctx.evald %{
+      dump.base = _embed("my_controller", 0, {}, null);         // Embed the controller
+      int_dispatch([]);                                         // Dispatch any events the are pending
+      dump.on_entry_base_pointer = on_entry_base_pointer; // Grab the base address of 'my_other_controller'
+    }
+
+    @driver.int "int_event", [ dump["on_entry_base_pointer"], "next_clicked", {} ] 
+    expect { @driver.ignore_up_to("if_hook_event", 0)}.to raise_error /Waited/
+
+    @driver.int "int_event", [ dump["on_entry_base_pointer"], "back_clicked", {} ] 
+    @driver.ignore_up_to("if_hook_event", 0)
+  end
+
+
+  it "can hook into a particualr action we are poping from" do
+    hooks_src = %{
+      hook :pop => :pop do
+        from_action "other2"
+      end
+    }
+
+    #Just expect this not to blow up
+    info = flok_new_user_with_src File.read('./spec/kern/assets/hook_entry_points/controller_0b_pop2.rb'), nil, nil, hooks_src
+    ctx = info[:ctx]
+
+    #Run the embed function
+    dump = ctx.evald %{
+      dump.base = _embed("my_controller", 0, {}, null); // Embed the controller
+      int_dispatch([]);                                 // Dispatch any events the are pending
+      dump.on_entry_base_pointer = on_entry_base_pointer;
+      dump.on_entry_base_pointer2 = on_entry_base_pointer2;
+    }
+
+    @driver.int "int_event", [ dump["on_entry_base_pointer"], "next_clicked", {} ] 
+    @driver.int "int_event", [ dump["on_entry_base_pointer2"], "next_clicked", {} ] 
+    @driver.int "int_event", [ dump["on_entry_base_pointer"], "back_clicked", {} ] 
+    @driver.int "int_event", [ dump["on_entry_base_pointer2"], "back_clicked", {} ] 
+
+    @driver.ignore_up_to("if_hook_event", 0);  @driver.get "if_hook_event", 0
+    expect {@driver.ignore_up_to("if_hook_event", 0)}.to raise_error /Waited/
+  end
+
+  it "can hook into multiple actions we are poping from" do
+    hooks_src = %{
+      hook :pop => :pop do
+        from_action "other2", "other"
+      end
+    }
+
+    #Just expect this not to blow up
+    info = flok_new_user_with_src File.read('./spec/kern/assets/hook_entry_points/controller_0b_pop2.rb'), nil, nil, hooks_src
+    ctx = info[:ctx]
+
+    #Run the embed function
+    dump = ctx.evald %{
+      dump.base = _embed("my_controller", 0, {}, null); // Embed the controller
+      int_dispatch([]);                                 // Dispatch any events the are pending
+      dump.on_entry_base_pointer = on_entry_base_pointer;
+      dump.on_entry_base_pointer2 = on_entry_base_pointer2;
+    }
+
+    @driver.int "int_event", [ dump["on_entry_base_pointer"], "next_clicked", {} ] 
+    @driver.int "int_event", [ dump["on_entry_base_pointer2"], "next_clicked", {} ] 
+    @driver.int "int_event", [ dump["on_entry_base_pointer"], "back_clicked", {} ] 
+    @driver.int "int_event", [ dump["on_entry_base_pointer2"], "back_clicked", {} ] 
+
+    @driver.ignore_up_to("if_hook_event", 0);  @driver.get "if_hook_event", 0
+    @driver.ignore_up_to("if_hook_event", 0);  @driver.get "if_hook_event", 0
+  end
+
+
+  it "Can use pop to embed a pre and post selectors which will be returned in the hooking response" do
+    #Hook source code
+    hooks_src = %{
+      hook :pop => :pop do
+        controller "my_controller"
+        from_action "other"
+
+        before_views({
+          "my_controller3" => {
+            "__leaf__" => "foo"
+          }
+        })
+
+        after_views({
+          "." => {
+            "__leaf__" => "foo2"
+          }
+        })
+
+      end
+    }
+
+    #Just expect this not to blow up
+    info = flok_new_user_with_src File.read('./spec/kern/assets/hook_entry_points/controller_0b_pop2.rb'), nil, nil, hooks_src
+    ctx = info[:ctx]
+
+    #Run the embed function
+    ctx.evald %{
+      dump.base = _embed("my_controller", 0, {}, null); // Embed the controller
+      int_dispatch([]);                                 // Dispatch any events the are pending
+    }
+
+
+    on_entry_base_pointer = ctx.eval("on_entry_base_pointer")
+    on_entry_base_pointer2 = ctx.eval("on_entry_base_pointer2")
+
+    @driver.int "int_event", [ on_entry_base_pointer, "next_clicked", {} ] 
+    on_entry_base_pointer3 = ctx.eval("my_controller3_base")
+    @driver.int "int_event", [ on_entry_base_pointer, "back_clicked", {} ] 
+
+    @driver.ignore_up_to("if_hook_event", 0)
+    hook_res = @driver.get "if_hook_event", 0
+
+    expect(hook_res[1]).to eq({
+      "views" => {
+        "foo2" => on_entry_base_pointer2,
+        "foo" => on_entry_base_pointer3
+      }
+    })
+  end
+
+  it "Does not dump the views until *after* the callback is received" do
+    #Hook source code
+    hooks_src = %{
+      hook :pop => :pop do
+        controller "my_controller"
+        from_action "other"
+
+        before_views({
+          "my_controller3" => {
+            "__leaf__" => "foo"
+          }
+        })
+
+        after_views({
+          "." => {
+            "__leaf__" => "foo2"
+          }
+        })
+
+      end
+    }
+
+    #Just expect this not to blow up
+    info = flok_new_user_with_src File.read('./spec/kern/assets/hook_entry_points/controller_0b_pop2.rb'), nil, nil, hooks_src
+    ctx = info[:ctx]
+
+    #Run the embed function
+    ctx.evald %{
+      dump.base = _embed("my_controller", 0, {}, null); // Embed the controller
+      int_dispatch([]);                                 // Dispatch any events the are pending
+    }
+
+
+    on_entry_base_pointer = ctx.eval("on_entry_base_pointer")
+    on_entry_base_pointer2 = ctx.eval("on_entry_base_pointer2")
+
+    @driver.int "int_event", [ on_entry_base_pointer, "next_clicked", {} ] 
+    on_entry_base_pointer3 = ctx.eval("my_controller3_base")
+    @driver.int "int_event", [ on_entry_base_pointer, "back_clicked", {} ] 
+
+    #Should not have gotten a free view at this point because we popped an intercepted segue
+    #So it should wait for the completion callback to release the views
+    expect {@driver.ignore_up_to("if_free_view", 0)}.to raise_error /Waited/
+
+    @driver.ignore_up_to("if_hook_event", 0)
+    hook_res = @driver.get "if_hook_event", 0
+
+    expect(hook_res[1]["views"]).to eq({
+      "foo2" => on_entry_base_pointer2,
+      "foo" => on_entry_base_pointer3
+    })
+
+    #This should cause the views to be dumped
+    @driver.int "int_event", [hook_res[1]["cep"], "", {}]
+    @driver.ignore_up_to("if_free_view", 0)
+    res = @driver.get("if_free_view", 0)
+    expect(res).to eq([on_entry_base_pointer3+1])
+  end
+end