MINT-statemachine 1.2.3 → 1.3.0

data/spec/sm_entry_exit_actions_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe "State Machine Entry and Exit Actions" do
 

data/spec/sm_odds_n_ends_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe "State Machine Odds And Ends" do
   include SwitchStatemachine

data/spec/sm_parallel_state_spec.rb

@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 require "noodle"
 
-describe "Nested parallel" do
+describe "Parallel states" do
   before(:each) do
     @out_out_order = false
     @locked = true
@@ -10,7 +10,9 @@ describe "Nested parallel" do
     @sm = Statemachine.build do
       trans :start,:go,:p
       state :maintenance
+
       parallel :p do
+        event :activate_exit, :maintain
         statemachine :s1 do
           superstate :operative do
             trans :locked, :coin, :unlocked, Proc.new {  @cooked = true }
@@ -25,10 +27,28 @@ describe "Nested parallel" do
           end
         end
       end
+
     end
 
     @sm.context = @noodle
   end
+
+  it "should call exit only once if exiting parallel state" do
+    counter = 0
+    @sm.get_state(:p).exit_action = Proc.new { counter += 1 }
+    @sm.go
+    @sm.activate_exit
+    counter.should == 1
+  end
+
+  it "should call enter only once if entering parallel state" do
+      counter = 0
+      @sm.get_state(:p).entry_action = Proc.new { counter += 1 }
+      @sm.go
+      counter.should == 1
+    end
+
+
 # @TODO add tests that set a certain state that is part of a parallel state machine
   # to check if
   # the other sub statemachine is set to the initial state
@@ -36,14 +56,18 @@ describe "Nested parallel" do
   it "supports entering a parallel state" do
     @sm.state.should eql :start
     @sm.go
+    @sm.abstract_states.should ==[:root,:p,  :operative, :onoff ]
     @sm.state.should eql :p
     @sm.states_id.should == [:locked,:on]
     @sm.coin
     @sm.state.should eql :p
     @sm.states_id.should == [:unlocked,:on]
+    @sm.abstract_states.should ==[:root,:p,  :operative, :onoff ]
     @sm.toggle
     @sm.state.should eql :p
     @sm.states_id.should == [:unlocked,:off]
+    @sm.abstract_states.should ==[:root,:p,  :operative, :onoff ]
+
   end
 
   it "supports leaving a parallel state" do
@@ -52,6 +76,7 @@ describe "Nested parallel" do
     @sm.states_id.should == [:locked,:on]
     @sm.maintain
     @sm.state.should == :maintenance
+    @sm.abstract_states.should ==[:root ]
 
   end
 
@@ -160,9 +185,12 @@ describe "Nested parallel" do
     @sm.go
     @sm.state.should == :p
     @sm.states_id.should == [:unlocked,:on]
+    @sm.abstract_states.should ==[:s,:root,:p,  :operative, :onoff ]
     @sm.maintain
     @sm.state.should == :maintenance
     @sm.states_id.should == [:maintenance]
+    @sm.abstract_states.should ==[:root]
+
   end
 
   it "should support leaving a parallel state by an event from a super state of the parallel state" do
@@ -174,8 +202,10 @@ describe "Nested parallel" do
           event :m, :maintenance
           parallel :p do
             statemachine :s1 do
+              superstate :s11 do
                 trans :locked, :coin, :unlocked, Proc.new {  @cooked = true }
                 trans :unlocked, :coin, :locked
+              end
             end
             statemachine :s2 do
               superstate :onoff do
@@ -202,10 +232,11 @@ describe "Nested parallel" do
     @sm.go
     lambda {@sm.unknown}.should raise_error
   end
+end
 
-
-it "should support entering a nested parallel states" do
-    @sm = Statemachine.build do
+describe "Nested parallel states" do
+  before (:each) do
+     @sm = Statemachine.build do
       trans :start,:go, :unlocked
       state :maintenance
       superstate :test do
@@ -213,11 +244,13 @@ it "should support entering a nested parallel states" do
           event :m, :maintenance
           parallel :p do
             statemachine :s1 do
+              superstate :s11 do
                 trans :locked, :coin, :unlocked, Proc.new {  @cooked = true }
                 trans :unlocked, :coin, :locked
+              end
             end
             statemachine :s2 do
-              #superstate :r2 do
+              superstate :r2 do
                 parallel :p2 do
                   statemachine :s21 do
                     superstate :onoff do
@@ -232,14 +265,22 @@ it "should support entering a nested parallel states" do
                       end
                   end
                 end
-              #end
+              end
             end
           end
         end
         event :repair, :maintenance
       end
     end
+  end
 
+  it "should point to their own state machine" do
+    @sm.go
+    @sm.state.should eql :p
+
+  end
+
+  it "should support entering a nested parallel states" do
     @sm.go
     @sm.state.should eql :p
     @sm.states_id.should == [:unlocked,:on,:on2]
@@ -250,5 +291,4 @@ it "should support entering a nested parallel states" do
     @sm.states_id.should == [:maintenance]
   end
 
-
 end

data/spec/sm_simple_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe "simple cases:" do
   before(:each) do

data/spec/sm_super_state_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe "Turn Stile" do
   include TurnstileStatemachine

data/spec/sm_turnstile_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe "Turn Stile" do
   include TurnstileStatemachine
@@ -14,10 +14,10 @@ describe "Turn Stile" do
     locked_state.transitions.length.should equal(2)
     unlocked_state.transitions.length.should equal(2)
     
-    check_transition(locked_state.transitions[:coin], :locked, :unlocked, :coin, @unlock)
-    check_transition(locked_state.transitions[:pass], :locked, :locked, :pass, @alarm)
-    check_transition(unlocked_state.transitions[:pass], :unlocked, :locked, :pass, @lock)
-    check_transition(unlocked_state.transitions[:coin], :unlocked, :locked, :coin, @thankyou)
+    check_transition(locked_state.get_transitions(:coin), :locked, :unlocked, :coin, @unlock)
+    check_transition(locked_state.get_transitions(:pass), :locked, :locked, :pass, @alarm)
+    check_transition(unlocked_state.get_transitions(:pass), :unlocked, :locked, :pass, @lock)
+    check_transition(unlocked_state.get_transitions(:coin), :unlocked, :locked, :coin, @thankyou)
   end
   
   it "start state" do

data/spec/spec_helper.rb

@@ -7,11 +7,13 @@ require 'statemachine'
 $IS_TEST = true
 
 def check_transition(transition, origin_id, destination_id, event, action)
-  transition.should_not equal(nil)
-  transition.event.should equal(event)
-  transition.origin_id.should equal(origin_id)
-  transition.destination_id.should equal(destination_id)
-  transition.action.should eql(action)
+  transition.each do |t|
+    t.should_not equal(nil)
+    t.event.should equal(event)
+    t.origin_id.should equal(origin_id)
+    t.destination_id.should equal(destination_id)
+    t.action.should eql(action)
+  end
 end
 
 module SwitchStatemachine

data/spec/transition_spec.rb

@@ -1,11 +1,11 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe "Transition Calculating Exits and Entries" do
 
   before(:each) do
     @transition = Statemachine::Transition.new(nil, nil, nil, nil, true)
   end
-  
+
   it "to nil" do
     @a = Statemachine::State.new("a", nil, nil)
     exits, entries = @transition.exits_and_entries(@a, nil)
@@ -13,7 +13,7 @@ describe "Transition Calculating Exits and Entries" do
     entries.to_s.should eql([].to_s)
     entries.length.should equal(0)
   end
-  
+
   it "to itself" do
     @a = Statemachine::State.new("a", nil, nil)
     exits, entries = @transition.exits_and_entries(@a, @a)
@@ -55,7 +55,7 @@ describe "Transition Calculating Exits and Entries" do
     exits.to_s.should eql([@a, @b].to_s)
     entries.to_s.should eql([@d, @c].to_s)
   end
-  
+
   it "to nephew" do
     @b = Statemachine::State.new("b", nil, nil)
     @c = Statemachine::State.new("c", nil, nil)
@@ -73,7 +73,7 @@ describe "Transition Calculating Exits and Entries" do
     exits.to_s.should eql([@a].to_s)
     entries.to_s.should eql([@b].to_s)
   end
