grenache-ruby-ws 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6a4323b732836b9d283bbfd7d662b9ed1b43da5
-  data.tar.gz: d304bd3797f6f014bc843f86fadb0bef6f5f924f
+  metadata.gz: 1c8de74e27d81dc88a7579b8f5776e659d08c2dc
+  data.tar.gz: 4bd5cc7f14282edf9ab3aaca6fb699c2af07b665
 SHA512:
-  metadata.gz: 223249ca40cc6506b43f0f1cfc1caf1dfdd3d94385cd3ef45242284def3f11601fb68ee2a7f553eddbdca17d4ee908b5019481c74c97dab8e8c40be347313a07
-  data.tar.gz: 89fc7b8c5ec6454a5ec7e3af46b29808387963e4a5da145315c7bcc9a0762484249e30dcdb7d42475e41b644a5812de92508e04ce2e50cacc1a648ac4427759e
+  metadata.gz: 798de5dccaa77d8a6a49f28cf616b018bc5960ca7f389d7da97fad68db2a28b5b2e0dc6f737a75fda425ba80f8795073522e00ee75cbf5263b580cdbca0d6e65
+  data.tar.gz: 6b9a2bd57f8e2aa29597f4d9fdefeed4b82d64d72982b11a862471a88528c19e5e65991aa4c0ca99dbe82e92a4136298cc08d7e80913a350be0af9aba17e98c1

data/examples/client.rb

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

data/examples/worker.rb

@@ -1,6 +1,6 @@
-require 'grenache-ruby-ws'
+require_relative '../lib/grenache-ruby-ws.rb'
 
-Grenache::Base.configure do |conf|
+Grenache::Ws.configure do |conf|
    conf.grape_address = "ws://127.0.0.1:30002"
 end
 
@@ -8,7 +8,6 @@ EM.run do
 
   Signal.trap("INT")  { EventMachine.stop }
   Signal.trap("TERM") { EventMachine.stop }
-
   c = Grenache::Ws.new
 
   c.listen('test',5004) do |ws,msg|

data/grenache-ruby-ws.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'grenache/version'
+require 'grenache/websocket/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "grenache-ruby-ws"
@@ -19,8 +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.0.5"
-  spec.add_runtime_dependency "httpclient", "~> 2.8"
+  spec.add_runtime_dependency "grenache-ruby-base", ">= 0.1.1"
   spec.add_runtime_dependency "oj", "~> 2.17"
   spec.add_runtime_dependency "thin", "~> 1.7"
 

data/lib/grenache/{version.rb → websocket/version.rb}

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

data/lib/grenache/websocket.rb

@@ -49,7 +49,7 @@ module Grenache
     def on_message(ev)
       msg = Oj.load(ev.data)
       disconnect
-      @callback.call(msg) if @callback
+      @callback.call([nil,msg]) if @callback
     end
 
     def disconnect

data/lib/grenache/{base-ws.rb → ws.rb}

@@ -1,4 +1,6 @@
 module Grenache
+  class NoPeerFoundError < Exception; end
+
   class Ws < Grenache::Base
     def listen(key, port,  opts={}, &block)
       EM.defer {
@@ -13,9 +15,13 @@ module Grenache
 
     def request(key, payload, &cb)
       lookup key do |services|
-        service = services.sample
-        ws = WebsocketClient.new(service, &cb)
-        ws.send Oj.dump(payload)
+        if services.length > 0
+          service = services.sample
+          ws = WebsocketClient.new(service, &cb)
+          ws.send Oj.dump(payload)
+        else
+          cb.call ["NoServiceFound", nil]
+        end
       end
     end
 

data/lib/grenache-ruby-ws.rb

@@ -5,7 +5,7 @@ require 'grenache-ruby-base'
 require 'thin'
 require 'rack'
 
-require 'grenache/base-ws'
-require 'grenache/version'
+require 'grenache/ws'
+require 'grenache/websocket/version'
 require 'grenache/websocket'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grenache-ruby-ws
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Bitfinex <info@bitfinex.com>
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-10 00:00:00.000000000 Z
+date: 2016-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -44,28 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.5
-- !ruby/object:Gem::Dependency
-  name: httpclient
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.8'
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
@@ -109,9 +95,9 @@ files:
 - examples/worker.rb
 - grenache-ruby-ws.gemspec
 - lib/grenache-ruby-ws.rb
-- lib/grenache/base-ws.rb
-- lib/grenache/version.rb
 - lib/grenache/websocket.rb
+- lib/grenache/websocket/version.rb
+- lib/grenache/ws.rb
 homepage: https://github.com/bitfinexcom/grenache-ruby-ws
 licenses:
 - MIT