From 4c3a76a044550d9d08b22cfc6140a727ebffc597 Mon Sep 17 00:00:00 2001 From: "Gun.io Whitespace Robot" Date: Thu, 27 Oct 2011 20:40:38 -0400 Subject: [PATCH] Remove whitespace [Gun.io WhitespaceBot] --- Makefile | 2 +- demo/demo.erl | 6 ++-- demo/demo_ssl.erl | 6 ++-- src/socketio_client_sup.erl | 2 +- src/socketio_data_v1.erl | 2 +- src/socketio_http.erl | 46 ++++++++++++------------ src/socketio_http_sup.erl | 2 +- src/socketio_listener.erl | 2 +- src/socketio_listener_sup.erl | 4 +-- src/socketio_listener_sup_sup.erl | 2 +- src/socketio_sup.erl | 2 +- src/socketio_transport_htmlfile.erl | 8 ++--- src/socketio_transport_polling.erl | 8 ++--- src/socketio_transport_websocket.erl | 6 ++-- src/socketio_transport_xhr_multipart.erl | 8 ++--- test/socketio_transport_tests.erl | 18 +++++----- 16 files changed, 62 insertions(+), 62 deletions(-) diff --git a/Makefile b/Makefile index 660e312..2a4df72 100644 --- a/Makefile +++ b/Makefile @@ -9,5 +9,5 @@ compile: deps test: force @./rebar eunit skip_deps=true -force: +force: @true diff --git a/demo/demo.erl b/demo/demo.erl index 3a393e4..7b38174 100755 --- a/demo/demo.erl +++ b/demo/demo.erl @@ -1,5 +1,5 @@ #! /usr/bin/env escript -%%! -pa ../ebin ../deps/misultin/ebin ../deps/ossp_uuid/ebin ../deps/jsx/ebin +%%! -pa ../ebin ../deps/misultin/ebin ../deps/ossp_uuid/ebin ../deps/jsx/ebin -mode(compile). -include_lib("../include/socketio.hrl"). -compile(export_all). @@ -14,9 +14,9 @@ main(_) -> application:start(sasl), application:start(misultin), application:start(socketio), - {ok, Pid} = socketio_listener:start([{http_port, 7878}, + {ok, Pid} = socketio_listener:start([{http_port, 7878}, {default_http_handler,?MODULE}]), - {ok, Pid} = socketio_listener:start([{http_port, 7878}, + {ok, Pid} = socketio_listener:start([{http_port, 7878}, {default_http_handler,?MODULE}]), EventMgr = socketio_listener:event_manager(Pid), ok = gen_event:add_handler(EventMgr, ?MODULE,[]), diff --git a/demo/demo_ssl.erl b/demo/demo_ssl.erl index 5bf6115..2322620 100755 --- a/demo/demo_ssl.erl +++ b/demo/demo_ssl.erl @@ -1,5 +1,5 @@ #! /usr/bin/env escript -%%! -pa ../ebin ../deps/misultin/ebin ../deps/ossp_uuid/ebin ../deps/jsx/ebin +%%! -pa ../ebin ../deps/misultin/ebin ../deps/ossp_uuid/ebin ../deps/jsx/ebin -mode(compile). -include_lib("../include/socketio.hrl"). -compile(export_all). @@ -8,13 +8,13 @@ %% gen_event callbacks -export([init/1, handle_event/2, handle_call/2, handle_info/2, terminate/2, code_change/3]). - + main(_) -> appmon:start(), application:start(sasl), application:start(misultin), application:start(socketio), - {ok, Pid} = socketio_listener:start([{http_port, 7878}, + {ok, Pid} = socketio_listener:start([{http_port, 7878}, {default_http_handler,?MODULE}, {ssl, [ {certfile, "test_certificate.pem"}, diff --git a/src/socketio_client_sup.erl b/src/socketio_client_sup.erl index 9e090e2..113f43c 100644 --- a/src/socketio_client_sup.erl +++ b/src/socketio_client_sup.erl @@ -24,7 +24,7 @@ start_link() -> init([]) -> {ok, { {simple_one_for_one, 5, 10}, [ - {socketio_client, {socketio_client, start_link, []}, + {socketio_client, {socketio_client, start_link, []}, transient, 5000, worker, [socketio_client]} ]} }. diff --git a/src/socketio_data_v1.erl b/src/socketio_data_v1.erl index 084a056..1d63ef5 100644 --- a/src/socketio_data_v1.erl +++ b/src/socketio_data_v1.erl @@ -8,7 +8,7 @@ %% Framing is only given when no other suitable mode exists. In this case, %% XHR-multipart will already frame these. -%% It is not defined whether we should +%% It is not defined whether we should -define(FRAME, 16#fffd). -define(BINFRAME, <<65533>>). -define(RESERVED_EVENTS, [<<"message">>, <<"connect">>, <<"disconnect">>, diff --git a/src/socketio_http.erl b/src/socketio_http.erl index d862fb0..a0ea6f7 100644 --- a/src/socketio_http.erl +++ b/src/socketio_http.erl @@ -9,7 +9,7 @@ -export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]). --define(SERVER, ?MODULE). +-define(SERVER, ?MODULE). -record(state, { default_http_handler, @@ -81,7 +81,7 @@ init([ServerModule, Port, Resource, SSL, DefaultHttpHandler, Sup]) -> %% {stop, Reason, State} %% @end %%-------------------------------------------------------------------- -handle_call({request, 'GET', ["socket.io.js"|Resource], Req}, _From, #state{ server_module = ServerModule, +handle_call({request, 'GET', ["socket.io.js"|Resource], Req}, _From, #state{ server_module = ServerModule, resource = Resource } = State) -> Response = apply(ServerModule, file, [Req, filename:join([filename:dirname(code:which(?MODULE)), "..", "priv", "Socket.IO", "socket.io.js"])]), {reply, Response, State}; @@ -96,11 +96,11 @@ handle_call({request, 'GET', [_Random, "xhr-polling"|Resource], Req }, From, #st handle_call({session, generate, {'xhr-polling', Req}, socketio_transport_polling}, From, State); %% Returning XHR Polling -handle_call({request, 'GET', [_Random, SessionId, "xhr-polling"|Resource], Req }, From, +handle_call({request, 'GET', [_Random, SessionId, "xhr-polling"|Resource], Req }, From, #state{ server_module = ServerModule, resource = Resource, sessions = Sessions } = State) -> case ets:lookup(Sessions, SessionId) of - [{SessionId, Pid}] -> + [{SessionId, Pid}] -> gen_server:cast(Pid, {'xhr-polling', polling_request, Req, From}); _ -> gen_server:reply(From, apply(ServerModule, respond, [Req, 404, ""])) @@ -108,12 +108,12 @@ handle_call({request, 'GET', [_Random, SessionId, "xhr-polling"|Resource], Req } {noreply, State}; %% Incoming XHR Polling data -handle_call({request, 'POST', ["send", SessionId, "xhr-polling"|Resource], Req }, _From, #state{ resource = Resource, +handle_call({request, 'POST', ["send", SessionId, "xhr-polling"|Resource], Req }, _From, #state{ resource = Resource, server_module = ServerModule, sessions = Sessions } = State) -> - Response = + Response = case ets:lookup(Sessions, SessionId) of - [{SessionId, Pid}] -> + [{SessionId, Pid}] -> gen_server:call(Pid, {'xhr-polling', data, Req}); _ -> apply(ServerModule, respond, [Req, 404, ""]) @@ -125,8 +125,8 @@ handle_call({request, 'GET', [Index, _Random, "jsonp-polling"|Resource], Req }, handle_call({session, generate, {'jsonp-polling', {Req, Index}}, socketio_transport_polling}, From, State); %% Returning JSONP Polling -handle_call({request, 'GET', [Index, _Random, SessionId, "jsonp-polling"|Resource], Req }, From, - #state{ resource = Resource, +handle_call({request, 'GET', [Index, _Random, SessionId, "jsonp-polling"|Resource], Req }, From, + #state{ resource = Resource, server_module = ServerModule, sessions = Sessions } = State) -> case ets:lookup(Sessions, SessionId) of @@ -138,13 +138,13 @@ handle_call({request, 'GET', [Index, _Random, SessionId, "jsonp-polling"|Resourc {noreply, State}; %% Incoming JSONP Polling data -handle_call({request, 'POST', [_Index, _Random, SessionId, "jsonp-polling"|Resource], Req }, _From, - #state{ resource = Resource, +handle_call({request, 'POST', [_Index, _Random, SessionId, "jsonp-polling"|Resource], Req }, _From, + #state{ resource = Resource, server_module = ServerModule, sessions = Sessions } = State) -> - Response = + Response = case ets:lookup(Sessions, SessionId) of - [{SessionId, Pid}] -> + [{SessionId, Pid}] -> gen_server:call(Pid, {'jsonp-polling', data, Req}); _ -> apply(ServerModule, respond, [Req, 404, ""]) @@ -157,13 +157,13 @@ handle_call({request, 'GET', ["xhr-multipart"|Resource], Req }, From, #state{ re {noreply, State}; %% Incoming XHR Multipart data -handle_call({request, 'POST', ["send", SessionId, "xhr-multipart"|Resource], Req }, _From, - #state{ resource = Resource, +handle_call({request, 'POST', ["send", SessionId, "xhr-multipart"|Resource], Req }, _From, + #state{ resource = Resource, server_module = ServerModule, sessions = Sessions } = State) -> - Response = + Response = case ets:lookup(Sessions, SessionId) of - [{SessionId, Pid}] -> + [{SessionId, Pid}] -> gen_server:call(Pid, {'xhr-multipart', data, Req}); _ -> apply(ServerModule, respond, [Req, 404, ""]) @@ -177,13 +177,13 @@ handle_call({request, 'GET', [_Random, "htmlfile"|Resource], Req }, From, #state {noreply, State}; %% Incoming htmlfile data -handle_call({request, 'POST', ["send", SessionId, "htmlfile"|Resource], Req }, _From, - #state{ resource = Resource, +handle_call({request, 'POST', ["send", SessionId, "htmlfile"|Resource], Req }, _From, + #state{ resource = Resource, server_module = ServerModule, sessions = Sessions } = State) -> - Response = + Response = case ets:lookup(Sessions, SessionId) of - [{SessionId, Pid}] -> + [{SessionId, Pid}] -> gen_server:call(Pid, {'htmlfile', data, Req}); _ -> apply(ServerModule, respond, [Req, 404, ""]) @@ -202,7 +202,7 @@ handle_call({request, Method, Path, Req}, _From, #state{ default_http_handler = {reply, Response, State}; %% Sessions -handle_call({session, generate, ConnectionReference, Transport}, _From, #state{ +handle_call({session, generate, ConnectionReference, Transport}, _From, #state{ sup = Sup, sessions = Sessions, event_manager = EventManager, @@ -260,7 +260,7 @@ handle_info({'EXIT', Pid, _}, #state{ event_manager = EventManager, sessions = S % If misultin goes down, we stop socket.io handle_info({'DOWN', WebServerRef, _, _, _}, #state{ web_server_monitor = WebServerRef } = State) -> - {stop, normal, State}; + {stop, normal, State}; handle_info(_Info, State) -> {noreply, State}. diff --git a/src/socketio_http_sup.erl b/src/socketio_http_sup.erl index 7434197..b98ce93 100644 --- a/src/socketio_http_sup.erl +++ b/src/socketio_http_sup.erl @@ -24,7 +24,7 @@ start_link() -> init([]) -> {ok, { {simple_one_for_one, 5, 10}, [ - {socketio_http, {socketio_http, start_link, []}, + {socketio_http, {socketio_http, start_link, []}, permanent, 5000, worker, [socketio_http]} ]} }. diff --git a/src/socketio_listener.erl b/src/socketio_listener.erl index cf1ae61..d91a4f3 100644 --- a/src/socketio_listener.erl +++ b/src/socketio_listener.erl @@ -109,7 +109,7 @@ handle_call(origins, _From, #state{ origins = Origins } = State) -> handle_call({origins, Origins}, _From,State) -> {reply, Origins, State#state{ origins = Origins }}; - + %% Event management handle_call(event_manager, _From, #state{ sup = Sup } = State) -> Children = supervisor:which_children(Sup), diff --git a/src/socketio_listener_sup.erl b/src/socketio_listener_sup.erl index 074a240..ea3415d 100644 --- a/src/socketio_listener_sup.erl +++ b/src/socketio_listener_sup.erl @@ -41,10 +41,10 @@ init([Options]) -> Resource, SSL, DefaultHttpHandler, - self()]}, + self()]}, permanent, 5000, worker, [socketio_http]}, - {socketio_client_sup, {socketio_client_sup, start_link, []}, + {socketio_client_sup, {socketio_client_sup, start_link, []}, permanent, infinity, supervisor, [socketio_client_sup]} ]} }. diff --git a/src/socketio_listener_sup_sup.erl b/src/socketio_listener_sup_sup.erl index 0de7c21..06141e9 100644 --- a/src/socketio_listener_sup_sup.erl +++ b/src/socketio_listener_sup_sup.erl @@ -24,7 +24,7 @@ start_link() -> init([]) -> {ok, { {simple_one_for_one, 5, 10}, [ - {socketio_listener_sup, {socketio_listener_sup, start_link, []}, + {socketio_listener_sup, {socketio_listener_sup, start_link, []}, permanent, infinity, supervisor, [socketio_listener_sup]} ]} }. diff --git a/src/socketio_sup.erl b/src/socketio_sup.erl index 32e16e0..8827b24 100644 --- a/src/socketio_sup.erl +++ b/src/socketio_sup.erl @@ -24,7 +24,7 @@ start_link() -> init([]) -> {ok, { {one_for_one, 5, 10}, [ - {socketio_listener_sup_sup, {socketio_listener_sup_sup, start_link, []}, + {socketio_listener_sup_sup, {socketio_listener_sup_sup, start_link, []}, permanent, infinity, supervisor, [socketio_listener_sup_sup]} ]} }. diff --git a/src/socketio_transport_htmlfile.erl b/src/socketio_transport_htmlfile.erl index 4d4b500..e60e9f8 100644 --- a/src/socketio_transport_htmlfile.erl +++ b/src/socketio_transport_htmlfile.erl @@ -9,7 +9,7 @@ -export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]). --define(SERVER, ?MODULE). +-define(SERVER, ?MODULE). -record(state, { session_id, @@ -56,7 +56,7 @@ start_link(Sup, SessionId, ServerModule, ConnectionReference) -> init([Sup, SessionId, ServerModule, {'htmlfile', {Req, Caller}}]) -> apply(ServerModule, ensure_longpolling_request, [Req]), process_flag(trap_exit, true), - HeartbeatInterval = + HeartbeatInterval = case application:get_env(heartbeat_interval) of {ok, Time} -> Time; @@ -67,7 +67,7 @@ init([Sup, SessionId, ServerModule, {'htmlfile', {Req, Caller}}]) -> ), 10000 end, - CloseTimeout = + CloseTimeout = case application:get_env(close_timeout) of {ok, Time0} -> Time0; @@ -169,7 +169,7 @@ handle_cast(heartbeat, #state{ heartbeats = Beats, heartbeat_interval = reset_heartbeat(Interval) }}; %% Send -handle_cast({send, Message}, #state{ req = Req, +handle_cast({send, Message}, #state{ req = Req, server_module = ServerModule, connection_reference = {'htmlfile', connected }, heartbeat_interval = Interval } = State) -> diff --git a/src/socketio_transport_polling.erl b/src/socketio_transport_polling.erl index 2f3fa78..59f81b7 100644 --- a/src/socketio_transport_polling.erl +++ b/src/socketio_transport_polling.erl @@ -9,7 +9,7 @@ -export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]). --define(SERVER, ?MODULE). +-define(SERVER, ?MODULE). -record(state, { session_id, @@ -56,7 +56,7 @@ start_link(Sup, SessionId, ServerModule, ConnectionReference) -> %%-------------------------------------------------------------------- init([Sup, SessionId, ServerModule, {TransportType, {Req, Index}}]) -> process_flag(trap_exit, true), - PollingDuration = + PollingDuration = case application:get_env(polling_duration) of {ok, Time} -> Time; @@ -67,7 +67,7 @@ init([Sup, SessionId, ServerModule, {TransportType, {Req, Index}}]) -> ), 20000 end, - CloseTimeout = + CloseTimeout = case application:get_env(close_timeout) of {ok, Time0} -> Time0; @@ -174,7 +174,7 @@ handle_cast({TransportType, polling_request, Req, Server}, #state { server_modul caller = Server, polling_duration = reset_duration(Interval) }}; -handle_cast({TransportType, polling_request, Req, Server}, #state { server_module = ServerModule, +handle_cast({TransportType, polling_request, Req, Server}, #state { server_module = ServerModule, message_buffer = Buffer } = State) -> link(ServerModule:socket(Req)), handle_cast({send, {buffer, Buffer}}, State#state{ connection_reference = {TransportType, connected}, diff --git a/src/socketio_transport_websocket.erl b/src/socketio_transport_websocket.erl index 44b72fd..c4b4170 100644 --- a/src/socketio_transport_websocket.erl +++ b/src/socketio_transport_websocket.erl @@ -9,7 +9,7 @@ -export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]). --define(SERVER, ?MODULE). +-define(SERVER, ?MODULE). -record(state, { session_id, @@ -52,7 +52,7 @@ start_link(Sup, SessionId, ServerModule, ConnectionReference) -> %% @end %%-------------------------------------------------------------------- init([Sup, SessionId, ServerModule, ConnectionReference]) -> - HeartbeatInterval = + HeartbeatInterval = case application:get_env(heartbeat_interval) of {ok, Time} -> Time; @@ -142,7 +142,7 @@ handle_cast({send, Message}, #state{ server_module = ServerModule, handle_send(ConnectionReference, Message, ServerModule), {noreply, State#state{ heartbeat_interval = reset_interval(Interval) }}; -handle_cast(heartbeat, #state{ +handle_cast(heartbeat, #state{ server_module = ServerModule, connection_reference = ConnectionReference, heartbeats = Beats, heartbeat_interval = Interval } = State) -> diff --git a/src/socketio_transport_xhr_multipart.erl b/src/socketio_transport_xhr_multipart.erl index dee55f8..d3b2615 100644 --- a/src/socketio_transport_xhr_multipart.erl +++ b/src/socketio_transport_xhr_multipart.erl @@ -9,7 +9,7 @@ -export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]). --define(SERVER, ?MODULE). +-define(SERVER, ?MODULE). -record(state, { session_id, @@ -56,7 +56,7 @@ start_link(Sup, SessionId, ServerModule, ConnectionReference) -> init([Sup, SessionId, ServerModule, {'xhr-multipart', {Req, Caller}}]) -> apply(ServerModule, ensure_longpolling_request, [Req]), process_flag(trap_exit, true), - HeartbeatInterval = + HeartbeatInterval = case application:get_env(heartbeat_interval) of {ok, Time} -> Time; @@ -67,7 +67,7 @@ init([Sup, SessionId, ServerModule, {'xhr-multipart', {Req, Caller}}]) -> ), 10000 end, - CloseTimeout = + CloseTimeout = case application:get_env(close_timeout) of {ok, Time0} -> Time0; @@ -185,7 +185,7 @@ handle_cast(heartbeat, #state{ heartbeats = Beats, heartbeat_interval = reset_heartbeat(Interval) }}; %% Send -handle_cast({send, Message}, #state{ req = Req, +handle_cast({send, Message}, #state{ req = Req, server_module = ServerModule, connection_reference = {'xhr-multipart', connected }, heartbeat_interval = Interval } = State) -> diff --git a/test/socketio_transport_tests.erl b/test/socketio_transport_tests.erl index f628fb3..720914e 100644 --- a/test/socketio_transport_tests.erl +++ b/test/socketio_transport_tests.erl @@ -9,7 +9,7 @@ t_echoes_string({Client, EventMgr}) -> gen_event:notify(EventMgr, {change_pid, self()}), socketio_client:send(Client, #msg{ content = "some text"}), - receive + receive X -> ?assertEqual("some text", X) end. @@ -18,7 +18,7 @@ t_echoes_json({Client, EventMgr}) -> gen_event:notify(EventMgr, {change_pid, self()}), JSON = [{<<"key">>,<<"value">>}], socketio_client:send(Client, #msg{ content = JSON, json = true }), - receive + receive X -> ?assertEqual(JSON, X) end. @@ -26,7 +26,7 @@ t_echoes_json({Client, EventMgr}) -> t_session_id({Client, EventMgr}) -> gen_event:notify(EventMgr, {change_pid, self()}), socketio_client:send(Client, #msg{ content = "socketio_session" }), - receive + receive X -> ?assertEqual(socketio_client:session_id(Client), X) end. @@ -48,13 +48,13 @@ transport_tests(Browser, Transport) -> error_logger:delete_report_handler(error_logger_tty_h), %% suppress annoying kernel logger application:start(misultin), application:start(socketio), - {ok, Pid} = socketio_listener:start([{http_port, 8989}, + {ok, Pid} = socketio_listener:start([{http_port, 8989}, {default_http_handler, ?MODULE}]), EventMgr = socketio_listener:event_manager(Pid), ok = gen_event:add_handler(EventMgr, ?MODULE,[self()]), ?cmd("open -a \"" ++ Browser ++ "\" -g http://localhost:8989/"), %% FIXME: will only work on OSX receive - {connected, Client, EM} -> + {connected, Client, EM} -> {Client, EM} end end, @@ -73,19 +73,19 @@ transport_tests(Browser, Transport) -> handle_request('GET', [], Req) -> - Transports = + Transports = case ets:lookup(socketio_tests, transport) of [{transport, Transport}] -> "transports: ['" ++ Transport ++ "']"; _ -> "" end, - Req:ok([{"Content-Type", "text/html"}], + Req:ok([{"Content-Type", "text/html"}], "" "