combi 0.0.18 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f249183796133308bcbd8d0b68d616e41843122
-  data.tar.gz: 74965fb85fa0badc9c3a105d150b9c9b83d7dd34
+  metadata.gz: 28565637d9bdb76e4bd9f256be6af0c89900ec25
+  data.tar.gz: 411ec39864499243853f42677ec76f3708c8c630
 SHA512:
-  metadata.gz: b99e6f2263b681f20f03b62054447258ec5b2fe99b514c7ec77e13f4160b7b2f6ffdcdd7e28d9a0e5a7f07681e4ca89bb63179fdb8ca4e8270260cf902ec8e8a
-  data.tar.gz: c9f21c5147d3afce3afb141e62d70f0c70b3d97498364abcc0719323bcf1a8160dc6a24a21eb8f753d2c6f57c1f4de3bad6666300bb0259f146ffe35e9813d99
+  metadata.gz: 8a353643e81e81912a88a8b756cf29a12ba19982e6db5e09c34fd88d153041bf14434a6d609196c202336d99671f08f3bf49b9c1fde43b1f656c04b2b66b9fa2
+  data.tar.gz: 98151bf6b13683a2992a3e0078bfea21f136377fd33971bb5190893aaac1e3e63b1ff9940516ae2558959229eb36e2d668890630b728850424e1467cf0e27d1a

data/README.md

@@ -28,7 +28,7 @@ module Service
     end
 
     def say_hello(params)
-      "hello #{params['name']}"
+      "hello #{params[:name]}"
     end
 
   end

data/lib/combi/buses/bus.rb

@@ -78,5 +78,20 @@ module Combi
       service = service_class.new
     end
 
+    def invoke_service(service_instance, action, params)
+      # convert keys to symbols in-place
+      params.keys.each {|key| params[key.to_sym] = params.delete(key) }
+      service_instance.send(action, params)
+    rescue => e
+      # TODO: report in a more effective way (I will not read server logs to find this)
+      require 'yaml'
+      puts " *** ERROR INVOKING SERVICE ***"
+      puts "   - #{e.inspect}"
+      puts "   - #{service_instance.class.ancestors.join ' > '}"
+      puts "   - #{action}"
+      puts "   - #{params.to_yaml}"
+      raise e
+    end
+
   end
 end

data/lib/combi/buses/http.rb

@@ -55,13 +55,13 @@ module Combi
         if service_instance.respond_to? kind
           message['payload'] ||= {}
           begin
-            response = service_instance.send(kind, message['payload'])
-          rescue Exception => e
-            response = {error: {message: e.message, backtrace: e.backtrace } }
+            response = invoke_service(service_instance, kind, message['payload'])
+          rescue RuntimeError => e
+            response = {error: {klass: e.class.name, message: e.message, backtrace: e.backtrace } }
           end
           {result: 'ok', response: response}
         else
-          {result: 'error', response: {error: 'unknown action'}}
+          {result: 'error', response: {error: { klass: 'unknown action', message: kind } } }
         end
       else
         {result: 'error', response: {error: 'unknown service'}}

data/lib/combi/buses/in_process.rb

@@ -16,7 +16,7 @@ module Combi
           waiter.timeout(options[:timeout], 'error' => 'Timeout::Error')
           begin
             Timeout.timeout(options[:timeout]) do
-              response = service_instance.send(kind, message)
+              response = invoke_service(service_instance, kind, message)
               if response.respond_to? :succeed
                 response.callback do |service_response|
                   log "responding with deferred response: #{service_response.inspect[0..500]}"
@@ -33,11 +33,11 @@ module Combi
             end
           rescue Timeout::Error => e
             waiter.fail 'error' => 'Timeout::Error'
-          rescue Exception => e
-            waiter.fail 'error' => { 'message' => e.message, 'backtrace' => e.backtrace}
+          rescue RuntimeError => e
+            waiter.fail 'error' => {'klass' => e.class.name, 'message' => e.message, 'backtrace' => e.backtrace}
           end
         else
-          waiter.fail('error' => 'unknown action')
+          waiter.fail('error' => { 'klass' => 'unknown action', 'message' => kind.to_s })
         end
       end
       waiter

data/lib/combi/buses/queue.rb

@@ -67,13 +67,13 @@ module Combi
       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: { message: e.message, backtrace: e.backtrace } }
+          response = invoke_service(service_instance, kind, payload)
+        rescue RuntimeError => e
+          response = {error: {klass: e.class.name, message: e.message, backtrace: e.backtrace } }
         end
       else
         log "Service instance does not respond to #{kind}: #{service_instance.inspect}"
