action_cable_client 2.0.2 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ce107c85e351970c2f8f0b4dec9608c75d78384c
-  data.tar.gz: cff39593ed8b01083d87c438617e3a8d073559db
+SHA256:
+  metadata.gz: ef3930c35f391add154d196da2d779e1e51aab9e710c97e138f743cf8aac8be7
+  data.tar.gz: 81e73f0c6aa96c39d2aafac68e03f08f3c15f7920bba10449711dc28cb21bddd
 SHA512:
-  metadata.gz: 8fa7c5702425a8494356236f444f10403a8f5bd21ae4029b3d3965c08e5f344830ab83dc05573b2ad32c29012820a215aac6383c26c8d61a542f33f6995311d7
-  data.tar.gz: c1f15938485dbe86c96abff5e0b922a4c270400f76d7202cc87e194e6513da934f9f5f467f6778edd960b982f8e22c4f0aa2c19427c3cfa48f4a4917eaeb9827
+  metadata.gz: 3a8835181f1d80da858441ad174571642791b5491cb734cdb9c9c660248d0d02b611000c18d456a1c20a6dab0502986226b30931e52bd2c1c7948c3242d7b00b
+  data.tar.gz: 4c5135c08c26bf4bb12dc3289b5bc024b03efa962b0617f6a21493b44683bec046dc8007971c5eb4cc76a21b69a14b3df996ee09b5fb5becbd0818f02eab9fef

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 3.0.1
+
+* [#27](https://github.com/NullVoxPopuli/action_cable_client/pull/27)
+  * Implement reconnect
+  * Fix issue with subscribing only working on initial connection
+  * Additional Tests
+  * Drop support for Ruby 2.2
+
 ## 2.0.2
 
 * [#24](https://github.com/NullVoxPopuli/action_cable_client/pull/24) Fix bug where action cable client is too fast for the server and doesn't wait for the server's welcome message before initiating a channel subscription (@wpp)

data/README.md

@@ -16,9 +16,7 @@ EventMachine.run do
 
   uri = "ws://localhost:3000/cable/"
   client = ActionCableClient.new(uri, 'RoomChannel')
-  # the connected callback is required, as it triggers
-  # the actual subscribing to the channel but it can just be
-  # client.connected {}
+  # called whenever a welcome message is received from the server
   client.connected { puts 'successfully connected.' }
 
   # called whenever a message is received from the server
@@ -62,7 +60,7 @@ end
 To reconnect,
 
 ```ruby
-client.connect!
+client.reconnect!
 ```
 
 #### Sending additional params

data/lib/action_cable_client.rb

@@ -22,7 +22,8 @@ class ActionCableClient
   attr_reader :_message_factory
   # The queue should store entries in the format:
   # [ action, data ]
-  attr_accessor :message_queue, :_subscribed, :_subscribed_callback, :_pinged_callback, :_connected_callback
+  attr_accessor :message_queue, :_subscribed
+  attr_accessor :_subscribed_callback, :_pinged_callback, :_connected_callback, :_disconnected_callback
 
   def_delegator :_websocket_client, :onerror, :errored
   def_delegator :_websocket_client, :send, :send_msg
@@ -58,6 +59,17 @@ class ActionCableClient
     # - ping - sends a ping
     # - pong - sends a pong
     @_websocket_client = WebSocket::EventMachine::Client.connect(uri: @_uri, headers: headers)
+
+    @_websocket_client.onclose do
+      self._subscribed = false
+      _disconnected_callback&.call
+    end
+  end
+
+  def reconnect!
+    uri = URI(@_uri)
+    EventMachine.reconnect uri.host, uri.port, @_websocket_client
+    @_websocket_client.post_init
   end
 
   # @param [String] action - how the message is being sent
@@ -91,9 +103,8 @@ class ActionCableClient
   #     # do things after the client is connected to the server
   #   end
   def connected
-    self._connected_callback = Proc.new do
-      subscribe
-      yield
+    self._connected_callback = proc do |json|
+      yield(json)
     end
   end
 
@@ -128,8 +139,7 @@ class ActionCableClient
   #     # cleanup after the server disconnects from the client
   #   end
   def disconnected
-    _websocket_client.onclose do
-      self._subscribed = false
+    self._disconnected_callback = proc do
       yield
     end
   end
@@ -143,11 +153,13 @@ class ActionCableClient
   # @param [String] message - the websockt message object
   def handle_received_message(message)
     return if message.empty?
+
     json = JSON.parse(message)
 
     if is_ping?(json)
       _pinged_callback&.call(json)
     elsif is_welcome?(json)
+      subscribe
       _connected_callback&.call(json)
     elsif !subscribed?
       check_for_subscribe_confirmation(json)

data/lib/action_cable_client/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class ActionCableClient
-  VERSION = '2.0.2'
+  VERSION = '3.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: action_cable_client
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 3.0.1
 platform: ruby
 authors:
 - L. Preston Sego III
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-29 00:00:00.000000000 Z
+date: 2018-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket-eventmachine-client
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -106,7 +106,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -114,8 +114,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
-summary: ActionCableClient-2.0.2
+summary: ActionCableClient-3.0.1
 test_files: []