aboutsummaryrefslogtreecommitdiffstats
path: root/lib/action_cable
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2015-06-26 19:11:31 +0200
committerDavid Heinemeier Hansson <david@loudthinking.com>2015-06-26 19:11:31 +0200
commite3cb3696cfaa766b62d644411fe71e4e64aab85a (patch)
treeac9888d82b0ae41499f8f2fc962f85665b7b77f7 /lib/action_cable
parent85272d8a91aa2a08a4f83100e24cb1b0c8c9ccf3 (diff)
downloadrails-e3cb3696cfaa766b62d644411fe71e4e64aab85a.tar.gz
rails-e3cb3696cfaa766b62d644411fe71e4e64aab85a.tar.bz2
rails-e3cb3696cfaa766b62d644411fe71e4e64aab85a.zip
TOC refactor
Diffstat (limited to 'lib/action_cable')
-rw-r--r--lib/action_cable/connection/base.rb27
1 files changed, 14 insertions, 13 deletions
diff --git a/lib/action_cable/connection/base.rb b/lib/action_cable/connection/base.rb
index aac23b2596..4af651a5d9 100644
--- a/lib/action_cable/connection/base.rb
+++ b/lib/action_cable/connection/base.rb
@@ -78,6 +78,20 @@ module ActionCable
attr_reader :websocket
attr_reader :heartbeat, :subscriptions, :message_buffer
+
+ def websocket_initialization
+ @websocket = Faye::WebSocket.new(@env)
+ end
+
+ def websocket_alive?
+ websocket && websocket.ready_state == Faye::WebSocket::API::OPEN
+ end
+
+ def websocket_request?
+ @is_websocket ||= Faye::WebSocket.websocket?(@env)
+ end
+
+
def on_open
server.add_connection(self)
@@ -111,19 +125,6 @@ module ActionCable
end
- def websocket_initialization
- @websocket = Faye::WebSocket.new(@env)
- end
-
- def websocket_alive?
- websocket && websocket.ready_state == Faye::WebSocket::API::OPEN
- end
-
- def websocket_request?
- @is_websocket ||= Faye::WebSocket.websocket?(@env)
- end
-
-
def started_request_message
'Started %s "%s"%s for %s at %s' % [
request.request_method,