harmony-service 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb896371b665b87c0a744f49a48c24f5a097a2cc
-  data.tar.gz: dfb996bc17cccf72310a8e6485edcbe492dd62ff
+  metadata.gz: 33baa1a1af30cb9c400ff84ee9a8db3f6e2b2321
+  data.tar.gz: 25faf44981c956a92b05499f405b74b4bfdcf6a1
 SHA512:
-  metadata.gz: 1a6562346a73bdb7aae171748f830c59ea8bf2fad3ba8d9c023c1def7ed66ffabbc9fef327ffab63c035ddb0028c604d7beea819bf15c7d454eb2fb5b8341914
-  data.tar.gz: 2c9bb8223a9bde4d46c92c6b8344de2fecd25afaab3f8d612b5ec2b6ae4b65a9fa2897ddb95d5bcc029f82764895abea5f2d60541b625f4b1893a1771f1fc41c
+  metadata.gz: ebe90d52a3b7d840a5c8c579d1954e9b84120fa641b17a8499425ef4ea051986ea1a82525fb9984e71935ecb97d74e714964318e947ef4e69123690ddf1294ce
+  data.tar.gz: 9deb6c4a0109d4eb0a0d0e4cbec171b04e8fa9b019c99d8e7093ebcdaadb5521aa57c520cccdc6d68d44e3dfe559b3919b509fc64055c1ee9fd2570b44a3b2bd

data/lib/harmony/service/error_response.rb

@@ -1,3 +1,3 @@
 class Harmony::Service::ErrorResponse < Harmony::Service::Response
-  attr_accessor :message, :detailed_message
+  attr_accessor :message, :exception
 end

data/lib/harmony/service/rpc_service.rb

@@ -21,21 +21,14 @@ module Harmony
           result = new_handler.work_with_request(request)
           raise "Unacceptable response class: #{result.class}" unless response_classes.include?(result.class)
           
-          json = Oj.dump(result)
-          logger.debug "Response: #{json}"
-          send_response(json, metadata.reply_to, metadata.correlation_id)
+          send_response(result, metadata)
           ack!
         rescue StandardError => error
           logger.error error.message
           logger.error error.backtrace.join("\n")
                     
-          error_response = ErrorResponse.new
-          error_response.message = "An error occurred."
-          error_response.detailed_message = error.message
-          json = Oj.dump(error_response)
-          logger.debug "Response: #{json}"  
-            
-          send_response(json, metadata.reply_to, metadata.correlation_id)
+          error_response = ErrorResponse.new message: error.message, exception: error
+          send_response(error_response, metadata)
           reject!
         end
       end
@@ -66,11 +59,19 @@ module Harmony
         ch.exchange(AMQ::Protocol::EMPTY_STRING, :auto_delete => true)    
       end
   
-      def send_response(result, reply_to, correlation_id)
-        reply_to_exchange.publish(result, :routing_key => reply_to, :correlation_id => correlation_id)
-      end
       
       private
