hifsm 0.4.3 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2036f5f0392c1b5556c67030d1f3f4124355b725
-  data.tar.gz: ee74be4931ceb43693bb6e32dae2cb320e6ff848
+  metadata.gz: 58e6687ae4f9842846c1053888058f2a900472a2
+  data.tar.gz: b8bd4da00022fca41f541224b09a717189395d58
 SHA512:
-  metadata.gz: f48f8b7c4967ad34beb03b74057dc0c876df9a855b3c23194ea6a2a3fd74945884f5ef7f265d42a2c874dcd0b39c270b47d80125e63a0ad801d49c329306f3c7
-  data.tar.gz: 6b49eac8561505a6a7a10d20024abe58c94c677b936e8f5ccf8fdff82f7c2581ca51c4dc49a5a0651e24e1a7485c36ee50781bd290de96dfe34f5d0008ac8249
+  metadata.gz: 01b20d9770b5a2623ed3af913de677b28e3de8110580d20781ed601d4d42c8a70ec7178d44c6050a9889cf709fd8737b0f27a234ffaa0aa413f624b58cf03ee8
+  data.tar.gz: 455a85c0392c5e64038f62e8b5025a282ba9657b1b0dec9f082a7e41b1ed2c685c94429ea4ed42d4f258e544f109cac954cc508f8fd52aa6b474af43643d8c47

data/README.md

@@ -58,6 +58,7 @@ class Monster
       state :pursuing do
         before_enter do
           self.roar!
+          true # since roar! returns nil it would stop processing
         end
         action do
           step_towards target

data/lib/hifsm/fsm.rb

@@ -2,8 +2,9 @@ module Hifsm
 
   # This class holds immutable state machine definition
   class FSM
-    attr_reader :name, :states, :transitions
+    attr_reader :name, :transitions
 
+    # public API
     def initialize(name = :state, parent = nil, &block)
       @name = name
       @parent = parent
@@ -26,6 +27,10 @@ module Hifsm
       @machine_class.new(self, target, initial_state)
     end
 
+    def states
+      @states.keys
+    end
+
     #DSL
     def event(name, options = {}, &block)
       Hifsm::DSL::EventBuilder.new(options, &block).each do |ev_def|

data/lib/hifsm/machine.rb

@@ -22,7 +22,7 @@ module Hifsm
     end
 
     def states
-      @fsm.states.keys
+      @fsm.states
     end
 
     def all_states

data/lib/hifsm/state.rb

@@ -55,9 +55,9 @@ module Hifsm
         if ev.guard?(target, *args)
           from_state = self
           to_state = ev.to
-          if ev.trigger(target, :before, *args) &&
-              to_state.trigger(target, :before_enter, *args) &&
-              from_state.trigger(target, :before_exit, *args)
+          if ev.trigger(target, :before, *args).all? &&
+              to_state.trigger(target, :before_enter, *args).all? &&
+              from_state.trigger(target, :before_exit, *args).all?
             new_state_callback.call(to_state.enter!)
             from_state.trigger(target, :after_exit, *args)
             to_state.trigger(target, :after_enter, *args)

data/lib/hifsm/version.rb

@@ -1,3 +1,3 @@
 module Hifsm
-  VERSION = "0.4.3"
+  VERSION = "0.4.5"
 end

data/test/monster.rb

@@ -15,6 +15,7 @@ class Monster
       state :pursuing do
         before_enter do
           self.roar!
+          true # since roar! returns nil it would stop processing
         end
         action do
           step_towards target

data/test/test_before_returning_false.rb

@@ -0,0 +1,36 @@
+require 'setup_tests'
+
+class TestBeforeReturningFalse < Minitest::Test
+  class Door
+    include Hifsm
+
+    hifsm do
+      state :open
+      state :closed, :initial => true do
+        state :unlocked, :initial => true
+        state :locked
+
+        event :lock, :from => :unlocked, :to => :locked
+      end
+
+      event :open, :from => :closed, :to => :open do
+        before do
+          state != 'closed.locked'
+        end
+      end
+      event :close, :from => :open, :to => :closed
+    end
+  end
+
+  def setup
+    @door = Door.new
+  end
+
+  def test_opening_locked_door_does_nothing
+    @door.lock
+    @door.open
+    assert_equal 'closed.locked', @door.state
+    # assert nothing raised
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hifsm
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.5
 platform: ruby
 authors:
 - Vladimir Meremyanin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-06 00:00:00.000000000 Z
+date: 2014-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -125,6 +125,7 @@ files:
 - test/test_activerecord_adapter.rb
 - test/test_any_state_event.rb
 - test/test_basic_fsm.rb
+- test/test_before_returning_false.rb
 - test/test_dynamic_initial_state.rb
 - test/test_event_guard.rb
 - test/test_groupped_transitions.rb
@@ -164,6 +165,7 @@ test_files:
 - test/test_activerecord_adapter.rb
 - test/test_any_state_event.rb
 - test/test_basic_fsm.rb
+- test/test_before_returning_false.rb
 - test/test_dynamic_initial_state.rb
 - test/test_event_guard.rb
 - test/test_groupped_transitions.rb