.gitignore

@@ -6,9 +6,6 @@ erl_crash.dump
 *.ez
 scopes-*.tar
 tmp/
-/priv/static/assets/
-/priv/static/cache_manifest.json
-/priv/static/docs
 
 log/
 .env

lib/core/environ.ex

@@ -10,7 +10,7 @@ defmodule Scopes.Core.Environ do
   def setup({state, proc}, init_seq, proc_env \\ &proc_env/2) do
     env_scope = {%State{init_seq: init_seq}, proc_env, [], self()}
     env = Core.neuron(env_scope)
-    msg = Shape.create([:csys, :zero], data: %{addr: [:csys, :c00, "0-0"]})
+    msg = Shape.create([:csys, :zero], data: %{addr: [:csys, :c00, {0, 0}]})
     proc = {state, proc, [], env}
     Core.create(msg, proc)
     env

lib/core/program.ex

@@ -124,10 +124,10 @@ defmodule Scopes.Core.Program do
   # demo init sequences
  
   def init_seq_b1() do 
-    zero = [:csys, :c00, "0-0"]
-    one = [:csys, :s01, "1-0"]
-    two = [:csys, :c00, "1-1"]
-    three = [:csys, :s01, "1-1"]
+    zero = [:csys, :c00, {0, 0}]
+    one = [:csys, :s01, {1, 0}]
+    two = [:csys, :c00, {1, 1}]
+    three = [:csys, :s01, {1, 1}]
     [
       fn state -> 
         Environ.send_message(state, zero, ~w(csys create pred)a, 
@@ -145,16 +145,16 @@ defmodule Scopes.Core.Program do
   end
 
   def init_recursive_1() do 
-    zero = [:csys, :c00, "0-0"]
+    zero = [:csys, :c00, {0, 0}]
     [
       fn state -> 
         Environ.connect(state, zero, zero, negate())
         Environ.send_message(state, zero, ~w(csys create succ)a, 
-          %{addr: [:csys, :e01, "1-1"]})
+          %{addr: [:csys, :e01, {1, 1}]})
       end,
       fn state ->
         Environ.send_message(state, zero, ~w(csys create pred)a,
-          %{addr: [:csys, :s01, "1-1"]})
+          %{addr: [:csys, :s01, {1, 1}]})
       end
     ]
   end

lib/web/server/endpoint.ex

@@ -10,10 +10,5 @@ defmodule Scopes.Web.Server.Endpoint do
 
   plug Plug.RequestId
 
-  plug Plug.Parsers,
-    parsers: [:urlencoded, :multipart, :json],
-    pass: ["*/*"],
-    json_decoder: Phoenix.json_library()
-
   plug Scopes.Web.Server.Router
 end

lib/web/server/router.ex

@@ -9,8 +9,9 @@ defmodule Scopes.Web.Server.Router do
     pipe_through :api
     #resources "/", Controller, except: [:new, :edit]
     get "/", Controller, :index
-    match :*, "/*path", Controller, :message
-    get "/:domain/:class", Controller, :resource
+    get "/:domain/:action", Controller, :message
+    get "/:domain/:action/:class", Controller, :message
+    get "/:domain/:action/:class/:item", Controller, :message
   end
 end
 
@@ -31,22 +32,16 @@ defmodule Scopes.Web.Server.Controller do
   def message(conn, params) do
     path_info = conn.path_info
     Logger.info(Scopes.Util.show [path_info, params])
-    {head, params} = Map.pop(params, "path")
-    message = %{head: head, data: params}
-    #json(conn, message)
-    render(conn, :index, message)
+    render(conn, :index, message: "Hello Message")
   end
 end
 
 defmodule Scopes.Web.Server.JSON do
-  alias Scopes.Util
-
   require Logger
-  require Util
+  require Scopes.Util
 
-  def index(resp) do
-    Logger.info(Util.show [resp])
-    {_conn, message} = Map.pop(resp, :conn)
-    message
+  def index(%{message: text}) do
+    Logger.info(Scopes.Util.show [text])
+    text
   end
 end

lib/web/server/server.ex

@@ -1,6 +1,6 @@
 defmodule Scopes.Web.Server do
 
-  def static_paths, do: ~w(assets fonts images favicon.ico robots.txt docs)
+  def static_paths, do: ~w(assets fonts images favicon.ico robots.txt)
 
   def router do
     quote do

test/core/core_test.exs

@@ -19,12 +19,12 @@ defmodule Scopes.CoreTest do
     test "minimal-b1" do
       env = Environ.setup(Program.prepare_basic(), Program.init_seq_b1())
       Process.sleep(50)
-      Environ.forward_value(env, [:csys, :c00, "0-0"], 0)
+      Environ.forward_value(env, [:csys, :c00, {0, 0}], 0)
       assert 0 = receive_data().value
-      Environ.forward_value(env, [:csys, :s01, "1-0"], 1)
+      Environ.forward_value(env, [:csys, :s01, {1, 0}], 1)
       assert receive_data().value == 1
       #assert receive_data().value in [-1, 1]
-      Environ.forward_value(env, [:csys, :s01, "1-1"], 3)
+      Environ.forward_value(env, [:csys, :s01, {1, 1}], 3)
       assert receive_data().value in [2, 3]
       assert receive_data().value in [2, 3]
       refute_receive msg, 30, "unhandled message(s): #{inspect(msg)}"
@@ -33,9 +33,9 @@ defmodule Scopes.CoreTest do
     test "recursive-1" do
       env = Environ.setup(Program.prepare_basic(), Program.init_recursive_1())
       Process.sleep(50)
-      Environ.forward_value(env, [:csys, :s01, "1-1"], 42)
+      Environ.forward_value(env, [:csys, :s01, {1, 1}], 42)
       assert receive_data().value == 42
-      Environ.forward_value(env, [:csys, :s01, "1-1"], 47)
+      Environ.forward_value(env, [:csys, :s01, {1, 1}], 47)
       assert receive_data().value == 5
       refute_receive msg, 30, "unhandled message(s): #{inspect(msg)}"
     end