@@ -1,35 +1,36 @@ -TODO -init.rb -rake_helper.rb Manifest -README.txt -test/event.spec -test/error.spec -test/red_steak.spec -test/synch_async.spec -test/copier.spec -test/example.spec -test/pending_transition.spec Rakefile +TODO +init.rb install.rb -example/loan_officer.zuml -example/ex1.rb -lib/red_steak/pseudostate.rb +lib/red_steak.rb lib/red_steak/base.rb -lib/red_steak/transition.rb -lib/red_steak/final_state.rb +lib/red_steak/builder.rb lib/red_steak/copier.rb -lib/red_steak/namespace.rb lib/red_steak/dot.rb -lib/red_steak/vertex.rb -lib/red_steak/builder.rb -lib/red_steak/state_machine.rb lib/red_steak/error.rb -lib/red_steak/state.rb -lib/red_steak/named_element.rb -lib/red_steak/named_array.rb +lib/red_steak/final_state.rb lib/red_steak/machine.rb -lib/red_steak.rb -lib/tasks/p4_svn.rb -lib/tasks/p4_git.rb +lib/red_steak/named_array.rb +lib/red_steak/named_element.rb +lib/red_steak/namespace.rb +lib/red_steak/pseudostate.rb +lib/red_steak/state.rb +lib/red_steak/state_machine.rb +lib/red_steak/transition.rb +lib/red_steak/vertex.rb lib/tasks/p4.rb +lib/tasks/p4_git.rb +lib/tasks/p4_svn.rb +test/example.spec +test/pending_transition.spec +test/red_steak.spec +test/synch_async.spec +test/copier.spec +test/error.spec +test/event.spec +example/ex1.rb +example/loan_officer.zuml +spec/builder_spec.rb +README.txt +rake_helper.rb Manifest @@ -23,7 +23,7 @@ end begin require 'spec/rake/spectask' - SPEC_FILES = FileList['test/**/*.spec'] + SPEC_FILES = FileList['test/**/*.spec'] + FileList['spec/**/*_spec.rb'] SPEC_OPTS = ['--color', '--backtrace'] Spec::Rake::SpecTask.new("spec") do |t| Rakefile @@ -22,7 +22,7 @@ module RedSteak # If some options are already set, merge them. if @options return @options if opts.empty? - @options.merge(_dup_opts(opts)) + @options.update(_dup_opts(opts)) else @options = _dup_opts opts end lib/red_steak/base.rb @@ -259,18 +259,30 @@ module RedSteak raise ArgumentError, "target state not given" unless opts[:target] opts[:statemachine] = @context[:statemachine] - @transitions << { + + x = { :block => blk, :owner => _owner, :opts => opts, + :caller => caller(1).first, } + if (xn = x[:opts][:name]) && @transitions.any? { | x2 | (x2n = x2[:opts][:name]) && x2n == xn } + raise Error, + :message => 'Ambigous Transition Name', + :data => x, + :others => @transitions + end + + @transitions << x + self end private + def _with_context name, val current_save = @current @@ -406,7 +418,7 @@ module RedSteak _log { " #{opts.inspect}" } - t = _find_transition opts + t = _find_transition opts, owner _with_context :transition, t do instance_eval &blk if blk @@ -415,26 +427,40 @@ module RedSteak # Locates a transition by name or creates a new object. - def _find_transition opts + def _find_transition opts, owner raise ArgumentError, "opts expected Hash" unless Hash === opts opts[:source] = _find_state opts[:source] opts[:target] = _find_state opts[:target] - opts[:name] ||= "#{opts[:source].to_s}->#{opts[:target].to_s}".to_sym + # Attempt to construct a unique Transition name. + unless opts[:name] + name = "#{opts[:source].to_s}->#{opts[:target].to_s}".to_sym + i = 1 + while @transitions.any?{ | t | t[:opts][:name] == name } + name = "#{opts[:source].to_s}->#{opts[:target].to_s}-#{i += 1}".to_sym + # $stderr.puts " #{__LINE__} #{name.inspect}" + end + opts[:name] = name + end + + # Try to locate an existing transition by name. t = opts[:statemachine].transitions.find do | x | opts[:name] == x.name end - unless t - # opts[:statemachine] ||= @context[:statemachine] + # If found just update it's options. + # Otherwise create a new one. + if t + # $stderr.puts " * UPDATING #{t.inspect}" + raise 'unexpected statemachine' unless opts[:statemachine] == t.statemachine + raise 'unexpected source' unless opts[:source] == t.source + raise 'unexpected target' unless opts[:target] == t.target + opts.delete(:name) + t.options = opts + else t = Transition.new opts opts[:statemachine].add_transition! t - else - if t - opts.delete(:name) - t.options = opts - end end t lib/red_steak/builder.rb @@ -652,7 +652,7 @@ module RedSteak result = @dot_command_output = `#{cmd} 2>&1` # Fall back to plain svg renderer. - if result =~ /Warning: language .* not recognized, use one of:/ + if result =~ /Warning: language .* not recognized, use one of:/ || ! File.exist?(file_svg) cmd = "dot -Tsvg #{file_dot.inspect} -o #{file_svg.inspect}" _log { "Run: #{cmd}" } result = @dot_command_output = `#{cmd} 2>&1` lib/red_steak/dot.rb @@ -11,7 +11,7 @@ describe "RedSteak Synchronous/Asynchronous Interactions" do def sm name = nil @sm ||= RedSteak::Builder.new.build do - statemachine (name or raise 'no name') do + statemachine(name || (raise 'no name')) do initial :start final :final test/synch_async.spec 1bb4e28a57eb0d52eb87f532ebb59c1dba88f466 Kurt Stephens ks.github@kurtstephens.com http://github.com/kstephens/red_steak/commit/220f807bddd54863de8c9a332cf760914c00d484 220f807bddd54863de8c9a332cf760914c00d484 2009-05-05T09:26:05-07:00 2009-05-05T09:26:05-07:00 Fixed issue with Builder augmentation; force unique Transition names in Builder. 0a38dd630268e9a99524eb2fa68faa653b479dbc Kurt Stephens ks.github@kurtstephens.com