lagomorph 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efb0c9a699dbf5706bbc949351fa2a83dc5839c3
-  data.tar.gz: 658000870814c1e7dacbb99ef46384cd14ec9c00
+  metadata.gz: f43d382ccc8fe66d01a384b667f7e0f62262bdcf
+  data.tar.gz: 977b4050ddff3f9ee3e45421e568d72a01b8f795
 SHA512:
-  metadata.gz: b1dd615c1ad6946efadb54609c95ba9f7d15eb0db86e2c503acbaecee7f754d4e14bc8626d4a2ab285be6ee24698b2a430438bec6c1def75998a8f889f302986
-  data.tar.gz: c989d1041e28afff05bf0042e5e0f3890a670d43a5c1f9ea68a6a01e7a6ecc718d7a581cf40f9a0e86a11759eded68d6067063e746e1ee1f156556277828d32e
+  metadata.gz: c19998e240ab84e68a26d698282446c2ab42d5e991d24c629b695619502cf3750f04b3e9d450ce4b9b8b15805ab87e1b3b3b858be22d8eda51b5c6dfc7df8ca9
+  data.tar.gz: 7af061a4eef4927797ef2b07d7652a45abcff4c2d0751ac106f5e7d539dd7efca85f616164f9d63ff7ed4ef8429a594c45907b52105dac37ca7a69b3c14a9799

data/lib/lagomorph.rb

@@ -31,3 +31,4 @@ require 'lagomorph/subscriber'
 require 'lagomorph/supervisor'
 require 'lagomorph/worker'
 require 'lagomorph/rpc_call'
+require 'lagomorph/exceptions'

data/lib/lagomorph/exceptions.rb

@@ -0,0 +1,4 @@
+module Lagomorph
+  class Exception < ::Exception; end
+  class RpcError  <   Exception; end
+end

data/lib/lagomorph/rpc_call.rb

@@ -24,7 +24,7 @@ module Lagomorph
       publish_rpc_call(payload, correlation_id)
       response = block_till_receive_response(correlation_id)
 
-      response['result'] || (fail response.fetch('error'))
+      response['result'] || fail(RpcError, response.fetch('error'))
     end
 
     def close_channel

data/lib/lagomorph/subscriber.rb

@@ -9,8 +9,7 @@ module Lagomorph
 
     def subscribe(queue, channel)
       queue.subscribe(manual_ack: true, block: false) do |metadata, payload|
-        result   = process_request(payload)
-        response = build_response(result)
+        response = process_request(payload)
         channel.ack(metadata.delivery_tag)
         publish_response(channel, metadata, response)
       end
@@ -21,7 +20,10 @@ module Lagomorph
 
     def process_request(request)
       method, params = parse_request(request)
-      @worker_class.new(method, *params).work
+      result = @worker_class.new(method, *params).work
+      build_response(result)
+    rescue => e
+      build_error(e.message)
     end
 
     def publish_response(channel, metadata, payload)
@@ -38,5 +40,9 @@ module Lagomorph
       JsonParser.new.build_response(result)
     end
 
+    def build_error(error)
+      JsonParser.new.build_error(error)
+    end
+
   end
 end

data/lib/lagomorph/version.rb

@@ -1,3 +1,3 @@
 module Lagomorph
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/lagomorph_spec.rb

@@ -4,6 +4,7 @@ require 'lagomorph/session'
 require 'lagomorph/supervisor'
 require 'lagomorph/subscriber'
 require 'lagomorph/rpc_call'
+require 'lagomorph/exceptions'
 
 describe 'a Lagomorph RPC process' do
 
@@ -21,6 +22,10 @@ describe 'a Lagomorph RPC process' do
     def echo(request)
       request
     end
+
+    def generate_failure
+      fail 'Could not process request'
+    end
   end
 
   context 'when supervising a PongWorker on the ping queue' do
@@ -42,7 +47,7 @@ describe 'a Lagomorph RPC process' do
       supervisor.route queue, PongWorker
     end
 
-    context 'and we have an rpc call manager thingy' do
+    context 'and we have an rpc call' do
       let!(:rpc_call) { Lagomorph::RpcCall.new(session) }
 
       context 'when a pong rpc call is made on the ping queue' do
@@ -54,6 +59,13 @@ describe 'a Lagomorph RPC process' do
         let(:result) { rpc_call.dispatch(queue, 'echo', 'test') }
         it { expect(result).to eq 'test' }
       end
+
+      context 'when a generate_failure rpc call is made on the ping queue' do
+        let(:result) { rpc_call.dispatch(queue, 'generate_failure') }
+        it { expect { result }.to raise_error Lagomorph::RpcError,
+                                              'Could not process request' }
+      end
+
       after { rpc_call.close_channel }
     end
 
@@ -69,7 +81,7 @@ describe 'a Lagomorph RPC process' do
       specify 'each thread will get the expected response' do
         rpc_calls.map do |rpc_call|
           Thread.new do
-            thread_results = calls_per_thread.times.map { |call_index|
+            calls_per_thread.times.map { |call_index|
               rpc_call.dispatch(queue, 'echo', call_index).tap { |result|
                 expect(result).to eq call_index
               }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lagomorph
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Alessandro Berardi
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-11-11 00:00:00.000000000 Z
+date: 2014-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -144,6 +144,7 @@ files:
 - Rakefile
 - lagomorph.gemspec
 - lib/lagomorph.rb
+- lib/lagomorph/exceptions.rb
 - lib/lagomorph/json_parser.rb
 - lib/lagomorph/metadata_adapter.rb
 - lib/lagomorph/queue_adapter.rb