faye-reconnect 0.0.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 34457f6dc6d2422c700fcf64f859faa2b26d99c2
-  data.tar.gz: bebc0fe60b864e93e15120ef69b6c5bdd9c78560
+SHA256:
+  metadata.gz: '09c9aa50ab9b10bc3ab23fc21f523785772429819b0730c868640a23bc883c03'
+  data.tar.gz: 9800a0e214785d34fc1b522ba850d523e4586e593835058de40f4aa5a9e41873
 SHA512:
-  metadata.gz: 66bf5efd7aef929a1646b268ce15675473ba511e498c6c6b20be0a21c8d5325b45f25b9df97d5e7c3e9fbbc046ae905aa69137b7d0dc91816920217f1d546f40
-  data.tar.gz: 044e91fba9132d88689ed2da546cfdcb26ae62ccf0006a998be3ee75a4e7c9a9c8740a986e582c0472336aaaa331fc00fa61f83c880ef631605d321408fcc9d1
+  metadata.gz: 280ef8208c7155290d49f916fbd3ee34d935ee666a71b4b00c4590b47d9bd56a8de06f1539f97d11cbeef0b7b22bdd98a0727fd6a396d1f8d7cfe44a6df5d0a6
+  data.tar.gz: 8fd10daa1ffdb2d2a699845aa7859157c11cffea6a68b1410a62d6b8a6ccfa613cdb03c124ffee2873282797df6575ad8c78f1a77be4fbc232e9811c7878e972

data/README.md

@@ -39,7 +39,7 @@ server.add_extension Faye::Reconnect::ServerExtension.new(server)
 
 ### Client Side
 
-The client extension has a dependency on redis. 
+The client extension has a dependency on redis.
 It uses redis to persist the client id after each successful handshake so it can re-use it when trying to reconnect.
 
 Add the extension to your faye client :
@@ -66,7 +66,7 @@ If you don't specify redis options, the ones provided in the above example will
 You may already have something along the lines of :
 
 ```ruby
-trap('TERM') do 
+trap('TERM') do
     client.disconnect
 end
 ```
@@ -74,7 +74,7 @@ end
 If you plan on reconnecting with the same client id and get missing messages, you have to use the ``stop!`` method provided by this gem :
 
 ```ruby
-trap('TERM') do 
+trap('TERM') do
     client.stop!
 end
 ```
@@ -84,7 +84,7 @@ Instead of sending a ``/meta/disconnect`` message to the server, it will cleanly
 
 ## Contributing
 
-1. Fork it ( https://github.com/dimelo/faye-reconnect/fork )
+1. Fork it (https://github.com/jarthod/faye-reconnect/fork)
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/faye-reconnect.gemspec

@@ -6,8 +6,8 @@ require 'faye/reconnect/version'
 Gem::Specification.new do |spec|
   spec.name          = "faye-reconnect"
   spec.version       = Faye::Reconnect::VERSION
-  spec.authors       = ["Adrien Siami"]
-  spec.email         = ["adrien.siami@dimelo.com"]
+  spec.authors       = ["Adrien Jarthon", "Adrien Siami"]
+  spec.email         = ["jobs@adrienjarthon.com"]
   spec.summary       = "Allow a long running faye client to reconnect to a faye server with the same client ID"
   spec.description   = "Allow a long running faye client to reconnect to a faye server with the same client ID"
   spec.homepage      = ""
@@ -20,10 +20,10 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'em-hiredis', '~> 0.3'
 
-  spec.add_development_dependency 'bundler', '~> 1.7'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.1.0'
-  spec.add_development_dependency 'rspec-eventmachine', '~> 0.2.0'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rspec-eventmachine'
   spec.add_development_dependency 'thin'
   spec.add_development_dependency 'pry-byebug'
 

data/lib/faye/reconnect/client_extension.rb

@@ -4,9 +4,14 @@ module Faye
   module Reconnect
     class ClientExtension
 
-      def initialize redis: nil, name:
+      def self.finalize(redis)
+        proc { redis&.close_connection }
+      end
+
+      def initialize redis: nil, name:, on_handshake: nil
         @name = name
         @clientIdFetched = false
+        @on_handshake = on_handshake
         redis ||= {}
         redis[:host] ||= 'localhost'
         redis[:port] ||= 6379
@@ -15,6 +20,8 @@ module Faye
         @redis = EventMachine::Hiredis::Client.new(redis[:host], redis[:port], redis[:password], redis[:database])
         EM.schedule do
           @redis.connect
+          @redis.client('setname', "faye-reconnect/#{name}[#{Socket.gethostname}][#{Process.pid}]")
+          ObjectSpace.define_finalizer(self, self.class.finalize(@redis))
           @redis.errback do |reason|
             raise "Connection to redis failed : #{reason}"
           end
@@ -25,6 +32,10 @@ module Faye
         "#{@name}/client_id"
       end
 
+      def close_redis_connection
+        @redis&.close_connection
+      end
+
       def fetch_client_id(&callback)
         if @clientIdFetched == false
           @clientIdFetched = true
@@ -48,6 +59,8 @@ module Faye
         elsif message['channel'] == '/meta/handshake'
           fetch_client_id do |clientId|
             message['previousClientId'] = clientId if !clientId.nil?
+            # Store the clientId sent with the /meta/handshake
+            @sent_client_id = clientId
             callback.call(message)
           end
         else
@@ -57,6 +70,7 @@ module Faye
 
       def incoming(message, callback)
         if message['channel'] == '/meta/handshake'
+          @on_handshake&.call(previous_client_id: @sent_client_id, new_client_id: message['clientId'])
           if message['error'] == 'Already connected' && message.key?('clientId')
             message.delete('error')
             message['successful'] = true

data/lib/faye/reconnect/version.rb

@@ -1,5 +1,5 @@
 module Faye
   module Reconnect
-    VERSION = "0.0.3"
+    VERSION = "1.0.0"
   end
 end

data/spec/client_extension_spec.rb

@@ -3,7 +3,6 @@ require 'faye/reconnect'
 require 'spec_helper'
 
 describe Faye::Reconnect::ClientExtension do
-
   it 'requires a name option' do
     expect {
       Faye::Reconnect::ClientExtension.new
@@ -13,4 +12,11 @@ describe Faye::Reconnect::ClientExtension do
     }.to_not raise_error
   end
 
+  describe '#close_redis_connection' do
+    it 'calls #close_connection on the redis client' do
+      faye_reconnect = Faye::Reconnect::ClientExtension.new(name: 'foobar')
+      expect_any_instance_of(EventMachine::Hiredis::Client).to receive(:close_connection).and_return(true)
+      faye_reconnect.close_redis_connection
+    end
+  end
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: faye-reconnect
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 1.0.0
 platform: ruby
 authors:
+- Adrien Jarthon
 - Adrien Siami
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-11 00:00:00.000000000 Z
+date: 2020-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-hiredis
@@ -28,58 +29,58 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-eventmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
@@ -111,7 +112,7 @@ dependencies:
 description: Allow a long running faye client to reconnect to a faye server with the
   same client ID
 email:
-- adrien.siami@dimelo.com
+- jobs@adrienjarthon.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -150,8 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Allow a long running faye client to reconnect to a faye server with the same