simplefsm 0.1.3 → 0.2.0

data/lib/simplefsm.rb

@@ -15,7 +15,7 @@
 # License::   MIT License
 
 module SimpleFSM
-  VERSION = '0.1.2'
+  VERSION = '0.2.0'
 
   def initialize
     @state ||=  {}
@@ -54,6 +54,7 @@ module SimpleFSM
             fsm_prepare_state args
 
             if args
+              # If we have args here it must be an Array
               if args.class != Array
                 return
               end
@@ -71,52 +72,67 @@ module SimpleFSM
             uniquestates = []
 
             if statetrans
+              # All transitions for this event in the current state
               trans = statetrans.select{|t| !t.select{|k, v| k==:event and v == ev}.empty?} 
 
               if trans and trans.size>0
-                newstates = trans.select do |v| 
-                    if v.has_key?(:guard)
-                      send(v[:guard], args)
-                    else
-                      true
-                    end
-                  end 
-
-                  newstates.each do |a|
-                    uniquestates << a[:new] if a.has_key?(:new)
+                # The first transition that is triggered
+                index_triggered = trans.index do |v| 
+                  # Guard specifiers:
+                  # :guard      - all must be true
+                  # :guard_not  - all must be false
+                  # :guard_or   - at least one must be true
+                  # All guard specified specifiers must evaluate to true
+                  # in order for transition to be triggered.
+                  guard_all = true
+                  guards_and = []
+                  guards_or = []
+                  guards_not = []
+                  if v.has_key?(:guard)
+                    guards_and << v[:guard]
+                    guards_and.flatten!
                   end
-                  uniquestates.uniq!
-                  numstates = uniquestates.size
-
-                  if numstates > 1
-                    raise "Error in transition (event #{ev}, state #{st}): More than 1 (#{numstates}) new state (#{uniquestates.inspect})."
-                    return
-                  elsif numstates < 1
-                    return
+                  if v.has_key?(:guard_or)
+                    guards_or << v[:guard_or]
+                    guards_or.flatten!
                   end
+                  if v.has_key?(:guard_not)
+                    guards_not << v[:guard_not]
+                    guards_not.flatten!
+                  end
+
+                  guard_all &&= guards_and.all?   {|g| send(g, args) } if guards_and.size > 0
+                  guard_all &&= guards_or.any?    {|g| send(g, args) } if guards_or.size > 0
+                  guard_all &&= !guards_not.any?  {|g| send(g, args) } if guards_not.size > 0
+                  guard_all
+                end 
+                if index_triggered
+                  trans_triggered = trans[index_triggered] 
+                  new_state = trans_triggered[:new] if trans_triggered.has_key?(:new)
+
+                  #START of :action keyword => call procs for event
+                  # :do keyword - is not prefered 
+                  # because it confuses source code editors
+                  action_keys = ['do'.to_sym, :action]
 
-                  #:do keyword => call proc for event
                   doprocs = []
-                  newstates.each do |a|
-                    doprocs << a[:do] if a.has_key?(:do)
+                  action_keys.each do |key|
+                    doprocs << trans_triggered[key] if trans_triggered.has_key?(key)
                   end
-                  doprocs.uniq!
+                  doprocs.flatten!
 
-                  if doprocs.size > 0
-                    doprocs.each do |p| 
-                      send(p, args)
-                    end
-                  end
-                  #end :do keyword
+                  doprocs.each {|p| send(p, args)} if doprocs.size > 0
+                  #END of :action keyword
 
-                  do_transform uniquestates.first, args 
+                  do_transform new_state, args 
                 end
               end
+            end
             fsm_save_state args
           end
         end
       end
-              
+
 
       ### FSM keywords: state, transitions_for ###
 
@@ -200,7 +216,7 @@ module SimpleFSM
 
       ## private class methods ######################
 
-      # add transition to state's transitions if it does not exist
+      # Add transition to state's transitions if it does not exist
       def self.add_transition st, t
           if !@@transitions[st].any? {|v| v == t}
             @@transitions[st] << t

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: simplefsm
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
+  prerelease:
 platform: ruby
 authors:
 - Edin Pjanic
@@ -9,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-02-15 00:00:00.000000000 Z
+date: 2013-03-22 00:00:00.000000000 Z
 dependencies: []
 description: A simple and lightweight domain specific language (DSL) for modeling finite state machines (FSM).
 email:
@@ -22,7 +23,6 @@ files:
 - lib/simplefsm.rb
 homepage: http://github.com/edictlab/SimpleFSM
 licenses: []
-metadata: {}
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -31,16 +31,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: !binary |-
+        MA==
+  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: !binary |-
+        MA==
+  none: false
 requirements: []
 rubyforge_project:
-rubygems_version: 2.0.3
+rubygems_version: 1.8.24
 signing_key:
-specification_version: 4
+specification_version: 3
 summary: SimpleFSM - a Ruby DSL for FSMs
 test_files: []

checksums.yaml

@@ -1,15 +0,0 @@
----
-SHA1:
-  metadata.gz: !binary |-
-    NzAxMzU4MGU4YWZjMzZjOGI5MWZkNTU2ZjI2MzFiYzgyZWRkZjkyOA==
-  data.tar.gz: !binary |-
-    YzAyODkyYjFiZWRkOWUwMWI3MGZkOTliMmI3Yzk3NmY1ZDRjNmRjZg==
-SHA512:
-  metadata.gz: !binary |-
-    OTE0MmRiNmUwZTc3NjgyZTdkYWJlZjNhOTEzZmNhZmE3ZGFhMTExMDBiNDAy
-    OTM0M2Y5Y2VkNDhlNGIyMWJmMjVjYmMxNGIwNGIxY2U1Y2ZkYjk0ZDE1N2U4
-    MmE0OTM0ZWVhZmYwZWZkNWI3YWQyMWNhY2U0MjgzNmQxOTE5ZWY=
-  data.tar.gz: !binary |-
-    N2Q4MTFiOTBmNDBkZDlmNTYwZTVkYWU2ZWI4N2VmZWE3NWU3NTdhY2MzMTJh
-    MGNmZjdlZmE0Yzc5NjkxOGQ3ZjkzNDI2MDBiODUxZjFkMjBjYTA1ZTk1OTIx
-    NjQyZDg2NWVjODlkYTZkMGQwNGI3ODZiMmQwZWY4NWY2M2Q5ZTA=