sub_zero 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c3d06f3806bd38f972069cccc381a5e14a10552
-  data.tar.gz: 201442b45283cc753950167905a088a450ec613a
+  metadata.gz: 1d2f91d35235df49176ba39a8f3cd6bf5cbca454
+  data.tar.gz: ada80f112ceff71a231d9bf2b05c05ce30cb66a2
 SHA512:
-  metadata.gz: 59833793e76d2543ad4ed8948f852b7a8b13b0db67e44352cf55c4df36044b16669f84cd8a6e5df9e8134a7c20f36a245bbe760b7fd3c5a30696ebe61b56dacf
-  data.tar.gz: 2aee09d0ea9f147d2acf510203f0b71d7619876b8dbe5750d32f6153f1710ce0e6aad0cdfdd1d96013a96643928c36a11becfc4c5f7b02e61efc2ce1eed31b3c
+  metadata.gz: 496a8f67eb47c3105724e05cab034f5efd519c120f7d6807de1173b2015c57692a622d6f25204fa11446be2a5fb84276d9c58dbe2727929108d79f85bcc11ac1
+  data.tar.gz: 5d0dc86764da65b7eacff51daa6431fd091a7a2055864bc8c84377bf8f15488df15ebc569c382ea2505e1cdfb6103ccc33929fbfb43ff962b329d9d64bf25174

data/lib/sub_zero/client/socket.rb

@@ -12,15 +12,21 @@ module SubZero
       def zeromq_fetch verb, payload = {}, options = {}
         result = []
 
-        zeromq_context do |context|
-          zeromq_socket context do |socket|
-            rid = SecureRandom.uuid
-            zeromq_send socket, "REQ:#{sid}", rid, verb, payload.to_msgpack, options.to_msgpack
-            result = zeromq_result(socket, rid, verb)
+        timeout = options.fetch(:timeout, 1000) / 1000.0
+
+        Timeout.timeout timeout do
+          zeromq_context do |context|
+            zeromq_socket context do |socket|
+              rid = SecureRandom.uuid
+              zeromq_send socket, "REQ:#{sid}", rid, verb, payload.to_msgpack, options.to_msgpack
+              result = zeromq_result(socket, rid, verb)
+            end
           end
         end
 
         result
+      rescue Timeout::Error
+        raise SubZero::Client::Error.new(code: 'timeout', message: "call timeout: #{timeout}s")
       end
 
       def zeromq_context
@@ -62,7 +68,7 @@ module SubZero
         zeromq_validate_result! rid, verb, result
 
         routing_info = MessagePack.unpack(result.pop)
-        payload = MessagePack.unpack(result.pop)
+        payload      = MessagePack.unpack(result.pop)
         rep_verb = result.pop
         status = rep_verb.end_with?('NOK') ? :error : :ok
 

data/lib/sub_zero/client.rb

@@ -1,4 +1,5 @@
 require 'active_support/string_inquirer'
+require 'active_support/hash_with_indifferent_access'
 
 module SubZero
   class Client
@@ -17,7 +18,7 @@ module SubZero
     def call verb, payload = {}, options = {}
       sz_verb = verb.to_s.upcase.gsub('_', '/')
       status, result = zeromq_fetch(sz_verb, payload, options)
-      result = handle_result(status, result)
+      result = handle_result(status, result).with_indifferent_access
       block_given? ? yield(result) : result
     end
 

data/lib/sub_zero/version.rb

@@ -1,3 +1,3 @@
 module SubZero
-  VERSION = "0.0.3"
+  VERSION = '0.0.4'
 end

data/lib/sub_zero.rb

@@ -1,5 +1,6 @@
 require 'yaml'
 require 'securerandom'
+require 'timeout'
 
 require 'thor'
 require 'thor/group'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sub_zero
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Victor Rodrigues
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-26 00:00:00.000000000 Z
+date: 2013-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -176,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: ZeroMQ GREAT SOA solution