grenache-ruby-http 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed3a66cedb0e348e84f2b00f269ed5eba0ba7c27
-  data.tar.gz: 8b27a723435c6143e8a775d6e09d299b070d2491
+  metadata.gz: 1ad7477904587c54d3a1e924b26c71d4ad87f92f
+  data.tar.gz: 859ef65da086a02b0c47bddcff6cd26524ce4249
 SHA512:
-  metadata.gz: afed98da6d1f06da9c0235fd4e4331e759d2a9a86072b9c4dab7681cfbdc96c5e8d03f7aa610a5a38fa2342616c22c6312c82a624a02f54e99b05ca93b699a8c
-  data.tar.gz: eed6a96fa47b5923f7dbb27eba96734d6df83e2361e2128cadfa004ab1d8b7b8e587954c72279ed7be7e5f971f0fb16092876aef94066d31f4a93f572eac702c
+  metadata.gz: b9407e40b2f9fa42bed390948b44633622f2ba5d9104c8109e9707d89dd64e5ca7be9d3062efcb67d9b964420c4e8b8d419733f209e04815469b51835120b07d
+  data.tar.gz: af073fc89cf1e60243b5ef020b9193c29a1d848f172653b1f67bd291e57e17a14bfd6999b520ec4065fe74924872fdceef1d123ed6845ea314e500393fa89dc2

data/README.md

@@ -15,13 +15,11 @@ end
 ```ruby
 c = Grenache::BaseHttp.new
 
-c.listen("test",5001) do |env|
-    req = Oj.load(env['rack.input'].read)
-    [200,nil,"hello #{req}"]
+c.listen("test",5001) do |req|
+    "hello #{req.payload}"
 end
 ```
 
-
 ## calling a remote service
 
 ```ruby

data/examples/client.rb

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

data/examples/worker.rb

@@ -12,8 +12,9 @@ EM.run do
   c = Grenache::Http.new
 
   c.listen('test', 5004) do |env|
-    req = Oj.load(env['rack.input'].read)
-    [200,nil,"hello #{req}"]
+    body = env['rack.input'].read
+    req = Grenache::Message.parse(body)
+    "hello #{req.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.1"
+  spec.add_runtime_dependency "grenache-ruby-base", "0.1.3"
   spec.add_runtime_dependency "httparty", "~> 0.14.0"
   spec.add_runtime_dependency "oj", "~> 2.17"
   spec.add_runtime_dependency "thin", "~> 1.7"

data/lib/grenache/http/version.rb

@@ -1,5 +1,5 @@
 module Grenache
   module HTTP
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

data/lib/grenache/http.rb

@@ -12,20 +12,21 @@ module Grenache
     def start_http_service(port, &block)
       EM.defer {
         app = -> (env) {
-          block.call(env)
+          resp = block.call(env)
+          [200,nil, Message.req(resp).to_json]
         }
         server = Thin::Server.start('0.0.0.0', port, app, {signals: false})
       }
     end
 
-    def request(key, payload, &block)
+    def request(key, payload)
       services = lookup(key)
       if services.size > 0
-        json = Oj.dump(payload)
+        json = Message.req(payload).to_json
         service = services.sample.sub("tcp://","http://")
         service.prepend("http://") unless service.start_with?("http://")
         resp = HTTParty.post(service,{body: json})
-        return [nil, Oj.load(resp.body)]
+        return [false, Message.parse(resp.body)]
       else
         return ["NoPeerFound",nil]
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grenache-ruby-http
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Bitfinex <info@bitfinex.com>
@@ -14,28 +14,28 @@ dependencies:
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: faye-websocket
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
 - !ruby/object:Gem::Dependency
@@ -44,54 +44,54 @@ 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: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.17'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 description: 
@@ -101,8 +101,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - README.md
 - examples/client.rb
@@ -121,17 +121,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: http client for Grenache