MINT-statemachine 1.3.0 → 1.3.2

data/CHANGES

@@ -1,26 +1,35 @@
 = Statemachine Changelog
 
+== Version 1.3.2 (2013/02/28)
+
+* Fixed bug with spontaneous transitions within parallel states.
+
+== Version 1.3.1 (2013/02/26)
+
+* improved support for spontaneous transitions. Direct transitions to atomic states that enter a parallel state
+  consider all spontaneous transitions of all entered states.
+
 == Version 1.3.0
 
-* (Sebastian) fixed bug that prevented exit call on parallel state exit
-* (Sebastian) refactorings to support existing parallel states without calling events twice
-* (Sebastian) if entering a parallel state, spontaneous initial transitions were not executed
-* (Sebastian) introduced workaround to retrieve correct activation callback within parallel state machines
-* (Jessica) fixed bug that prevented spontaneous transitions from initial state within superstate
-* (Jessica) added test using transition to self to recheck spontaneous transition's condition.
-* (Jessica) transitions now stored as array
-* (Jessica) correct abstract states handling working. All tests working
-* (Jessica) fixed bug that prevented in parallel state machine setups the correct publishing of all new atomic and abstract states
-* (Sebastian) added option to temporarily disable activation callback for reset
-* (Sebastian) several minor bug fixes
-* (Sebastian) changed activation callback processing so it can be used fo publishing state updates with redis
-* (Jessica) Added tests for on_entry, on_exit and transitions for parallel states.
-* (Sebastian) fixed optional parameter handling
-* (Sebastian) allow dynamic parameter size
-* (Jessica) No more In() hack. Use is_in? instead
-* (Jessica) Support for spontaneous transitions
-* (Sebastian) abstract_states now also includes parallel state name
-* (Jessica) added treatment for ifs
+* fixed bug that prevented exit call on parallel state exit
+* refactorings to support existing parallel states without calling events twice
+* if entering a parallel state, spontaneous initial transitions were not executed
+* introduced workaround to retrieve correct activation callback within parallel state machines
+* fixed bug that prevented spontaneous transitions from initial state within superstate
+* added test using transition to self to recheck spontaneous transition's condition.
+* transitions now stored as array
+* correct abstract states handling working. All tests working
+* fixed bug that prevented in parallel state machine setups the correct publishing of all new atomic and abstract states
+* added option to temporarily disable activation callback for reset
+* several minor bug fixes
+* changed activation callback processing so it can be used fo publishing state updates with redis
+* Added tests for on_entry, on_exit and transitions for parallel states.
+* fixed optional parameter handling
+* allow dynamic parameter size
+* No more In() hack. Use is_in? instead
+* Support for spontaneous transitions
+* abstract_states now also includes parallel state name
+* added treatment for ifs
 
 == Version 1.2.3
 

data/MINT-statemachine.gemspec

@@ -2,18 +2,18 @@
 
 Gem::Specification.new do |s|
   s.name = "MINT-statemachine"
-  s.version = "1.3.0"
+  s.version = "1.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sebastian Feuerstack"]
-  s.date = "2012-11-20"
+  s.date = "2013-02-26"
   s.description = "The MINT Statemachine is a ruby library for building Finite State Machines, based on the Statemachine gem by Micah Martin."
   s.email = "Sebastian@Feuerstack.org"
   s.files = ["TODO", "Gemfile.lock", "LICENSE", "CHANGES", "Rakefile", "Gemfile", "README.rdoc", "MINT-statemachine.gemspec", "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/transition.rb", "lib/statemachine/version.rb", "lib/statemachine/parallelstate.rb", "lib/statemachine/action_invokation.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/generate/java/java_statemachine_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/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"]
   s.homepage = "http://www.multi-access.de"
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.15"
-  s.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/"
+  s.summary = "MINT-Statemachine-1.3.1 - 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/"
   s.test_files = ["spec/default_transition_spec.rb", "spec/sm_super_state_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"]
 
   if s.respond_to? :specification_version then

data/README.rdoc

