Fix RouteMapping + handler.

Author: inamiy

Sources/Machine.swift

@@ -381,11 +381,14 @@ public class Machine<S: StateType, E: EventType>
         let routeDisposable = self.addRouteMapping(routeMapping)
 
         let handlerDisposable = self._addHandler(event: .Any, order: order) { context in
-            guard let event = context.event else { return }
 
-            if self._hasRouteMappingInDict(event: event, fromState: context.fromState, toState: .Some(context.toState), userInfo: context.userInfo) != nil {
-                handler(context)
+            guard let preferredToState = routeMapping(event: context.event, fromState: context.fromState, userInfo: context.userInfo)
+                where preferredToState == context.toState else
+            {
+                return
             }
+            
+            handler(context)
         }
 
         return ActionDisposable.init {

Sources/StateMachine.swift

@@ -464,9 +464,16 @@ public final class StateMachine<S: StateType, E: EventType>: Machine<S, E>
         let routeDisposable = self.addStateRouteMapping(routeMapping)
 
         let handlerDisposable = self.addHandler(.Any => .Any) { context in
-            if self._hasRouteMappingInDict(fromState: context.fromState, toState: context.toState, userInfo: context.userInfo) != nil {
-                handler(context)
+            
+            guard context.event == nil else { return }
+            
+            guard let preferredToStates = routeMapping(fromState: context.fromState, userInfo: context.userInfo)
+                where preferredToStates.contains(context.toState) else
+            {
+                return
             }
+            
+            handler(context)
         }
 
         return ActionDisposable.init {