Add websocket/longpoll macro

Author: LostKobrakai

lib/phoenix/socket/router.ex

@@ -12,13 +12,7 @@ defmodule Phoenix.Socket.Router do
         path = Path.join(path, end_segment)
 
         quote do
-          match :*,
-                unquote(path),
-                Phoenix.Transports.WebSocket,
-                [
-                  {:user_socket, unquote(user_socket)}
-                  | unquote(websocket)
-                ]
+          websocket unquote(path), unquote(user_socket), unquote(websocket)
         end
       else
         []
@@ -31,13 +25,7 @@ defmodule Phoenix.Socket.Router do
         path = Path.join(path, end_segment)
 
         quote do
-          match :*,
-                unquote(path),
-                Phoenix.Transports.LongPoll,
-                [
-                  {:user_socket, unquote(user_socket)}
-                  | unquote(longpoll)
-                ]
+          longpoll unquote(path), unquote(user_socket), unquote(longpoll)
         end
       else
         []
@@ -49,6 +37,30 @@ defmodule Phoenix.Socket.Router do
     end
   end
 
+  defmacro websocket(path, user_socket, opts \\ []) do
+    quote do
+      match :*,
+            unquote(path),
+            Phoenix.Transports.WebSocket,
+            [
+              {:user_socket, unquote(user_socket)}
+              | unquote(opts)
+            ]
+    end
+  end
+
+  defmacro longpoll(path, user_socket, opts \\ []) do
+    quote do
+      match :*,
+            unquote(path),
+            Phoenix.Transports.LongPoll,
+            [
+              {:user_socket, unquote(user_socket)}
+              | unquote(opts)
+            ]
+    end
+  end
+
   defp put_auth_token(true, enabled), do: [auth_token: enabled]
   defp put_auth_token(opts, enabled), do: Keyword.put(opts, :auth_token, enabled)
 end

test/phoenix/integration/websocket_socket_test.exs

@@ -100,9 +100,18 @@ defmodule Phoenix.Integration.WebSocketTest do
     #
     #   match :*, "/longpoll", Phoenix.Transports.LongPoll, user_socket: UserSocket
     # end
+    #
+    #
+
 
-    socket "/ws", UserSocket,
-      websocket: [check_origin: ["//example.com"], subprotocols: ["sip"], timeout: 200]
+    # socket "/ws", UserSocket,
+    #       websocket: [check_origin: ["//example.com"], subprotocols: ["sip"], timeout: 200]
+    scope "/ws" do
+      websocket "/websocket", UserSocket,
+        check_origin: ["//example.com"], subprotocols: ["sip"], timeout: 200
+
+      longpoll "/longpoll", UserSocket
+    end
 
     socket "/custom/some_path", UserSocket,
       websocket: [path: "nested/path", check_origin: ["//example.com"], timeout: 200]