aboutsummaryrefslogtreecommitdiffstats
path: root/lib/action_cable
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2015-07-08 22:36:08 +0200
committerDavid Heinemeier Hansson <david@loudthinking.com>2015-07-08 22:49:34 +0200
commita1200616cc22ad266537e31a808a1e90bf4da79f (patch)
treee2d0eea657fafda709ddabb140597c87996e01e3 /lib/action_cable
parent4c20f1b810595a8eb8b321a24768c7b80be9b98d (diff)
downloadrails-a1200616cc22ad266537e31a808a1e90bf4da79f.tar.gz
rails-a1200616cc22ad266537e31a808a1e90bf4da79f.tar.bz2
rails-a1200616cc22ad266537e31a808a1e90bf4da79f.zip
Revert to perform_action language – we're already using process for the connection
Diffstat (limited to 'lib/action_cable')
-rw-r--r--lib/action_cable/channel/base.rb2
-rw-r--r--lib/action_cable/connection/subscriptions.rb6
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/action_cable/channel/base.rb b/lib/action_cable/channel/base.rb
index 9c23ba382b..f389e360f6 100644
--- a/lib/action_cable/channel/base.rb
+++ b/lib/action_cable/channel/base.rb
@@ -83,7 +83,7 @@ module ActionCable
# Extract the action name from the passed data and process it via the channel. The process will ensure
# that the action requested is a public method on the channel declared by the user (so not one of the callbacks
# like #subscribed).
- def process_action(data)
+ def perform_action(data)
action = extract_action(data)
if processable_action?(action)
diff --git a/lib/action_cable/connection/subscriptions.rb b/lib/action_cable/connection/subscriptions.rb
index 803894c8f6..0411d96413 100644
--- a/lib/action_cable/connection/subscriptions.rb
+++ b/lib/action_cable/connection/subscriptions.rb
@@ -12,7 +12,7 @@ module ActionCable
case data['command']
when 'subscribe' then add data
when 'unsubscribe' then remove data
- when 'message' then process_action data
+ when 'message' then perform_action data
else
logger.error "Received unrecognized command in #{data.inspect}"
end
@@ -41,8 +41,8 @@ module ActionCable
subscriptions.delete(data['identifier'])
end
- def process_action(data)
- find(data).process_action ActiveSupport::JSON.decode(data['data'])
+ def perform_action(data)
+ find(data).perform_action ActiveSupport::JSON.decode(data['data'])
end