transitions 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5fdc12a9620c4afb752d88f581df0416e1bfb2c
-  data.tar.gz: 2e513473a1ab671758977874cc4670c43a38d76b
+  metadata.gz: b87d3c72b83d64e0c80f22f8b6984fc897e75725
+  data.tar.gz: c680875bb9ebd5b68fcf0b02943a04a07147121b
 SHA512:
-  metadata.gz: 8843c2845f29a81cc1a4fe170796976850515a3d5b513996e50e4904ae8a418d47fa38be5e72f1a325623e0295910df7022c4f061c395bc9aeb8120a6d84e2c8
-  data.tar.gz: a00d3f4ed41f725e47e4afc81aa030958e86d966f1192008365c988e9a167d3243dd2d79126fd7365a2965cd58071779294b59d8caaefef2849e3f41d43c56f5
+  metadata.gz: 400a2ecb0b2c08ae1a29f860607eeddb1c9d0cb4565a2530e90b9d886a88d4c292658097a604e993af2150a8fc90bfacefc030d03a2d76f9d57dede7327de239
+  data.tar.gz: 08d83f73449b3338b4b8a4cbc8ff6f031e9ab61eaa715fdc016f4a3794722e25fb0887ac9326be8195241a76e401d1ed4d93495accdcaec80f6fce3b3145ec43

data/.ruby-version

@@ -1 +1 @@
-2.0.0
+2.1.0

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.1.13
+
+* (Nathan Amick and Ryan Long) Allow passing non-Proc callables as guards
+* (troessner) Bugfixes, Refactorings and documentation improvements
+
 # 0.1.12
 
 * (troessner) Fix issue 107: timestamps are updated even if guard fails.

data/README.md

