Refactored more code out to be more generic

cburgdorf · Mar 11, 2012 · 6bbfc73 · 6bbfc73
1 parent 7a7d988
commit 6bbfc73
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/SignalR.Reactive/SignalR.Reactive/Clientside.cs b/SignalR.Reactive/SignalR.Reactive/Clientside.cs
@@ -27,9 +27,9 @@ public IDisposable Observable<THub>(string eventName, string clientName) where T
             clients = string.IsNullOrEmpty(clientName) ? clients : clients[clientName];
 
             return _observable.Subscribe(
-                x => clients.Invoke(ClientsideConstants.OnNextMethodName, new { Data = x, EventName = eventName, Type = ClientsideConstants.OnNextType }),
-                x => clients.Invoke(ClientsideConstants.OnNextMethodName, new { Data = x, EventName = eventName, Type = ClientsideConstants.OnErrorType }),
-                () => clients.Invoke(ClientsideConstants.OnNextMethodName, new { EventName = eventName, Type = ClientsideConstants.OnCompletedType })
+                x => RxHelper.RaiseOnNext(eventName, clients, x),
+                x => RxHelper.RaiseOnError(eventName, clients, x),
+                () => RxHelper.RaiseOnCompleted(eventName, clients)
                 );
         }
 

diff --git a/SignalR.Reactive/SignalR.Reactive/RxHelper.cs b/SignalR.Reactive/SignalR.Reactive/RxHelper.cs
@@ -14,5 +14,20 @@ public static dynamic GetHubClients<THub>() where THub : Hub, new()
             var connectionManager = DependencyResolverContext.Instance.Resolve<IConnectionManager>();
             return connectionManager.GetClients<THub>();
         }
+
+        public static void RaiseOnNext<T>(string eventName, dynamic clients, T payload)
+        {
+            clients.Invoke(ClientsideConstants.OnNextMethodName, new { Data = payload, EventName = eventName, Type = ClientsideConstants.OnNextType});
+        }
+
+        public static void RaiseOnError(string eventName, dynamic clients, Exception payload)
+        {
+            clients.Invoke(ClientsideConstants.OnNextMethodName,new { Data = payload, EventName = eventName, Type = ClientsideConstants.OnErrorType});
+        }
+
+        public static void RaiseOnCompleted(string eventName, dynamic clients)
+        {
+            clients.Invoke(ClientsideConstants.OnNextMethodName, new { EventName = eventName, Type = ClientsideConstants.OnCompletedType});
+        }
     }
 }