MINT-statemachine 1.3.2 → 1.4.0

data/CHANGES

@@ -1,5 +1,11 @@
 = Statemachine Changelog
 
+== Version 1.4.0 (2013/07/02)
+
+* Changed behavior: Entry into a parallel state that has been already entered before resets parallel state
+  contents to initial (no longer history by default for parallel states!).
+* fixed requires and class names since new rake version has marked rdoc and package task class as depreciated.
+
 == Version 1.3.2 (2013/02/28)
 
 * Fixed bug with spontaneous transitions within parallel states.

data/Gemfile

@@ -1,4 +1,5 @@
 source :rubygems
 
 gem "rspec", "1.3.1"
-gem "rake","0.9.2"
+gem "rake","0.9.2"
+gem 'rdoc'

data/Gemfile.lock

@@ -1,7 +1,10 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    json (1.7.7)
     rake (0.9.2)
+    rdoc (3.12.1)
+      json (~> 1.4)
     rspec (1.3.1)
 
 PLATFORMS
@@ -9,4 +12,5 @@ PLATFORMS
 
 DEPENDENCIES
   rake (= 0.9.2)
+  rdoc
   rspec (= 1.3.1)

data/LICENSE

@@ -1,3 +1,4 @@
+Copyright (C) 2013 Sebastian Feuerstack
 Copyright (C) 2010-2012 Sebastian Feuerstack, Jessica Colnago
 Copyright (C) 2006-2010 Micah Martin
 

data/MINT-statemachine.gemspec

@@ -2,18 +2,18 @@
 
 Gem::Specification.new do |s|
   s.name = "MINT-statemachine"
-  s.version = "1.3.1"
+  s.version = "1.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sebastian Feuerstack"]
-  s.date = "2013-02-26"
+  s.date = "2013-07-02"
   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.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.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.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/Rakefile

@@ -1,8 +1,8 @@
 $:.unshift('lib')
 require 'rubygems'
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 require 'rake/clean'
-require 'rake/rdoctask'
+require 'rdoc/task'
 require 'spec/rake/spectask'
 require 'statemachine'
 
@@ -24,7 +24,7 @@ Spec::Rake::SpecTask.new do |t|
 end
 
 desc 'Generate RDoc'
-rd = Rake::RDocTask.new do |rdoc|
+rd = RDoc::Task.new do |rdoc|
   rdoc.options << '--title' << 'Statemachine' << '--line-numbers' << '--inline-source' << '--main' << 'README.rdoc'
   rdoc.rdoc_files.include('README.rdoc', 'CHANGES', 'lib/**/*.rb')
 end
@@ -43,8 +43,7 @@ spec = Gem::Specification.new do |s|
   s.email = "Sebastian@Feuerstack.org"
   s.homepage = "http://www.multi-access.de"
   end
-
-Rake::GemPackageTask.new(spec) do |pkg|
+Gem::PackageTask.new(spec) do |pkg|
   pkg.need_zip = true
   pkg.need_tar = true
 end

data/lib/statemachine/parallelstate.rb

@@ -196,8 +196,8 @@ module Statemachine
     end
 
     def spontaneous_transition
- 		nil
- 	end
+      nil
+    end
 
 
     def exit(args)
@@ -213,10 +213,17 @@ module Statemachine
       @parallel_statemachines.each_with_index do |s,i|
         as = s.get_state(s.state)
         while as and as != self do
-         as.exit(args)
-         as = as.superstate
-         end
+          as.exit(args)
+          as = as.superstate
+        end
+
+      end
+    end
 
+    # explicit reset on parallel state entry
+    def reset
+      @parallel_statemachines.each_with_index do |s,i|
+        s.reset(@startstate_ids[i])
       end
     end
 

data/lib/statemachine/transition.rb

@@ -43,6 +43,11 @@ 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]
       else

data/lib/statemachine/version.rb

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

data/spec/sm_parallel_state_spec.rb

@@ -9,7 +9,8 @@ describe "Parallel states" do
 
     @sm = Statemachine.build do
       trans :start,:go,:p
-      state :maintenance
+     # state :maintenance
+      trans :maintenance,:go,:p
 
       parallel :p do
         event :activate_exit, :maintain
@@ -123,10 +124,14 @@ describe "Parallel states" do
     @noodle2.cooked.should equal(true)
   end
 
-  it "should support state recovery" do
-    @sm.states=[:locked,:off]
+  it "should support state recovery to initial state if without history state" do
+    @sm.states=[:locked,:on]
     @sm.toggle
-    puts @sm.abstract_states
+    @sm.states_id.should == [:locked,:off]
+    @sm.maintain
+    @sm.states_id.should == [:maintenance]
+    @sm.go
+    @sm.states_id.should == [:locked,:on]
   end
 
   it "should support parallel states inside superstates" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: MINT-statemachine
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-28 00:00:00.000000000Z
+date: 2013-07-02 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.
@@ -73,7 +73,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 744247185
+      hash: 725809469
 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.3.2 - Statemachine Library for Ruby based on statemachine
+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/
 test_files:
 - spec/default_transition_spec.rb