-        response = {error: 'unknown action'}
+        response = {error: { klass: 'unknown action', message: kind } }
       end
       if response.respond_to? :succeed
         log "response is deferred"

data/lib/combi/buses/web_socket.rb

@@ -171,9 +171,9 @@ module Combi
       payload = message['payload'] || {}
       payload['session'] = session
       begin
-        response = invoke_service(service_name, kind, payload)
-      rescue Exception => e
-        response = {error: {message: e.message, backtrace: e.backtrace } }
+        response = lookup_and_invoke_service(service_name, kind, payload)
+      rescue RuntimeError => e
+        response = {error: {klass: e.class.name, message: e.message, backtrace: e.backtrace } }
       end
 
       msg = {result: 'ok', correlation_id: message['correlation_id']}
@@ -198,15 +198,15 @@ module Combi
       end
     end
 
-    def invoke_service(service_name, kind, payload)
+    def lookup_and_invoke_service(service_name, kind, payload)
       handler = handlers[service_name.to_s]
       if handler
         service_instance = handler[:service_instance]
         if service_instance.respond_to? kind
-          response = service_instance.send(kind, payload)
+          response = invoke_service(service_instance, kind, payload)
         else
           log "[WARNING] Service #{service_name}(#{service_instance.class.name}) does not respond to message #{kind}"
-          response = {error: 'unknown action'}
+          response = {error: { klass: 'unknown action', message: kind } }
         end
       else
         log "[WARNING] Service #{service_name} not found"

data/lib/combi/version.rb

@@ -1,3 +1,3 @@
 module Combi
-  VERSION = '0.0.18'
+  VERSION = '0.1.0'
 end

data/spec/integration/multi_bus_spec.rb

@@ -9,7 +9,7 @@ describe "in a multi bus environment" do
   Given(:boring_salutation_service) do
     Module.new do
       def actions; [:say_hello]; end
-      def do_it(params); "Hello #{params['who']}"; end
+      def do_it(params); "Hello #{params[:who]}"; end
     end
   end
 
@@ -26,7 +26,7 @@ describe "in a multi bus environment" do
       def do_it(params)
         defer = EventMachine::DefaultDeferrable.new
         EM.synchrony do
-          service_name = params ['service_name'] || :say_hello
+          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
           if service_result.is_a? RuntimeError

data/spec/shared_examples/standard_bus.rb

@@ -6,7 +6,7 @@ shared_examples_for "standard_bus" do
     Module.new do
       def actions; [:sleep]; end
       def do_it(params)
-        sleep params['time']
+        sleep params[:time]
       end
     end
   end
@@ -15,7 +15,7 @@ shared_examples_for "standard_bus" do
     Module.new do
       def actions; [:say_hello]; end
       def do_it(params)
-        "Hello #{params['who']}"
+        "Hello #{params[:who]}"
       end
     end
   end
@@ -24,7 +24,7 @@ shared_examples_for "standard_bus" do
     Module.new do
       def actions; [:echo_this]; end
       def do_it(params)
-        params['data']
+        params[:data]
       end
     end
   end
@@ -33,7 +33,7 @@ shared_examples_for "standard_bus" do
     Module.new do
       def actions; [:shout_error]; end
       def do_it(params)
-        raise params['message']
+        raise params[:message]
       end
     end
   end
@@ -185,7 +185,8 @@ shared_examples_for "standard_bus" do
         EM.synchrony do
           begin
             service_result = EM::Synchrony.sync consumer.request(:echo_this, :do_other, {}, { timeout: 0.1 })
-            service_result['error'].should eq error_message
+            service_result['error']['klass'].should eq error_message
+            service_result['error']['message'].should eq 'do_other'
             done
             finalize
           end

data/spec/support/rabbitmq_server.rb

@@ -27,7 +27,8 @@ class RabbitmqServer
   end
 
   def start_forwarder!
-    command = "/usr/local/bin/boot2docker ssh -L #{port}:localhost:#{port} -N"
+    # workaround https://github.com/boot2docker/boot2docker-cli/issues/165
+    command = "ssh docker@localhost -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -p 2022 -i ~/.ssh/id_boot2docker -N -L #{port}:localhost:#{port}"
     return if @_command_running ||= `ps`.include?(command)
     @forwarder_pid = Process.spawn command
     #Process.detach @forwarder_pid

metadata

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