drb-websocket 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2b32ebe2bfd968d7c059fe793877dc8d991c40cd783aa3e09747e74cdfebb6b
-  data.tar.gz: ab794959933f89028c7b31b75e61a0dfd7444f268a5de262b8d4e8f8e2ad2e6e
+  metadata.gz: a45fcb51e428c61444bbee61bc8652f8fe7ce4569f9ce8dda558de99be697f83
+  data.tar.gz: d103f546870476188c292479c085efe24993a61d1a8ec3efdbc068346eaa4103
 SHA512:
-  metadata.gz: 36cdc524946deb717b49c50183a48c87f8efe2857986b6d0a9f6ced795d3380853258a68e9d86b95fef6c0dd31e11512b13ce5329b4b9b559681ff4dd456bba1
-  data.tar.gz: 8fe1f109859622d83654b8fe9981c0cc7585bd7b0b05e033afcb615063d52ae67b16a5e4368081e1cbbd05a2dc955d67c6ff590366bf1a1471430419a8699982
+  metadata.gz: 879b10e9576a233a0ab2a8000c237caca72a9401cdd90b6d86d9d23b7c3ce212972a9fb32e22d0e59c10d3faeebacb8cabdfcb0fa61c5e125ef782edd9913375
+  data.tar.gz: 8f562ac8da96ddc2f72d46578eb56d7020c7081cf00ba780e250c0f9f8e085b7ed1a449d67a90f7342c49e2d5b3fde89d4c1725c9485bf9240012727be748016

data/.gitignore

@@ -44,7 +44,7 @@ build-iPhoneSimulator/
 
 # for a library or gem, you might want to ignore these files since the code is
 # intended to run in multiple environments; otherwise, check them in:
-# Gemfile.lock
+Gemfile.lock
 # .ruby-version
 # .ruby-gemset
 

data/examples/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    drb-websocket (0.1.0)
+    drb-websocket (0.4.0)
       faye-websocket
       rack
       thin
@@ -9,19 +9,19 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    daemons (1.2.4)
-    eventmachine (1.2.3)
+    daemons (1.2.6)
+    eventmachine (1.2.7)
     faye-websocket (0.10.7)
       eventmachine (>= 0.12.0)
       websocket-driver (>= 0.5.1)
-    rack (2.0.3)
+    rack (2.0.6)
     thin (1.7.2)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
-    websocket-driver (0.6.5)
+    websocket-driver (0.7.0)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.2)
+    websocket-extensions (0.1.3)
 
 PLATFORMS
   ruby
@@ -30,4 +30,4 @@ DEPENDENCIES
   drb-websocket!
 
 BUNDLED WITH
-   1.14.6
+   1.17.1

data/examples/client.rb

@@ -1,6 +1,15 @@
 require 'drb/websocket'
 
 factory = DRbObject.new_with_uri "ws://127.0.0.1:1234"
+DRb.start_service("ws://127.0.0.1:1234/callback")
 
 remote = factory.get
-puts remote.test
+
+5.times do
+  puts remote.test
+  sleep 1
+end
+
+remote.set_callback do
+  puts "got callback"
+end

data/examples/server.rb

@@ -1,10 +1,17 @@
 require 'drb/drb'
-require 'drb/websocket/server'
+require 'drb/websocket'
 
 class SampleObject
   def test
     "ACK!"
   end
+
+  def set_callback(&callback)
+    5.times do
+      callback.call
+      sleep 1
+    end
+  end
 end
 
 class SampleFactory

data/lib/drb/websocket/callback_server.rb

@@ -6,8 +6,12 @@ module DRb
       def initialize(uri, config)
         @uri = uri
         @config = config
-        @wsclient = WSClient.new(uri)
         @queue = Thread::Queue.new
+        reconnect
+      end
+
+      def reconnect
+        @wsclient = WSClient.new(uri)
 
         @wsclient.on(:message) do |event|
           message = event.data
@@ -17,13 +21,17 @@ module DRb
       end
 
       def close
-        @wsclient.close
-        @wsclient = nil
+        EM.defer do
+          @wsclient.close
+          @wsclient = nil
+        end
       end
 
       def accept
         (sender_id, message) = @queue.pop
-        ServerSide.new(@wsclient, sender_id, message, @config, @uri)
+        server_side = ServerSide.new(@wsclient, sender_id, message, @config, @uri)
+        reconnect
+        server_side
       end
 
       class ServerSide

data/lib/drb/websocket/version.rb

@@ -1,5 +1,5 @@
 module Drb
   module Websocket
-    VERSION = "0.4.0"
+    VERSION = "0.5.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drb-websocket
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - youchan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-10 00:00:00.000000000 Z
+date: 2018-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faye-websocket
@@ -103,7 +103,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -140,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A druby protocol of WebSocket.

data/Gemfile.lock

@@ -1,51 +0,0 @@
-PATH
-  remote: .
-  specs:
-    drb-websocket (0.4.0)
-      faye-websocket
-      rack
-      thin
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    daemons (1.2.6)
-    diff-lcs (1.3)
-    eventmachine (1.2.5)
-    faye-websocket (0.10.7)
-      eventmachine (>= 0.12.0)
-      websocket-driver (>= 0.5.1)
-    rack (2.0.4)
-    rake (10.5.0)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.0)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.0)
-    thin (1.7.2)
-      daemons (~> 1.0, >= 1.0.9)
-      eventmachine (~> 1.0, >= 1.0.4)
-      rack (>= 1, < 3)
-    websocket-driver (0.7.0)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.14)
-  drb-websocket!
-  rake (~> 10.0)
-  rspec (~> 3.0)
-
-BUNDLED WITH
-   1.16.1