+      def send_response(result, metadata)
+        json = Oj.dump(result)
+        logger.debug "Response: #{json}"
+        send_response_json(json, metadata.reply_to, metadata.correlation_id)
+      end
+      
+      def send_response_json(json, routing_key, correlation_id)
+        reply_to_exchange.publish(json, :routing_key => routing_key, :correlation_id => correlation_id)        
+      end
+      
+      
       def request_response_mapping
         {
           Calculator::Request => [Calculator::Response],

data/lib/harmony/service/version.rb

@@ -1,6 +1,6 @@
 module Harmony
   module Service
-    VERSION = "0.4.1"
+    VERSION = "0.4.2"
   end
 end
 

data/spec/harmony/service/rpc_service_spec.rb

@@ -8,10 +8,11 @@ describe Harmony::Service::RpcService do
       
     context "ack!" do
       before(:each) do
-        expect(handler).to receive(:work_with_request).with(kind_of(request.class)) { response }
+        allow(handler).to receive(:work_with_request).with(kind_of(request.class)) { response }
         allow(subject).to receive(:new_handler) { handler }
-        allow(subject).to receive(:send_response)
-        allow(subject).to receive(:ack!)          
+        allow(subject).to receive(:send_response_json)
+        allow(subject).to receive(:ack!) 
+        allow(subject).to receive(:reject!)         
         subject.work_with_params(Oj.dump(request), {}, metadata)
       end    
       
@@ -19,7 +20,7 @@ describe Harmony::Service::RpcService do
         let(:request) { Harmony::Service::Calculator::Request.new(harmony_user_email: "matt@futureworkshops.com", inputs: {"lat" => "51.0", "lon" => "0.1"}) }
         let(:response) { Harmony::Service::Calculator::Response.new(outputs: {price: 50})}
       
-        it { expect(subject).to have_received(:send_response).with("{\"^o\":\"Harmony::Service::Calculator::Response\",\"outputs\":{\":price\":50}}", "harmony.trello", "abc123") }
+        it { expect(subject).to have_received(:send_response_json).with("{\"^o\":\"Harmony::Service::Calculator::Response\",\"outputs\":{\":price\":50}}", "harmony.trello", "abc123", any_args) }
         it { expect(subject).to have_received(:ack!) }
       end
       
@@ -28,7 +29,7 @@ describe Harmony::Service::RpcService do
           let(:request) { Harmony::Service::ActionList::ListRequest.new(harmony_user_email: "matt@futureworkshops.com", page: 0, per_page: 10) }
           let(:response) { [Harmony::Service::ActionList::Item.new({id: 1, title: "Carrots"})]}
       
-          it { expect(subject).to have_received(:send_response).with("[{\"^o\":\"Harmony::Service::ActionList::Item\",\"id\":1,\"title\":\"Carrots\"}]", "harmony.trello", "abc123") }
+          it { expect(subject).to have_received(:send_response_json).with("[{\"^o\":\"Harmony::Service::ActionList::Item\",\"id\":1,\"title\":\"Carrots\"}]", "harmony.trello", "abc123") }
           it { expect(subject).to have_received(:ack!) }
         end
         
@@ -36,7 +37,7 @@ describe Harmony::Service::RpcService do
           let(:request) { Harmony::Service::ActionList::ItemRequest.new(harmony_user_email: "matt@futureworkshops.com", id: 1) }
           let(:response) { Harmony::Service::ActionList::Item.new({id: 1, title: "Carrots", subtitle: "Bag of Carrots", detail_html: "<html><body>Carrots</body></html>"})}
       
-          it { expect(subject).to have_received(:send_response).with("{\"^o\":\"Harmony::Service::ActionList::Item\",\"id\":1,\"title\":\"Carrots\",\"subtitle\":\"Bag of Carrots\",\"detail_html\":\"<html><body>Carrots</body></html>\"}", "harmony.trello", "abc123") }
+          it { expect(subject).to have_received(:send_response_json).with("{\"^o\":\"Harmony::Service::ActionList::Item\",\"id\":1,\"title\":\"Carrots\",\"subtitle\":\"Bag of Carrots\",\"detail_html\":\"<html><body>Carrots</body></html>\"}", "harmony.trello", "abc123") }
           it { expect(subject).to have_received(:ack!) }
         end
         
@@ -44,7 +45,7 @@ describe Harmony::Service::RpcService do
           let(:request) { Harmony::Service::ActionList::ActionRequest.new(harmony_user_email: "matt@futureworkshops.com", id: 1, action: "Done") }
           let(:response) { Harmony::Service::Response.new }
       
-          it { expect(subject).to have_received(:send_response).with("{\"^o\":\"Harmony::Service::Response\"}", "harmony.trello", "abc123") }
+          it { expect(subject).to have_received(:send_response_json).with("{\"^o\":\"Harmony::Service::Response\"}", "harmony.trello", "abc123") }
           it { expect(subject).to have_received(:ack!) }
         end
       end
@@ -52,7 +53,7 @@ describe Harmony::Service::RpcService do
       context "chart" do
         let(:request) { Harmony::Service::Chart::Request.new(harmony_user_email: "matt@futureworkshops.com") }
         let(:response) { Harmony::Service::Chart::Response.new(x_values: ["Jan", "Feb", "Mar"], y_values: [10, 20, 40])}
-        it { expect(subject).to have_received(:send_response).with("{\"^o\":\"Harmony::Service::Chart::Response\",\"x_values\":[\"Jan\",\"Feb\",\"Mar\"],\"y_values\":[10,20,40]}", "harmony.trello", "abc123") }
+        it { expect(subject).to have_received(:send_response_json).with("{\"^o\":\"Harmony::Service::Chart::Response\",\"x_values\":[\"Jan\",\"Feb\",\"Mar\"],\"y_values\":[10,20,40]}", "harmony.trello", "abc123") }
         it { expect(subject).to have_received(:ack!) }
       end
       
@@ -60,7 +61,7 @@ describe Harmony::Service::RpcService do
         context 'get' do
           let(:request) { Harmony::Service::Form::GetRequest.new(harmony_user_email: "matt@futureworkshops.com", inputs: ['satisfaction_level']) }
           let(:response) { Harmony::Service::Form::GetResponse.new({input_values: [{'satisfaction_level': ['1','2','3']}]})}
-          it { expect(subject).to have_received(:send_response).with("{\"^o\":\"Harmony::Service::Form::GetResponse\",\"input_values\":[{\":satisfaction_level\":[\"1\",\"2\",\"3\"]}],\"options\":{}}", "harmony.trello", "abc123") }
+          it { expect(subject).to have_received(:send_response_json).with("{\"^o\":\"Harmony::Service::Form::GetResponse\",\"input_values\":[{\":satisfaction_level\":[\"1\",\"2\",\"3\"]}],\"options\":{}}", "harmony.trello", "abc123") }
           it { expect(subject).to have_received(:ack!) }
         end
       end
@@ -68,37 +69,50 @@ describe Harmony::Service::RpcService do
       context "flow ended" do
         let(:request) { Harmony::Service::Flow::EndedRequest.new(harmony_user_email: "matt@futureworkshops.com", pages: [{page_id: 1}]) }
         let(:response) { Harmony::Service::Response.new }
-        it { expect(subject).to have_received(:send_response).with("{\"^o\":\"Harmony::Service::Response\"}", "harmony.trello", "abc123") }
+        it { expect(subject).to have_received(:send_response_json).with("{\"^o\":\"Harmony::Service::Response\"}", "harmony.trello", "abc123") }
         it { expect(subject).to have_received(:ack!) }
       end
       
       context "app notification" do
         let(:request) { Harmony::Service::Notification::Request.new }
         let(:response) { Harmony::Service::Notification::AppResponse.new(text: 'Check out the new data')}
-        it { expect(subject).to have_received(:send_response).with("{\"^o\":\"Harmony::Service::Notification::AppResponse\",\"text\":\"Check out the new data\"}", "harmony.trello", "abc123") }
+        it { expect(subject).to have_received(:send_response_json).with("{\"^o\":\"Harmony::Service::Notification::AppResponse\",\"text\":\"Check out the new data\"}", "harmony.trello", "abc123") }
         it { expect(subject).to have_received(:ack!) }
       end
       
       context "attribute names" do
         let(:request) { Harmony::Service::AttributeNamesRequest.new }
         let(:response) { Harmony::Service::AttributeNamesResponse.new}
-        it { expect(subject).to have_received(:send_response).with("{\"^o\":\"Harmony::Service::AttributeNamesResponse\",\"options\":{}}", "harmony.trello", "abc123") }
+        it { expect(subject).to have_received(:send_response_json).with("{\"^o\":\"Harmony::Service::AttributeNamesResponse\",\"options\":{}}", "harmony.trello", "abc123") }
         it { expect(subject).to have_received(:ack!) }
       end
       
+      context "exception" do
+        let(:handler) do 
+          handler = double("Object")
+          expect(handler).to receive(:work_with_request).and_raise("Could not complete.")
+          handler
+        end
+        
+        let(:request) { Harmony::Service::Notification::Request.new }
+        
+        it { expect(subject).to have_received(:send_response_json).with(/Could not complete/,"harmony.trello", "abc123") }
+        it { expect(subject).to have_received(:reject!) }
+      end
+      
     end    
   
     context "unacceptable request class" do
       before(:each) do
         allow(subject).to receive(:work_with_request).and_raise("A timeout occured")
-        allow(subject).to receive(:send_response)
+        allow(subject).to receive(:send_response_json)
         allow(subject).to receive(:reject!)
             
         metadata = instance_double("Metadata", reply_to: "harmony.trello", correlation_id: "abc123")
         subject.work_with_params("{\"trello_board_id\": \"12345\"}", {}, metadata)
       end
     
-      it { expect(subject).to have_received(:send_response).with("{\"^o\":\"Harmony::Service::ErrorResponse\",\"message\":\"An error occurred.\",\"detailed_message\":\"Unacceptable request class: Hash\"}", "harmony.trello", "abc123") }
+      it { expect(subject).to have_received(:send_response_json).with(/Unacceptable request class: Hash/,"harmony.trello", "abc123") }
       it { expect(subject).to have_received(:reject!) }
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: harmony-service
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Matt Brooke-Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-25 00:00:00.000000000 Z
+date: 2017-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sneakers