Add setChannel method to cable; only bind channels if they exist

schneidmaster · Dec 22, 2015 · bdfa91b · bdfa91b
1 parent ed39107
commit bdfa91b
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 20 deletions.
diff --git a/dist/action_cable_react.js b/dist/action_cable_react.js
diff --git a/dist/cable.js b/dist/cable.js
diff --git a/dist/channel_mixin.js b/dist/channel_mixin.js
diff --git a/lib/cable.coffee b/lib/cable.coffee
@@ -5,4 +5,7 @@ class Cable
   channel: (name) ->
     @channels[name]
 
+  setChannel: (name, channel) ->
+    @channels[name] = channel
+
 module.exports = Cable
diff --git a/lib/channel_mixin.coffee b/lib/channel_mixin.coffee
@@ -9,27 +9,29 @@ ChannelMixin = ->
       @mounted = true
 
       for channel in channelNames
-        cable.channel(channel).on 'connected', @handleConnected if @handleConnected?
-        cable.channel(channel).on 'disconnected', @handleDisconnected if @handleDisconnected?
-        cable.channel(channel).on 'rejected', @handleDisconnected if @handleDisconnected?
-        cable.channel(channel).on 'received', @handleReceived if @handleReceived?
+        if cable.channel(channel)
+          cable.channel(channel).on 'connected', @handleConnected if @handleConnected?
+          cable.channel(channel).on 'disconnected', @handleDisconnected if @handleDisconnected?
+          cable.channel(channel).on 'rejected', @handleDisconnected if @handleDisconnected?
+          cable.channel(channel).on 'received', @handleReceived if @handleReceived?
 
-        for action in cable.channel(channel).actions
-          actionMethod = "handle#{_capitalize(action)}"
-          cable.channel(channel).on action, @[actionMethod] if @[actionMethod]?
+          for action in cable.channel(channel).actions
+            actionMethod = "handle#{_capitalize(action)}"
+            cable.channel(channel).on action, @[actionMethod] if @[actionMethod]?
 
     componentWillUnmount: ->
       cable = @props.cable or @context.cable
       @mounted = false
       for channel in channelNames
-        cable.channel(channel).removeListener 'connected', @handleConnected if @handleConnected?
-        cable.channel(channel).removeListener 'disconnected', @handleDisconnected if @handleDisconnected?
-        cable.channel(channel).removeListener 'rejected', @handleDisconnected if @handleDisconnected?
-        cable.channel(channel).removeListener 'received', @handleReceived if @handleReceived?
-
-        for action in cable.channel(channel).actions
-          actionMethod = "handle#{_capitalize(action)}"
-          cable.channel(channel).removeListener action, @[actionMethod] if @[actionMethod]?
+        if cable.channel(channel)
+          cable.channel(channel).removeListener 'connected', @handleConnected if @handleConnected?
+          cable.channel(channel).removeListener 'disconnected', @handleDisconnected if @handleDisconnected?
+          cable.channel(channel).removeListener 'rejected', @handleDisconnected if @handleDisconnected?
+          cable.channel(channel).removeListener 'received', @handleReceived if @handleReceived?
+
+          for action in cable.channel(channel).actions
+            actionMethod = "handle#{_capitalize(action)}"
+            cable.channel(channel).removeListener action, @[actionMethod] if @[actionMethod]?
 
     perform: (channel, action, data = {}) ->
       cable = @props.cable or @context.cable

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "action-cable-react",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Use Rails 5 ActionCable channels with React for realtime magic.",
   "main": "index.js",
   "scripts": {

diff --git a/version.js b/version.js
@@ -1 +1 @@
-module.exports = '0.1.0'
+module.exports = '0.1.1'