README @@ -7,8 +7,7 @@ <cfargument name="transitionTable" type="struct" required="true" /> <cfscript> instance.name = arguments.name; - // Use an ArrayList rather than a normal array so it will be passed by reference, not value - arguments.transitionTable[arguments.name] = createObject("component", "target.StateTransitionCollection").init(); + arguments.transitionTable[arguments.name] = createObject("component", "shade.StateTransitionCollection").init(); instance.transitions = arguments.transitionTable[arguments.name]; </cfscript> <cfreturn this /> @@ -21,29 +20,13 @@ <cfset var local = structNew() /> <cfloop list="#arguments.from#" index="local.from"> - <cfset local.transition = createObject("component", "target.StateTransition").init(local.from, arguments.to, arguments.guard) /> + <cfset local.transition = createObject("component", "shade.StateTransition").init(local.from, arguments.to, arguments.guard) /> <cfset instance.transitions.add(local.transition) /> </cfloop> <cfreturn this /> </cffunction> - <!--- <cffunction name="getNextStates" access="public" output="false"> - <cfargument name="obj" required="true" /> - <cfset var i = 1 /> - <cfset var next = arrayNew(1) /> - <cfset var transition = "" /> - - <cfset instance.transitions.reset() /> - <cfloop condition="instance.transitions.hasNext()"> - <cfset transition = instance.transitions.next() /> - <cfif transition.getFromState() eq obj.getCurrentState()> - <cfset arrayAppend(next, transition) /> - </cfif> - </cfloop> - <cfreturn next /> - </cffunction> ---> - <cffunction name="fire" access="public" output="false"> <cfargument name="obj" type="any" required="true" /> <cfset var i = 1 /> @@ -71,40 +54,5 @@ <cffunction name="getTransitions" access="public" returntype="string" output="false"> <cfreturn instance.name /> </cffunction> - -<!--- - class Event - attr_reader :name - attr_reader :transitions - attr_reader :opts - - def initialize(name, opts, transition_table, &block) - @name = name.to_sym - @transitions = transition_table[@name] = [] - instance_eval(&block) if block - @opts = opts - @opts.freeze - @transitions.freeze - freeze - end - - def next_states(record) - @transitions.select { |t| t.from == record.current_state } - end - - def fire(record) - next_states(record).each do |transition| - break true if transition.perform(record) - end - end - - def transitions(trans_opts) - Array(trans_opts[:from]).each do |s| - @transitions << SupportingClasses::StateTransition.new(trans_opts.merge({:from => s.to_sym})) - end - end - end - end ----> </cfcomponent> \ No newline at end of file Event.cfc @@ -25,14 +25,14 @@ <cffunction name="addState" access="private" output="false"> <cfargument name="name" type="string" required="true" /> - <cfset var state = createObject("component", "target.State").init(arguments.name) /> + <cfset var state = createObject("component", "shade.State").init(arguments.name) /> <cfset instance.states[arguments.name] = state /> <cfreturn state /> </cffunction> <cffunction name="addEvent" access="private" output="false"> <cfargument name="name" type="string" required="true" /> - <cfset var event = createObject("component", "target.Event").init(arguments.name, instance.transitionTable) /> + <cfset var event = createObject("component", "shade.Event").init(arguments.name, instance.transitionTable) /> <cfset instance.eventTable[arguments.name] = event /> <cfreturn event /> </cffunction> StateMachine.cfc @@ -79,39 +79,4 @@ <cfset instance.from = arguments.from /> </cffunction> -<!--- - class StateTransition - attr_reader :from, :to, :opts - - def initialize(opts) - @from, @to, @guard = opts[:from], opts[:to], opts[:guard] - @opts = opts - end - - def guard(obj) - @guard ? obj.send(:run_transition_action, @guard) : true - end - - def perform(record) - return false unless guard(record) - loopback = record.current_state == to - states = record.class.read_inheritable_attribute(:states) - next_state = states[to] - old_state = states[record.current_state] - - next_state.entering(record) unless loopback - - record.update_attribute(record.class.state_column, to.to_s) - - next_state.entered(record) unless loopback - old_state.exited(record) unless loopback - true - end - - def ==(obj) - @from == obj.from && @to == obj.to - end - end ----> - </cfcomponent> \ No newline at end of file StateTransition.cfc @@ -1,4 +1,4 @@ -<cfcomponent displayname="StateTransitionCollection" extends="target.CollectionBase" output="false"> +<cfcomponent displayname="StateTransitionCollection" extends="shade.CollectionBase" output="false"> <cffunction name="init" access="public" output="false"> <cfset super.init() /> @@ -18,7 +18,7 @@ <cffunction name="getTransitionsFromState" access="public" output="false"> <cfargument name="state" type="string" required="true" /> <cfset var i = 1 /> - <cfset var fromState = createObject("component", "target.StateTransitionCollection").init() /> + <cfset var fromState = createObject("component", "shade.StateTransitionCollection").init() /> <cfset var transition = "" /> <cfset reset() /> StateTransitionCollection.cfc @@ -1,8 +1,8 @@ -<cfcomponent displayname="ConversationState" extends="target.StateMachine" output="false"> +<cfcomponent displayname="ConversationState" extends="shade.StateMachine" output="false"> <cfset instance = structNew() /> <cffunction name="init" access="public" returntype="any" output="false"> - <cfargument name="conversation" type="target.test.Conversation" required="true" /> + <cfargument name="conversation" type="shade.test.Conversation" required="true" /> <cfset super.init(arguments.conversation, 'needingAttention', 'MyState') /> <cfreturn this /> </cffunction> test/ConversationState.cfc @@ -2,8 +2,8 @@ <cffunction name="setup" returntype="void" access="public"> <cfscript> - original = createObject("component", "target.test.Conversation").init(); - conversation = createObject( "component", "target.test.ConversationState" ).init(original); + original = createObject("component", "shade.test.Conversation").init(); + conversation = createObject( "component", "shade.test.ConversationState" ).init(original); </cfscript> </cffunction> test/StateMachineTest.cfc 5d7f1b18043b115e833efa42b66a40b05e288f8a Ryan Wood ryan.wood@gmail.com http://github.com/ryanwood/shade/commit/b336ed32deeb1f7a7410b1ad692e363d88624a07 b336ed32deeb1f7a7410b1ad692e363d88624a07 2008-07-18T06:55:00-07:00 2008-07-18T06:55:00-07:00 Updated project name to shade. Added README 74a08c1230716112e0a86d86d2f157126bca4af6 Ryan Wood ryan.wood@gmail.com