-  
+
   it "to second cousin" do
     @c = Statemachine::State.new("c", nil, nil)
     @b = Statemachine::State.new("b", @c, nil)
@@ -97,11 +97,107 @@ describe "Transition Calculating Exits and Entries" do
   it "to parent's grandchild" do
     @c = Statemachine::State.new("c", nil, nil)
     @b = Statemachine::State.new("b", @c, nil)
-    @a = Statemachine::State.new("a", @b, nil) 
+    @a = Statemachine::State.new("a", @b, nil)
     @d = Statemachine::State.new("d", @c, nil)
     exits, entries = @transition.exits_and_entries(@d, @a)
     exits.to_s.should eql([@d].to_s)
     entries.to_s.should eql([@b, @a].to_s)
   end
-  
+
 end
+
+describe "Transitions without events" do
+  it "should be done" do
+    @log = ""
+    @sm = Statemachine.build do
+      state :off do
+        on_entry Proc.new {puts "entering off"}
+        on_exit Proc.new {puts "exiting off"}
+        event :toggle, :on, Proc.new { @log += "on" }
+        event nil, :done, nil, Proc.new {@log == "onoff"}
+      end
+      trans :on, :toggle, :off, Proc.new { @log += "off" }
+    end
+    @sm.context = self
+
+    @sm.toggle
+    @sm.state.should == :on
+    @sm.toggle
+    @sm.state.should == :done
+  end
+
+  it "should be done" do
+    @sm = Statemachine.build do
+      trans :on, :toggle, :off, ["@data = 0"]
+      state :off do
+        on_entry Proc.new {@data = @data + 1}
+        event :toggle, :off
+        event nil, :done, nil, "@data == 10"
+      end
+    end
+    @sm.context = self
+
+    for i in 1..9
+      @sm.toggle
+      @sm.state.should == :off
+      @data == i
+    end
+    @sm.toggle
+    @sm.state.should == :done
+  end
+
+  it "after entering a parallel statemachine shoud be done" do
+    def activate(new_states,abstract_states, atomic_states)
+
+           puts "activate #{new_states} #{abstract_states} #{atomic_states}"
+    end
+
+    @sm = Statemachine.build do
+      trans :start,:go,:p
+      parallel :p do
+        statemachine :s1 do
+          superstate :operative do
+            state :unlocked do
+              event nil, :locked
+            end
+            trans :locked, :coin, :unlocked
+          end
+        end
+        statemachine :s2 do
+          superstate :onoff do
+            trans :on, :toggle, :off
+            trans :off, :toggle, :on
+          end
+        end
+      end
+    end
+    @sm.activation=self.method(:activate)
+    @sm.go
+    @sm.states_id.should == [:locked,:on]
+  end
+
+end
+
+describe "Transitions with same events but different conditions" do
+  before(:each) do
+    @power = true
+    @sm = Statemachine.build do
+      trans :off, :toggle, :on, nil, "@power"
+      trans :off, :toggle, :no_power, nil, "not @power"
+      trans :on, :toggle, :off
+    end
+    @sm.context = self
+  end
+
+  it "should be on then no_power" do
+    @sm.state.should == :off
+    @sm.toggle
+    @sm.state.should == :on
+    @sm.toggle
+    @power = false
+    @sm.state.should == :off
+    @sm.toggle
+    @sm.state.should == :no_power
+  end
+end
+

metadata

@@ -1,117 +1,100 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: MINT-statemachine
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 1.3.0
   prerelease: 
-  segments: 
-  - 1
-  - 2
-  - 3
-  version: 1.2.3
 platform: ruby
-authors: 
+authors:
 - Sebastian Feuerstack
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-01 00:00:00 Z
+date: 2012-11-20 00:00:00.000000000Z
 dependencies: []
-
-description: The MINT Statemachine is a ruby library for building Finite State Machines, based on the Statemachine gem by Micah Martin.
+description: The MINT Statemachine is a ruby library for building Finite State Machines,
+  based on the Statemachine gem by Micah Martin.
 email: Sebastian@Feuerstack.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- Gemfile
+files:
+- TODO
+- Gemfile.lock
+- LICENSE
+- CHANGES
 - Rakefile
+- Gemfile
 - README.rdoc
 - MINT-statemachine.gemspec
-- Gemfile.lock
-- CHANGES
-- TODO
-- LICENSE
+- lib/statemachine.rb
+- lib/statemachine/builder.rb
+- lib/statemachine/statemachine.rb
+- lib/statemachine/generate/util.rb
+- lib/statemachine/generate/dot_graph/dot_graph_statemachine.rb
 - lib/statemachine/generate/java/java_statemachine.rb
+- lib/statemachine/generate/dot_graph.rb
 - lib/statemachine/generate/src_builder.rb
 - lib/statemachine/generate/java.rb
-- lib/statemachine/generate/dot_graph.rb
-- lib/statemachine/generate/util.rb
-- lib/statemachine/generate/dot_graph/dot_graph_statemachine.rb
 - lib/statemachine/transition.rb
-- lib/statemachine/superstate.rb
 - lib/statemachine/version.rb
-- lib/statemachine/statemachine.rb
-- lib/statemachine/stub_context.rb
-- lib/statemachine/state.rb
 - lib/statemachine/parallelstate.rb
 - lib/statemachine/action_invokation.rb
-- lib/statemachine/builder.rb
-- lib/statemachine.rb
-- spec/sm_turnstile_spec.rb
-- spec/generate/java/java_statemachine_spec.rb
+- lib/statemachine/superstate.rb
+- lib/statemachine/state.rb
+- lib/statemachine/stub_context.rb
+- spec/default_transition_spec.rb
+- spec/spec_helper.rb
+- spec/sm_super_state_spec.rb
+- spec/sm_action_parameterization_spec.rb
 - spec/generate/dot_graph/dot_graph_stagemachine_spec.rb
-- spec/sm_odds_n_ends_spec.rb
-- spec/noodle.rb
+- spec/generate/java/java_statemachine_spec.rb
 - spec/sm_entry_exit_actions_spec.rb
-- spec/default_transition_spec.rb
-- spec/action_invokation_spec.rb
+- spec/sm_simple_spec.rb
 - spec/sm_parallel_state_spec.rb
-- spec/builder_spec.rb
-- spec/sm_activation_spec.rb
-- spec/sm_super_state_spec.rb
 - spec/transition_spec.rb
-- spec/spec_helper.rb
-- spec/sm_simple_spec.rb
-- spec/sm_action_parameterization_spec.rb
+- spec/noodle.rb
+- spec/sm_activation_spec.rb
+- spec/builder_spec.rb
+- spec/action_invokation_spec.rb
+- spec/sm_turnstile_spec.rb
 - spec/history_spec.rb
+- spec/sm_odds_n_ends_spec.rb
 homepage: http://www.multi-access.de
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: MINT-Statemachine-1.2.3 - Statemachine Library for Ruby based on statemachine from http://slagyr.github.com/statemachine http://www.multi-access.de/open-source-software/third-party-software-extensions/
-test_files: 
-- spec/sm_turnstile_spec.rb
-- spec/sm_odds_n_ends_spec.rb
-- spec/sm_entry_exit_actions_spec.rb
+summary: MINT-Statemachine-1.3.0 - Statemachine Library for Ruby based on statemachine
+  from http://slagyr.github.com/statemachine http://www.multi-access.de/open-source-software/third-party-software-extensions/
+test_files:
 - spec/default_transition_spec.rb
-- spec/action_invokation_spec.rb
-- spec/sm_parallel_state_spec.rb
-- spec/builder_spec.rb
-- spec/sm_activation_spec.rb
 - spec/sm_super_state_spec.rb
-- spec/transition_spec.rb
-- spec/sm_simple_spec.rb
 - spec/sm_action_parameterization_spec.rb
+- spec/sm_entry_exit_actions_spec.rb
+- spec/sm_simple_spec.rb
+- spec/sm_parallel_state_spec.rb
+- spec/transition_spec.rb
+- spec/sm_activation_spec.rb
+- spec/builder_spec.rb
+- spec/action_invokation_spec.rb
+- spec/sm_turnstile_spec.rb
 - spec/history_spec.rb
+- spec/sm_odds_n_ends_spec.rb