Fix trigger handling check with async version

prasannavl · May 1, 2015 · 04b6582 · 04b6582
1 parent feae6bf
commit 04b6582
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 19 deletions.
diff --git a/LiquidState/Machines/AsyncStateMachine.cs b/LiquidState/Machines/AsyncStateMachine.cs
@@ -41,9 +41,9 @@ public event Action<TState, TState> StateChanged
             remove { machine.StateChanged -= value; }
         }
 
-        public bool CanHandleTrigger(TTrigger trigger)
+        public Task<bool> CanHandleTriggerAsync(TTrigger trigger)
         {
-            return machine.CanHandleTrigger(trigger);
+            return machine.CanHandleTriggerAsync(trigger);
         }
 
         public bool CanTransitionTo(TState state)

diff --git a/LiquidState/Machines/AwaitableStateMachine.cs b/LiquidState/Machines/AwaitableStateMachine.cs
@@ -61,14 +61,24 @@ public async Task MoveToState(TState state, StateTransitionOption option = State
             }
         }
 
-        public bool CanHandleTrigger(TTrigger trigger)
+        public async Task<bool> CanHandleTriggerAsync(TTrigger trigger)
         {
             foreach (var current in CurrentStateRepresentation.Triggers)
             {
                 if (current.Trigger.Equals(trigger))
-                    return true;
+                {
+                    if ((CheckFlag(current.TransitionFlags, AwaitableStateTransitionFlag.TriggerPredicateReturnsTask)))
+                    {
+                        var predicate = current.ConditionalTriggerPredicate as Func<Task<bool>>;
+                        return predicate == null || await predicate();
+                    }
+                    else
+                    {
+                        var predicate = current.ConditionalTriggerPredicate as Func<bool>;
+                        return predicate == null || predicate();
+                    }
+                }
             }
-
             return false;
         }
 

diff --git a/LiquidState/Machines/AwaitableStateMachineWithScheduler.cs b/LiquidState/Machines/AwaitableStateMachineWithScheduler.cs
@@ -42,9 +42,9 @@ public event Action<TState, TState> StateChanged
             remove { machine.StateChanged -= value; }
         }
 
-        public bool CanHandleTrigger(TTrigger trigger)
+        public Task<bool> CanHandleTriggerAsync(TTrigger trigger)
         {
-            return machine.CanHandleTrigger(trigger);
+            return machine.CanHandleTriggerAsync(trigger);
         }
 
         public bool CanTransitionTo(TState state)

diff --git a/LiquidState/Machines/BlockingStateMachine.cs b/LiquidState/Machines/BlockingStateMachine.cs
@@ -69,9 +69,12 @@ public bool CanHandleTrigger(TTrigger trigger)
         {
             foreach (var current in CurrentStateRepresentation.Triggers)
             {
-                if (current.Trigger.Equals(trigger)) return true;
+                if (current.Trigger.Equals(trigger))
+                {
+                    var predicate = current.ConditionalTriggerPredicate;
+                    return predicate == null || predicate();
+                }
             }
-
             return false;
         }
 

diff --git a/LiquidState/Machines/IAwaitableStateMachine.cs b/LiquidState/Machines/IAwaitableStateMachine.cs
@@ -20,7 +20,7 @@ public interface IAwaitableStateMachine<TState, TTrigger>
         bool IsInTransition { get; }
         event Action<TState, TState> StateChanged;
         event Action<TTrigger, TState> UnhandledTriggerExecuted;
-        bool CanHandleTrigger(TTrigger trigger);
+        Task<bool> CanHandleTriggerAsync(TTrigger trigger);
         bool CanTransitionTo(TState state);
 
         Task FireAsync<TArgument>(ParameterizedTrigger<TTrigger, TArgument> parameterizedTrigger,
@@ -37,7 +37,7 @@ public abstract class AwaitableStateMachineContract<T, U> : IAwaitableStateMachi
     {
         public abstract event Action<U, T> UnhandledTriggerExecuted;
         public abstract event Action<T, T> StateChanged;
-        public abstract bool CanHandleTrigger(U trigger);
+        public abstract Task<bool> CanHandleTriggerAsync(U trigger);
         public abstract bool CanTransitionTo(T state);
         public abstract Task MoveToState(T state, StateTransitionOption option = StateTransitionOption.Default);
         public abstract void Pause();

diff --git a/LiquidState/Machines/StateMachine.cs b/LiquidState/Machines/StateMachine.cs
@@ -81,9 +81,12 @@ public bool CanHandleTrigger(TTrigger trigger)
         {
             foreach (var current in CurrentStateRepresentation.Triggers)
             {
-                if (current.Trigger.Equals(trigger)) return true;
+                if (current.Trigger.Equals(trigger))
+                {
+                    var predicate = current.ConditionalTriggerPredicate;
+                    return predicate == null || predicate();
+                }
             }
-
             return false;
         }
 

diff --git a/README.md b/README.md
@@ -93,7 +93,7 @@ Benchmarking code, and libraries at: [https://github.com/prasannavl/Benchmarks](
         TState CurrentState { get; }
         bool IsEnabled { get; }
         bool IsInTransition { get; }
-        bool CanHandleTrigger(TTrigger trigger);
+        Task<bool> CanHandleTriggerAsync(TTrigger trigger);
         bool CanTransitionTo(TState state);
 
         Task FireAsync<TArgument>(
@@ -370,4 +370,13 @@ Now, let's take the same dumb, and terrible example, but now do it **asynchronou
 
 ######v.4.1.1
 
-- Fix CanHandleTrigger()
+- Fix CanHandleTrigger()
+
+######v.5.0.0
+
+- Add `Task<bool> CanHandleTriggerAsync(TTrigger trigger);` to IAwaitableStateMachine
+- Make CanHandleTrigger check for predicates, if present. 
+
+Breaking changes:
+
+- Removed `bool CanHandleTrigger(TTrigger trigger)` from it IAwaitableStateMachine. Has been replaced by the async version.
diff --git a/VersionInfo.cs b/VersionInfo.cs
@@ -1,5 +1,5 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("4.1.1")]
-[assembly: AssemblyFileVersion("4.1.1")]
-[assembly: AssemblyInformationalVersion("4.1.1")]
+[assembly: AssemblyVersion("5.0.0")]
+[assembly: AssemblyFileVersion("5.0.0")]
+[assembly: AssemblyInformationalVersion("5.0.0")]
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-version: '4.1.1.{build}'
+version: '5.0.0.{build}'
 branches:
   only:
   - master