grenache-ruby-ws 0.1.10 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9d71a1723fb380b1dfc56ba83ca6e683a01b51f
-  data.tar.gz: 4c23608f1c153cfb750ccefd896340cc34cbf49d
+  metadata.gz: 272e3e86ab5bd934f0cd63743d3d6135f88d5ea8
+  data.tar.gz: 01e9c933a0f07984516226fac6d62e048b64e24d
 SHA512:
-  metadata.gz: ede5e8881ae2b74864ee31650bcb66a44851d7ca19ce63ad4ff41602ce7a9d694edc1130cd2a1513dc7047e588d34356752fc1fa95e44dcbe73febad899dbf1a
-  data.tar.gz: 3e59ca12d63e51fabee2cd354807f6498ac5bdafa05b14fac610cdc08efa7ed4b121813dcf8acad9a7ade8b865a360795d87ff357e274b7b75b9ade00050350e
+  metadata.gz: 76821804b32418ef6f8ff993cd52807c690809dccc408aa922cb35b142025d0e8d67756c412239f38651ff83f35c27443d9fc8357169445b20f4b6dd06c17b9e
+  data.tar.gz: 76febb3877073572837f59cdb1a0af7f2b6c2c8fcaa31240ef92fce35e047ca3cf5237dd84338ff2ab5f433114a74717ac11daaff6521731d2b055b93a2caa25

data/examples/client.rb

@@ -1,13 +1,13 @@
 require_relative '../lib/grenache-ruby-ws.rb'
 
 Grenache::Ws.configure do |conf|
-   conf.grape_address = "ws://127.0.0.1:30002"
+   conf.grape_address = "ws://127.0.0.1:30001"
 end
 
 EM.run do
   client = Grenache::Ws.new
   10.times do |n|
-    client.request("test","world #{n}") do |err, msg|
+    client.request("rpc_test","world #{n}") do |err, msg|
       if msg
         puts "response: #{msg.payload}"
       else

data/examples/worker.rb

@@ -1,7 +1,7 @@
 require_relative '../lib/grenache-ruby-ws.rb'
 
 Grenache::Ws.configure do |conf|
-   conf.grape_address = "ws://127.0.0.1:30002"
+   conf.grape_address = "ws://127.0.0.1:30001"
 end
 
 EM.run do
@@ -10,8 +10,8 @@ EM.run do
   Signal.trap("TERM") { EventMachine.stop }
   c = Grenache::Ws.new
 
-  c.listen('test',5004) do |req|
-    "hello #{req.payload}"
+  c.listen('rpc_test',5004) do |req|
+    [nil,"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.10"
+  spec.add_runtime_dependency "grenache-ruby-base", "~> 0.2.0"
   spec.add_runtime_dependency "oj", "~> 2.18"
   spec.add_runtime_dependency "thin", "~> 1.7"
 

data/lib/grenache/websocket.rb

@@ -14,9 +14,9 @@ module Grenache
     def app(env)
       ws = Faye::WebSocket.new(env)
       ws.on :message, -> (ev) do
-        req = Message.parse(ev.data)
-        res = @callback.call(req)
-        ws.send(Message.response_to(req, res).to_json)
+        req = ServiceMessage.parse(ev.data)
+        err, payload = @callback.call(req)
+        ws.send(ServiceMessage.new(payload, err, req.rid).to_json)
       end
       ws.rack_response
     end
@@ -55,7 +55,7 @@ module Grenache
     end
 
     def on_message(ev)
-      msg = Message.parse(ev.data)
+      msg = ServiceMessage.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.10"
+    VERSION = "0.2.0"
   end
 end

data/lib/grenache/ws.rb

@@ -15,7 +15,7 @@ module Grenache
     end
 
     def request(key, payload, &cb)
-      json = Message.req(key,payload).to_json
+      json = ServiceMessage.new(payload).to_json
       if service_cache[key] && service_cache[key].connected?
         service_cache[key].send json
       else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grenache-ruby-ws
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.2.0
 platform: ruby
 authors:
 - Bitfinex <info@bitfinex.com>
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-28 00:00:00.000000000 Z
+date: 2017-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -42,16 +42,16 @@ dependencies:
   name: grenache-ruby-base
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.10
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.10
+        version: 0.2.0
 - !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.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Websocket client for Grenache