Merge pull request #1037 from hawkthorne/fsm_mixin

FSM mixin

src/datastructures/lsm/spec/fsm_spec.lua → spec/fsm_spec.lua

@@ -1,83 +1,80 @@
 require("busted")
 
-local machine = require("statemachine")
-
-local stoplight =  {
-  { name = 'warn',  from = 'green',  to = 'yellow' },
-  { name = 'panic', from = 'yellow', to = 'red'    },
-  { name = 'calm',  from = 'red',    to = 'yellow' },
-  { name = 'clear', from = 'yellow', to = 'green'  }
-}
+local machine = require 'hawk/statemachine'
+local middle = require 'hawk/middleclass'
 
 describe("Lua state machine framework", function()
   describe("A stop light", function()
+    local fsm
+    local stoplight = {
+      { name = 'warn',  from = 'green',  to = 'yellow' },
+      { name = 'panic', from = 'yellow', to = 'red'    },
+      { name = 'calm',  from = 'red',    to = 'yellow' },
+      { name = 'clear', from = 'yellow', to = 'green'  }
+    }
+
+    before_each(function()
+      fsm = machine.create({ initial = 'green', events = stoplight })
+    end)
+
     it("should start as green", function()
-      local fsm = machine.create({ initial = 'green', events = stoplight })
-      assert.are.equal(fsm.current, 'green')
+      assert.is_true(fsm:is('green'))
     end)
 
     it("should not let you get to the wrong state", function()
-      local fsm = machine.create({ initial = 'green', events = stoplight })
       assert.is_false(fsm:panic())
       assert.is_false(fsm:calm())
       assert.is_false(fsm:clear())
     end)
 
     it("should let you go to yellow", function()
-      local fsm = machine.create({ initial = 'green', events = stoplight })
       assert.is_true(fsm:warn())
-      assert.are.equal(fsm.current, 'yellow')
+      assert.is_true(fsm:is('yellow'))
     end)
 
     it("should tell you what it can do", function()
-      local fsm = machine.create({ initial = 'green', events = stoplight })
       assert.is_true(fsm:can('warn'))
       assert.is_false(fsm:can('panic'))
       assert.is_false(fsm:can('calm'))
       assert.is_false(fsm:can('clear'))
     end)
 
     it("should tell you what it can't do", function()
-      local fsm = machine.create({ initial = 'green', events = stoplight })
       assert.is_false(fsm:cannot('warn'))
       assert.is_true(fsm:cannot('panic'))
       assert.is_true(fsm:cannot('calm'))
       assert.is_true(fsm:cannot('clear'))
     end)
 
     it("should support checking states", function()
-      local fsm = machine.create({ initial = 'green', events = stoplight })
       assert.is_true(fsm:is('green'))
       assert.is_false(fsm:is('red'))
       assert.is_false(fsm:is('yellow'))
     end)
 
-    it("should cancel the warn event", function()
-      local fsm = machine.create({ initial = 'green', events = stoplight })
+    it("should cancel the warn event on leave", function()
       fsm.onleavegreen = function(self, name, from, to) 
         return false
       end
 
       local result = fsm:warn()
 
       assert.is_false(result)
-      assert.are.equals(fsm.current, 'green')
+      assert.is_true(fsm:is('green'))
     end)
 
-    it("should cancel the warn event", function()
-      local fsm = machine.create({ initial = 'green', events = stoplight })
+    it("should cancel the warn event on before", function()
       fsm.onbeforewarn = function(self, name, from, to) 
         return false
       end
 
       local result = fsm:warn()
 
       assert.is_false(result)
-      assert.are.equals(fsm.current, 'green')
+      assert.is_true(fsm:is('green'))
     end)
 
     it("should accept other arguments", function()
-      local fsm = machine.create({ initial = 'green', events = stoplight })
       fsm.onstatechange = function(self, name, from, to, foo)
         self.foo = foo
       end
@@ -88,7 +85,6 @@ describe("Lua state machine framework", function()
     end)
 
     it("should fire the onstatechange handler", function()
-      local fsm = machine.create({ initial = 'green', events = stoplight })
       fsm.onstatechange = function(self, name, from, to) 
         self.name = name
         self.from = from
@@ -103,8 +99,31 @@ describe("Lua state machine framework", function()
     end)
 
 
+    it("should support mixins", function()
+      local Stoplight = middle.class('Stoplight')
+
+      Stoplight:include(machine.mixin({ initial = 'green', events = stoplight }))
+
+      function Stoplight:onwarn(name, from, to) 
+        self.name = name
+        self.from = from
+        self.to = to
+      end
+
+      local light = Stoplight()
+      local light2 = Stoplight()
+
+      light:warn()
+
+      assert.is_true(light:is('yellow'))
+      assert.are.equals(light.name, 'warn')
+      assert.are.equals(light.from, 'green')
+      assert.are.equals(light.to, 'yellow')
+
+      assert.is_true(light2:is('green'))
+    end)
+
     it("should fire the onwarn handler", function()
-      local fsm = machine.create({ initial = 'green', events = stoplight })
       fsm.onwarn = function(self, name, from, to) 
         self.name = name
         self.from = from

src/app.lua

@@ -1,2 +1,2 @@
 local app = require 'hawk/application'
-return app.new('config.json')
+return app('config.json')

src/controls.lua

@@ -1,6 +1,6 @@
 local store = require 'hawk/store'
 
-local db = store.load('controls-1')
+local db = store('controls-1')
 local controls = {}
 
 local buttonmap = db:get('buttonmap', {