aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2015-01-15 10:24:35 +0530
committerPratik Naik <pratiknaik@gmail.com>2015-01-15 10:24:35 +0530
commit935b73b4c132b9ef6b71054dd577cab88c0050a3 (patch)
tree4f70c0783316ed3f9f2bc68fb38e89ff05c0a434 /lib
parentdb568553d172e6ebdc3bc0aae3839d4a91299b42 (diff)
downloadrails-935b73b4c132b9ef6b71054dd577cab88c0050a3.tar.gz
rails-935b73b4c132b9ef6b71054dd577cab88c0050a3.tar.bz2
rails-935b73b4c132b9ef6b71054dd577cab88c0050a3.zip
Rename publish to broadcast
Diffstat (limited to 'lib')
-rw-r--r--lib/action_cable/channel/base.rb4
-rw-r--r--lib/action_cable/server.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/action_cable/channel/base.rb b/lib/action_cable/channel/base.rb
index 82c1a14b49..e091d08c9c 100644
--- a/lib/action_cable/channel/base.rb
+++ b/lib/action_cable/channel/base.rb
@@ -45,8 +45,8 @@ module ActionCable
# Override in subclasses
end
- def publish(data)
- @connection.publish(data.merge(identifier: @channel_identifier).to_json)
+ def broadcast(data)
+ @connection.broadcast(data.merge(identifier: @channel_identifier).to_json)
end
def start_periodic_timers
diff --git a/lib/action_cable/server.rb b/lib/action_cable/server.rb
index 2d80e96265..a55c3be3bc 100644
--- a/lib/action_cable/server.rb
+++ b/lib/action_cable/server.rb
@@ -38,7 +38,7 @@ module ActionCable
end
end
- def publish(data)
+ def broadcast(data)
render data
end