combi 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e83ce25285ff2714f2e21113cecb746367cfc6fe
-  data.tar.gz: ca74535ae551fb435cc972790c7bbe0030745ffe
+  metadata.gz: 38eced61f795b66ed4f2eafe663e8dd5a204b99a
+  data.tar.gz: e0793e82d4b75ba93ddc5a835a9bea71d1453117
 SHA512:
-  metadata.gz: 9654c9586db5baaf388d891cf640f6481103aa5dfe85a3237be894284c2c50bfba4213586f6699447e52ec64c944741c17c231f17685af4e1a66cf221dffec6c
-  data.tar.gz: b389cf59a5ef1e0c37b4d2a907c4ff68292f29e153ba352431a26e01e58052e61ee81061e83621994cf1df79c8bb3541989e9cb653883ad6279c23b2c795ff1a
+  metadata.gz: c8bddb984ae14b2c28329dc152873cd580dd70e3bc13a641fb1da673d0edf6c2835b59d52ec87acc2552cab6124e79f33a4be8829eecba68e05ce6667b90e124
+  data.tar.gz: 756143cca67900ca14a5c038ab14eda751ebda96a68c956634c8b5fcf3885f396bd6f88ec9e9b00ce7f4c2cbf8978344748079cf2b4145e9cac241f7fa4f5fff

data/lib/combi/buses/http.rb

@@ -54,7 +54,11 @@ module Combi
         kind = message['kind']
         if service_instance.respond_to? kind
           message['payload'] ||= {}
-          response = service_instance.send(kind, message['payload'])
+          begin
+            response = service_instance.send(kind, message['payload'])
+          rescue Exception => e
+            response = {error: true, message: e.message}
+          end
           {result: 'ok', response: response}
         end
       end

data/lib/combi/buses/in_process.rb

@@ -26,9 +26,10 @@ module Combi
       rescue Timeout::Error => e
         log "ERROR"
         waiter.fail RuntimeError.new(Timeout::Error)
-      rescue e
+      rescue Exception => e
         log "other ERROR"
         log e.inspect
+        waiter.fail({'error' => true, 'message' => e.message})
       end
       waiter
     end

data/lib/combi/buses/queue.rb

@@ -69,17 +69,21 @@ module Combi
         return
       end
       log "generating response for #{service_instance.class}#{service_instance.actions.inspect}.#{kind} #{payload.inspect}"
-      response = service_instance.send(kind, payload)
+      begin
+        response = service_instance.send(kind, payload)
+      rescue Exception => e
+        response = {error: true, message: e.message}
+      end
 
       if response.respond_to? :succeed
         log "response is deferred"
         response.callback do |service_response|
           log "responding with deferred answer: #{service_response.inspect}"
-          queue_service.respond(service_response, delivery_info)
+          queue_service.respond(service_response.to_json, delivery_info)
         end
       else
         log "responding with inmediate answer: #{response.inspect}"
-        queue_service.respond(response, delivery_info) unless response.nil?
+        queue_service.respond(response.to_json, delivery_info) unless response.nil?
       end
     end
 

data/lib/combi/buses/web_socket.rb

@@ -170,17 +170,21 @@ module Combi
       kind = message['kind']
       payload = message['payload'] || {}
       payload['session'] = session
-      response = invoke_service(service_name, kind, payload)
+      begin
+        response = invoke_service(service_name, kind, payload)
+      rescue Exception => e
+        response = {error: true, message: e.message}
+      end
 
       msg = {result: 'ok', correlation_id: message['correlation_id']}
 
       if response.respond_to? :succeed
         response.callback do |service_response|
-          msg[:response] = service_response
+          msg[:response] = service_response.to_json
           ws.send(msg.to_json)
         end
       else
-        msg[:response] = response
+        msg[:response] = response.to_json
         ws.send(msg.to_json)
       end
     end

data/lib/combi/queue_service.rb

@@ -49,7 +49,6 @@ module Combi
     end
 
     def publish(*args, &block)
-      args[0] = args[0].to_json unless args[0].is_a? String
       @exchange.publish *args do
         log "Sent to network drivers: #{args.inspect}"
         block.call if block_given?
@@ -95,7 +94,7 @@ module Combi
         payload: message,
         options: {}
       }
-      publish(request, options)
+      publish(request.to_json, options)
     end
 
   end

data/lib/combi/response_store.rb

@@ -14,7 +14,7 @@ module Combi
       correlation_id = response['correlation_id']
       waiter = @waiters[correlation_id]
       response = response['response']
-      waiter.succeed(response)
+      waiter.succeed(JSON.parse response)
       @waiters.delete correlation_id
     end
   end

data/lib/combi/version.rb

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

data/spec/shared_examples/standard_bus.rb

@@ -20,6 +20,24 @@ shared_examples_for "standard_bus" do
     end
   end
 
+  Given(:echo_service) do
+    Module.new do
+      def actions; [:echo_this]; end
+      def do_it(params)
+        params['data']
+      end
+    end
+  end
+
+  Given(:broken_service) do
+    Module.new do
+      def actions; [:shout_error]; end
+      def do_it(params)
+        raise params['message']
+      end
+    end
+  end
+
   Given(:finalize) do
     provider.stop!
     consumer.stop!
@@ -59,4 +77,78 @@ shared_examples_for "standard_bus" do
       end
     end
   end
+
+  context 'return the same data type returned by service' do
+    Given(:result_container) { {} }
+    Given(:params) { { data: data } }
+    When(:service) { provider.add_service echo_service }
+    When('service is called') do
+      em do
+        prepare
+        EM.synchrony do
+          result_container[:result] = EM::Synchrony.sync consumer.request(:echo_this, :do_it, params)
+          done
+          finalize
+        end
+      end
+    end
+
+    context 'for string' do
+      Given(:data) { "a simple string" }
+      Then { result_container[:result].should eq data}
+    end
+
+    context 'for numbers' do
+      Given(:data) { 237.324 }
+      Then { result_container[:result].should eq data}
+    end
+
+    context 'for arrays' do
+      Given(:data) { [1, 2, 3.0, "4", "cinco"]}
+      Then { result_container[:result].should eq data}
+    end
+
+    context 'for symbols always return a string' do
+      Given(:data) { :some_symbol }
+      Then { result_container[:result].should eq data.to_s}
+    end
+
+    context 'for maps' do
+      Given(:data) { {'a' => 1, 'b' => 'dos'} }
+      Then { result_container[:result].should eq data}
+    end
+
+    context 'for objects returns their json version' do
+      Given(:custom_json) { {val: 'value'} }
+      Given(:custom_class) do
+        Class.new do
+          def initialize(custom_json)
+            @custom_json = custom_json
+          end
+          def to_json
+            @custom_json
+          end
+        end
+      end
+      Given(:data) { custom_class.new(custom_json).to_json}
+      Then { result_container[:result].should eq JSON.parse(custom_json.to_json)}
+    end
+  end
+
+  context 'return something when service raise an error' do
+    Given(:error_message) { 'service is broken' }
+    When(:service) { provider.add_service broken_service }
+    Then do
+      em do
+        prepare
+        EM.synchrony do
+          service_result = EM::Synchrony.sync consumer.request(:shout_error, :do_it, {message: error_message}, { timeout: 0.1 })
+          service_result['error'].should be_true
+          service_result['message'].should eq error_message
+          done
+          finalize
+        end
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: combi
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - German Del Zotto
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-14 00:00:00.000000000 Z
+date: 2014-05-24 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: