@@ -16,17 +16,20 @@ <cffunction name="before" returntype="boolean" access="public" output="false"> <cfargument name="obj" required="true" /> + <cfset invokeCallback('beforeAction', arguments.obj) /> <cfreturn invokeCallback('before#getName()#Action', arguments.obj) /> </cffunction> <cffunction name="after" returntype="void" access="public" output="false"> - <cfargument name="obj" required="true" /> + <cfargument name="obj" required="true" /> <cfset invokeCallback('after#getName()#Action', arguments.obj) /> + <cfset invokeCallback('afterAction', arguments.obj) /> </cffunction> <cffunction name="exit" returntype="void" access="public" output="false"> <cfargument name="obj" required="true" /> <cfset invokeCallback('exit#getName()#Action', arguments.obj) /> + <cfset invokeCallback('exitAction', arguments.obj) /> </cffunction> <cffunction name="invokeCallback" returntype="boolean" access="private" output="false"> State.cfc @@ -3,6 +3,7 @@ <cffunction name="init" access="public" returntype="any" output="false" hint=""> <cfset instance.state = '' /> + <cfset instance.beforeActionCount = 0 /> <cfreturn this /> </cffunction> @@ -88,5 +89,13 @@ <cfargument name="value" type="boolean" required="true" /> <cfset instance.readExit = arguments.value /> </cffunction> + + <cffunction name="incrementBeforeActionCount" access="public" returntype="void" output="false"> + <cfset instance.beforeActionCount = instance.beforeActionCount + 1 /> + </cffunction> + + <cffunction name="getBeforeActionCount" access="public" returntype="Numeric" output="false"> + <cfreturn instance.beforeActionCount /> + </cffunction> </cfcomponent> \ No newline at end of file test/Conversation.cfc @@ -57,5 +57,9 @@ <cffunction name="afterClosedAction" access="public" returntype="void" output="false"> <cfset getOriginalObject().setClosedAfter(true) /> </cffunction> + + <cffunction name="beforeAction" access="public" returntype="void" output="false"> + <cfset getOriginalObject().incrementBeforeActionCount() /> + </cffunction> </cfcomponent> \ No newline at end of file test/ConversationState.cfc @@ -221,4 +221,15 @@ </cfscript> </cffunction> + <cffunction name="testGlobalBeforeActionExecuted" returntype="void" access="public" output="false"> + <cfscript> + // Should be 1 because it has to set the initial state + assertEquals(1, conversation.getBeforeActionCount()); + conversation.view(); + assertEquals(2, conversation.getBeforeActionCount()); + conversation.reply(); + assertEquals(3, conversation.getBeforeActionCount()); + </cfscript> + </cffunction> + </cfcomponent> \ No newline at end of file test/StateMachineTest.cfc a0424f7ec70c1d1f8a0d8c1d83097ef9b5b92d1c Ryan Wood ryan.wood@gmail.com http://github.com/ryanwood/shade/commit/4c22d15ff9d74cfaf15153438ed0b4bb6ca7af08 4c22d15ff9d74cfaf15153438ed0b4bb6ca7af08 2008-09-12T07:57:35-07:00 2008-09-12T07:57:35-07:00 Added global event callbacks with tests 57a762ab00953a01ce374fadd3b4fccc495f933e Ryan Wood ryan.wood@gmail.com