flok 0.0.43 → 0.0.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e0d45d6c71fab7dd38c7692e0f123e1c066c959
-  data.tar.gz: be210489af74948276d3e21ceb689fc51e054f89
+  metadata.gz: 012105cd4ab1a238ba2cc8d06605e30d672ba0ee
+  data.tar.gz: e3edf3a8c64227344f35030966f645cf6cfb99a4
 SHA512:
-  metadata.gz: 038e4ec9c74142f331a0d6f4d155d206f0570ef36ff2b9a5d3a14bc22843b1de682549c27cfa8d76e8f48fdf306ca6b7a5832e1e15af99e59c747819d5709276
-  data.tar.gz: 10b75dc31d35bda8494d5fdfa09eaae0b82f0841684beaf23f2bedc3e628ff0aa9999699e0b42fa9538255ee6409cdffd1620c5dd9970ff7b99d464d3e4b34a2
+  metadata.gz: 51522633e57cb371e0bf2d0dd400b15b771fec2dbe6e3aa63699c1fba99a1e31029f8c25c02fa89cffd1721da5449adf6e3b1b9d14b8f1456852e53303692d70
+  data.tar.gz: a15aff14e629db8f1759a3edd5281df6d3be6cfb8d090926178a2f001062923bb27f206c70b13bd0557da47b572b6e1b2236efdb7dbbe406fac8993427e5257b

data/app/kern/services/rest.rb

@@ -0,0 +1,46 @@
+service :rest do
+  global %{
+    rest_in_flight = {}
+
+    function rest_cb(tp, success, info) {
+      var e = rest_in_flight[tp];
+      var bp = e[0];
+      var path = e[1];
+
+      int_event(bp, "rest_res", {
+        path: path,
+        res: info
+      });
+
+      tel_del(tp);
+    }
+  }
+
+  on_wakeup %{
+  }
+
+  on_sleep %{
+  }
+
+  on_connect %{
+  }
+
+  on "get", %{
+    <% if @debug %>
+      if (params.path === undefined) {
+        throw "rest_service, no path given in get request";
+      }
+
+      if (params.params === undefined) {
+        throw "rest_service, no params given in get request";
+      }
+    <% end %>
+
+    var tp = tel_reg(rest_cb);
+    rest_in_flight[tp] = [bp, params.path];
+    SEND("net", "if_net_req", "GET", "<%= @options[:base_url] %>"+params.path, params.params, tp);
+  }
+
+  on_disconnect %{
+  }
+end

data/docs/services/rest.md

@@ -1,21 +1,27 @@
 #Rest Service
 This is the RESTful network request service. Designed for small payloads of RESTful network requests.
 
+#Options
+  * `base_url` - The url like `"http://services.my_host.com/"` for the path to be based on. Must include ending slash.
+
 ###Info to start a request
 ```js
 var info = {
-  url: "http://my_rest_endpoint",
+  path: "/user/register",
   params: {
     my_param_0: "test",
   }
 }
-```
 
-When you receive a request back, you will receive 
-```js
-{
-  success: true,
-  info: 
-}
+Request("<service name>", "get", info);
 ```
-Where if success is true, then info is a hash. If success is false, then info is a failure message.
+
+You will then receive the event `rest_res`.
+
+For sucessful requests, `rest_res` will be sent as an event. This event
+will contain `path` and `res` where `path` is the `path` given in th
+request and `res` is the results of the request.
+
+###Globals
+  * `rest_in_flight` - A hash that maps `rest_in_flight[tp_base] => bp` where `[bp, path]` is the requesting entity for the original request and
+      `path` is the original path.

data/lib/flok/version.rb

@@ -1,3 +1,3 @@
 module Flok
-  VERSION = "0.0.43"
+  VERSION = "0.0.44"
 end

data/spec/env/kern.rb

@@ -131,9 +131,17 @@ shared_context "kern" do
       name = @cq.shift
       args = @cq.shift(arg_len)
 
+      msg_args.each_with_index do |e, i|
+        if e == Integer
+          msg_args[i] = args[i];
+        end
+      end
+
       expect(name).to eq(msg_name)
       expect(args).to eq(msg_args)
       expect(priority).to eq(@cp)
+
+      return args
     end
 
     #Ignore all messages until this one is received, then keep that one in the queue

data/spec/kern/assets/rest_service/config0.rb

@@ -0,0 +1,4 @@
+#Simple service config that uses built-in spec service to create a instance called 'spec'
+service_instance :rest, :rest, {
+  :base_url => "http://localhost:8080/"
+}

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

@@ -0,0 +1,8 @@
+controller :my_controller do
+  services :rest
+
+  action :my_action do
+    on_entry %{
+    }
+  end
+end

data/spec/kern/assets/rest_service/controller1.rb

@@ -0,0 +1,17 @@
+controller :my_controller do
+  services :rest
+
+  action :my_action do
+    on_entry %{
+      var info = {
+        path: "test",
+        params: {"hello": "world"}
+      }
+      Request("rest", "get", info);
+    }
+
+    on "rest_res", %{
+      rest_res_params = params;
+    }
+  end
+end

data/spec/kern/rest_service_spec.rb

