grenache-ruby-ws 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d428863d0a4a8945e20c5c6c9b249e9919a8892d
-  data.tar.gz: 0c1e08c99b9dd5d504a1b1c96632091a31cd723e
+  metadata.gz: 5c16b03fdd4ba2d0a42314fc2d2531e0f3ddb7eb
+  data.tar.gz: f6f3b768f046e5aba49b6fa4cc9a7be5d5e147d7
 SHA512:
-  metadata.gz: c7e7ce9a67298c06e981286c5f9e0def2ad081e9c3576a2ef77f95477f3999795b7567f798786a38fd9f3e2dc9102520f3261be363ac15a424a3df75e7f11ca0
-  data.tar.gz: 7231fa5a6b54438f2e5374426adc9beb24e6c120c2c69b76c571fff08e5563dee0c88db46ca514f0259186176d19c60f2386b3c1668b7adace48d17dc2628b88
+  metadata.gz: fb59cdfbecf933c067fbf49af9818ce647d772edfe1bc64709b1196e9aeab3515ea3d093178b3e5ded1ed39681b7987521fc15c3b5558914ca8f547b4392f6d9
+  data.tar.gz: 7b4108afbb0acc49b470557b3d3d6f25c3d0d6c63df5c237d05b7762a435092e38c0a9ef88014863f1a844ee05d240c29c16f0662bd18453f7318e0ccb266d6f

data/examples/worker.rb

@@ -1,5 +1,4 @@
 require 'thin'
-require 'pry'
 require 'grenache-ruby-base'
 require_relative "../lib/grenache/base.rb"
 require_relative "../lib/grenache/websocket.rb"

data/lib/grenache/base.rb

@@ -11,16 +11,11 @@ module Grenache
       end
     end
 
-    def request(key, payload, &block)
-      f = Fiber.current
+    def request(key, payload, &cb)
       lookup key do |services|
-        f.resume services
-      end
-      services = Fiber.yield
-
-      ws = WebsocketClient.new services.sample
-      ws.sync_send Oj.dump(payload) do |msg|
-        f.resume msg
+        service = services.sample
+        ws = WebsocketClient.new(service, &cb)
+        ws.send Oj.dump(payload)
       end
     end
 

data/lib/grenache/version.rb

@@ -1,5 +1,5 @@
 module Grenache
   module Websocket
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/lib/grenache/websocket.rb

@@ -13,23 +13,13 @@ module Grenache
 
     def app(env)
       ws = Faye::WebSocket.new(env)
-      on_message = -> (ev) { @callback.call(ws, ev) }
-      ws.on :message, on_message
+      ws.on :message, -> (ev) { @callback.call(ws, ev) }
       ws.rack_response
     end
 
-    def on_message(ev)
-      @callback.call(@ws,ev)
-    end
-
     def send(payload)
       @server.send(payload)
     end
-
-    def on_close(ev)
-      puts "ws closed"
-    end
-
   end
 
   class WebsocketClient
@@ -59,7 +49,7 @@ module Grenache
     def on_message(ev)
       msg = Oj.load(ev.data)
       disconnect
-      @block.call(msg) if @block
+      @callback.call(msg) if @callback
     end
 
     def disconnect

data/lib/grenache-ruby-ws.rb

@@ -3,7 +3,6 @@ require 'eventmachine'
 require 'faye/websocket'
 require 'thin'
 require 'rack'
-require 'pry'
 
 require 'grenache/base'
 require 'grenache/version'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grenache-ruby-ws
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Bitfinex <info@bitfinex.com>