flok 0.0.40 → 0.0.41

data/spec/kern/assets/vm/config5.rb

@@ -0,0 +1,20 @@
+#Simple service config that uses built-in spec service to create a instance called 'spec'
+service_instance :vm, :vm, {
+  :pagers => [
+    {
+      :name => "pg_spec0",
+      :namespace => "spec0",
+      :options => {
+        "hello" => "world"
+      }
+    },
+    {
+      :name => "pg_spec1",
+      :namespace => "spec1",
+      :options => {
+        "foo" => "bar"
+      }
+    }
+
+  ]
+}

data/spec/kern/assets/vm/config6.rb

@@ -0,0 +1,20 @@
+#Simple service config that uses built-in spec service to create a instance called 'spec'
+service_instance :vm, :vm, {
+  :pagers => [
+    {
+      :name => "pg_spec0",
+      :namespace => "spec",
+      :options => {
+        "hello" => "world"
+      }
+    },
+    {
+      :name => "pg_spec1",
+      :namespace => "spec1",
+      :options => {
+        "foo" => "bar"
+      }
+    }
+
+  ]
+}

data/spec/kern/assets/vm/controller10.rb

@@ -7,7 +7,7 @@ controller :my_controller do
         hello: "world"
       }
 
-      page = NewPage("test");
+      page = NewPage("array", "test");
       SetPageHead(page, "head");
       SetPageNext(page, "next");
       EntryInsert(page, 0, entry);

data/spec/kern/assets/vm/controller11.rb

@@ -7,7 +7,7 @@ controller :my_controller do
         hello: "world"
       }
 
-      page = NewPage("test");
+      page = NewPage("array", "test");
       SetPageHead(page, "head");
       SetPageNext(page, "next");
       EntryInsert(page, 0, entry);

data/spec/kern/assets/vm/controller12.rb

@@ -7,7 +7,7 @@ controller :my_controller do
         hello: "world"
       }
 
-      page = NewPage("test");
+      page = NewPage("array", "test");
       SetPageHead(page, "head");
       SetPageNext(page, "next");
       EntryInsert(page, 0, entry);

data/spec/kern/assets/vm/controller13.rb

@@ -7,7 +7,7 @@ controller :my_controller do
         hello: "world"
       }
 
-      page = NewPage("test");
+      page = NewPage("array", "test");
       SetPageHead(page, "head");
       SetPageNext(page, "next");
       EntryInsert(page, 0, entry);

data/spec/kern/assets/vm/controller16b.rb

@@ -0,0 +1,28 @@
+controller :my_controller do
+  spots "content"
+
+  action :a do
+
+    on_entry %{
+      Embed("a", "content", {});
+    }
+
+    on "next", %{
+      Goto("b");
+    }
+  end
+
+  action :b do
+    on_entry %{
+    }
+  end
+end
+
+controller :a do
+  services :vm
+  action :index do
+    on_entry %{
+      var info = {ns: "spec", id: "test"}
+    }
+  end
+end

data/spec/kern/assets/vm/controller18.rb

@@ -7,7 +7,7 @@ controller :my_controller do
         hello: "world"
       }
 
-      page = NewPage("test");
+      page = NewPage("array", "test");
       SetPageHead(page, "head");
       SetPageNext(page, "next");
       EntryInsert(page, 0, entry);

data/spec/kern/assets/vm/controller21.rb

@@ -7,7 +7,7 @@ controller :my_controller do
         hello: "world"
       }
 
-      page = NewPage("test");
+      page = NewPage("array", "test");
 
       SetPageHead(page, "head");
       SetPageNext(page, "next");

data/spec/kern/assets/vm/controller22.rb

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

data/spec/kern/assets/vm/controller_exc_ewatch.rb

@@ -9,6 +9,7 @@ controller :my_controller do
       }
 
       Request("vm", "unwatch", watch_info);
+      Request("vm", "unwatch", watch_info);
     }
   end
 end

data/spec/kern/assets/vm/controller_exc_ewatch2.rb

@@ -0,0 +1,30 @@
+controller :my_controller do
+  services :vm
+
+  action :my_action do
+    on_entry %{
+      var watch_info = {
+        ns: "spec",
+        id: "test"
+      }
+
+      Request("vm", "unwatch", watch_info);
+    }
+  end
+end
+
+controller :my_watch_controller do
+  services :vm
+
+  action :my_action do
+    on_entry %{
+      var watch_info = {
+        ns: "spec",
+        id: "test"
+      }
+
+      Request("vm", "watch", watch_info);
+    }
+  end
+end
+

data/spec/kern/assets/vm/controller_exc_ewatch3.rb

@@ -0,0 +1,16 @@
+controller :my_controller do
+  services :vm
+
+  action :my_action do
+    on_entry %{
+      var watch_info = {
+        ns: "spec",
+        id: "test"
+      }
+
+      Request("vm", "watch", watch_info);
+      Request("vm", "unwatch", watch_info);
+      Request("vm", "watch", watch_info);
+    }
+  end
+end

data/spec/kern/assets/vm/controller_exc_ewatch4.rb

@@ -0,0 +1,16 @@
+controller :my_controller do
+  services :vm
+
+  action :my_action do
+    on_entry %{
+      var watch_info = {
+        ns: "spec",
+        id: "test"
+      }
+
+      Request("vm", "unwatch", watch_info);
+      Request("vm", "watch", watch_info);
+      Request("vm", "unwatch", watch_info);
+    }
+  end
+end

data/spec/kern/assets/vm/macros/copy_page_c.rb

@@ -5,6 +5,7 @@ controller :controller do
         _head: "head",
         _next: "next",
         _id: "id",
+        _type: "array",
         entries: [
           {_id: "id", _sig: "sig"},
         ],

data/spec/kern/assets/vm/macros/copy_page_ch.rb

@@ -0,0 +1,25 @@
+controller :controller do
+  action :index do
+    on_entry %{
+      original_page = {
+        _head: "head",
+        _next: "next",
+        _id: "id",
+        _type: "hash",
+        entries: {
+          "id0": {_sig: "sig1"},
+          "id1": {_sig: "sig2"},
+        },
+        _hash: "hash",
+      };
+
+      //One page done the right away, another, the wrong way
+      copied_page = CopyPage(original_page);
+      not_copied_page = original_page;
+
+      //The copied page is now modified and does
+      //not contain _hash
+      copied_page._next = "test"
+    }
+  end
+end

data/spec/kern/assets/vm/macros/entry_del_c.rb

@@ -9,6 +9,7 @@ controller :controller do
           {_id: "id", _sig: "sig"},
         ],
         _hash: "hash",
+        _type: "array",
       };
 
       page = CopyPage(original_page);

data/spec/kern/assets/vm/macros/entry_del_ch.rb

@@ -0,0 +1,20 @@
+controller :controller do
+  action :index do
+    on_entry %{
+      original_page = {
+        _head: "head",
+        _next: "next",
+        _id: "id",
+        entries: {
+          "id0": {_sig: "sig"},
+          "id1": {_sig: "sig2"},
+        },
+        _hash: "hash",
+        _type: "hash",
+      };
+
+      page = CopyPage(original_page);
+      EntryDel(page, "id0");
+    }
+  end
+end

data/spec/kern/assets/vm/macros/entry_insert_c.rb

@@ -9,6 +9,7 @@ controller :controller do
           {_id: "id", _sig: "sig"},
         ],
         _hash: "hash",
+        _type: "array",
       };
 
       page = CopyPage(original_page);

data/spec/kern/assets/vm/macros/entry_insert_ch.rb

@@ -0,0 +1,23 @@
+controller :controller do
+  action :index do
+    on_entry %{
+      original_page = {
+        _head: "head",
+        _next: "next",
+        _id: "id",
+        entries: {
+          "id0": {"_sig": "sig0"},
+          "id1": {"_sig": "sig1"},
+        },
+        _hash: "hash",
+        _type: "hash",
+      };
+
+      page = CopyPage(original_page);
+      var entry0 = {hello: "world"}
+      var entry2 = {hello: "world2"}
+      EntryInsert(page, "id0", entry0);
+      EntryInsert(page, "id2", entry2);
+    }
+  end
+end

data/spec/kern/assets/vm/macros/entry_mutable_c.rb

@@ -5,20 +5,21 @@ controller :controller do
         _head: "head",
         _next: "next",
         _id: "id",
+        _type: "array",
         entries: [
-          {_id: "id", _sig: "sig"},
+          {_id: "id1", _sig: "sig1"},
           {_id: "id2", _sig: "sig2"},
-          {_id: "id3", _sig: "sig3"},
         ],
         _hash: "hash",
       };
 
+      //Now we make a new copy
       page = CopyPage(original_page);
-      EntryMutable(page, 0);
-      EntryMutable(page, 2);
+      var a = EntryMutable(page, 0);
+      var b = EntryMutable(page, 1);
 
-      page.entries[0].hello = "world";
-      page.entries[2].hello = "world";
+      a.hello = "world";
+      b.hello = "world";
 
       //This is a violation of the vm, it will set the original but not copied
       //This is because the page.entries[1] actually refers to the original_page.entries[1]
@@ -26,7 +27,7 @@ controller :controller do
       //are references. When you call entrymutable, you are making a copy and replacing that
       //entry in the array so that page.entries[0] is actually owned by page and is no longer apart
       //of original_page
-      page.entries[1].foo = "bar";
+      original_page.entries[0].foo = "bar";
     }
   end
 end

data/spec/kern/assets/vm/macros/entry_mutable_ch.rb

@@ -0,0 +1,34 @@
+controller :controller do
+  action :index do
+    on_entry %{
+      original_page = {
+        _head: "head",
+        _next: "next",
+        _id: "id",
+        _type: "hash",
+        entries: {
+          "id1": {_sig: "sig1"},
+          "id2": {_sig: "sig2"},
+        },
+        _hash: "hash",
+      };
+
+      //Now we make a new copy
+      page = CopyPage(original_page);
+      var a = EntryMutable(page, "id1");
+      var b = EntryMutable(page, "id2");
+
+      a.hello = "world";
+      b.hello = "world";
+
+      //This is a violation of the vm, it will set the original but not copied
+      //This is because the page.entries[1] actually refers to the original_page.entries[1]
+      //the array of original_page.entries belongs to original_page, but the entries inside it
+      //are references. When you call entrymutable, you are making a copy and replacing that
+      //entry in the array so that page.entries[0] is actually owned by page and is no longer apart
+      //of original_page
+      original_page.entries["id1"].foo = "bar";
+    }
+  end
+end
+

data/spec/kern/assets/vm/macros/new_page_c.rb

@@ -1,7 +1,7 @@
 controller :controller do
   action :index do
     on_entry %{
-      page = NewPage();
+      page = NewPage("array");
     }
   end
 end

data/spec/kern/assets/vm/macros/new_page_c2.rb

@@ -1,7 +1,7 @@
 controller :controller do
   action :index do
     on_entry %{
-      page = NewPage("test");
+      page = NewPage("array", "test");
     }
   end
 end

data/spec/kern/assets/vm/macros/new_page_ch.rb

@@ -0,0 +1,7 @@
+controller :controller do
+  action :index do
+    on_entry %{
+      page = NewPage("hash");
+    }
+  end
+end

data/spec/kern/assets/vm/pg_mem/config.rb

@@ -0,0 +1,10 @@
+#Simple service config that uses built-in spec service to create a instance called 'spec'
+service_instance :vm, :vm, {
+  :pagers => [
+    {
+      :name => "pg_mem0",
+      :namespace => "local",
+      :options => {}
+    }
+  ]
+}

data/spec/kern/assets/vm/pg_mem/config1.rb

@@ -0,0 +1,10 @@
+#Simple service config that uses built-in spec service to create a instance called 'spec'
+service_instance :vm, :vm, {
+  :pagers => [
+    {
+      :name => "pg_mem1",
+      :namespace => "local",
+      :options => {}
+    }
+  ]
+}

data/spec/kern/assets/vm/pg_mem/config2.rb

@@ -0,0 +1,10 @@
+#Simple service config that uses built-in spec service to create a instance called 'spec'
+service_instance :vm, :vm, {
+  :pagers => [
+    {
+      :name => "pg_mem2",
+      :namespace => "local",
+      :options => {}
+    }
+  ]
+}