@@ -0,0 +1,71 @@
+#The rest service
+
+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 'zlib'
+
+RSpec.describe "kern:rest_service" do
+  include Zlib
+  include_context "kern"
+
+  it "Can use rest service" do
+    ctx = flok_new_user File.read('./spec/kern/assets/rest_service/controller0.rb'), File.read("./spec/kern/assets/rest_service/config0.rb") 
+    dump = ctx.evald %{
+      base = _embed("my_controller", 0, {}, null);
+
+      //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
+    ctx = flok_new_user File.read('./spec/kern/assets/rest_service/controller1.rb'), File.read("./spec/kern/assets/rest_service/config0.rb") 
+    dump = ctx.evald %{
+      dump.base = _embed("my_controller", 0, {}, null);
+
+      //Drain queue
+      int_dispatch([]);
+    }
+
+    @driver.ignore_up_to("if_net_req")
+    @driver.mexpect("if_net_req", ["GET", "http://localhost:8080/test", {"hello" => "world"}, Integer], 1) #network priority
+  end
+
+  it "Does send the controller the rest_res when a response is returned" do
+    ctx = flok_new_user File.read('./spec/kern/assets/rest_service/controller1.rb'), File.read("./spec/kern/assets/rest_service/config0.rb") 
+    dump = ctx.evald %{
+      dump.base = _embed("my_controller", 0, {}, null);
+
+      //Drain queue
+      int_dispatch([]);
+    }
+
+    @driver.ignore_up_to("if_net_req")
+    msg = @driver.mexpect("if_net_req", ["GET", "http://localhost:8080/test", {"hello" => "world"}, Integer], 1) #network priority
+
+    #Last argument is teh tp_base for if_net_req
+    tp_base = msg.last
+
+    @driver.int "int_net_cb", [
+      tp_base, true, {"foo" => "bar"}
+    ]
+
+    dump = ctx.evald %{
+      dump.rest_res_params = rest_res_params;
+    }
+
+    expect(dump["rest_res_params"]).to eq({
+      "path" => "test",
+      "res" => {
+        "foo" => "bar"
+      }
+    })
+  end
+end

data/spec/lib/helpers.rb

@@ -23,7 +23,12 @@ class DuplexPipe
     @w = @w1
   end
 
-
+  def close
+    @r0.close
+    @w0.close
+    @r1.close
+    @w1.close
+  end
 
   def claim_high
     @r = @r1
@@ -56,7 +61,9 @@ module Webbing
     attr_accessor :port
 
     def kill
-      Process.kill(:KILL, @pid)
+      $stderr.puts "KILL"
+      @pipe.close
+      Process.kill(:TERM, @pid)
     end
 
     def initialize verb, path, port=nil, &block

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flok
 version: !ruby/object:Gem::Version
-  version: 0.0.43
+  version: 0.0.44
 platform: ruby
 authors:
 - seo
@@ -316,6 +316,7 @@ files:
 - app/kern/pagers/spec0.js
 - app/kern/pagers/spec1.js
 - app/kern/pagers/spec2.js
+- app/kern/services/rest.rb
 - app/kern/services/test.rb
 - app/kern/services/vm.rb
 - app/kern/spec_helper.js
@@ -1167,6 +1168,9 @@ files:
 - spec/kern/assets/interval3.rb
 - spec/kern/assets/lower_event.rb
 - spec/kern/assets/raise_event.rb
+- spec/kern/assets/rest_service/config0.rb
+- spec/kern/assets/rest_service/controller0.rb
+- spec/kern/assets/rest_service/controller1.rb
 - spec/kern/assets/send_event.rb
 - spec/kern/assets/service0.rb
 - spec/kern/assets/service1.rb
@@ -1257,7 +1261,7 @@ files:
 - spec/kern/dispatch_spec.rb
 - spec/kern/event_spec.rb
 - spec/kern/functions_spec.rb
-- spec/kern/net_spec.rb
+- spec/kern/rest_service_spec.rb
 - spec/kern/service_controller_spec.rb
 - spec/kern/vm_service_functional_spec.rb
 - spec/kern/vm_service_mem_pagers_spec.rb
@@ -2074,6 +2078,9 @@ test_files:
 - spec/kern/assets/interval3.rb
 - spec/kern/assets/lower_event.rb
 - spec/kern/assets/raise_event.rb
+- spec/kern/assets/rest_service/config0.rb
+- spec/kern/assets/rest_service/controller0.rb
+- spec/kern/assets/rest_service/controller1.rb
 - spec/kern/assets/send_event.rb
 - spec/kern/assets/service0.rb
 - spec/kern/assets/service1.rb
@@ -2164,7 +2171,7 @@ test_files:
 - spec/kern/dispatch_spec.rb
 - spec/kern/event_spec.rb
 - spec/kern/functions_spec.rb
-- spec/kern/net_spec.rb
+- spec/kern/rest_service_spec.rb
 - spec/kern/service_controller_spec.rb
 - spec/kern/vm_service_functional_spec.rb
 - spec/kern/vm_service_mem_pagers_spec.rb

data/spec/kern/net_spec.rb

@@ -1,14 +0,0 @@
-#Anything and everything to do with networking above the driver level
-
-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'
-
-RSpec.describe "kern:net_spec" do
-  include_context "kern"
-
-  it "can call get_req() and returns to the correct callback" do
-  end
-end