combi 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38eced61f795b66ed4f2eafe663e8dd5a204b99a
-  data.tar.gz: e0793e82d4b75ba93ddc5a835a9bea71d1453117
+  metadata.gz: bf7f73f8dc51e7b390cbdfd3d76bd26d74e95261
+  data.tar.gz: eed9f9840dd7e43cb8c72057bdb9688e49d94bf5
 SHA512:
-  metadata.gz: c8bddb984ae14b2c28329dc152873cd580dd70e3bc13a641fb1da673d0edf6c2835b59d52ec87acc2552cab6124e79f33a4be8829eecba68e05ce6667b90e124
-  data.tar.gz: 756143cca67900ca14a5c038ab14eda751ebda96a68c956634c8b5fcf3885f396bd6f88ec9e9b00ce7f4c2cbf8978344748079cf2b4145e9cac241f7fa4f5fff
+  metadata.gz: c5287c09cd3cceb88ca67b98ffe8641ae3f607d8d472a1048762d8318bbad8254a0d299555811a09d0e8ad998a45fa780b3449efed7a708a395f8f1d17f4ab18
+  data.tar.gz: 82a80a9e331d18d31ada7497e2a9ddde314a4b59874f1487baf95bb73d3ef77fd1766032f3569a692316e414c876cf81a088098ba9cf859f4305dcb8fd95e732

data/lib/combi/buses/http.rb

@@ -61,6 +61,8 @@ module Combi
           end
           {result: 'ok', response: response}
         end
+      else
+        {result: 'error', response: {error: true, message: 'unknown service'}}
       end
     end
 

data/lib/combi/buses/in_process.rb

@@ -6,30 +6,33 @@ module Combi
     def request(handler_name, kind, message, options = {})
       options[:timeout] ||= RPC_DEFAULT_TIMEOUT
       handler = memory_handlers[handler_name.to_s]
-      return if handler.nil?
-      service_instance = handler[:service_instance]
-      message = JSON.parse(message.to_json)
-      return unless service_instance.respond_to?(kind)
       waiter = EventMachine::DefaultDeferrable.new
-      waiter.timeout(options[:timeout], RuntimeError.new(Timeout::Error))
-      begin
-        Timeout.timeout(options[:timeout]) do
-          response = service_instance.send(kind, message)
-          if response.respond_to? :succeed
-            response.callback do |service_response|
-              waiter.succeed service_response
+      if handler.nil?
+        waiter.fail('error' => true, 'message' => 'unknown service')
+      else
+        service_instance = handler[:service_instance]
+        message = JSON.parse(message.to_json)
+        return unless service_instance.respond_to?(kind)
+        waiter.timeout(options[:timeout], RuntimeError.new(Timeout::Error))
+        begin
+          Timeout.timeout(options[:timeout]) do
+            response = service_instance.send(kind, message)
+            if response.respond_to? :succeed
+              response.callback do |service_response|
+                waiter.succeed service_response
+              end
+            else
+              waiter.succeed response
             end
-          else
-            waiter.succeed response
           end
+        rescue Timeout::Error => e
+          log "ERROR"
+          waiter.fail RuntimeError.new(Timeout::Error)
+        rescue Exception => e
+          log "other ERROR"
+          log e.inspect
+          waiter.fail({'error' => true, 'message' => e.message})
         end
-      rescue Timeout::Error => e
-        log "ERROR"
-        waiter.fail RuntimeError.new(Timeout::Error)
-      rescue Exception => e
-        log "other ERROR"
-        log e.inspect
-        waiter.fail({'error' => true, 'message' => e.message})
       end
       waiter
     end

data/lib/combi/buses/web_socket.rb

@@ -201,6 +201,7 @@ module Combi
       else
         log "[WARNING] Service #{service_name} not found"
         log "[WARNING] handlers: #{handlers.keys.inspect}"
+        response = {error: true, message: 'unknown service'}
       end
     end
 

data/lib/combi/version.rb

@@ -1,3 +1,3 @@
 module Combi
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

data/spec/integration/multi_bus_spec.rb

@@ -26,15 +26,35 @@ describe "in a multi bus environment" do
       def do_it(params)
         defer = EventMachine::DefaultDeferrable.new
         EM.synchrony do
-          req = @other_client.request(:say_hello, :do_it, params, timeout: 3)
+          service_name = params ['service_name'] || :say_hello
+          req = @other_client.request(service_name, :do_it, params, timeout: 0.1)
           service_result = EM::Synchrony.sync req
-          defer.succeed(service_result*2)
+          if service_result.is_a? RuntimeError
+            if @other_client.is_a?(Combi::Queue) && service_result.message == "Timeout::Error"
+              defer.succeed({'error' => true, 'message' => 'other service failed'})
+            else
+              defer.succeed({'error' => true, 'message' => 'unknown error'})
+            end
+          else
+            if service_result.respond_to?(:keys) && service_result['error'] == true
+              defer.succeed({'error' => true, 'message' => 'other service failed'})
+            else
+              defer.succeed(service_result*2)
+            end
+          end
         end
         defer
       end
     end
   end
 
