MINT-statemachine 1.4.0 → 1.4.1

data/CHANGES

@@ -1,5 +1,10 @@
 = Statemachine Changelog
 
+== Version 1.4.1 (2013/07/02)
+
+* bug fixed: direct entry into a parallel state child state that has been already entered has not reseted parallel state
+  contents to initial.
+
 == Version 1.4.0 (2013/07/02)
 
 * Changed behavior: Entry into a parallel state that has been already entered before resets parallel state

data/MINT-statemachine.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "MINT-statemachine"
-  s.version = "1.4.0"
+  s.version = "1.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sebastian Feuerstack"]
@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://www.multi-access.de"
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.15"
-  s.summary = "MINT-Statemachine-1.4.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.4.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/lib/statemachine/parallelstate.rb

@@ -216,7 +216,7 @@ module Statemachine
           as.exit(args)
           as = as.superstate
         end
-
+        s.reset
       end
     end
 

data/lib/statemachine/transition.rb

@@ -43,10 +43,7 @@ module Statemachine
 #entries.each { |entered_state| entered_state.activate(terminal_state.id)  if entered_state.is_parallel }
       statemachine.state = terminal_state if statemachine.has_state(terminal_state.id) and statemachine.is_parallel
 
-      # on transition to parallel state, all  nested parallel runnign states are reseted -> no histoy TODO implement history
-      if terminal_state.is_parallel
-        terminal_state.reset
-      end
+
 
       if is_self_transition? # handle special case of self transition
         new_states = [@destination_id]

data/lib/statemachine/version.rb

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

data/spec/sm_parallel_state_spec.rb

@@ -11,6 +11,7 @@ describe "Parallel states" do
       trans :start,:go,:p
      # state :maintenance
       trans :maintenance,:go,:p
+      trans :maintenance,:go2,:locked
 
       parallel :p do
         event :activate_exit, :maintain
@@ -124,7 +125,7 @@ describe "Parallel states" do
     @noodle2.cooked.should equal(true)
   end
 
-  it "should support state recovery to initial state if without history state" do
+  it "should support state recovery to initial states  upon entering the parallel super state  if without history state" do
     @sm.states=[:locked,:on]
     @sm.toggle
     @sm.states_id.should == [:locked,:off]
@@ -134,6 +135,17 @@ describe "Parallel states" do
     @sm.states_id.should == [:locked,:on]
   end
 
+
+  it "should support state recovery to initial states upon direct entering a child of the parallel super state  if without history state" do
+    @sm.states=[:locked,:on]
+    @sm.toggle
+    @sm.states_id.should == [:locked,:off]
+    @sm.maintain
+    @sm.states_id.should == [:maintenance]
+    @sm.go2
+    @sm.states_id.should == [:locked,:on]
+  end
+
   it "should support parallel states inside superstates" do
     @sm = Statemachine.build do
       trans :start,:go,:s

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: MINT-statemachine
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -73,7 +73,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 725809469
+      hash: 115116705
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -85,7 +85,7 @@ rubyforge_project:
 rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: MINT-Statemachine-1.4.0 - Statemachine Library for Ruby based on statemachine
+summary: MINT-Statemachine-1.4.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/
 test_files:
 - spec/default_transition_spec.rb