@@ -40,6 +40,42 @@ Each action that is called during a transaction has to return true for the trans
 Otherwise the entire transition is assumed as failed and the statemachine remains in its origin
 state.
 
+=== Transitions can be spontaneous (eventless)
+
+In this example the statemachine will first enter the inital u1 state but then directly
+will do a transition to u2. 
+
+  @sm = Statemachine.build @old_sm do
+     superstate :unlocked do
+       trans :u1, nil , :u2
+       trans :u2, :e, :maintenance
+     end
+  end   
+
+=== Support for parallel running states
+
+After sending the :go event, the statemachine of this
+example will end up in a [:locked,:on] setting.
+
+    @sm = Statemachine.build do
+      trans :start,:go,:p
+
+      parallel :p do
+        statemachine :s1 do
+          superstate :operative do
+            trans :locked, :coin, :unlocked
+            trans :unlocked, :coin, :locked
+          end
+        end
+        statemachine :s2 do
+          superstate :onoff do
+            trans :on, :toggle, :off
+            trans :off, :toggle, :on
+          end
+        end
+      end
+    end
+
 === Support for GemBundler
 
 rake make_spec can be used to create a gemspec file that is required for GemBundler
@@ -66,4 +102,4 @@ Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

data/lib/statemachine/parallelstate.rb

@@ -196,16 +196,8 @@ module Statemachine
     end
 
     def spontaneous_transition
-      transition = []
-      @parallel_statemachines.each do |s|
-        t = s.get_state(s.state).spontaneous_transition
-        transition << [t,s] if t # we need to store the state machine relevant for the transition
-      end
-      if transition.empty?
-        return nil
-      end
-      transition
-    end
+ 		nil
+ 	end
 
 
     def exit(args)

data/lib/statemachine/superstate.rb

@@ -49,7 +49,7 @@ module Statemachine
     end
 
     def spontaneous_transition
-      startstate.spontaneous_transition
+     nil
     end
 
   end

data/lib/statemachine/transition.rb

@@ -58,22 +58,26 @@ module Statemachine
         sm.activation.call(new_states,sm.abstract_states,sm.states_id) if sm.activation # and  not @statemachine.is_parallel
       end
 
-      # Take any valid spontaneous transitions
-      transition = destination.spontaneous_transition
-
-      if transition
-        if destination.is_parallel
-          transition.each do |trans,statem|
-            trans.each do |t|
-              t[0].invoke(t[1], statem, args) if t[0].is_a? Transition
-            end
+      # Take any valid spontaneous transitions for entered states
+      new_states.each do |entered_state|
+        s = statemachine.get_state(entered_state)
+        transition = s.spontaneous_transition
+        perform_spontaneous_transition(statemachine,s,transition,args) if transition and transition.length >0
+      end
+    end
+
+    def perform_spontaneous_transition(statemachine,destination,transition,args)
+      if destination.is_parallel
+        transition.each do |trans,statem|
+          trans.each do |t|
+            t[0].invoke(t[1], statem, args) if t[0].is_a? Transition
           end
-        else
+        end
+      else
 
-          if transition.is_a? Array
-            transition.each do |t|
-              t[0].invoke(t[1], statemachine, args) if t[0].is_a? Transition
-            end
+        if transition.is_a? Array
+          transition.each do |t|
+            t[0].invoke(t[1], statemachine, args) if t[0].is_a? Transition
           end
         end
       end

data/lib/statemachine/version.rb

@@ -3,7 +3,7 @@ module Statemachine
     unless defined? MAJOR
       MAJOR  = 1
       MINOR  = 3
-      TINY   = 0
+      TINY   = 2
 
       STRING = [MAJOR, MINOR, TINY].join('.')
       TAG    = "REL_" + [MAJOR, MINOR, TINY].join('_')

data/spec/generate/dot_graph/dot_graph_stagemachine_spec.rb

@@ -1,4 +1,4 @@
-require "./"+File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../../spec_helper'
 require 'statemachine/generate/dot_graph/dot_graph_statemachine'
 
 describe Statemachine::Statemachine, "(Turn Stile)" do

data/spec/sm_parallel_state_spec.rb

@@ -42,17 +42,17 @@ describe "Parallel states" do
   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
+    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
-  # the other sub state machines states doe not change if already in this parallel state machine
+# to check if
+# the other sub statemachine is set to the initial state
+# the other sub state machines states doe not change if already in this parallel state machine
   it "supports entering a parallel state" do
     @sm.state.should eql :start
     @sm.go
@@ -232,11 +232,106 @@ describe "Parallel states" do
     @sm.go
     lambda {@sm.unknown}.should raise_error
   end
+
+  it "should support spontaneous initial transitions" do
+
+    @sm = Statemachine.build do
+      trans :start,:go,:p
+
+      parallel :p do
+        statemachine :s1 do
+          superstate :operative do
+            trans :locked, nil, :unlocked
+            trans :unlocked, :coin, :locked
+          end
+        end
+        statemachine :s2 do
+          superstate :onoff do
+            trans :on, nil, :off
+            trans :off, :toggle, :on
+          end
+        end
+      end
+
+    end
+
+    @sm.go
+    @sm.state.should eql :p
+    @sm.states_id.should == [:unlocked,:off]
+  end
+
+  describe "state flows" do
+    before(:each) do
+      @state_flow = []
+
+      def activate(new_states,abstract_states, atomic_states)
+        @state_flow << new_states
+      end
+
+    end
+    it "should support spontaneous initial transitions triggered by direct transition into a parallel atomic state" do
+
+      @sm = Statemachine.build do
+        trans :start,:go,:on
+
+        parallel :p do
+          statemachine :s1 do
+            superstate :operative do
+              trans :locked, nil, :unlocked
+              trans :unlocked, :coin, :locked
+            end
+          end
+          statemachine :s2 do
+            superstate :onoff do
+              trans :on, nil, :off
+              trans :off, :toggle, :on
+            end
+          end
+        end
+      end
+      @sm.activation=self.method(:activate)
+      @sm.go
+      @sm.state.should eql :p
+      @state_flow.should == [[:p, :operative, :onoff, :locked, :on],[:unlocked],[:off]]
+      @sm.states_id.should == [:unlocked,:off]
+    end
+
+    it "should support spontaneous initial transitions triggered by direct transition into a parallel atomic state" do
+      @sm = Statemachine.build do
+        trans :start,:go,:a1
+
+        superstate :s do
+          trans :a1, nil, :a2
+          trans :a2, nil, :locked
+
+          parallel :p do
+            statemachine :s1 do
+              superstate :operative do
+                trans :locked, nil, :unlocked
+                trans :unlocked, :coin, :locked
+              end
+            end
+            statemachine :s2 do
+              superstate :onoff do
+                trans :on, nil, :off
+                trans :off, :toggle, :on
+              end
+            end
+          end
+        end
+      end
+      @sm.activation=self.method(:activate)
+      @sm.go
+      @sm.state.should eql :p
+      @state_flow.should == [[:s, :a1], [:a2],[:p, :operative, :onoff, :locked, :on],[:unlocked],[:off] ]
+      @sm.states_id.should == [:unlocked,:off]
+    end
+  end
 end
 
 describe "Nested parallel states" do
   before (:each) do
-     @sm = Statemachine.build do
+    @sm = Statemachine.build do
       trans :start,:go, :unlocked
       state :maintenance
       superstate :test do
@@ -262,7 +357,7 @@ describe "Nested parallel states" do
                     superstate :onoff2 do
                       trans :on2, :toggle2, :off2
                       trans :off2, :toggle2, :on2
-                      end
+                    end
                   end
                 end
               end
@@ -292,3 +387,4 @@ describe "Nested parallel states" do
   end
 
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: MINT-statemachine
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-20 00:00:00.000000000Z
+date: 2013-02-28 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.
@@ -71,6 +71,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 744247185
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -82,7 +85,7 @@ rubyforge_project:
 rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: MINT-Statemachine-1.3.0 - Statemachine Library for Ruby based on statemachine
+summary: MINT-Statemachine-1.3.2 - 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