finite_machine 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3f7827c0cdd099708b2dd384b7d7acfe82449d8
-  data.tar.gz: 1aa5b2f9964b04c5ff1c7d642acd6eb67b985411
+  metadata.gz: ec0da72426b4f28c1b3e06cb7bce0de974ac4445
+  data.tar.gz: 36d0560b1fc8148cf9c3d194aff3843148e56854
 SHA512:
-  metadata.gz: 2146d17c6edc868af3e1dc7e0a772893e2b7c4b1954a2a259dd3a9bca6a750083ac06a78ce1bc10fbc3c04902a98ce7ae659a42948d558a3a3fd25ccc942ae4b
-  data.tar.gz: 4ac655d7e523e6c2d872844b65de8fa0b29449b7d33b4c6cf8834e8586b5b68503cda2653f266e4a4f9cf07291d47031513caf97d04fe2e33f88e6e154f917ad
+  metadata.gz: 57dbe7dada41dcfe1fafda95f2a5e7664cdaa62c506e9afdf5f943aa561bae2ea2d9a9a399bc910a08c82e3c76e5350345f89471c90e4deb9e8133a4a37c3a73
+  data.tar.gz: a14127d9c43b5bcb68b0223c4b5dc3f807c48513ba6fe89fda7e0f4e191e849ac013d2144bf489c54fbe71b9b7c61d0999bef986e436159a3de287acdae807e8

data/.travis.yml

@@ -5,6 +5,7 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
+  - 2.2.0
   - ruby-head
 matrix:
   include:
@@ -16,8 +17,6 @@ matrix:
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
-    - rvm: jruby-20mode
-    - rvm: jruby-21mode
     - rvm: rbx-2
   fast_finish: true
 branches:

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+0.10.1 (May 24, 2015)
+
+* Add ability to inherit state machine definitions
+* Add Env class for holiding machine envionment references
+* Change DSL to delegate calls to machine instance
+* Change ChoiceMerger to use machine directly
+
 0.10.0 (November 16, 2014)
 
 * Add #alias_target to allow renaming of target object by @reggieb

data/Gemfile

@@ -3,13 +3,14 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  gem 'rake',  '~> 10.3.2'
-  gem 'rspec', '~> 3.1.0'
+  gem 'pry',   '~> 0.10.1'
+  gem 'rake',  '~> 10.4.2'
+  gem 'rspec', '~> 3.2.0'
   gem 'yard',  '~> 0.8.7'
 end
 
 group :metrics do
-  gem 'coveralls', '~> 0.7.0'
-  gem 'simplecov', '~> 0.8.2'
+  gem 'coveralls', '~> 0.8.1'
+  gem 'simplecov', '~> 0.10.0'
   gem 'yardstick', '~> 0.9.9'
 end

data/README.md

@@ -1,9 +1,9 @@
 # FiniteMachine
-[![Gem Version](https://badge.fury.io/rb/finite_machine.png)][gem]
-[![Build Status](https://secure.travis-ci.org/peter-murach/finite_machine.png?branch=master)][travis]
-[![Code Climate](https://codeclimate.com/github/peter-murach/finite_machine.png)][codeclimate]
-[![Coverage Status](https://coveralls.io/repos/peter-murach/finite_machine/badge.png)][coverage]
-[![Inline docs](http://inch-ci.org/github/peter-murach/finite_machine.png)][inchpages]
+[![Gem Version](https://badge.fury.io/rb/finite_machine.svg)][gem]
+[![Build Status](https://secure.travis-ci.org/peter-murach/finite_machine.svg?branch=master)][travis]
+[![Code Climate](https://codeclimate.com/github/peter-murach/finite_machine/badges/gpa.svg)][codeclimate]
+[![Coverage Status](https://coveralls.io/repos/peter-murach/finite_machine/badge.svg)][coverage]
+[![Inline docs](http://inch-ci.org/github/peter-murach/finite_machine.svg)][inchpages]
 [![Gitter](https://badges.gitter.im/Join Chat.svg)][gitter]
 
 [gem]: http://badge.fury.io/rb/finite_machine
@@ -13,7 +13,7 @@
 [inchpages]: http://inch-ci.org/github/peter-murach/finite_machine
 [gitter]: https://gitter.im/peter-murach/finite_machine?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
 
-A minimal finite state machine with a straightforward and intuitive syntax. You can quickly model states and add callbacks that can be triggered synchronously or asynchronously. The machine is event driven with a focus on passing synchronous and asynchronous messages to trigger state transitions.
+> A minimal finite state machine with a straightforward and intuitive syntax. You can quickly model states and add callbacks that can be triggered synchronously or asynchronously. The machine is event driven with a focus on passing synchronous and asynchronous messages to trigger state transitions.
 
 ## Features
 
@@ -91,6 +91,7 @@ Or install it yourself as:
 * [7. Stand-Alone FiniteMachine](#7-stand-alone-finitemachine)
     * [7.1 Creating a Definition](#71-creating-a-definition)
     * [7.2 Targeting definition](#72-targeting-definition)
+    * [7.3 Definition inheritance](#73-definition-inheritance)
 * [8. Integration](#8-integration)
     * [8.1 Plain Ruby Objects](#81-plain-ruby-objects)
     * [8.2 ActiveRecord](#82-activerecord)
@@ -232,7 +233,7 @@ end
 
 ### 1.3 terminal
 
-To specify a final state **FiniteMachine** uses the `terminal` method. The `terminal` can accpet more than one state.
+To specify a final state **FiniteMachine** uses the `terminal` method. The `terminal` can accept more than one state.
 
 ```ruby
 fm = FiniteMachine.define do
@@ -1213,6 +1214,45 @@ class Car
 end
 ```
 
+### 7.3 Definition inheritance
+
+You can create more specialised versions of a generic definition by using inheritance. Assuming a generic state machine definition:
+
+```ruby
+class GenericStateMachine < FiniteMachine::Definition
+  initial :red
+
+  events {
+    event :start, :red => :green
+  }
+
+  callbacks {
+    on_enter { |event| ... }
+  }
+end
+```
+
+we can easily create a more specifc definition that adds new event and more specifc callback to the mix.
+
+```ruby
+class SpecificStateMachine < GenericStateMachine
+  events {
+    event :stop, :green => :yellow
+  }
+
+  callbacks {
+    on_enter(:yellow) { |event| ... }
+  }
+end
+```
+
+Finally to use the specific state machine definition do:
+
+```ruby
+specific_fsm = SpecificStateMachine.new
+specific_fsm.target ... # Target specific object
+```
+
 ## 8 Integration
 
 Since **FiniteMachine** is an object in its own right, it leaves integration with other systems up to you. In contrast to other Ruby libraries, it does not extend from models (i.e. ActiveRecord) to transform them into a state machine or require mixing into exisiting classes.
@@ -1318,7 +1358,7 @@ class Account < ActiveRecord::Base
 
       callbacks {
         on_enter do |event|
-          target.state = event.to
+          target.state = state
         end
       }
     end
@@ -1363,4 +1403,4 @@ Creating a standalone **FiniteMachine** brings a number of benefits, one of them
 
 ## Copyright
 
-Copyright (c) 2014 Piotr Murach. See LICENSE for further details.
+Copyright (c) 2014-2015 Piotr Murach. See LICENSE for further details.

data/lib/finite_machine.rb

@@ -15,6 +15,7 @@ require "finite_machine/choice_merger"
 require "finite_machine/async_proxy"
 require "finite_machine/async_call"
 require "finite_machine/hook_event"
+require "finite_machine/env"
 require "finite_machine/event"
 require "finite_machine/event_builder"
 require "finite_machine/event_queue"
@@ -78,8 +79,6 @@ module FiniteMachine
   # Raised when argument is already defined
   AlreadyDefinedError = Class.new(::ArgumentError)
 
-  Environment = Struct.new(:target, :aliases)
-
   class << self
     attr_accessor :logger
 

data/lib/finite_machine/choice_merger.rb

@@ -6,16 +6,16 @@ module FiniteMachine
     include Threadable
 
     # The context where choice is executed
-    attr_threadsafe :context
+    attr_threadsafe :machine
 
-    # The options passed in to the context
+    # The options passed in to the machine
     attr_threadsafe :options
 
     # Initialize a ChoiceMerger
     #
     # @api private
-    def initialize(context, options)
-      self.context = context
+    def initialize(machine, options)
+      self.machine = machine
       self.options = options
     end
 
@@ -36,7 +36,7 @@ module FiniteMachine
     def choice(to, attrs = {})
       opts = options.dup
       opts.merge!(attrs)
-      transition_builder = TransitionBuilder.new(context.machine, opts)
+      transition_builder = TransitionBuilder.new(machine, opts)
       transition_builder.call(options[:from] => to)
     end
     alias_method :default, :choice

data/lib/finite_machine/definition.rb

@@ -43,6 +43,15 @@ module FiniteMachine
       end
     end
 
+    # Set deferrerd methods on the subclass
+    #
+    # @api private
+    def self.inherited(subclass)
+      super
+
+      self.deferreds.each { |d| subclass.add_deferred(d) }
+    end
+
     # Delay lookup of DSL method
     #
     # @param [Symbol] method_name

data/lib/finite_machine/dsl.rb

@@ -22,9 +22,12 @@ module FiniteMachine
       self.machine = machine
     end
 
+    # Delegate attributes to machine instance
+    #
+    # @api private
     def method_missing(method_name, *args, &block)
-      if @machine.respond_to?(method_name)
-        @machine.send(method_name, *args, &block)
+      if machine.respond_to?(method_name)
+        machine.send(method_name, *args, &block)
       else
         super
       end
@@ -88,7 +91,7 @@ module FiniteMachine
       state = (value && !value.is_a?(Hash)) ? value : raise_missing_state
       name, self.defer, silent = parse(options)
       self.initial_event = name
-      machine.event(name, FiniteMachine::DEFAULT_STATE => state, silent: silent)
+      event(name, FiniteMachine::DEFAULT_STATE => state, silent: silent)
     end
 
     # Trigger initial event
@@ -97,7 +100,7 @@ module FiniteMachine
     #
     # @api private
     def trigger_init
-      machine.send(:"#{initial_event}") unless defer
+      public_send(:"#{initial_event}") unless defer
     end
 
     # Attach state machine to an object
@@ -117,9 +120,9 @@ module FiniteMachine
     # @api public
     def target(object = nil)
       if object.nil?
-        machine.env.target
+        env.target
       else
-        machine.env.target = object
+        env.target = object
       end
     end
 
@@ -141,7 +144,7 @@ module FiniteMachine
     #
     # @api public
     def alias_target(alias_name)
-      machine.env.aliases << alias_name.to_sym
+      env.aliases << alias_name.to_sym
     end
 
     # Define terminal state
@@ -153,7 +156,7 @@ module FiniteMachine
     #
     # @api public
     def terminal(*values)
-      machine.final_state = values
+      self.final_state = values
     end
 
     # Define state machine events
@@ -167,7 +170,7 @@ module FiniteMachine
     #
     # @api public
     def events(&block)
-      machine.events_dsl.call(&block)
+      events_dsl.call(&block)
     end
 
     # Define state machine callbacks
@@ -181,21 +184,21 @@ module FiniteMachine
     #
     # @api public
     def callbacks(&block)
-      machine.observer.call(&block)
+      observer.call(&block)
     end
 
     # Error handler that throws exception when machine is in illegal state
     #
     # @api public
     def handlers(&block)
-      machine.errors.call(&block)
+      errors.call(&block)
     end
 
     # Decide whether to log transitions
     #
     # @api public
     def log_transitions(value)
-      machine.log_transitions = value
+      self.log_transitions = value
     end
 
     private
@@ -256,7 +259,7 @@ module FiniteMachine
       sync_exclusive do
         attributes = attrs.merge!(name: name)
         if block_given?
-          merger = ChoiceMerger.new(self, attributes)
+          merger = ChoiceMerger.new(machine, attributes)
           merger.instance_eval(&block)
         else
           transition_builder = TransitionBuilder.new(machine, attributes)

data/lib/finite_machine/env.rb

@@ -0,0 +1,19 @@
+# encoding: utf-8
+
+module FiniteMachine
+  # Holds references to targets and aliases
+  #
+  # @api public
+  class Env
+    include Threadable
+
+    attr_threadsafe :target
+
+    attr_threadsafe :aliases
+
+    def initialize(target, aliases)
+      @target = target
+      @aliases = aliases
+    end
+  end # Env
+end # FiniteMachine

data/lib/finite_machine/state_machine.rb

@@ -62,12 +62,12 @@ module FiniteMachine
       attributes     = args.last.is_a?(Hash) ? args.pop : {}
       @initial_state = DEFAULT_STATE
       @subscribers   = Subscribers.new(self)
-      @events_dsl    = EventsDSL.new(self)
-      @errors        = ErrorsDSL.new(self)
       @observer      = Observer.new(self)
       @transitions   = Hash.new { |hash, name| hash[name] = Hash.new }
       @events_chain  = EventsChain.new(self)
-      @env           = Environment.new(self, [])
+      @env           = Env.new(self, [])
+      @events_dsl    = EventsDSL.new(self)
+      @errors        = ErrorsDSL.new(self)
       @dsl           = DSL.new(self, attributes)
 
       @dsl.call(&block) if block_given?

data/lib/finite_machine/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module FiniteMachine
-  VERSION = "0.10.0"
+  VERSION = "0.10.1"
 end

data/spec/spec_helper.rb

@@ -21,19 +21,12 @@ RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
   config.raise_errors_for_deprecations!
-
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  #     --seed 1234
-  config.order = 'random'
-
-  # Remove defined constants
-  config.before :each do
-    [:Car, :DummyLogger, :Bug, :User, :Engine].each do |class_name|
-      if Object.const_defined?(class_name)
-        Object.send(:remove_const, class_name)
-      end
-    end
+  config.mock_with :rspec do |mocks|
+    mocks.verify_partial_doubles = true
+  end
+  config.disable_monkey_patching!
+  if config.files_to_run.one?
+    config.default_formatter = 'doc'
   end
+  config.order = :random
 end

data/spec/unit/alias_target_spec.rb

@@ -2,10 +2,10 @@
 
 require 'spec_helper'
 
-describe FiniteMachine::Definition, '#alias_target' do
+RSpec.describe FiniteMachine::Definition, '#alias_target' do
 
   before do
-    Car = Class.new do
+    stub_const("Car", Class.new do
       def turn_reverse_lights_off
         @reverse_lights = false
       end
@@ -17,7 +17,7 @@ describe FiniteMachine::Definition, '#alias_target' do
       def reverse_lights?
         @reverse_lights ||= false
       end
-    end
+    end)
   end
 
   it "aliases target" do

data/spec/unit/async_events_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe FiniteMachine, 'async_events' do
+RSpec.describe FiniteMachine, 'async_events' do
 
   it 'runs events asynchronously' do
     called = []

data/spec/unit/callable/call_spec.rb

@@ -2,10 +2,10 @@
 
 require 'spec_helper'
 
-describe FiniteMachine::Callable, '#call' do
+RSpec.describe FiniteMachine::Callable, '#call' do
 
   before(:each) {
-    Car = Class.new do
+    stub_const("Car", Class.new do
       attr_reader :result
 
       def initialize
@@ -31,7 +31,7 @@ describe FiniteMachine::Callable, '#call' do
         @result = 'engine_on'
         !!@engine_on
       end
-    end
+    end)
   }
 
   let(:called) { [] }

data/spec/unit/callbacks_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe FiniteMachine, 'callbacks' do
+RSpec.describe FiniteMachine, 'callbacks' do
 
   it "triggers default init event" do
     called = []

data/spec/unit/can_spec.rb

@@ -2,13 +2,13 @@
 
 require 'spec_helper'
 
-describe FiniteMachine, 'can?' do
+RSpec.describe FiniteMachine, 'can?' do
   before(:each) {
-    Bug = Class.new do
+    stub_const("Bug", Class.new do
       def pending?
         false
       end
-    end
+    end)
   }
 
   it "allows to check if event can be fired" do

data/spec/unit/choice_spec.rb

@@ -2,13 +2,13 @@
 
 require 'spec_helper'
 
-describe FiniteMachine, '#choice' do
+RSpec.describe FiniteMachine, '#choice' do
   before(:each) {
-    User = Class.new do
+    stub_const("User", Class.new do
       def promo?(token = false)
         token == :yes
       end
-    end
+    end)
   }
 
   it "allows for static choice based on conditional branching" do
@@ -185,6 +185,34 @@ describe FiniteMachine, '#choice' do
     expect(fsm.current).to eq(:green)
   end
 
+  it "performs matching transitions for multiple event definitions with the same name" do
+    ticket = double(:ticket, :pending? => true, :finished? => true)
+    fsm = FiniteMachine.define do
+      initial :inactive
+
+      target ticket
+
+      events {
+        event :advance, from: [:inactive, :paused, :fulfilled] do
+          choice :active, if: proc { |_ticket| !_ticket.pending? }
+        end
+
+        event :advance, from: [:inactive, :active, :fulfilled] do
+          choice :paused, if: proc { |_ticket| _ticket.pending? }
+        end
+
+        event :advance, from: [:inactive, :active, :paused] do
+          choice :fulfilled, if: proc { |_ticket| _ticket.finished? }
+        end
+      }
+    end
+    expect(fsm.current).to eq(:inactive)
+    fsm.advance
+    expect(fsm.current).to eq(:paused)
+    fsm.advance
+    expect(fsm.current).to eq(:fulfilled)
+  end
+
   it "sets callback properties correctly" do
     expected = {name: :init, from: :none, to: :red, a: nil, b: nil, c: nil }
 

data/spec/unit/define_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe FiniteMachine, 'define' do
+RSpec.describe FiniteMachine, 'define' do
 
   context 'with block' do
     it "creates system state machine" do

data/spec/unit/definition_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe FiniteMachine::Definition, 'definition' do
+RSpec.describe FiniteMachine::Definition, 'definition' do
 
   before do
     class Engine < FiniteMachine::Definition
@@ -42,7 +42,7 @@ describe FiniteMachine::Definition, 'definition' do
   end
 
   it "allows to create standalone machine" do
-    Car = Class.new do
+    stub_const("Car", Class.new do
       def turn_reverse_lights_off
         @reverse_lights = false
       end
@@ -54,7 +54,7 @@ describe FiniteMachine::Definition, 'definition' do
       def reverse_lights?
         @reverse_lights ||= false
       end
-    end
+    end)
 
     car = Car.new
     engine = Engine.new
@@ -63,10 +63,53 @@ describe FiniteMachine::Definition, 'definition' do
 
     engine.forward
     expect(engine.current).to eq(:one)
-    expect(car.reverse_lights?).to be false
+    expect(car.reverse_lights?).to eq(false)
 
     engine.back
     expect(engine.current).to eq(:reverse)
-    expect(car.reverse_lights?).to be true
+    expect(car.reverse_lights?).to eq(true)
+  end
+
+  it "supports inheritance of definitions" do
+    class GenericStateMachine < FiniteMachine::Definition
+      initial :red
+
+      events {
+        event :start, :red => :green
+      }
+
+      callbacks {
+        on_enter { |event| target << 'generic' }
+      }
+    end
+
+    class SpecificStateMachine < GenericStateMachine
+      events {
+        event :stop, :green => :yellow
+      }
+
+      callbacks {
+        on_enter(:yellow) { |event| target << 'specific' }
+      }
+    end
+
+    generic_fsm = GenericStateMachine.new
+    specific_fsm = SpecificStateMachine.new
+    called = []
+    generic_fsm.target called
+    specific_fsm.target called
+
+    expect(generic_fsm.states).to match_array([:none, :red, :green])
+    expect(specific_fsm.states).to match_array([:none, :red, :green, :yellow])
+
+    expect(specific_fsm.current).to eq(:red)
+
+    specific_fsm.start
+    expect(specific_fsm.current).to eq(:green)
+    expect(called).to match_array(['generic'])
+
+    specific_fsm.stop
+    expect(specific_fsm.current).to eq(:yellow)
+    expect(called).to match_array(['generic', 'generic', 'specific'])
   end
 end

data/spec/unit/event/add_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe FiniteMachine::Event, '#<<' do
+RSpec.describe FiniteMachine::Event, '#<<' do
   let(:machine) { double(:machine) }
 
   let(:object) { described_class }

data/spec/unit/event/eql_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe FiniteMachine::Event, 'eql?' do
+RSpec.describe FiniteMachine::Event, 'eql?' do
   let(:machine) { double(:machine) }
   let(:name)    { :green }
   let(:options) { {} }

data/spec/unit/event/initialize_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe FiniteMachine::Event, 'new' do
+RSpec.describe FiniteMachine::Event, 'new' do
   let(:machine) { double(:machine) }
   let(:name)    { :green }
   let(:options) { {} }

data/spec/unit/event/inspect_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe FiniteMachine::Event, '#inspect' do
+RSpec.describe FiniteMachine::Event, '#inspect' do
   let(:machine) { double(:machine) }
 
   let(:object) { described_class }

data/spec/unit/event/next_transition_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe FiniteMachine::Event, '#next_transition' do
+RSpec.describe FiniteMachine::Event, '#next_transition' do
   let(:object) { described_class }
 
   subject(:event) { object.new(machine, name: :test) }

data/spec/unit/event_queue_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe FiniteMachine::EventQueue do
+RSpec.describe FiniteMachine::EventQueue do
 
   subject(:event_queue) { described_class.new }
 

data/spec/unit/events_chain/check_choice_conditions_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe FiniteMachine::EventsChain, '#clear' do
+RSpec.describe FiniteMachine::EventsChain, '#clear' do
   let(:object)  { described_class }
 
   let(:machine) { double(:machine) }

data/spec/unit/events_chain/clear_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe FiniteMachine::EventsChain, '#insert' do
+RSpec.describe FiniteMachine::EventsChain, '#insert' do
   let(:object)  { described_class }
 
   let(:machine) { double(:machine) }

data/spec/unit/events_chain/insert_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe FiniteMachine::EventsChain, '#insert' do
+RSpec.describe FiniteMachine::EventsChain, '#insert' do
   let(:object)  { described_class }
 
   let(:machine) { double(:machine) }

data/spec/unit/events_chain/inspect_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe FiniteMachine::EventsChain, '#insert' do
+RSpec.describe FiniteMachine::EventsChain, '#insert' do
   let(:object)  { described_class }
 
   let(:machine) { double(:machine) }

data/spec/unit/events_chain/select_transition_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe FiniteMachine::EventsChain, '#select_transition' do
+RSpec.describe FiniteMachine::EventsChain, '#select_transition' do
   let(:object)  { described_class }
 
   let(:machine) { double(:machine) }

data/spec/unit/events_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe FiniteMachine, 'events' do
+RSpec.describe FiniteMachine, 'events' do
 
   it "allows for hash rocket syntax to describe transition" do
     fsm = FiniteMachine.define do

data/spec/unit/handlers_spec.rb

@@ -2,10 +2,10 @@
 
 require 'spec_helper'
 
-describe FiniteMachine, 'handlers' do
+RSpec.describe FiniteMachine, 'handlers' do
 
   before(:each) {
-    DummyLogger = Class.new do
+    stub_const("DummyLogger", Class.new do
       attr_reader :result
 
       def log_error(exception)
@@ -15,7 +15,7 @@ describe FiniteMachine, 'handlers' do
       def raise_error
         raise FiniteMachine::TransitionError
       end
-    end
+    end)
   }
 
   it "allows to customise error handling" do

data/spec/unit/hook_event/eql_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe FiniteMachine::HookEvent, 'eql?' do
+RSpec.describe FiniteMachine::HookEvent, 'eql?' do
   let(:name)       { :green }
   let(:transition) { double(:transition) }
   let(:data)       { [:foo, :bar] }

data/spec/unit/hook_event/initialize_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe FiniteMachine::HookEvent, 'new' do
+RSpec.describe FiniteMachine::HookEvent, 'new' do
   let(:name)       { :green }
   let(:transition) { double(:transition) }
   let(:data)       { [:foo, :bar] }

data/spec/unit/hooks/call_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe FiniteMachine::Hooks, '#call' do
+RSpec.describe FiniteMachine::Hooks, '#call' do
   let(:object) { described_class }
 
   subject(:hooks) { object.new }

data/spec/unit/hooks/inspect_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe FiniteMachine::Hooks, '#inspect' do
+RSpec.describe FiniteMachine::Hooks, '#inspect' do
   subject(:hooks) { described_class.new }
 
   it "displays name and transitions" do

data/spec/unit/hooks/register_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe FiniteMachine::Hooks, '#register' do
+RSpec.describe FiniteMachine::Hooks, '#register' do
   let(:object) { described_class }
 
   subject(:hooks) { object.new }

data/spec/unit/if_unless_spec.rb

@@ -2,9 +2,9 @@
 
 require 'spec_helper'
 
-describe FiniteMachine, ':if, :unless' do
+RSpec.describe FiniteMachine, ':if, :unless' do
   before(:each) {
-    Car = Class.new do
+    stub_const("Car", Class.new do
       attr_accessor :engine_on
 
       def turn_engine_on
@@ -18,13 +18,13 @@ describe FiniteMachine, ':if, :unless' do
       def engine_on?
         !!@engine_on
       end
-    end
+    end)
 
-    class Bug
+    stub_const("Bug", Class.new do
       def pending?
         false
       end
-    end
+    end)
   }
 
   it "passes context to conditionals" do

data/spec/unit/initialize_spec.rb

@@ -2,16 +2,16 @@
 
 require 'spec_helper'
 
-describe FiniteMachine, 'initialize' do
+RSpec.describe FiniteMachine, 'initialize' do
 
   before(:each) {
-    DummyLogger = Class.new do
+    stub_const("DummyLogger", Class.new do
       attr_accessor :level
 
       def initialize
         @level = :pending
       end
-    end
+    end)
   }
 
   it "defaults initial state to :none" do

data/spec/unit/inspect_spec.rb

@@ -2,8 +2,7 @@
 
 require 'spec_helper'
 
-describe FiniteMachine, '#inspect' do
-
+RSpec.describe FiniteMachine, '#inspect' do
   it "print useful information about state machine" do
     fsm = FiniteMachine.define do
       initial :green

data/spec/unit/is_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe FiniteMachine, 'is?' do
+RSpec.describe FiniteMachine, 'is?' do
 
   it "allows to check if state is reachable" do
     fsm = FiniteMachine.define do

data/spec/unit/log_transitions_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe FiniteMachine, 'log_transitions' do
+RSpec.describe FiniteMachine, 'log_transitions' do
   let(:output) { StringIO.new('', 'w+')}
 
   before { FiniteMachine.logger = ::Logger.new(output) }

data/spec/unit/logger_spec.rb

@@ -1,9 +1,8 @@
 # encoding: utf-8
 
 require 'spec_helper'
-require 'logger'
 
-describe FiniteMachine::Logger do
+RSpec.describe FiniteMachine::Logger do
   let(:message) { 'error' }
   let(:log) { double }
 

data/spec/unit/respond_to_spec.rb

@@ -2,14 +2,15 @@
 
 require 'spec_helper'
 
-describe FiniteMachine, '#respond_to' do
+RSpec.describe FiniteMachine, '#respond_to' do
 
   subject(:fsm) {
-    Car = Class.new do
+    stub_const("Car", Class.new do
       def engine_on?
         true
       end
-    end
+    end)
+
     FiniteMachine.new target: Car.new do
       initial :green
 

data/spec/unit/state_parser/inspect_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe FiniteMachine::StateParser, "#inspect" do
+RSpec.describe FiniteMachine::StateParser, "#inspect" do
   let(:object) { described_class }
 
   subject(:parser) { object.new(attrs) }

data/spec/unit/state_parser/parse_states_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe FiniteMachine::StateParser, '#inspect' do
+RSpec.describe FiniteMachine::StateParser, '#inspect' do
   let(:object) { described_class }
 
   subject(:parser) { object.new(attrs) }

data/spec/unit/states_spec.rb

@@ -2,8 +2,7 @@
 
 require 'spec_helper'
 
-describe FiniteMachine, 'states' do
-
+RSpec.describe FiniteMachine, 'states' do
   it "retrieves all available states" do
     fsm = FiniteMachine.define do
       initial :green

data/spec/unit/subscribers_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe FiniteMachine::Subscribers do
+RSpec.describe FiniteMachine::Subscribers do
   let(:machine)  { double }
   let(:event)    { double }
   let(:listener) { double }

data/spec/unit/target_spec.rb

@@ -2,10 +2,9 @@
 
 require 'spec_helper'
 
-describe FiniteMachine, '#target' do
-
+RSpec.describe FiniteMachine, '#target' do
   it "allows to target external object" do
-    Car = Class.new do
+    stub_const("Car", Class.new do
       attr_accessor :reverse_lights
 
       def turn_reverse_lights_off
@@ -45,7 +44,7 @@ describe FiniteMachine, '#target' do
           }
         end
       end
-    end
+    end)
     car = Car.new
     expect(car.reverse_lights?).to be(false)
     expect(car.engine.current).to eql(:neutral)
@@ -104,7 +103,7 @@ describe FiniteMachine, '#target' do
   end
 
   it "allows context methods take precedence over machine ones" do
-    Car = Class.new do
+    stub_const("Car", Class.new do
       attr_accessor :reverse_lights
       attr_accessor :called
 
@@ -147,7 +146,7 @@ describe FiniteMachine, '#target' do
           }
         end
       end
-    end
+    end)
 
     car = Car.new
     expect(car.reverse_lights?).to be(false)
@@ -185,14 +184,14 @@ describe FiniteMachine, '#target' do
 
   it "allows to differentiate between same named methods" do
     called = []
-    Car = Class.new do
+    stub_const("Car", Class.new do
       def initialize(called)
         @called = called
       end
       def save
         @called << 'car save called'
       end
-    end
+    end)
 
     car = Car.new(called)
     fsm = FiniteMachine.define do

data/spec/unit/terminated_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe FiniteMachine, 'terminated?' do
+RSpec.describe FiniteMachine, 'terminated?' do
 
   it "allows to specify terminal state" do
     fsm = FiniteMachine.define do

data/spec/unit/transition/inspect_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe FiniteMachine::Transition, '#inspect' do
+RSpec.describe FiniteMachine::Transition, '#inspect' do
   let(:machine) { double(:machine) }
 
   subject(:transition) { described_class.new(machine, attrs) }

data/spec/unit/transition/parse_states_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe FiniteMachine::Transition, 'parsed_states' do
+RSpec.describe FiniteMachine::Transition, 'parsed_states' do
   let(:machine) { double(:machine) }
 
   subject(:transition) { described_class.new(machine, attrs) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: finite_machine
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Piotr Murach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-16 00:00:00.000000000 Z
+date: 2015-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -54,6 +54,7 @@ files:
 - lib/finite_machine/choice_merger.rb
 - lib/finite_machine/definition.rb
 - lib/finite_machine/dsl.rb
+- lib/finite_machine/env.rb
 - lib/finite_machine/event.rb
 - lib/finite_machine/event_builder.rb
 - lib/finite_machine/event_queue.rb