hsume2-state_machine 1.0.1 → 1.0.2

data/Rakefile

@@ -6,7 +6,7 @@ require 'rake/gempackagetask'
 
 spec = Gem::Specification.new do |s|
   s.name              = 'hsume2-state_machine'
-  s.version           = '1.0.1'
+  s.version           = '1.0.2'
   s.platform          = Gem::Platform::RUBY
   s.summary           = 'Adds support for creating state machines for attributes on any Ruby class'
   s.description       = s.summary

data/lib/state_machine/branch.rb

@@ -160,7 +160,10 @@ module StateMachine
         # Generate an edge between each from and to state
         from_states.each do |from_state|
           from_state = from_state ? from_state.to_s : 'nil'
-          edges << graph.add_edge(from_state, loopback ? from_state : to_state, :label => event.to_s)
+          label = event.to_s
+          label += " (#{if_condition})" if if_condition
+          label += " (not #{unless_condition})" if unless_condition
+          edges << graph.add_edge(from_state, loopback ? from_state : to_state, :label => label)
         end
         
         edges

data/lib/state_machine/machine.rb

@@ -328,13 +328,7 @@ module StateMachine
           end
           
           # Evaluate DSL
-          if block_given?
-            if options[:syntax] == :alternate
-              machine.instance_eval(&machine.alternate_syntax_eval(&block))
-            else
-              machine.instance_eval(&block)
-            end
-          end
+          machine.evaluate_with_syntax(&block) if block_given?
         else
           # No existing machine: create a new one
           machine = new(owner_class, name, options, &block)
@@ -467,13 +461,7 @@ module StateMachine
       after_initialize
       
       # Evaluate DSL
-      if block_given?
-        if @syntax == :alternate
-          instance_eval(&alternate_syntax_eval(&block))
-        else
-          instance_eval(&block)
-        end
-      end
+      evaluate_with_syntax(&block) if block_given?
     end
     
     # Creates a copy of this machine in addition to copies of each associated
@@ -489,6 +477,14 @@ module StateMachine
       @callbacks = {:before => @callbacks[:before].dup, :after => @callbacks[:after].dup, :failure => @callbacks[:failure].dup}
     end
     
+    def evaluate_with_syntax(&block)
+      if @syntax == :alternate
+        instance_eval(&alternate_syntax_eval(&block))
+      else
+        instance_eval(&block)
+      end
+    end
+    
     def alternate_syntax_eval(&block)
       alternate = AlternateMachine.new(&block)
       alternate.to_state_machine

data/test/unit/branch_test.rb

@@ -885,6 +885,38 @@ begin
       assert_equal 'nil', @edges.first.instance_variable_get('@xNodeTwo')
     end
   end
+  
+  class BranchDrawingWithIfConditionTest < Test::Unit::TestCase
+    def setup
+      @machine = StateMachine::Machine.new(Class.new)
+      
+      graph = GraphViz.new('G')
+      graph.add_node('parked')
+      
+      @branch = StateMachine::Branch.new(:from => :idling, :to => nil, :if => :have_keys?)
+      @edges = @branch.draw(graph, :park, [nil, :idling])
+    end
+    
+    def test_should_use_event_name_and_if_condition_as_label
+      assert_equal 'park (have_keys?)', @edges.first['label'].to_s.gsub('"', '')
+    end
+  end
+  
+  class BranchDrawingWithUnlessConditionTest < Test::Unit::TestCase
+    def setup
+      @machine = StateMachine::Machine.new(Class.new)
+      
+      graph = GraphViz.new('G')
+      graph.add_node('parked')
+      
+      @branch = StateMachine::Branch.new(:from => :idling, :to => nil, :unless => :missing_keys?)
+      @edges = @branch.draw(graph, :park, [nil, :idling])
+    end
+    
+    def test_should_use_event_name_and_unless_condition_as_label
+      assert_equal 'park (not missing_keys?)', @edges.first['label'].to_s.gsub('"', '')
+    end
+  end
 rescue LoadError
   $stderr.puts 'Skipping GraphViz StateMachine::Branch tests. `gem install ruby-graphviz` >= v0.9.0 and try again.'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hsume2-state_machine
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Aaron Pfeifer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-26 00:00:00 -07:00
+date: 2011-07-27 00:00:00 -07:00
 default_executable: 
 dependencies: []