statemachine 2.1.0 → 2.2.0

data/CHANGES

@@ -1,5 +1,9 @@
 = Statemachine Changelog
 
+== Version 2.2.0
+
+* applied dotfile improvements from @wsobel (https://github.com/slagyr/statemachine/pull/12)
+
 == Version 2.1.0
 
 * Do not perform transitions if context method returns false | by @zombor (https://github.com/slagyr/statemachine/pull/11)

data/lib/statemachine/generate/dot_graph/dot_graph_statemachine.rb

@@ -39,15 +39,30 @@ module Statemachine
 
         def explore_sm
           @nodes = []
-          @transitions = []
-          @sm.states.values.each { |state|
-            state.transitions.values.each { |transition|
-              @nodes << transition.origin_id
-              @nodes << transition.destination_id
-              @transitions << transition
-            }
-          }
-          @nodes = @nodes.uniq
+           @transitions = []
+           @sm.states.values.each { |state|
+             state.transitions.values.each { |transition|
+               @nodes << transition.origin_id
+               if transition.destination_id.to_s =~ /_H$/
+                 dest = transition.destination_id.to_s.sub(/_H$/, '').to_sym
+                 @nodes << dest
+                 @transitions << Transition.new(transition.origin_id, dest, transition.event.to_s + '_H', nil)
+               else
+                 @nodes << transition.destination_id
+                 @transitions << transition
+               end
+             }
+             if Superstate === state and state.startstate_id
+               @nodes << state.startstate_id
+               @transitions << Transition.new(state.id, state.startstate_id, :start, nil)
+             end
+             if state.default_transition
+               transition = state.default_transition
+               @transitions << Transition.new(transition.origin_id, transition.destination_id, '*', nil)
+             end
+           }
+           @transitions = @transitions.uniq
+           @nodes = @nodes.uniq
         end
 
         def build_full_graph
@@ -55,7 +70,29 @@ module Statemachine
 
           add_graph_header(builder, "main")
 
-          @nodes.each { |node| add_node(builder, node) }
+          # Create graph tree
+          @sm.states.values.each { |state|
+            class << state
+              attr_reader :children
+              def add_child(child)
+                (@children ||= []) << child
+              end
+            end
+          }
+
+          roots = []
+          @sm.states.values.each { |state|
+            if state.superstate.id == :root
+              roots << state
+            else
+              state.superstate.add_child(state)
+            end
+          }
+
+          roots.each do |root|
+            add_node(builder, root)
+          end
+
           builder << endl
 
           @transitions.each do |transition|
@@ -83,6 +120,8 @@ module Statemachine
 
         def add_graph_header(builder, graph_name)
           builder << "digraph #{graph_name} {" << endl
+          builder << "  compound=true; compress=true; rankdir=LR;"
+          builder << endl
           builder.indent!
         end
 
@@ -92,9 +131,24 @@ module Statemachine
         end
 
         def add_node(builder, node)
-          builder << node
-          builder << " [ href = \"#{node}.svg\"]"
-          builder << endl
+          if Superstate === node
+            builder << "subgraph cluster_#{node.id} { "
+            builder.indent!
+            builder << endl
+            builder << "label = \"#{node.id}\"; style=rounded; #{node.id} "
+            builder << " [ style=\"rounded,filled\", shape=box, href=\"#{node.id}.svg\" ];"
+            builder << endl
+            node.children.each do |child|
+              add_node(builder, child)
+            end
+            builder.undent!
+            builder << "}"
+            builder << endl
+          else
+            builder << node.id
+            builder << " [shape=box, style=rounded, href=\"#{node.id}.svg\" ]"
+            builder << endl
+          end
         end
 
         def add_transition(builder, transition)
@@ -102,7 +156,11 @@ module Statemachine
           builder << " -> "
           builder << transition.destination_id
           builder << " [ "
-          builder << "label = #{transition.event} "
+          builder << "label = \"#{transition.event}\" "
+          if transition.event.to_s =~ /_H$/
+            dest = 'cluster_' + transition.destination_id.to_s
+            builder << ", lhead=#{dest}"
+          end
           builder << "]"
           builder << endl
         end

data/lib/statemachine/version.rb

@@ -2,7 +2,7 @@ module Statemachine
   module VERSION #:nodoc:
     unless defined? MAJOR
       MAJOR  = 2
-      MINOR  = 1
+      MINOR  = 2
       TINY   = 0
 
       STRING = [MAJOR, MINOR, TINY].join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: statemachine
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: statemachine
 bindir: bin
 cert_chain: []
-date: 2012-12-13 00:00:00.000000000 Z
+date: 2013-03-11 00:00:00.000000000 Z
 dependencies: []
 description: Statemachine is a ruby library for building Finite State Machines (FSM),
   also known as Finite State Automata (FSA).
@@ -205,7 +205,7 @@ rubyforge_project: statemachine
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Statemachine-2.1.0 - Statemachine Library for Ruby http://slagyr.github.com/statemachine
+summary: Statemachine-2.2.0 - Statemachine Library for Ruby http://slagyr.github.com/statemachine
 test_files:
 - spec/action_invokation_spec.rb
 - spec/builder_spec.rb