aboutsummaryrefslogtreecommitdiffstats
path: root/lib/action_cable/connection/base.rb
diff options
context:
space:
mode:
authorJeremy Daer <jeremydaer@gmail.com>2015-10-16 01:02:22 -0700
committerJeremy Daer <jeremydaer@gmail.com>2015-10-16 09:06:44 -0700
commitacfdcf556888a88dc2d2026553d585f920fae105 (patch)
tree9e9bbe0a5b43170d3495653315fe396e546e6dd0 /lib/action_cable/connection/base.rb
parentd7ab5c8f1ffd04acd2cf610f5756fc18fdfc6160 (diff)
downloadrails-acfdcf556888a88dc2d2026553d585f920fae105.tar.gz
rails-acfdcf556888a88dc2d2026553d585f920fae105.tar.bz2
rails-acfdcf556888a88dc2d2026553d585f920fae105.zip
Devolve blanket #require to reveal intent and responsibility
* Move specific requires close to where they're needed. * Use the private active_support/rails dep to wrap up common needs like eager autoload and module delegation. * Use a single Rails engine rather than an engine and a railtie. * Prefer `AS::JSON.encode` to `Object#to_json`.
Diffstat (limited to 'lib/action_cable/connection/base.rb')
-rw-r--r--lib/action_cable/connection/base.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/action_cable/connection/base.rb b/lib/action_cable/connection/base.rb
index de27628d7d..9f74226f98 100644
--- a/lib/action_cable/connection/base.rb
+++ b/lib/action_cable/connection/base.rb
@@ -119,7 +119,7 @@ module ActionCable
end
def beat
- transmit({ identifier: '_ping', message: Time.now.to_i }.to_json)
+ transmit ActiveSupport::JSON.encode(identifier: '_ping', message: Time.now.to_i)
end
@@ -203,7 +203,7 @@ module ActionCable
request.filtered_path,
websocket.possible? ? ' [WebSocket]' : '',
request.ip,
- Time.now.to_default_s ]
+ Time.now.to_s ]
end
def finished_request_message
@@ -211,7 +211,7 @@ module ActionCable
request.filtered_path,
websocket.possible? ? ' [WebSocket]' : '',
request.ip,
- Time.now.to_default_s ]
+ Time.now.to_s ]
end
end
end