combi 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61873a14703492a9006d76ea15b32bc49cf5e0dc
-  data.tar.gz: a2d86582246b74a58647a9e2a26774c98af52c07
+  metadata.gz: f3a283e392128d694635fce6d3c7dd96de05d5ac
+  data.tar.gz: 764eb5e7ad402be1b8940982e77dc16cf1fa29cd
 SHA512:
-  metadata.gz: 4fdb24566230c75f2f0550a7ee8060b51b611ac78871a170f54723ae3f0fe3008c50490f9db4313316efe9fa22f17446e6db8f4817ebe94144438bb667c37c20
-  data.tar.gz: 2ee0cdf9f93c8717e35cbeab3f190546709385853734dd2f8e16c672efb27c87d3d8f6423e1787534edc6965eebda6d799ccbb8b331338b1bae30ea968818481
+  metadata.gz: 94f13d90ebe75c453e209ae69109e4a0173c6df4c4a1258fc26b79b07ff1e002db408584dc98a0da2e526df8581dda276f4bd58db2825a0df7d850458f47e351
+  data.tar.gz: ff64c2764b536b5a7bc501a3228fc0eb431eb4215e2492f7572abe91bb07744915b36606297652e4740ebd86d60f5d2f3620103044a4eb9b021f870d6762dbfc

data/lib/combi/buses/web_socket.rb

@@ -234,7 +234,7 @@ module Combi
       @ready.callback do |r|
         web_socket = @machine.ws || options[:ws]
         log "sending request #{msg.inspect}"
-        web_socket.send msg.to_json
+        web_socket.send msg.to_json unless web_socket.nil?
       end
       waiter
     end

data/lib/combi/queue_service.rb

@@ -87,7 +87,7 @@ module Combi
     def call(kind, message, options = {})
       log "sending request #{kind} #{message.inspect[0..500]} with options #{options.inspect}"
       raise "RPC is not enabled or reply_to is not included" if (@rpc_queue.nil? || @rpc_queue.name.nil?) && options[:reply_to].nil?
-      options[:timeout] ||= RPC_DEFAULT_TIMEOUT
+      options[:expiration] = (options[:timeout] || RPC_DEFAULT_TIMEOUT) * 1000
       options[:routing_key] ||= 'rcalls_queue'
       options[:reply_to] ||= @rpc_queue.name
       request = {

data/lib/combi/version.rb

@@ -1,3 +1,3 @@
 module Combi
-  VERSION = '0.0.13'
+  VERSION = '0.0.14'
 end

data/spec/lib/combi/buses/web_socket_spec.rb

@@ -80,4 +80,29 @@ describe 'Combi::WebSocket' do
       end
     end
   end
+
+  context "it don't send messages when is not connected" do
+    Then do
+      em do
+        provider.add_service null_service
+        prepare
+        EM::add_timer(0.1) do
+          consumer.stop!
+        end
+        EM::add_timer(0.2) do
+          EM.synchrony do
+            provider.stop!
+            service_result = EM::Synchrony.sync consumer.request(:null, :do_it, {}, { timeout: 0.3 })
+            service_result.should be_a Hash
+            service_result.should have_key 'error'
+            service_result['error'].should eq 'Timeout::Error'
+            done(0.3) #timeout response must came before this timeout
+          end
+          provider.stop!
+          consumer.stop!
+        end
+      end
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: combi
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - German Del Zotto
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-07 00:00:00.000000000 Z
+date: 2014-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
@@ -196,8 +196,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Mini Bus for microservices
 test_files: []
+has_rdoc: