flok 0.0.38 → 0.0.39

data/lib/flok.rb

@@ -1,3 +1,4 @@
+require "flok/macro"
 require "flok/version"
 require "flok/utilities"
 require "flok/build"

data/lib/flok/build.rb

@@ -66,9 +66,8 @@ module Flok
     Flok.src_glob("js", './app/kern/pagers/', "#{build_path}/glob/3kern.pre_macro.js")
 
     #5. All js files in `./products/$PLATFORM/glob/{2,3}kern.pre_macro.js` are run through `./app/kern/macro.rb's macro_process` and then sent to ./products/$PLATFORM/glob/{2,3}kern.js
-    require './app/kern/macro.rb'
-    File.write("#{build_path}/glob/2kern.pre_macro.js", macro_process(File.read("#{build_path}/glob/2kern.pre_macro.js")))
-    File.write("#{build_path}/glob/3kern.pre_macro.js", macro_process(File.read("#{build_path}/glob/3kern.pre_macro.js")))
+    File.write("#{build_path}/glob/2kern.pre_macro.js", Flok.macro_process(File.read("#{build_path}/glob/2kern.pre_macro.js")))
+    File.write("#{build_path}/glob/3kern.pre_macro.js", Flok.macro_process(File.read("#{build_path}/glob/3kern.pre_macro.js")))
 
     #6. All js files are globbed from `./products/$platform/glob` and combined into `./products/$platform/glob/application.js.erb`
     Flok.src_glob("js", "#{build_path}/glob", "#{build_path}/glob/application.js.erb")
@@ -95,7 +94,7 @@ module Flok
     mods.each do |mod|
       s = File.read("./app/kern/mod/#{mod}.js")
       open("#{build_path}/glob/application.js.erb", "a") do |f|
-        f.puts macro_process(s)
+        f.puts Flok.macro_process(s)
       end
     end
 

data/lib/flok/macro.rb

@@ -0,0 +1,27 @@
+module Flok
+  #Process one js code file at a time
+  def self.macro_process text
+    out = StringIO.new
+
+    text.split("\n").each do |l|
+      #Send macro
+      if l =~ /SEND/
+        l.strip!
+        l.gsub!(/SEND\(/, "")
+        l.gsub! /\)$/, ""
+        l.gsub! /\);$/, ""
+        o = l.split(",").map{|e| e.strip}
+
+        queue_name = o.shift.gsub(/"/, "")
+
+        res = %{#{queue_name}_q.push([#{o.count-1}, #{o.join(", ")}])}
+        out.puts res
+      else
+        out.puts l
+      end
+    end
+
+    return out.string
+  end
+end
+

data/lib/flok/services_compiler.rb

@@ -17,7 +17,7 @@ module Flok
       context = ServicesCompilerContext.new(config_context)
       context.instance_eval(rb_src, __FILE__, __LINE__)
       context.ready
-
+      
       @src = ""
       services_erb = File.read File.join(File.dirname(__FILE__), "./service_compiler_templates/services.js.erb")
       services_renderer = ERB.new(services_erb)
@@ -95,6 +95,9 @@ module Flok
 
       #These are for every 5.seconds
       @every_handlers = []
+
+      @debug = true if ENV["FLOK_ENV"] == "DEBUG"
+      @release = true if ENV["FLOK_ENV"] == "RELEASE"
     end
 
     def get_on_init
@@ -108,32 +111,32 @@ module Flok
     def global(str)
       render = ERB.new(str)
       str = render.result(binding)
-      @_global = str
+      @_global = macro(str)
     end
 
     def on_wakeup(str) 
       render = ERB.new(str)
       str = render.result(binding)
-      @_on_wakeup  = str
+      @_on_wakeup  = macro(str)
     end
 
     def on_sleep(str) 
       render = ERB.new(str)
       str = render.result(binding)
 
-      @_on_sleep = str
+      @_on_sleep = macro(str)
     end
 
     def on_connect(str) 
       render = ERB.new(str)
       str = render.result(binding)
-      @_on_connect = str
+      @_on_connect = macro(str)
     end
 
     def on_disconnect(str) 
       render = ERB.new(str)
       str = render.result(binding)
-      @_on_disconnect = str
+      @_on_disconnect = macro(str)
     end
 
     def on(name, str)
@@ -142,7 +145,7 @@ module Flok
 
       @event_handlers << {
         :name => name,
-        :str => str
+        :str => macro(str)
       }
     end
 
@@ -150,7 +153,7 @@ module Flok
       @every_handlers << {
         :name => "#{seconds}_sec_#{SecureRandom.hex[0..6]}",
         :ticks => seconds*4,
-        :str => str
+        :str => macro(str)
       }
     end
 
@@ -163,6 +166,7 @@ module Flok
     end
 
     def macro text
+      return Flok.macro_process(text)
       #out = StringIO.new
 
       #text.split("\n").each do |l|

data/lib/flok/user_compiler.rb

@@ -14,7 +14,7 @@ module Flok
       ctable_erb = File.read File.join(File.dirname(__FILE__), "./user_compiler_templates/ctable.js.erb")
       ctable_renderer = ERB.new(ctable_erb)
       @src << ctable_renderer.result(context.get_binding)
-
+      
       return @src
     end
   end
@@ -169,7 +169,6 @@ module Flok
               int_event(vcs[i], #{event_name}, #{info});
             }
           }
-
         #GOTO(action_name)
         elsif l =~ /Goto/
           l.strip!
@@ -240,12 +239,140 @@ module Flok
           name = o.shift.gsub(/"/, "")
           ename = o.shift.gsub(/"/, "")
           info = o.shift.gsub(/"/, "")
-
           raise "You tried to Request the service #{name.inspect}, but you haven't added that to your 'services' for this controller (#{@controller.name.inspect})" unless @controller._services.include? name
-
           out << %{
             #{name}_on_#{ename}(__base__, #{info});
           }
+        #VM Page macros
+        elsif l =~ /NewPage/
+          le = (l.split /NewPage/)
+          lvar = le[0].strip #Probably var x = 
+          exp = le[1].strip
+
+          #For CopyPage(original_page), page_var is original_page
+          #This only supports variable names at this time
+          exp.match /\((.*)\);?/
+
+          #Get the id value the user wants, but we have to be careful
+          #because if nothing is passed, then we need to set it to null
+          id_var = $1.strip
+          if id_var == ""
+            id_var = "null"
+          end
+
+          out << %{
+            #{lvar} {
+              _head: null,
+              _next: null,
+              entries: [],
+              _id: #{id_var},
+            }
+          }
+        elsif l =~ /CopyPage/
+          le = (l.split /CopyPage/)
+          lvar = le[0].strip #Probably var x = 
+          exp = le[1].strip
+
+          #For CopyPage(original_page), page_var is original_page
+          #This only supports variable names at this time
+          exp.match /\((.*)\);?/
+          page_var = $1
+
+          out << %{
+            var __page__ = {
+              _head: #{page_var}._head,
+              _next: #{page_var}._next,
+              _id: #{page_var}._id,
+              entries: [],
+            }
+
+            //This is a shallow clone, but we own this array
+            //When a mutable entry needs to be created, an entry will be cloned
+            //and swappend out
+            for (var i = 0; i < #{page_var}.entries.length; ++i) {
+              __page__.entries.push(#{page_var}.entries[i]);
+            }
+
+            #{lvar} __page__;
+          }
+        elsif l =~ /EntryDel/
+          le = (l.split /EntryDel/)
+          lvar = le[0].strip #Probably var x = 
+          exp = le[1].strip
+
+          #For CopyPage(original_page), page_var is original_page
+          #This only supports variable names at this time
+          exp.match /\((.*?),(.*)\);?/
+          page_var = $1
+          index_var = $2
+
+          out << %{
+            #{page_var}.entries.splice(#{index_var}, 1);
+          }
+
+        elsif l =~ /EntryInsert/
+          le = (l.split /EntryInsert/)
+          lvar = le[0].strip #Probably var x = 
+          exp = le[1].strip
+
+          #For CopyPage(original_page), page_var is original_page
+          #This only supports variable names at this time
+          exp.match /\((.*?),(.*),(.*)\);?/
+          page_var = $1
+          index_var = $2
+          entry_var = $3
+
+          out << %{
+            #{entry_var}._id = gen_id();
+            #{entry_var}._sig = gen_id();
+            #{page_var}.entries.splice(#{index_var}, 0, #{entry_var});
+          }
+
+        elsif l =~ /SetPageNext/
+          le = (l.split /SetPageNext/)
+          lvar = le[0].strip #Probably var x = 
+          exp = le[1].strip
+
+          #For CopyPage(original_page), page_var is original_page
+          #This only supports variable names at this time
+          exp.match /\((.*?),(.*)\);?/
+          page_var = $1
+          value_var = $2
+
+          out << %{
+            #{page_var}._next = #{value_var};
+          }
+
+        elsif l =~ /SetPageHead/
+          le = (l.split /SetPageHead/)
+          lvar = le[0].strip #Probably var x = 
+          exp = le[1].strip
+
+          #For CopyPage(original_page), page_var is original_page
+          #This only supports variable names at this time
+          exp.match /\((.*?),(.*)\);?/
+          page_var = $1
+          value_var = $2
+
+          out << %{
+            #{page_var}._head = #{value_var};
+          }
+
+        elsif l =~ /EntryMutable/
+          le = (l.split /EntryMutable/)
+          lvar = le[0].strip #Probably var x = 
+          exp = le[1].strip
+
+          #For CopyPage(original_page), page_var is original_page
+          #This only supports variable names at this time
+          exp.match /\((.*?),(.*)\);?/
+          page_var = $1
+          index_var = $2
+
+          out << %{
+            //Duplicate entry
+            #{page_var}.entries.splice(#{index_var}, 1, JSON.parse(JSON.stringify(#{page_var}.entries[#{index_var}])));
+          }
         else
           out.puts l
         end

data/lib/flok/version.rb

@@ -1,3 +1,3 @@
 module Flok
-  VERSION = "0.0.38"
+  VERSION = "0.0.39"
 end

data/spec/env/kern.rb

@@ -4,6 +4,10 @@ require './spec/lib/temp_dir'
 
 shared_context "kern" do
   before(:each) do
+    reset_for_ctx
+  end
+
+  def reset_for_ctx
     res=system('rake build:world')
     raise "Could not run build:world" unless res
     @ctx = V8::Context.new
@@ -15,6 +19,16 @@ shared_context "kern" do
     end
   end
 
+  class V8::Context
+    def dump variable
+      json_res = self.eval %{
+        JSON.stringify(#{variable});
+      }
+
+      return JSON.parse(json_res)
+    end
+  end
+
   #Execute flok binary with a command
   def flok args
     #Get path to the flok binary relative to this file
@@ -44,6 +58,7 @@ shared_context "kern" do
         #Execute
         @driver = FakeDriverContext.new
         v8 = V8::Context.new(:with => @driver)
+        @ctx = v8
         @driver.ctx = v8
         v8.eval %{
           //We must convert this to JSON because the fake driver will receive
@@ -74,6 +89,12 @@ shared_context "kern" do
       @q += JSON.parse(q)
     end
 
+    #When you're running these unit tests, you may need to log, but you will
+    #need to remove any _log statements before running other tests!
+    def log(msg)
+      $stderr.puts "v8: #{msg}"
+    end
+
     #Expect a certain message, with some arguments, and a certain priority
     #expect("if_init_view", ["test_view", {}]) === [[0, 4, "if_init_view", "test_view", {}]]
     def mexpect(msg_name, msg_args, priority=0)
@@ -96,6 +117,50 @@ shared_context "kern" do
       expect(priority).to eq(@cp)
     end
 
+    #Ignore all messages until this one is received, then keep that one in the queue
+    #There may be a lot going on and you're only interested in a part.
+    #If priority is nil, it won't matter what the priority is, useful for checking exceptions
+    #for non-existant messages
+    def ignore_up_to msg_name, priority=nil
+      @did_get = []
+
+      loop do
+        if @q.count == 0 and @cq.count == 0
+          raise "Waited for the message #{msg_name.inspect} but never got it... did get: \n * #{@did_get.join("\n * ")}"
+        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)
+
+        @did_get << name
+
+        if name == msg_name
+          if priority
+            raise "Found the message #{msg_name.inspect} while calling ignore_up_to... but it's the wrong priority: #{@cp}, should be #{priority}" if @cp != priority
+          end
+
+          #Unshift everything in reverse order, we are only peeking here...
+          args.reverse.each do |a|
+            @cq.unshift a
+          end
+          @cq.unshift name
+          @cq.unshift arg_len
+          break
+        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
@@ -129,5 +194,11 @@ shared_context "kern" do
           int_dispatch(#{msg});
         }
     end
+
+    def dump_q
+      q = @q
+      @q = []
+      return q
+    end
   end
 end

data/spec/etc/macro_spec.rb

@@ -3,14 +3,9 @@ require './spec/env/etc.rb'
 
 
 RSpec.describe "macro" do
-  before(:each) do
-    macro_file = './app/kern/macro.rb'
-    load macro_file
-  end
-
   it "Changes the text when SEND exists" do
     original = 'SEND("main", "if_net_req", url, params, tp)'
-    text = macro_process original
+    text = Flok.macro_process original
 
     expect(original).not_to eq(text)
     expect(text.class).to eq(String)
@@ -19,14 +14,14 @@ RSpec.describe "macro" do
 
   it "Has same # of lines with SEND" do
     original = 'SEND("main", "if_net_req", url, params, tp)'
-    text = macro_process original
+    text = Flok.macro_process original
 
     expect(text.split("\n").length).to eq(original.split("\n").length)
   end
 
   it "encodes SEND correctly" do
     original = 'SEND("main", "if_net_req", url, params, tp)'
-    text = macro_process original
+    text = Flok.macro_process original
 
     @arr = []
     expected_code = %{main_q.push([3, "if_net_req", url, params, tp])}

data/spec/etc/service_compiler/service3.rb

@@ -0,0 +1,27 @@
+service :my_service do
+  on_wakeup %{
+    on_wakeup_called = '#{@options[:hello]}';
+    SEND("main", "if_event", 3, "action", {});
+  }
+
+  on_sleep %{
+    on_sleep_called = true;
+  }
+
+  on_connect %{
+    on_connect_called_bp = bp;
+  }
+
+  on_disconnect %{
+    on_disconnect_called_bp = bp;
+  }
+
+  on "hello", %{
+    on_hello_called_bp = bp;
+    on_hello_called_params = JSON.stringify(params);
+  }
+
+  every 5.seconds, %{
+    on_every_5_sec_called = true;
+  }
+end