@@ -2,21 +2,30 @@
 [![Build status](https://secure.travis-ci.org/troessner/transitions.png?branch=master)](http://travis-ci.org/troessner/transitions) 
 [![Gem Version](https://badge.fury.io/rb/transitions.png)](http://badge.fury.io/rb/transitions)
 [![Code Climate](https://codeclimate.com/github/troessner/transitions.png)](https://codeclimate.com/github/troessner/transitions)
+[![Dependency Status](https://gemnasium.com/troessner/transitions.png)](https://gemnasium.com/troessner/transitions)
+[![Inline docs](http://inch-ci.org/github/troessner/transitions.png)](http://inch-ci.org/github/troessner/transitions)
+
 
 ### Synopsis
 
 `transitions` is a ruby state machine implementation.
 
-### Compatibility
+### Ruby Compatibility
 
-Supported ruby versions:
+Supported versions:
 
 *   1.9.3
 *   2.0
+*   2.1
 
 `transitions` does not work with ruby 1.8.7 (see [this
 issue](https://github.com/troessner/transitions/issues/86) for example).
 
+### Supported Rails versions:
+
+*   3
+*   4
+
 ### Installation
 
 #### Rails
@@ -119,62 +128,74 @@ If you need to get all available transitions for current state you can simply ca
 >> Product.new.available_transitions
 => [:discontinued, :out_of_stock]
 ```
-    
-#### Automatic scope generation
 
-`transitions` will automatically generate scopes for you if you are using
-ActiveRecord and tell it to do so via the `auto_scopes` option:
 
-Given a model like this:
-```ruby
-class Order < ActiveRecord::Base
-  include ActiveModel::Transitions
-  state_machine :auto_scopes => true do
-    state :pick_line_items
-    state :picking_line_items
-    event :move_cart do
-      transitions to: :pick_line_items, from: :picking_line_items
-    end
-  end
-end
-```
+#### Callback overview
 
-you can use this feature a la:
-```ruby
->> Order.pick_line_items
-=> []
->> Order.create!
-=> #<Order id: 3, state: "pick_line_items", description: nil, created_at: "2011-08-23 15:48:46", updated_at: "2011-08-23 15:48:46">
->> Order.pick_line_items
-=> [#<Order id: 3, state: "pick_line_items", description: nil, created_at: "2011-08-23 15:48:46", updated_at: "2011-08-23 15:48:46">]
-```
+`transitions` offers you the possibility to define a couple of callbacks during the different stages / places of transitioning from one state to another. So let's say you have an event `discontinue` which transitions the current state from `in_stock` to `sold_out`. The callback sequence would look like this:
 
-#### Using `guard`
 
-Each event definition takes an optional `guard` argument, which acts as a
-predicate for the transition.
+      | discontinue event |
+            |
+            |
+            |
+      | current_state `in_stock` | ----> executes `exit` callback
+            |
+            |
+            |
+      | current_state `in_stock` | ----> executes `on_transition` callback if and only the `guard` check was successfull. If not successfull, the chain aborts here and the `event_failed` callback is executed
+            |
+            |
+            |
+      | current_state `in_stock` | ----> executes `enter` callback for new state `sold_out`
+            |
+            |
+            |
+      | current_state `in_stock` | ----> executes `event_fired` callback
+            |
+            |
+            |
+      | current_state `in_stock` | ----> move state from `in_stock` to `sold_out`
+            |
+            |
+            |
+      | current_state `sold_out` | ----> executes `success` callback of the `discontinue` event
 
-You can pass in Symbols, Strings, or Procs like this:
-```ruby
-event :discontinue do
-  transitions :to => :discontinued, :from => [:available, :out_of_stock], :guard => :can_discontinue
-end
-```
 
-or
+
+This all looks very complicated (I know), but don't worry, in 99% of all cases you don't have to care about the details and the usage itself is straightforward as you can see in the examples below where each callback is explained a little more throrough.
+
+
+#### Callback # 1: State callbacks `enter` and `exit`
+
+If you want to trigger a method call when the object enters or exits a state regardless
+of the transition that made that happen, use `enter` and `exit`.
+
+`exit` will be called before the transition out of the state is executed. If you want the method
+to only be called if the transition is successful, then use another approach.
+
+`enter` will be called after the transition has been made but before the object is persisted. If you want
+the method to only be called after a successful transition to a new state including persistence,
+use the `success` argument to an event instead.
+
+An example:
+
 ```ruby
-event :discontinue do
-  transitions :to => :discontinued, :from => [:available, :out_of_stock], :guard => [:can_discontinue, :super_sure?]
+class Motor < ActiveRecord::Base
+  include ActiveModel::Transitions
+
+  state_machine do
+    state :off, enter: :turn_power_off
+    state :on,  exit: :prepare_shutdown
+  end
 end
 ```
 
-Any arguments passed to the event method will be passed on to the `guard`
-predicate.
+#### Callback # 2: Transition callback `on_transition`
 
-#### Using `on_transition`
 
 Each event definition takes an optional `on_transition` argument, which allows
-you to execute methods on transition.
+you to execute code on transition. This callback is executed after the `exit` callback of the former state (if it has been defined) but before the `enter` callback of the new state and only if the `guard` check succeeds. There is no check if the callback itself succeeds (meaning that `transitions` does not evaluate its return value somewhere). However, you can easily add some properly abstracted error handling yourself by raising an exception in this callback and then handling this exception in the (also defined by you) `event_failed` callback (see below and / or the wonderful ascii diagram above).
 
 You can pass in a Symbol, a String, a Proc or an Array containing method names
 as Symbol or String like this:
@@ -186,21 +207,8 @@ end
 
 Any arguments passed to the event method will be passed on to the `on_transition` callback.
 
-`on_transition` is called after `guard` and before `enter` on the state that it is transitioning to.
-
-#### Using `enter` and `exit`
-
-If you want to trigger a method call when the object enters or exits a state regardless
-of the transition that made that happen, use `enter` and `exit`.
 
-`exit` will be called before the transition out of the state is executed. If you want the method
-to only be called if the transition is successful, then use another approach.
-
-`enter` will be called after the transition has been made but before the object is persisted. If you want
-the method to only be called after a successful transition to a new state including persistence,
-use the `success` argument to an event instead.
-
-#### Using `success`
+#### Callback #3 : Event callback `success`
 
 In case you need to trigger a method call after a successful transition you
 can use `success`. This will be called after the `save!` is complete (if you
@@ -228,6 +236,71 @@ event :discontinue, :success => [:notify_admin, lambda { |order| AdminNotifier.n
 end
 ```
 
+#### Callback caveats
+
+Since callbacks will not be called by you but by `transitions` the scope is different when they are called and you'll run into problems if you use classes / modules in those callbacks that have the same names like `transitions` ones, e.g. "Event":
+
+```Ruby
+def event_fired(current_state, new_state, event)
+  Event.create!
+end
+```
+
+This will crash because `transitions` uses an Event class as well, and, since the scope has changed when `transitions` calls this method, `transitions` will use it's own Event class here, not yours.
+In this case you can try to prefix your models with the "::" operator and see if that solves your problems. See https://github.com/troessner/transitions/issues/123 for details.
+
+#### Automatic scope generation
+
+`transitions` will automatically generate scopes for you if you are using
+ActiveRecord and tell it to do so via the `auto_scopes` option:
+
+Given a model like this:
+```ruby
+class Order < ActiveRecord::Base
+  include ActiveModel::Transitions
+  state_machine :auto_scopes => true do
+    state :pick_line_items
+    state :picking_line_items
+    event :move_cart do
+      transitions to: :pick_line_items, from: :picking_line_items
+    end
+  end
+end
+```
+
+you can use this feature a la:
+```ruby
+>> Order.pick_line_items
+=> []
+>> Order.create!
+=> #<Order id: 3, state: "pick_line_items", description: nil, created_at: "2011-08-23 15:48:46", updated_at: "2011-08-23 15:48:46">
+>> Order.pick_line_items
+=> [#<Order id: 3, state: "pick_line_items", description: nil, created_at: "2011-08-23 15:48:46", updated_at: "2011-08-23 15:48:46">]
+```
+
+#### Using `guard`
+
+Each event definition takes an optional `guard` argument, which acts as a
+predicate for the transition.
+
+You can pass in Symbols, Strings, or Procs like this:
+```ruby
+event :discontinue do
+  transitions :to => :discontinued, :from => [:available, :out_of_stock], :guard => :can_discontinue
+end
+```
+
+or
+```ruby
+event :discontinue do
+  transitions :to => :discontinued, :from => [:available, :out_of_stock], :guard => [:can_discontinue, :super_sure?]
+end
+```
+
+Any arguments passed to the event method will be passed on to the `guard`
+predicate.
+
+
 #### Timestamps
 
 If you'd like to note the time of a state change, Transitions comes with
@@ -285,6 +358,9 @@ state_machine :initial => :closed do
 end
 ```
 
+The explicitly specified state **must** be one of the states listed in the state definition below, otherwise `transitions` will raise a rather unhelpful exception like "NoMethodError: undefined method `call_action' for nil:NilClass" (there's a ticket to fix this already: https://github.com/troessner/transitions/issues/112)
+
+
 ### Configuring a different column name with ActiveRecord
 
 To use a different column than `state` to track it's value simply do this:
@@ -306,7 +382,7 @@ end
     possible fix had to be rolled back due to other side effects:
     https://github.com/troessner/transitions/issues/76. Since I know virtually
     zero about mongoid, a pull request would be highly appreciated.
-*   Multiple state machines are and will not be supported. For the rationale
+*   Multiple state machines are not and will not be supported. For the rationale
     behind this see the Changelog.
 
 

data/lib/active_model/transitions.rb

@@ -1,25 +1,3 @@
-# Copyright (c) 2009 Rick Olson
-
-# Permission is hereby granted, free of charge, to any person
-# obtaining a copy of this software and associated documentation files
-# (the "Software"), to deal in the Software without restriction,
-# including without limitation the rights to use, copy, modify, merge,
-# publish, distribute, sublicense, and/or sell copies of the Software,
-# and to permit persons to whom the Software is furnished to do so,
-# subject to the following conditions:
-
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
 module ActiveModel
   module Transitions
     extend ActiveSupport::Concern

data/lib/transitions.rb

@@ -1,27 +1,6 @@
-# Copyright (c) 2009 Rick Olson
-
-# Permission is hereby granted, free of charge, to any person
-# obtaining a copy of this software and associated documentation files
-# (the "Software"), to deal in the Software without restriction,
-# including without limitation the rights to use, copy, modify, merge,
-# publish, distribute, sublicense, and/or sell copies of the Software,
-# and to permit persons to whom the Software is furnished to do so,
-# subject to the following conditions:
-
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
 require "transitions/event"
 require "transitions/machine"
+require "transitions/presenter"
 require "transitions/state"
 require "transitions/state_transition"
 require "transitions/version"
@@ -29,6 +8,7 @@ require "transitions/version"
 module Transitions
   class InvalidTransition     < StandardError; end
   class InvalidMethodOverride < StandardError; end
+  include Presenter
 
   module ClassMethods
     def inherited(klass)

data/lib/transitions/event.rb

@@ -1,25 +1,3 @@
-# Copyright (c) 2009 Rick Olson
-
-# Permission is hereby granted, free of charge, to any person
-# obtaining a copy of this software and associated documentation files
-# (the "Software"), to deal in the Software without restriction,
-# including without limitation the rights to use, copy, modify, merge,
-# publish, distribute, sublicense, and/or sell copies of the Software,
-# and to permit persons to whom the Software is furnished to do so,
-# subject to the following conditions:
-
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
 module Transitions
   class Event
     attr_reader :name, :success, :timestamp

data/lib/transitions/machine.rb

@@ -1,25 +1,3 @@
-# Copyright (c) 2009 Rick Olson
-
-# Permission is hereby granted, free of charge, to any person
-# obtaining a copy of this software and associated documentation files
-# (the "Software"), to deal in the Software without restriction,
-# including without limitation the rights to use, copy, modify, merge,
-# publish, distribute, sublicense, and/or sell copies of the Software,
-# and to permit persons to whom the Software is furnished to do so,
-# subject to the following conditions:
-
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
 module Transitions
   class Machine
     attr_writer :initial_state
@@ -43,31 +21,22 @@ module Transitions
       self
     end
 
-    # TODO Refactor me please?
+    # TODO There is still way to much parameter passing around going on down below.
     def fire_event(event, record, persist, *args)
-      state_index[record.current_state].call_action(:exit, record)
-      begin
-        if new_state = @events[event].fire(record, nil, *args)
-          state_index[new_state].call_action(:enter, record)
-
-          if record.respond_to?(:event_fired)
-            record.send(:event_fired, record.current_state, new_state, event)
-          end
-
-          record.update_current_state(new_state, persist)
-          @events[event].success.call(record) if @events[event].success
-          return true
-        else
-          record.send(:event_failed, event) if record.respond_to?(:event_failed)
-          return false
-        end
-      rescue => e
-        if record.respond_to?(:event_failed)
-          record.send(:event_failed, event)
-          return false
-        else
-          raise e
-        end
+      handle_state_exit_callback record
+      if new_state = transition_to_new_state(record, event, *args)
+        handle_state_enter_callback record, new_state
+        handle_event_fired_calllback record, new_state, event
+        record.update_current_state(new_state, persist)
+        handle_event_success_callback record, event
+      else
+        handle_event_failed_callback record, event
+      end
+    rescue => e
+      if record.respond_to?(:event_failed)
+        record.send(:event_failed, event)
+      else
+        raise e
       end
     end
 
@@ -81,7 +50,35 @@ module Transitions
       :@current_state
     end
 
-    private
+  private
+
+    def handle_state_exit_callback(record)
+      state_index[record.current_state].call_action(:exit, record)
+    end
+
+    def transition_to_new_state(record, event, *args)
+      @events[event].fire(record, nil, *args)
+    end
+
+    def handle_state_enter_callback(record, new_state)
+      state_index[new_state].call_action(:enter, record)
+    end
+
+    def handle_event_fired_calllback(record, new_state, event)
+      if record.respond_to?(:event_fired, true)
+        record.send(:event_fired, record.current_state, new_state, event)
+      end
+    end
+
+    def handle_event_success_callback(record, event)
+      @events[event].success.call(record) if @events[event].success
+    end
+
+    def handle_event_failed_callback(record, event)
+      if record.respond_to?(:event_failed, true)
+        record.send(:event_failed, event)
+      end
+    end
 
     def state(name, options = {})
       unless @state_index.key? name # Just ignore duplicates

data/lib/transitions/presenter.rb

@@ -0,0 +1,15 @@
+module Transitions
+  module Presenter
+    def available_states
+      @state_machine.states.map(&:name).sort_by {|x| x.to_s}
+    end
+
+    def available_events
+      @state_machine.events.keys.sort
+    end
+
+    def available_transitions
+      @state_machine.events_for(current_state)
+    end
+  end
+end

data/lib/transitions/state.rb

@@ -1,25 +1,3 @@
-# Copyright (c) 2009 Rick Olson
-
-# Permission is hereby granted, free of charge, to any person
-# obtaining a copy of this software and associated documentation files
-# (the "Software"), to deal in the Software without restriction,
-# including without limitation the rights to use, copy, modify, merge,
-# publish, distribute, sublicense, and/or sell copies of the Software,
-# and to permit persons to whom the Software is furnished to do so,
-# subject to the following conditions:
-
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
 module Transitions
   class State
     attr_reader :name, :options

data/lib/transitions/state_transition.rb

@@ -1,25 +1,3 @@
-# Copyright (c) 2009 Rick Olson
-
-# Permission is hereby granted, free of charge, to any person
-# obtaining a copy of this software and associated documentation files
-# (the "Software"), to deal in the Software without restriction,
-# including without limitation the rights to use, copy, modify, merge,
-# publish, distribute, sublicense, and/or sell copies of the Software,
-# and to permit persons to whom the Software is furnished to do so,
-# subject to the following conditions:
-
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
 module Transitions
   class StateTransition
     attr_reader :from, :to, :options
@@ -33,17 +11,6 @@ module Transitions
       [@guard].flatten.all? { |g| perform_guard(obj, g, *args) }
     end
 
-    def perform_guard(obj, guard, *args)
-      case guard
-      when Symbol, String
-        obj.send(guard, *args)
-      when Proc
-        guard.call(obj, *args)
-      else
-        true
-      end
-    end
-
     def execute(obj, *args)
       case @on_transition
       when Symbol, String
@@ -69,5 +36,17 @@ module Transitions
     def from?(value)
       @from == value
     end
+
+  private
+
+    def perform_guard(obj, guard, *args)
+      if guard.respond_to?(:call)
+        guard.call(obj, *args)
+      elsif guard.is_a?(Symbol) || guard.is_a?(String)
+        obj.send(guard, *args)
+      else
+        true
+      end
+    end
   end
 end

data/lib/transitions/version.rb

@@ -1,3 +1,3 @@
 module Transitions
-  VERSION = '0.1.12'
+  VERSION = '0.1.13'
 end

data/test/state_transition/test_state_transition_guard_check.rb

@@ -5,7 +5,7 @@ class TestStateTransitionGuardCheck < Test::Unit::TestCase
 
   test "should return true of there is no guard" do
     opts = {:from => "foo", :to => "bar"}
-      st = Transitions::StateTransition.new(opts)
+    st = Transitions::StateTransition.new(opts)
 
     assert st.executable?(nil, *args)
   end
@@ -40,6 +40,19 @@ class TestStateTransitionGuardCheck < Test::Unit::TestCase
     st.executable?(obj, *args)
   end
 
+  test "should call the callable passing the object if the guard responds to #call" do
+    callable = Object.new
+    callable.define_singleton_method(:call) { |obj, *args| obj.test_guard(*args) }
+
+    opts = {:from => "foo", :to => "bar", :guard => callable }
+    st = Transitions::StateTransition.new(opts)
+
+    obj = stub
+    obj.expects(:test_guard).with(*args)
+
+    st.executable?(obj, *args)
+  end
+
   test "should call the method on the object if guard is a symbol" do
     opts = {:from => "foo", :to => "bar", :guard => [:test_guard, :test_another_guard] }
     st = Transitions::StateTransition.new(opts)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: transitions
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - Jakub Kuzma
@@ -9,110 +9,110 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-30 00:00:00.000000000 Z
+date: 2014-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: random_data
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - <=
+    - - "<="
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - <=
+    - - "<="
       - !ruby/object:Gem::Version
         version: '4.0'
 description: Lightweight state machine extracted from ActiveModel
@@ -121,10 +121,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-gemset
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
@@ -140,6 +140,7 @@ files:
 - lib/transitions.rb
 - lib/transitions/event.rb
 - lib/transitions/machine.rb
+- lib/transitions/presenter.rb
 - lib/transitions/state.rb
 - lib/transitions/state_transition.rb
 - lib/transitions/version.rb
@@ -173,17 +174,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: transitions
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: State machine extracted from ActiveModel