combi 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf7f73f8dc51e7b390cbdfd3d76bd26d74e95261
-  data.tar.gz: eed9f9840dd7e43cb8c72057bdb9688e49d94bf5
+  metadata.gz: 842db51c04bfe53f9a03dee7e7a7dcd1c82d7256
+  data.tar.gz: a18fba47f8b819d81f994a2afbe7d2243a459b6b
 SHA512:
-  metadata.gz: c5287c09cd3cceb88ca67b98ffe8641ae3f607d8d472a1048762d8318bbad8254a0d299555811a09d0e8ad998a45fa780b3449efed7a708a395f8f1d17f4ab18
-  data.tar.gz: 82a80a9e331d18d31ada7497e2a9ddde314a4b59874f1487baf95bb73d3ef77fd1766032f3569a692316e414c876cf81a088098ba9cf859f4305dcb8fd95e732
+  metadata.gz: 50e91d8a37b80e45563311c0b0e6c5d7ced744388292b9a4e964138f45d392c337b19d3cc128bfc713ad8dd5fe7e13846bace1d7a707257dbac1e2177483c5f5
+  data.tar.gz: 8448f3cb3c208674c7f7ebe225b0827d3914a5378064dad0633ac6c6bca6797424039276a4c4839a99921b3aaca0b0c0ca736f972c85c6a604785e052b81c6e3

data/lib/combi/buses/http.rb

@@ -60,14 +60,16 @@ module Combi
             response = {error: true, message: e.message}
           end
           {result: 'ok', response: response}
+        else
+          {result: 'error', response: {error: true, message: 'unknown action'}}
         end
       else
         {result: 'error', response: {error: true, message: 'unknown service'}}
       end
     end
 
-    def respond_to(service_instance, handler, options = {})
-      handlers[handler.to_s] = {service_instance: service_instance, options: options}
+    def respond_to(service_instance, action, options = {})
+      handlers[action.to_s] = {service_instance: service_instance, options: options}
     end
 
     def handlers

data/lib/combi/buses/in_process.rb

@@ -12,33 +12,36 @@ module Combi
       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
+        if 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})
+        else
+          waiter.fail('error' => true, 'message' => 'unknown action')
         end
       end
       waiter
     end
 
-    def respond_to(service_instance, handler, options = {})
-      memory_handlers[handler.to_s] = {service_instance: service_instance, options: options}
+    def respond_to(service_instance, action, options = {})
+      memory_handlers[action.to_s] = {service_instance: service_instance, options: options}
     end
 
     def memory_handlers

data/lib/combi/buses/queue.rb

@@ -25,8 +25,8 @@ module Combi
       end
     end
 
-    def respond_to(service_instance, handler, options = {})
-      log "registering #{handler}"
+    def respond_to(service_instance, action, options = {})
+      log "registering #{action}"
       queue_options = {}
       subscription_options = {}
       if options[:fast] == true
@@ -35,8 +35,8 @@ module Combi
         subscription_options[:ack] = true
       end
       queue_service.ready do
-        queue_service.queue(handler.to_s, queue_options) do |queue|
-          log "subscribing to queue #{handler.to_s} with options #{queue_options}"
+        queue_service.queue(action.to_s, queue_options) do |queue|
+          log "subscribing to queue #{action.to_s} with options #{queue_options}"
           queue.subscribe(subscription_options) do |delivery_info, payload|
             respond service_instance, payload, delivery_info
             queue_service.acknowledge delivery_info unless options[:fast] == true
@@ -46,14 +46,14 @@ module Combi
     end
 
     def request(name, kind, message, options = {})
-      log "Preparing request: #{name}.#{kind} #{message.inspect}\t|| #{options.inspect}"
+      log "Preparing request: #{name}.#{kind} #{message.inspect[0..500]}\t|| #{options.inspect}"
       options[:timeout] ||= RPC_DEFAULT_TIMEOUT
       options[:routing_key] = name.to_s
       correlation_id = Combi::Correlation.generate
       options[:correlation_id] = correlation_id
       waiter = EventedWaiter.wait_for(correlation_id, @response_store, options[:timeout])
       queue_service.ready do
-        log "Making request: #{name}.#{kind} #{message.inspect}\t|| #{options.inspect}"
+        log "Making request: #{name}.#{kind} #{message.inspect[0..500]}\t|| #{options.inspect[0..500]}"
         queue_service.call(kind, message, options)
       end
       waiter
@@ -64,26 +64,26 @@ module Combi
       kind = message['kind']
       payload = message['payload']
       options = message['options']
-      unless service_instance.respond_to?(kind)
+      if service_instance.respond_to?(kind)
+        log "generating response for #{service_instance.class}#{service_instance.actions.inspect}.#{kind} #{payload.inspect[0..500]}"
+        begin
+          response = service_instance.send(kind, payload)
+        rescue Exception => e
+          response = {error: true, message: e.message}
+        end
+      else
         log "Service instance does not respond to #{kind}: #{service_instance.inspect}"
-        return
+        response = {error: true, message: 'unknown action'}
       end
-      log "generating response for #{service_instance.class}#{service_instance.actions.inspect}.#{kind} #{payload.inspect}"
-      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}"
+          log "responding with deferred answer: #{service_response.inspect[0..500]}"
           queue_service.respond(service_response.to_json, delivery_info)
         end
       else
-        log "responding with inmediate answer: #{response.inspect}"
-        queue_service.respond(response.to_json, delivery_info) unless response.nil?
+        log "responding with inmediate answer: #{response.inspect[0..500]}"
+        queue_service.respond(response.to_json, delivery_info)
       end
     end
 

data/lib/combi/buses/web_socket.rb

@@ -23,7 +23,7 @@ module Combi
       end
 
       def on_message(ws, session, raw_message)
-        @bus.log "ON MESSAGE #{raw_message}"
+        @bus.log "ON MESSAGE #{raw_message[0..500]}"
         message = JSON.parse(raw_message)
         @bus.on_message(ws, message, session)
       end
@@ -72,7 +72,7 @@ module Combi
         end
 
         ws.on :message do |event|
-          @bus.log "ON MESSAGE: #{event.data}"
+          @bus.log "ON MESSAGE: #{event.data[0..500]}"
           message = JSON.parse(event.data)
           @bus.on_message(ws, message)
         end
@@ -163,7 +163,7 @@ module Combi
     def on_message(ws, message, session = nil)
       if message['correlation_id'] && message.has_key?('result')
         @response_store.handle_rpc_response(message)
-        log "Stored message with correlation_id #{message['correlation_id']} - #{message.inspect}"
+        log "Stored message with correlation_id #{message['correlation_id']} - #{message.inspect[0..500]}"
         return
       end
       service_name = message['service']
@@ -179,11 +179,14 @@ module Combi
       msg = {result: 'ok', correlation_id: message['correlation_id']}
 
       if response.respond_to? :succeed
+        log "response is deferred"
         response.callback do |service_response|
+          log "responding with deferred answer: #{service_response.inspect[0..500]}"
           msg[:response] = service_response.to_json
           ws.send(msg.to_json)
         end
       else
+        log "responding with inmediate answer: #{response.inspect[0..500]}"
         msg[:response] = response.to_json
         ws.send(msg.to_json)
       end
@@ -197,6 +200,7 @@ module Combi
           response = service_instance.send(kind, payload)
         else
           log "[WARNING] Service #{service_name}(#{service_instance.class.name}) does not respond to message #{kind}"
+          response = {error: true, message: 'unknown action'}
         end
       else
         log "[WARNING] Service #{service_name} not found"
@@ -205,9 +209,9 @@ module Combi
       end
     end
 
-    def respond_to(service_instance, handler, options = {})
-      log "registering #{handler}"
-      handlers[handler.to_s] = {service_instance: service_instance, options: options}
+    def respond_to(service_instance, action, options = {})
+      log "registering #{action}"
+      handlers[action.to_s] = {service_instance: service_instance, options: options}
       log "handlers: #{handlers.keys.inspect}"
     end
 

