Extend websocket listener protocol to maps

Author: weavejester

ring-core/src/ring/websocket.clj

@@ -9,6 +9,19 @@
   (on-error   [listener socket throwable])
   (on-close   [listener socket code reason]))
 
+(extend-protocol Listener
+  clojure.lang.IPersistentMap
+  (on-open [m socket]
+    (when-let [kv (find m :on-open)] ((val kv) socket)))
+  (on-message [m socket message]
+    (when-let [kv (find m :on-message)] ((val kv) socket message)))
+  (on-pong [m socket data]
+    (when-let [kv (find m :on-pong)] ((val kv) socket data)))
+  (on-error [m socket throwable]
+    (when-let [kv (find m :on-error)] ((val kv) socket throwable)))
+  (on-close [m socket code reason]
+    (when-let [kv (find m :on-close)] ((val kv) socket code reason))))
+
 (defprotocol Socket
   (-send  [socket message])
   (-ping  [socket data])

ring-jetty-adapter/test/ring/adapter/test/jetty.clj

@@ -716,4 +716,21 @@
           @(hato/close! ws)
           (Thread/sleep 100)))
       (is (= [[:ping "foo"] [:pong "foo"]]
-             @log)))))
+             @log))))
+
+  (testing "using a map as a listener"
+    (let [listener {:on-open (fn [s] [:on-open s])
+                    :on-message (fn [s m] [:on-message s m])
+                    :on-pong (fn [s d] [:on-pong s d])
+                    :on-error (fn [s e] [:on-error s e])
+                    :on-close (fn [s c r] [:on-close s c r])}]
+      (is (= [:on-open :sock]
+             (ws/on-open listener :sock)))
+      (is (= [:on-message :sock "foo"]
+             (ws/on-message listener :sock "foo")))
+      (is (= [:on-pong :sock "data"]
+             (ws/on-pong listener :sock "data")))
+      (is (= [:on-error :sock "err"]
+             (ws/on-error listener :sock "err")))
+      (is (= [:on-close :sock 1000 "closed"]
+             (ws/on-close listener :sock 1000 "closed"))))))