@@ -78,7 +78,7 @@ module RedSteak def inspect @inspect ||= - "#<#{self.class} #{@message.inspect}#{@options.keys.sort { |a, b| a.to_s <=> b.to_s }.map { | k | " #{k.inspect} => #{@options[k].inspect}" }.join('')}>".freeze + "#<#{self.class} #{@message.inspect}#{@options.keys.sort { |a, b| a.to_s <=> b.to_s }.map { | k | "\n #{k.inspect} => #{@options[k].inspect}" }.join('')}>".freeze end lib/red_steak/error.rb @@ -309,16 +309,16 @@ module RedSteak unless t.empty? case t.size when 0 - _raise UnhandledEvent, "No transitions for event", + _raise Error::UnhandledEvent, "No transitions for event", :event => @event when 1 event_args = event.size > 1 ? @event[1 .. -1] : EMPTY_ARRAY transition_fired, @trigger = *t.first queue_transition! transition_fired, event_args else - _raise UnhandledEvent, "Too many transititons for event", + _raise Error::UnhandledEvent, "Too many transititons for event", :event => @event, - :transitions => t + :transitions => t # .map { | x | [ x[0].to_uml_s, x[1] ] } end end @@ -727,14 +727,15 @@ module RedSteak def _log msg = nil return unless @logger - msg ||= yield case when Proc === @logger + msg ||= yield @logger.call(msg) when ::IO === @logger + msg ||= yield @logger.puts "#{self.to_s} #{state.to_s} #{msg}" when defined?(::Log4r) && (Log4r::Logger === @logger) - @logger.send(log_level || :debug, msg) + @logger.send(log_level || :debug) { msg ||= yield } end end @@ -878,14 +879,14 @@ module RedSteak def fire_transition! trans, args _log { "fire_transition! #{trans.inspect}" } - _raise RedSteak::Error::UnexpectedRecursion, :transition if @transition + _raise Error::UnexpectedRecursion, :transition if @transition old_state = @state @transition = trans # Behavior: Transition effect. - _raise RedSteak::Error::UnexpectedRecursion, :effect if @in_effect + _raise Error::UnexpectedRecursion, :effect if @in_effect @in_effect = true _log { "effect! #{trans.inspect}" } trans.effect!(self, args) lib/red_steak/machine.rb @@ -63,9 +63,22 @@ module RedSteak end if force_send - # $stderr.puts " _behavior! #{self.inspect} #{action.inspect} #{machine.inspect}\n => #{c}.send(#{behavior.inspect}, #{machine}, #{self.inspect}, *#{args.inspect})" - - return c.send(behavior, machine, self, *args) + meth_arity = c.method(behavior).arity rescue args.size + 2 + case + when meth_arity == 0 + args = EMPTY_ARRAY + when meth_arity < 0 + args = args.dup # args might be frozen. + args.unshift self + args.unshift machine + else + args = args.dup # args might be frozen. + args.unshift self + args.unshift machine + args = [0 ... meth_arity] + end + # $stderr.puts " _behavior! #{self.inspect} #{action.inspect} #{machine.inspect}\n => #{c}.send(#{behavior.inspect}, *#{args.inspect})" + return c.send(behavior, *args) end end default_value lib/red_steak/named_element.rb @@ -43,7 +43,7 @@ describe 'RedSteak::Error' do e.options[:message].should == nil e.options[:foo].should == :bar e.message.should == "message" - e.inspect.should == "#<RedSteak::Error \"message\" :foo => :bar>" + e.inspect.should == "#<RedSteak::Error \"message\"\n :foo => :bar>" end test/error.spec @@ -26,6 +26,10 @@ describe 'RedSteak::Machine#event!' do @number = "" end + ######################################## + # dialed digit management. + # + def prefix number = self.number case number when /^0/ @@ -45,24 +49,47 @@ describe 'RedSteak::Machine#event!' do prefix.first end - def valid *args + def valid p = prefix number p[0] != nil && p[1] == number.size end - def incomplete *args + def incomplete ! valid && ! invalid end - def invalid *args + def invalid ! (number =~ /^\d+$/) end + + ######################################## + # Methods that generate events. + # + def dial_digit n @number << n @m.event! [ :dial_digit, n ] end + [ + :after_timeout, + :lift_reciever, + :connected, + :busy, + :callee_answers, + :callee_hangs_up, + :caller_hangs_up, + :terminate, + ].each do | meth | + class_eval <<"RUBY", __FILE__, __LINE__ +def #{meth} + $stderr.puts "#{name} #{meth}()" + @m.event! [ #{meth.inspect} ] +end +RUBY + end + def inspect "#{self.class} #{name} n=#{number.inspect} t=#{call_type.inspect} state=#{@m.state.to_s}" @@ -109,9 +136,6 @@ describe 'RedSteak::Machine#event!' do :guard => :incomplete transition :time_out, :trigger => :after_timeout - transition :dialing, - :trigger => :dial_digit, - :guard => :incomplete transition :connecting, :trigger => :dial_digit, :guard => :valid, @@ -192,6 +216,7 @@ describe 'RedSteak::Machine#event!' do attr_accessor :t it 'transitions using transition_if_valid!' do + begin self.t = Telephone.new t.name = "t" sm = t.sm @@ -229,11 +254,15 @@ describe 'RedSteak::Machine#event!' do when Array t.send(*event) else - m.event! event + t.send(event) end m.run_events! render_graph(m) end + rescue Exception => err + $stderr.puts "UNEXPECTED ERROR: #{err.inspect}" + raise err + end end end # describe test/event.spec @@ -423,7 +423,7 @@ describe RedSteak do err[:transitions].should == nil err[:state].should == m.state err.state.should == m.state - err.inspect.should == "#<RedSteak::Error::UnknownTransition \"transition_to_next_state!\" :machine => #<RedSteak::Machine :test [:end]> :state => #<RedSteak::State test end>>" + err.inspect.should == "#<RedSteak::Error::UnknownTransition \"transition_to_next_state!\"\n :machine => #<RedSteak::Machine :test [:end]>\n :state => #<RedSteak::State test end>>" end m.history.map { |h| h[:previous_state].to_s }.should == test/red_steak.spec 7afd4bcf0503d97e3dea852a59e0fd541bcfa386 Kurt Stephens kstephens ks.github@kurtstephens.com http://github.com/kstephens/red_steak/commit/229df7a1d32c54c8cfde0fc26d0c80ece5a931dc 229df7a1d32c54c8cfde0fc26d0c80ece5a931dc

2009-05-08T13:54:10-07:00

Error#inspect now has newlines to aid human comprehension. Preliminary support for improved #_behavior! callback argument handling. 69e6b11942ee74912ce3931e1af43eb983338989 Kurt Stephens kstephens ks.github@kurtstephens.com