data/lib/combi/helpers.rb

@@ -4,13 +4,17 @@ module Combi
 
   def self.wait_for(defer, options = {}, &block)
     options[:timeout] ||= 2
-    resolved = false
     waiter_thread = Thread.current
     defer.callback { |response|
-      resolved = true
       block.call response
       waiter_thread.wakeup
     }
+    defer.errback { |response|
+      log "waiting for result, received an error"
+      log response
+      block.call error: true, message: 'service request error'
+      waiter_thread.wakeup
+    }
     Timeout::timeout(options[:timeout]) do
       Thread.stop
     end

data/lib/combi/queue_service.rb

@@ -50,7 +50,6 @@ module Combi
 
     def publish(*args, &block)
       @exchange.publish *args do
-        log "Sent to network drivers: #{args.inspect}"
         block.call if block_given?
       end
     end
@@ -84,7 +83,7 @@ module Combi
     end
 
     def call(kind, message, options = {})
-      log "sending request #{kind} #{message.inspect} with options #{options.inspect}"
+      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[:routing_key] ||= 'rcalls_queue'

data/lib/combi/reactor.rb

@@ -11,12 +11,15 @@ module Combi
       log "-EM.start- the reactor is running: #{EM::reactor_running?}"
       raise "EM did not shut down" if EM::reactor_running?
       @@reactor_thread = Thread.new do
-        log "------- starting EM reactor"
-        EM::run do
-          log "------- reactor started"
-          block.call unless block.nil?
+        begin
+          log "------- starting EM reactor"
+          EM::run do
+            log "------- reactor started"
+            block.call unless block.nil?
+          end
+        ensure
+          puts "------- reactor stopped"
         end
-        log "------- reactor stopped"
       end
       30.times do
         sleep 0.1 unless EM::reactor_running?

data/lib/combi/response_store.rb

@@ -8,14 +8,19 @@ module Combi
 
     def add_waiter(key, waiter)
       @waiters[key] = waiter
+      waiter.callback { |r| finish key }
+      waiter.errback  { |r| finish key }
     end
 
     def handle_rpc_response(response)
       correlation_id = response['correlation_id']
       waiter = @waiters[correlation_id]
       response = response['response']
-      waiter.succeed(JSON.parse response)
-      @waiters.delete correlation_id
+      waiter.succeed(JSON.parse response) if waiter.respond_to? :succeed
+    end
+
+    def finish(key)
+      @waiters.delete key
     end
   end
 
@@ -32,7 +37,7 @@ module Combi
       waiter = new(key, response_store, timeout)
       response_store.add_waiter(key, waiter)
       waiter.callback {|r| log "success waiting for #{key}: #{Time.now.to_f - t1.to_f}s" }
-      waiter.errback {|r| log "failed waiting for #{key}: #{Time.now.to_f - t1.to_f}s, #{r.inspect}" }
+      waiter.errback {|r| log "failed waiting for #{key}: #{Time.now.to_f - t1.to_f}s, #{r.inspect[0..500]}" }
       waiter
     end
 

data/lib/combi/version.rb

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

data/spec/shared_examples/standard_bus.rb

@@ -175,4 +175,23 @@ shared_examples_for "standard_bus" do
       end
     end
   end
+
+  context 'return an error when requesting an unknown action for the service' do
+    Given(:error_message) { 'unknown action' }
+    When(:service) { provider.add_service echo_service }
+    Then do
+      em do
+        prepare
+        EM.synchrony do
+          begin
+            service_result = EM::Synchrony.sync consumer.request(:echo_this, :do_other, {}, { timeout: 0.1 })
+            service_result['error'].should be_true
+            service_result['message'].should eq error_message
+            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.8
+  version: 0.0.9
 platform: ruby
 authors:
 - German Del Zotto
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-25 00:00:00.000000000 Z
+date: 2014-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby