finity 0.0.4 → 0.1.0

data/finity.gemspec

@@ -8,9 +8,8 @@ Gem::Specification.new do |s|
   s.authors     = ['Martin Donath']
   s.email       = 'md@struct.cc'
   s.homepage    = 'http://github.com/squidfunk/finity'
-  s.summary     = 'Slim and more readable state machine for Ruby'
-  s.description = 'Extremly lightweight state machine implementation with an easily readable syntax, ' +
-                  'which is essential if you have tens or hundreds of transitions.'
+  s.summary     = 'Slim and readable state machine for Ruby'
+  s.description = 'Extremly lightweight state machine implementation with an easily readable syntax'
 
   s.required_rubygems_version = '>= 1.3.6'
   s.add_development_dependency 'bundler', '~> 1'

data/lib/finity/event.rb

@@ -45,7 +45,8 @@ module Finity
       @transitions[state.name].find do |transition|
         name = transition.handle object
         return name unless name.nil?
-      end
+      end rescue
+        raise InvalidState, "No handler for :#{name} from :#{state.name}"
     end
   end
 end

data/lib/finity/machine.rb

@@ -44,7 +44,7 @@ module Finity
         )
       end
       @klass.send :define_method, :state? do |*args|
-        klass.finity.current.name.eql? *args
+        self.current.eql? *args
       end
     end
 
@@ -53,27 +53,34 @@ module Finity
       @initial ||= @states.keys.first unless @states.first.nil?
     end
 
-    # Register a state.
+    # Register a state, or a set of states.
     def state name, options = {}
-      @states[name] = State.new name, options
+      name.is_a?(Array) ? name.each { |value| state value, options } :
+        @states[name] = State.new(name, options)
     end
 
     # Register an event and evaluate the block for transitions.
     def event name, options = {}, &block
-      @events[name] = Event.new name, options, &block
+      name.is_a?(Array) ? name.each { |value| event value, options, &block } :
+        @events[name] = Event.new(name, options, &block)
     end
 
     # An event occured, so update the state machine by evaluating the
-    # transition functions and notify the left and entered state.
+    # transition functions and notify the left and entered state, but only if
+    # the event leads to a transition that triggers a state change.
     def update object, current, event
       now ||= @states[current]
       if state = @events[event].handle(object, now)
         if @states[state].nil?
           raise InvalidState, "Invalid state #{state}"
         end
-        now.leave object
-        now = @states[current = state]
-        now.enter object
+        if state.eql? current
+          now.cycle object
+        else
+          now.leave object
+          now = @states[current = state]
+          now.enter object
+        end
       end
       current
     end

data/lib/finity/state.rb

@@ -26,7 +26,7 @@ module Finity
 
     # Initialize a new state for the state machine with callbacks.
     def initialize name, options = {}
-      @name, @enter, @leave = name, *options.values_at(:enter, :leave)
+      @name, @enter, @cycle, @leave = name, *options.values_at(:enter, :cycle, :leave)
       instance_eval &block if block_given?
     end
 
@@ -35,6 +35,11 @@ module Finity
       execute object, @enter unless @enter.nil?
     end
 
+    # Executed if a state is kept during a cycle.
+    def cycle object
+      execute object, @cycle unless @cycle.nil?
+    end
+
     # Executed when the current state is left.
     def leave object
       execute object, @leave unless @leave.nil?

data/lib/finity/version.rb

@@ -1,3 +1,3 @@
 module Finity
-  VERSION = '0.0.4'
+  VERSION = '0.1.0'
 end

metadata

@@ -1,36 +1,39 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: finity
-version: !ruby/object:Gem::Version 
-  version: 0.0.4
+version: !ruby/object:Gem::Version
+  version: 0.1.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Martin Donath
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-07-17 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-08-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1'
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1"
-    version: 
-description: Extremly lightweight state machine implementation with an easily readable syntax, which is essential if you have tens or hundreds of transitions.
+      - !ruby/object:Gem::Version
+        version: '1'
+description: Extremly lightweight state machine implementation with an easily readable
+  syntax
 email: md@struct.cc
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - Gemfile
 - LICENSE
 - README.md
@@ -41,33 +44,28 @@ files:
 - lib/finity/state.rb
 - lib/finity/transition.rb
 - lib/finity/version.rb
-has_rdoc: true
 homepage: http://github.com/squidfunk/finity
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
-  version: 
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Slim and more readable state machine for Ruby
+summary: Slim and readable state machine for Ruby
 test_files: []
-