Renaming input -> match.

Author: ycombinator

README.md

@@ -37,8 +37,8 @@ URIs in the rest of this document start with `{baseuri}`. This is a placeholder
       "states": {
         "foo": {
           "transitions": [
-            { "input": "1|2|[a-bA-B]","nextState": "bar" },
-            { "input": "3","nextState": "baz" }
+            { "match": "1|2|[a-bA-B]","nextState": "bar" },
+            { "match": "3","nextState": "baz" }
           ]
         },
         "bar": {
@@ -95,7 +95,7 @@ URIs in the rest of this document start with `{baseuri}`. This is a placeholder
 
 #### State machine input
 
-##### Inform the state machine of an input
+##### Provide input to the state machine
 
 ###### Request
 

migrations/20130426173632-rename-transitions-input-to-match.js

@@ -0,0 +1,10 @@
+var dbm = require('db-migrate');
+var type = dbm.dataType;
+
+exports.up = function(db, callback) {
+  db.renameColumn('transitions', 'input', 'match', callback)
+};
+
+exports.down = function(db, callback) {
+  db.renameColumn('transitions', 'match', 'input', callback)
+};

models/transition.js

@@ -3,7 +3,7 @@ var sequelize = require('sequelize'),
     State = require('./state.js')
 
 var Transition = db.define('transitions', {
-  input: { type: sequelize.STRING, notNull: true }
+  match: { type: sequelize.STRING, notNull: true }
 })
 
 Transition.belongsTo(State, { as: 'State', foreignKey: 'state_id' })

restapi/resources/v1/state_machine_input.js

@@ -51,7 +51,7 @@ var processInput = function(dbStateMachine, dbState, input, cb) {
         transitions,
         function(dbTransition, callback) {
 
-          var matches = input.match(new RegExp(dbTransition.input))
+          var matches = input.match(new RegExp(dbTransition.match))
           if (matches) {
             dbTransition.getNextState()
               .success(function(dbns) { dbNextState = dbns; callback(true) })
@@ -80,7 +80,7 @@ var updateCurrentState = function(dbStateMachine, dbState, cb) {
   dbStateMachine.current_state_id = dbState.id
   dbStateMachine.save()
     .success(function() { cb(null, dbState) })
-    .error(function(err) { console.error(err); cb(err) })
+    .error(cb)
 
 } // END function - updateCurrentState
 

restapi/resources/v1/state_machines.js

@@ -23,22 +23,24 @@ var validateRequest = function(req, cb) {
   }
   var initialState = body.initialState
 
-  for (var state in states) {
-    
+  for (var stateName in states) {
+
+    var state = states[stateName]
+
     if (state.hasOwnProperty('transitions') && (state.transitions instanceof Array)) {
 
-      for (var tid in transitions) {
+      for (var tid in state.transitions) {
 
-        var transition = transitions[tid]
+        var transition = state.transitions[tid]
 
-        // Ensure transition has 'input' property present
-        if (!transition.hasOwnProperty('input')) {
-          cb({code: 400, message: 'Missing transition property \'input\''})
+        // Ensure transition has 'match' property present
+        if (!transition.hasOwnProperty('match')) {
+          cb({code: 400, message: 'Missing transition property \'match\''})
         }
 
-        // Ensure transition has 'newState' property present
-        if (!transition.hasOwnProperty('newState')) {
-          cb({code: 400, message: 'Missing transition property \'newState\''})
+        // Ensure transition has 'nextState' property present
+        if (!transition.hasOwnProperty('nextState')) {
+          cb({code: 400, message: 'Missing transition property \'nextState\''})
         }
 
       } // END for - transitions
@@ -57,12 +59,12 @@ var validateRequest = function(req, cb) {
     for (var tid in state.transitions) {
 
       var transition = state.transitions[tid]
-      var input = transition.input
-      var transitionState = transition.newState
+      var match = transition.match
+      var transitionState = transition.nextState
 
       // Ensure transition state is one of the defined states
       if (!states.hasOwnProperty(transitionState)) {
-        cb({code: 400, message: 'Transition state for state \'' + state + '\' and input \'' + input + '\' not found'})
+        cb({code: 400, message: 'Transition state for state \'' + state + '\' and match \'' + match + '\' not found'})
       }
 
     } // END for - transitions
@@ -90,7 +92,6 @@ var persistInitialState = function(stateMachine, dbStateMachine, cb) {
       dbStateMachine.current_state_id = state.id
       dbStateMachine.save()
         .success(function(dbsm) {
-          console.log(dbsm.current_state_id)
           cb(null, stateMachine, dbsm)
         })
         .error(cb)
@@ -144,7 +145,7 @@ var persistTransitions = function(stateMachine, dbStateMachine, cb) {
 
                   models.transition.create({
                     state_id: dbState.id,
-                    input: transition.input,
+                    match: transition.match,
                     next_state_id: dbNextState.id
                   })
                     .success(function(t) { callback() })