finity 0.0.2 → 0.0.3

data/README.md

@@ -48,7 +48,7 @@ class Readfile
 
     event :read do
       transitions :from => [:opened, :reading], :to => :reading,
-        :if => proc { not @file.eof? }
+        :if => proc { not @file.eof? },
         :do => proc { log 'Reading next line of file' }
 
       transitions :from => [:opened, :reading], :to => :reading,
@@ -97,10 +97,10 @@ object. Many other state machine implementations define one method for each even
 however, **Finity** tries to be as minimally invasive as possible:
 
 ```
-  object = SomeClassIncludingFinity.new
-  if object.state? :some_state
-    object.event! :some_event
-  end
+object = SomeClassIncludingFinity.new
+if object.state? :some_state
+  object.event! :some_event
+end
 ```
 
 [transitions]: https://github.com/troessner/transitions

data/lib/finity.rb

@@ -35,12 +35,6 @@ module Finity
   module ClassMethods
     attr_accessor :machine
 
-    # When inheriting this module, pass the registered machines to the
-    # inheriting class after executing potential parent inheritance logic.
-    def inherited klass
-      super and klass.machine = machine
-    end
-
     # Instantiate a new state machine for the including class by accepting a
     # block with state and event (and subsequent transition) definitions.
     def finity options = {}, &block

data/lib/finity/machine.rb

@@ -27,7 +27,7 @@ module Finity
     # Initialize a new state machine within the provided class and define
     # methods for querying the current state and initiating transitions.
     def initialize klass, options = {}, &block
-      @klass, @states, @events, @init = klass, {}, {}, options.delete(:init)
+      @klass, @states, @events, @inital = klass, {}, {}, options.delete(:inital)
       @klass.send :define_method, :event! do |*args|
         klass.machine.update self, *args
       end
@@ -35,11 +35,12 @@ module Finity
         klass.machine.current.name.eql? *args
       end
       instance_eval &block if block_given?
+      @current = inital
     end
 
     # Return the name of the initial state.
-    def init
-      @init ||= @states.keys.first unless @states.first.nil?
+    def inital
+      @inital ||= @states.keys.first unless @states.first.nil?
     end
 
     # Register a state.
@@ -55,14 +56,14 @@ module Finity
     # An event occured, so update the state machine by evaluating the
     # transition functions and notify the left and entered state.
     def update object, event
-      @current ||= @states[init]
-      if (state = @events[event].handle object, @current)
+      current ||= @states[@current || inital]
+      if state = @events[event].handle(object, current)
         if @states[state].nil?
           raise InvalidState, "Invalid state '#{state}'"
         end
-        @current.leave object
-        @current = @states[state]
-        @current.enter object
+        current.leave object
+        current = @states[@current = state]
+        current.enter object
       end
     end
   end

data/lib/finity/version.rb

@@ -1,3 +1,3 @@
 module Finity
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: finity
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-22 00:00:00.000000000 Z
+date: 2012-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler