finite_machine 0.8.1 → 0.9.0

data/spec/unit/is_spec.rb

@@ -18,17 +18,17 @@ describe FiniteMachine, 'is?' do
 
     expect(fsm.current).to eql(:green)
 
-    expect(fsm.is?(:green)).to be_true
-    expect(fsm.is?(:yellow)).to be_false
-    expect(fsm.is?([:green,  :red])).to be_true
-    expect(fsm.is?([:yellow, :red])).to be_false
+    expect(fsm.is?(:green)).to be true
+    expect(fsm.is?(:yellow)).to be false
+    expect(fsm.is?([:green,  :red])).to be true
+    expect(fsm.is?([:yellow, :red])).to be false
 
     fsm.slow
 
-    expect(fsm.is?(:green)).to be_false
-    expect(fsm.is?(:yellow)).to be_true
-    expect(fsm.is?([:green, :red])).to be_false
-    expect(fsm.is?([:yellow, :red])).to be_true
+    expect(fsm.is?(:green)).to be false
+    expect(fsm.is?(:yellow)).to be true
+    expect(fsm.is?([:green, :red])).to be false
+    expect(fsm.is?([:yellow, :red])).to be true
   end
 
   it "defines helper methods to check current state" do
@@ -44,12 +44,12 @@ describe FiniteMachine, 'is?' do
     end
     expect(fsm.current).to eql(:green)
 
-    expect(fsm.green?).to be_true
-    expect(fsm.yellow?).to be_false
+    expect(fsm.green?).to be true
+    expect(fsm.yellow?).to be false
 
     fsm.slow
 
-    expect(fsm.green?).to be_false
-    expect(fsm.yellow?).to be_true
+    expect(fsm.green?).to be false
+    expect(fsm.yellow?).to be true
   end
 end

data/spec/unit/logger_spec.rb

@@ -9,7 +9,7 @@ describe FiniteMachine::Logger do
 
   subject(:logger) { described_class }
 
-  before { FiniteMachine.stub(:logger) { log } }
+  before { allow(FiniteMachine).to receive(:logger) { log } }
 
   it "debugs message call" do
     expect(log).to receive(:debug).with(message)

data/spec/unit/respond_to_spec.rb

@@ -31,7 +31,7 @@ describe FiniteMachine, '#respond_to' do
     expect(fsm).to respond_to(:on_enter_slow)
   end
 
-  it "knows about target class methods" do
-    expect(fsm).to respond_to(:engine_on?)
+  it "doesn't know about target class methods" do
+    expect(fsm).not_to respond_to(:engine_on?)
   end
 end

data/spec/unit/standalone_spec.rb

@@ -0,0 +1,72 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe FiniteMachine::Definition, 'definition' do
+
+  before do
+    class Engine < FiniteMachine::Definition
+      initial :neutral
+
+      events {
+        event :forward, [:reverse, :neutral] => :one
+        event :shift, :one => :two
+        event :shift, :two => :one
+        event :back,  [:neutral, :one] => :reverse
+      }
+
+      callbacks {
+        on_enter :reverse do |event|
+          target.turn_reverse_lights_on
+        end
+
+        on_exit :reverse do |event|
+          target.turn_reverse_lights_off
+        end
+      }
+
+      handlers {
+        handle FiniteMachine::InvalidStateError do |exception| end
+      }
+    end
+  end
+
+  it "creates unique instances" do
+    engine_a = Engine.new
+    engine_b = Engine.new
+    expect(engine_a).not_to be(engine_b)
+
+    engine_a.forward
+    expect(engine_a.current).to eq(:one)
+    expect(engine_b.current).to eq(:neutral)
+  end
+
+  it "allows to create standalone machine" do
+    Car = Class.new do
+      def turn_reverse_lights_off
+        @reverse_lights = false
+      end
+
+      def turn_reverse_lights_on
+        @reverse_lights = true
+      end
+
+      def reverse_lights?
+        @reverse_lights ||= false
+      end
+    end
+
+    car = Car.new
+    engine = Engine.new
+    engine.target car
+    expect(engine.current).to eq(:neutral)
+
+    engine.forward
+    expect(engine.current).to eq(:one)
+    expect(car.reverse_lights?).to be false
+
+    engine.back
+    expect(engine.current).to eq(:reverse)
+    expect(car.reverse_lights?).to be true
+  end
+end

data/spec/unit/subscribers_spec.rb

@@ -12,7 +12,7 @@ describe FiniteMachine::Subscribers do
   before { subscribers.subscribe(listener) }
 
   it "checks if any subscribers exist" do
-    expect(subscribers.empty?).to be_false
+    expect(subscribers.empty?).to be(false)
   end
 
   it "returns index for the subscriber" do
@@ -26,6 +26,6 @@ describe FiniteMachine::Subscribers do
 
   it "resets the subscribers" do
     subscribers.reset
-    expect(subscribers.empty?).to be_true
+    expect(subscribers.empty?).to be(true)
   end
 end

data/spec/unit/target_spec.rb

@@ -16,6 +16,10 @@ describe FiniteMachine, '#target' do
         @reverse_lights = true
       end
 
+      def reverse_lights?
+        @reverse_lights ||= false
+      end
+
       def engine
         context = self
         @engine ||= FiniteMachine.define do
@@ -32,25 +36,25 @@ describe FiniteMachine, '#target' do
 
           callbacks {
             on_enter :reverse do |event|
-              turn_reverse_lights_on
+              target.turn_reverse_lights_on
             end
 
             on_exit :reverse do |event|
-              turn_reverse_lights_off
+              target.turn_reverse_lights_off
             end
           }
         end
       end
     end
     car = Car.new
-    expect(car.reverse_lights).to be_false
+    expect(car.reverse_lights?).to be(false)
     expect(car.engine.current).to eql(:neutral)
     car.engine.back
     expect(car.engine.current).to eql(:reverse)
-    expect(car.reverse_lights).to be_true
+    expect(car.reverse_lights?).to be(true)
     car.engine.forward
     expect(car.engine.current).to eql(:one)
-    expect(car.reverse_lights).to be_false
+    expect(car.reverse_lights?).to be(false)
   end
 
   it "propagates method call" do
@@ -112,6 +116,10 @@ describe FiniteMachine, '#target' do
         @reverse_lights = true
       end
 
+      def reverse_lights?
+        @reverse_lights ||= false
+      end
+
       def engine
         self.called ||= []
         context ||= self
@@ -129,12 +137,12 @@ describe FiniteMachine, '#target' do
 
           callbacks {
             on_enter :reverse do |event|
-              called << 'on_enter_reverse'
-              turn_reverse_lights_on
+              target.called << 'on_enter_reverse'
+              target.turn_reverse_lights_on
               forward('Piotr!')
             end
             on_before :forward do |event, name|
-              called << "on_enter_forward with #{name}"
+              target.called << "on_enter_forward with #{name}"
             end
           }
         end
@@ -142,7 +150,7 @@ describe FiniteMachine, '#target' do
     end
 
     car = Car.new
-    expect(car.reverse_lights).to be_false
+    expect(car.reverse_lights?).to be(false)
     expect(car.engine.current).to eql(:neutral)
     car.engine.back
     expect(car.engine.current).to eql(:one)
@@ -158,7 +166,7 @@ describe FiniteMachine, '#target' do
     fsm = FiniteMachine.define do
       initial :green
 
-      target  context
+      target context
 
       events {
         event :slow, :green  => :yellow
@@ -174,4 +182,45 @@ describe FiniteMachine, '#target' do
     fsm.slow
     expect(called).to eq(context)
   end
+
+  it "allows to differentiate between same named methods" do
+    called = []
+    Car = Class.new do
+      def initialize(called)
+        @called = called
+      end
+      def save
+        @called << 'car save called'
+      end
+    end
+
+    car = Car.new(called)
+    fsm = FiniteMachine.define do
+      initial :unsaved
+
+      target car
+
+      events {
+        event :validate, :unsaved => :valid
+        event :save, :valid => :saved
+      }
+
+      callbacks {
+        on_enter :valid do |event|
+          target.save
+          save
+        end
+        on_after :save do |event|
+          called << 'event save called'
+        end
+      }
+    end
+    expect(fsm.current).to eql(:unsaved)
+    fsm.validate
+    expect(fsm.current).to eql(:saved)
+    expect(called).to eq([
+      'car save called',
+      'event save called'
+    ])
+  end
 end

data/spec/unit/{finished_spec.rb → terminated_spec.rb}

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe FiniteMachine, 'finished?' do
+describe FiniteMachine, 'terminated?' do
 
   it "allows to specify terminal state" do
     fsm = FiniteMachine.define do
@@ -16,15 +16,15 @@ describe FiniteMachine, 'finished?' do
     end
 
     expect(fsm.current).to eql(:green)
-    expect(fsm.finished?).to be_false
+    expect(fsm.terminated?).to be(false)
 
     fsm.slow
     expect(fsm.current).to eql(:yellow)
-    expect(fsm.finished?).to be_false
+    expect(fsm.terminated?).to be(false)
 
     fsm.stop
     expect(fsm.current).to eql(:red)
-    expect(fsm.finished?).to be_true
+    expect(fsm.terminated?).to be(true)
   end
 
   it "allows to specify terminal state as parameter" do
@@ -38,7 +38,7 @@ describe FiniteMachine, 'finished?' do
     end
     fsm.slow
     fsm.stop
-    expect(fsm.finished?).to be_true
+    expect(fsm.terminated?).to be(true)
   end
 
   it "checks without terminal state" do
@@ -52,14 +52,44 @@ describe FiniteMachine, 'finished?' do
     end
 
     expect(fsm.current).to eql(:green)
-    expect(fsm.finished?).to be_false
+    expect(fsm.terminated?).to be(false)
 
     fsm.slow
     expect(fsm.current).to eql(:yellow)
-    expect(fsm.finished?).to be_false
+    expect(fsm.terminated?).to be(false)
 
     fsm.stop
     expect(fsm.current).to eql(:red)
-    expect(fsm.finished?).to be_false
+    expect(fsm.terminated?).to be(false)
+  end
+
+  it "allows for multiple terminal states" do
+    fsm = FiniteMachine.define do
+      initial :open
+
+      terminal :close, :canceled, :faulty
+
+      events {
+        event :resolve, :open => :close
+        event :decline, :open => :canceled
+        event :error,   :open => :faulty
+      }
+    end
+    expect(fsm.current).to eql(:open)
+    expect(fsm.terminated?).to be(false)
+
+    fsm.resolve
+    expect(fsm.current).to eql(:close)
+    expect(fsm.terminated?).to be(true)
+
+    fsm.restore!(:open)
+    fsm.decline
+    expect(fsm.current).to eql(:canceled)
+    expect(fsm.terminated?).to be(true)
+
+    fsm.restore!(:open)
+    fsm.error
+    expect(fsm.current).to eql(:faulty)
+    expect(fsm.terminated?).to be(true)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: finite_machine
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Piotr Murach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-05 00:00:00.000000000 Z
+date: 2014-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,7 @@ files:
 - lib/finite_machine/callable.rb
 - lib/finite_machine/catchable.rb
 - lib/finite_machine/choice_merger.rb
+- lib/finite_machine/definition.rb
 - lib/finite_machine/dsl.rb
 - lib/finite_machine/event.rb
 - lib/finite_machine/event_builder.rb
@@ -79,6 +80,8 @@ files:
 - spec/unit/choice_spec.rb
 - spec/unit/define_spec.rb
 - spec/unit/event/add_spec.rb
+- spec/unit/event/eql_spec.rb
+- spec/unit/event/initialize_spec.rb
 - spec/unit/event/inspect_spec.rb
 - spec/unit/event/next_transition_spec.rb
 - spec/unit/event_queue_spec.rb
@@ -88,8 +91,9 @@ files:
 - spec/unit/events_chain/inspect_spec.rb
 - spec/unit/events_chain/select_transition_spec.rb
 - spec/unit/events_spec.rb
-- spec/unit/finished_spec.rb
 - spec/unit/handlers_spec.rb
+- spec/unit/hook_event/eql_spec.rb
+- spec/unit/hook_event/initialize_spec.rb
 - spec/unit/hooks/call_spec.rb
 - spec/unit/hooks/inspect_spec.rb
 - spec/unit/hooks/register_spec.rb
@@ -99,11 +103,13 @@ files:
 - spec/unit/is_spec.rb
 - spec/unit/logger_spec.rb
 - spec/unit/respond_to_spec.rb
+- spec/unit/standalone_spec.rb
 - spec/unit/state_parser/inspect_spec.rb
 - spec/unit/state_parser/parse_states_spec.rb
 - spec/unit/states_spec.rb
 - spec/unit/subscribers_spec.rb
 - spec/unit/target_spec.rb
+- spec/unit/terminated_spec.rb
 - spec/unit/transition/inspect_spec.rb
 - spec/unit/transition/parse_states_spec.rb
 - tasks/console.rake
@@ -142,6 +148,8 @@ test_files:
 - spec/unit/choice_spec.rb
 - spec/unit/define_spec.rb
 - spec/unit/event/add_spec.rb
+- spec/unit/event/eql_spec.rb
+- spec/unit/event/initialize_spec.rb
 - spec/unit/event/inspect_spec.rb
 - spec/unit/event/next_transition_spec.rb
 - spec/unit/event_queue_spec.rb
@@ -151,8 +159,9 @@ test_files:
 - spec/unit/events_chain/inspect_spec.rb
 - spec/unit/events_chain/select_transition_spec.rb
 - spec/unit/events_spec.rb
-- spec/unit/finished_spec.rb
 - spec/unit/handlers_spec.rb
+- spec/unit/hook_event/eql_spec.rb
+- spec/unit/hook_event/initialize_spec.rb
 - spec/unit/hooks/call_spec.rb
 - spec/unit/hooks/inspect_spec.rb
 - spec/unit/hooks/register_spec.rb
@@ -162,11 +171,13 @@ test_files:
 - spec/unit/is_spec.rb
 - spec/unit/logger_spec.rb
 - spec/unit/respond_to_spec.rb
+- spec/unit/standalone_spec.rb
 - spec/unit/state_parser/inspect_spec.rb
 - spec/unit/state_parser/parse_states_spec.rb
 - spec/unit/states_spec.rb
 - spec/unit/subscribers_spec.rb
 - spec/unit/target_spec.rb
+- spec/unit/terminated_spec.rb
 - spec/unit/transition/inspect_spec.rb
 - spec/unit/transition/parse_states_spec.rb
 has_rdoc: