grenache-ruby-http 0.1.10 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76d70970562d92075db7ff94a1944c5d6db1b5b4
-  data.tar.gz: 1a9e6adba3523d1a3b93c144227055b9d9533c30
+  metadata.gz: 5c0067db6a0553b48ee55b40bb10c38a066e65a8
+  data.tar.gz: 6a168ab8efae135e0baecfd626d75447aa5fdab8
 SHA512:
-  metadata.gz: 1773298d76850ff7cf45c8066c5fde27d9b36e2ee27fa4002c6b795672936d5dde357d30183d2babf21534486ca27c304eb2e19ce6f9b1c38a816ae74b2dee95
-  data.tar.gz: 828ff03a491ae28de20dbb612037a53cbe601cee39f27b3ff6aea73ed08583e87f53b5af1cfb750b1ca70ec989b6557b11e4e2d34d54a5ba00f8e1dadc947e3b
+  metadata.gz: 1230a0c4eb8241a557e337fc6d57fa2bb9ed10f324ca34bbcf7237f0a5cdb36435ffa29ebecbfed97f79f1ccd04ab6f06b5d980296641679d0dcb78df3fca8e8
+  data.tar.gz: 2cc83302a824617126034a9bd747b6e2b2c1ab718816a6d4b350f75870f03fb17c9eb179814eb096348f65b4cbe2580b740a8acd450e358efa5e266b64949204

data/examples/client.rb

@@ -8,9 +8,9 @@ c = Grenache::Http.new
 start_time = Time.now
 
 10.times do |n|
-  err,resp = c.request("test","world #{n}")
+  err,resp = c.request("rpc_test","world #{n}")
   if !err
-    puts "response: #{resp.payload}"
+    puts "response: #{resp}"
   else
     puts err
   end

data/examples/worker.rb

@@ -11,8 +11,8 @@ EM.run do
 
   c = Grenache::Http.new
 
-  c.listen('test', 5005) do |msg|
-    "hello #{msg.payload}"
+  c.listen('rpc_test', 5004) do |msg|
+   [nil,"hello #{msg.payload}"]
   end
 
 end

data/grenache-ruby-http.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "eventmachine", "~> 1.2"
   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 "httparty", "~> 0.14.0"
   spec.add_runtime_dependency "oj", "~> 2.18"
   spec.add_runtime_dependency "thin", "~> 1.7"

data/lib/grenache/http/version.rb

@@ -1,5 +1,5 @@
 module Grenache
   module HTTP
-    VERSION = "0.1.10"
+    VERSION = "0.2.0"
   end
 end

data/lib/grenache/http.rb

@@ -1,4 +1,3 @@
-
 module Grenache
   class Http < Grenache::Base
     def listen(key, port,  opts={}, &block)
@@ -12,9 +11,9 @@ module Grenache
     def start_http_service(port, &block)
       EM.defer {
         app = -> (env) {
-          req = Message.parse(env['rack.input'].read)
-          resp = block.call(req)
-          [200,nil, Message.response_to(req,resp).to_json]
+          req = ServiceMessage.parse(env['rack.input'].read)
+          err, payload = block.call(req)
+          [200,nil, ServiceMessage.new(payload, err, req.rid).to_json]
         }
         server = Thin::Server.start('0.0.0.0', port, app, {signals: false})
       }
@@ -23,11 +22,12 @@ module Grenache
     def request(key, payload)
       services = lookup(key)
       if services.size > 0
-        json = Message.req(key,payload).to_json
+        json = ServiceMessage.new(payload).to_json
         service = services.sample.sub("tcp://","http://")
         service.prepend("http://") unless service.start_with?("http://")
         resp = HTTParty.post(service,{body: json})
-        return [false, Message.parse(resp.body)]
+        msg = ServiceMessage.parse(resp.body)
+        return [msg.err, msg.payload]
       else
         return ["NoPeerFound",nil]
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grenache-ruby-http
 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: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -131,7 +131,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: http client for Grenache