+  Given(:broken_service) do
+    Module.new do
+      def actions; [:say_hello_if_you_can]; end
+      def do_it(params); puts "raising error"; raise "I can't talk" ; end
+    end
+  end
+
   Given(:amqp_config) do
     {
       :host      => "127.0.0.1",
@@ -68,10 +88,8 @@ describe "in a multi bus environment" do
     RabbitmqServer.instance.stop! if ENV['CLEAN']
   }
 
-  Given(:options) { {timeout: 3} }
+  Given(:options) { {timeout: 0.5} }
 
-  Given(:service_for_main_bus) { main_bus_provider.add_service composed_service_class.new(internal_bus_consumer) }
-  Given(:service_for_internal_bus)   { internal_bus_provider.add_service boring_salutation_service }
   When(:params) { { who: 'world' } }
   When(:expected_result) { "Hello worldHello world" }
 
@@ -111,28 +129,78 @@ describe "in a multi bus environment" do
           end
         end
 
-        Then do
-          em do
-            service_for_main_bus
-            service_for_internal_bus
-            main_bus_provider.start!
-            internal_bus_provider.start!
-            send("#{main}_server")
-            send("#{internal}_server")
-            main_bus_consumer.start!
-            internal_bus_consumer.start!
-
-            EM.synchrony do
-              service_result = EM::Synchrony.sync main_bus_consumer.request(:repeat_with_me, :do_it, params, options)
-              service_result.should eq expected_result
-              done
-              main_bus_provider.stop!
-              internal_bus_provider.stop!
-              main_bus_consumer.stop!
-              internal_bus_consumer.stop!
+        Given(:prepare) do
+          service_for_main_bus
+          start_internal = service_for_internal_bus
+          main_bus_provider.start!
+          internal_bus_provider.start! if start_internal
+          send("#{main}_server")
+          send("#{internal}_server")
+          main_bus_consumer.start!
+          internal_bus_consumer.start! if start_internal
+        end
+
+        Given(:finalize) do
+          main_bus_provider.stop!
+          internal_bus_provider.stop!
+          main_bus_consumer.stop!
+          internal_bus_consumer.stop!
+        end
+
+        context "both services are working ok" do
+          Given(:service_for_main_bus) { main_bus_provider.add_service composed_service_class.new(internal_bus_consumer); true }
+          Given(:service_for_internal_bus) { internal_bus_provider.add_service boring_salutation_service; true }
+
+          Then do
+            em do
+              prepare
+              EM.synchrony do
+                service_result = EM::Synchrony.sync main_bus_consumer.request(:repeat_with_me, :do_it, params, options)
+                service_result.should eq expected_result
+                done
+                finalize
+              end
+            end
+          end
+        end
+
+        context "the external service raise an error" do
+          Given(:service_for_main_bus) { main_bus_provider.add_service broken_service; true }
+          Given(:service_for_internal_bus) { false }
+
+          Then do
+            em do
+              prepare
+              EM.synchrony do
+                service_result = EM::Synchrony.sync main_bus_consumer.request(:say_hello_if_you_can, :do_it, params, options)
+                service_result['error'].should be_true
+                service_result['message'].should eq "I can't talk"
+                done
+                finalize
+              end
             end
           end
         end
+
+        context "the internal service raise an error" do
+          Given(:service_for_main_bus) { main_bus_provider.add_service composed_service_class.new(internal_bus_consumer); true }
+          Given(:service_for_internal_bus) { main_bus_provider.add_service broken_service; true }
+
+          Then do
+            em do
+              prepare
+              EM.synchrony do
+                params.merge!('service_name' => 'say_hello_if_you_can')
+                service_result = EM::Synchrony.sync main_bus_consumer.request(:repeat_with_me, :do_it, params, options)
+                service_result['error'].should be_true
+                service_result['message'].should eq 'other service failed'
+                done
+                finalize
+              end
+            end
+          end
+        end
+
       end
     end
   end

data/spec/shared_examples/standard_bus.rb

@@ -151,4 +151,28 @@ shared_examples_for "standard_bus" do
       end
     end
   end
+
+  context 'return an error when requesting an unknown service' do
+    Given(:error_message) { 'unknown service' }
+    When(:service) { provider.add_service broken_service }
+    Then do
+      em do
+        prepare
+        EM.synchrony do
+          begin
+            service_result = EM::Synchrony.sync consumer.request(:some_not_service, :do_it, {}, { timeout: 0.1 })
+            if service_result.is_a? RuntimeError
+              consumer.class.should eq Combi::Queue
+              service_result.message.should eq "Timeout::Error"
+            else
+              service_result['error'].should be_true
+              service_result['message'].should eq error_message
+            end
+            done
+            finalize
+          end
+        end
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: combi
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - German Del Zotto
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-24 00:00:00.000000000 Z
+date: 2014-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby