pretty-fsm 0.1 → 0.2

data/Rakefile

@@ -8,7 +8,7 @@ Echoe.new('pretty-fsm') do |p|
   p.author = 'v01d'
   p.summary = "Finite State Machine class with intuitive integration"
   p.url = "http://github.com/v01d/pretty-fsm"
-  p.version = "0.1"
+  p.version = "0.2"
 #  p.dependencies = ['yard']
 #  p.eval = proc { s.has_rdoc = 'yard' }
 end

data/lib/pretty-fsm/fsm.rb

@@ -11,7 +11,8 @@ module PrettyFSM
       @while_prefix,@start_prefix,@end_prefix = while_prefix,start_prefix,end_prefix
       @initial_state = initial_state
       @state = nil
-      @transitions = Hash.new {|k,v| []}
+      @transitions = Hash.new {|h,k| h[k] = []}
+      @observers = []
       if (block_given?) then self.instance_eval(&Proc.new) end
     end
     
@@ -21,7 +22,7 @@ module PrettyFSM
       if (@state.nil?) then start(@initial_state) end
       call_fsm_method(@while_prefix)
 
-      possible_next_state, = @transitions[@state].find {|state,condition| puts state,condition; @object.send(condition)}
+      possible_next_state, = @transitions[@state].find {|state,condition| @object.send(condition)}
       start(possible_next_state) unless possible_next_state.nil?
     end
 
@@ -29,6 +30,11 @@ module PrettyFSM
     def transition(options)
       @transitions[options[:from]].push([ options[:to], options[:if] ])
     end
+
+    # All "from" states defined so far with #transition
+    def defined_states
+      @transitions.keys
+    end
     
     # Transitions the FSM into the specified state, calling the 'end' and 'start' method, of the old and new states, respectively.
     # Any additional parameter passed to this method will be received by the corresponding 'start' method.
@@ -37,11 +43,24 @@ module PrettyFSM
       @state = new_state
       call_fsm_method(@start_prefix, args)
     end
+
+    # Adds +obj+ to the observer list. An observer receives all +while+, +start+ and +end+ (if defined) methods right after #object
+    def add_observer(obj)
+      @observers << obj
+    end
+
+    def remove_observer(obj)
+      @observers.delete(obj)
+    end
     
   private
     def call_fsm_method(prefix, args = [])
       method_name = (prefix + @state.to_s).to_sym
       if (@object.respond_to?(method_name)) then @object.send(method_name, *args) end
+      
+      @observers.each do |observer|
+        if (observer.respond_to?(method_name)) then observer.send(method_name, *args) end
+      end
     end
   end
   

data/nbproject/project.properties

@@ -1,5 +1,5 @@
-file.reference.fsm-examples=examples
-file.reference.fsm-lib=lib
+file.reference.pretty-fsm-examples=examples
+file.reference.pretty-fsm-lib=lib
 javac.classpath=
 main.file=door.rb
 source.encoding=ISO-8859-1

data/nbproject/project.xml

@@ -3,7 +3,7 @@
     <type>org.netbeans.modules.ruby.rubyproject</type>
     <configuration>
         <data xmlns="http://www.netbeans.org/ns/ruby-project/1">
-            <name>fsm</name>
+            <name>pretty-fsm</name>
             <source-roots>
                 <root id="src.lib.dir"/>
                 <root id="src.examples.dir"/>

data/pretty-fsm.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pretty-fsm}
-  s.version = "0.1"
+  s.version = "0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["v01d"]
-  s.date = %q{2010-03-26}
+  s.date = %q{2010-07-02}
   s.description = %q{Finite State Machine class with intuitive integration}
   s.email = %q{}
   s.extra_rdoc_files = ["README", "lib/pretty-fsm.rb", "lib/pretty-fsm/fsm.rb", "lib/pretty-fsm/timed_event.rb"]

metadata

@@ -4,8 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  version: "0.1"
+  - 2
+  version: "0.2"
 platform: ruby
 authors: 
 - v01d
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-26 00:00:00 -03:00
+date: 2010-07-02 00:00:00 -03:00
 default_executable: 
 dependencies: []