grenache-ruby-ws 0.1.0 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c8de74e27d81dc88a7579b8f5776e659d08c2dc
-  data.tar.gz: 4bd5cc7f14282edf9ab3aaca6fb699c2af07b665
+  metadata.gz: 351d8ba16c4113d2f8cb8778f4bf43a67d480a38
+  data.tar.gz: 7a10fdde8803a15db4af8f6920e3a040e9b299b5
 SHA512:
-  metadata.gz: 798de5dccaa77d8a6a49f28cf616b018bc5960ca7f389d7da97fad68db2a28b5b2e0dc6f737a75fda425ba80f8795073522e00ee75cbf5263b580cdbca0d6e65
-  data.tar.gz: 6b9a2bd57f8e2aa29597f4d9fdefeed4b82d64d72982b11a862471a88528c19e5e65991aa4c0ca99dbe82e92a4136298cc08d7e80913a350be0af9aba17e98c1
+  metadata.gz: 551a8ed6156b2a00209fbbad3d84040d354833258affa3e71a3f97eda7e81b8d0d5a39704cd90481198a98b02d395f32e53b1993b421e4114a6d4bf4c52a8817
+  data.tar.gz: 1fd12daff8411cf21f23dbc4a95f51c05e3c5e545d0e783637f93e72068eeac661fd8aeba96ad38edfb2a3119a7366ce36ea26b562ab3d5ca512649ca5b1cbaa

data/examples/client.rb

@@ -5,12 +5,11 @@ Grenache::Ws.configure do |conf|
 end
 
 EM.run do
-
   client = Grenache::Ws.new
   10.times do |n|
     client.request("test","world #{n}") do |err, msg|
       if msg
-        puts "response: #{msg}"
+        puts "response: #{msg.payload}"
       else
         puts "error: #{err}"
       end

data/examples/worker.rb

@@ -10,8 +10,8 @@ EM.run do
   Signal.trap("TERM") { EventMachine.stop }
   c = Grenache::Ws.new
 
-  c.listen('test',5004) do |ws,msg|
-    ws.send Oj.dump("hello #{msg.data}")
+  c.listen('test',5004) do |req|
+    "hello #{req.payload}"
   end
 
 end

data/grenache-ruby-ws.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "eventmachine", "~> 1.0"
   spec.add_runtime_dependency "faye-websocket", "~> 0.10"
-  spec.add_runtime_dependency "grenache-ruby-base", ">= 0.1.1"
+  spec.add_runtime_dependency "grenache-ruby-base", ">= 0.1.3"
   spec.add_runtime_dependency "oj", "~> 2.17"
   spec.add_runtime_dependency "thin", "~> 1.7"
 

data/lib/grenache/websocket.rb

@@ -13,7 +13,11 @@ module Grenache
 
     def app(env)
       ws = Faye::WebSocket.new(env)
-      ws.on :message, -> (ev) { @callback.call(ws, ev) }
+      ws.on :message, -> (ev) do
+        req = Message.parse(ev.data)
+        res = @callback.call(req)
+        ws.send(Message.response_to(req, res).to_json)
+      end
       ws.rack_response
     end
 
@@ -47,7 +51,7 @@ module Grenache
     end
 
     def on_message(ev)
-      msg = Oj.load(ev.data)
+      msg = Message.parse(ev.data)
       disconnect
       @callback.call([nil,msg]) if @callback
     end

data/lib/grenache/websocket/version.rb

@@ -1,5 +1,5 @@
 module Grenache
   module Websocket
-    VERSION = "0.1.0"
+    VERSION = "0.1.3"
   end
 end

data/lib/grenache/ws.rb

@@ -16,9 +16,10 @@ module Grenache
     def request(key, payload, &cb)
       lookup key do |services|
         if services.length > 0
+          json = Message.req(payload).to_json
           service = services.sample
           ws = WebsocketClient.new(service, &cb)
-          ws.send Oj.dump(payload)
+          ws.send json
         else
           cb.call ["NoServiceFound", nil]
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grenache-ruby-ws
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.3
 platform: ruby
 authors:
 - Bitfinex <info@bitfinex.com>
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-14 00:00:00.000000000 Z
+date: 2017-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Websocket client for Grenache