harmony-service 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbc119d784fec7bb9d15ea494e8416babc7a6640
-  data.tar.gz: '049f0cf96ebf3e3697b2c85cca128e7a215c1e5c'
+  metadata.gz: 97593af953be5a6547c65d0dcd81626fa5c454f6
+  data.tar.gz: 86c5b8b56b9a9243bcf556a830b21b4222daf568
 SHA512:
-  metadata.gz: 34324d51945b97ab2a6b2a5b98f46737db546881f7159fb6477af3a2b2ddff6e0b5e2d8cbba24c8fb595153da001c8a43b4d57d8dd34eb0a540a050e7e20ece4
-  data.tar.gz: 71d2b58d9d42d265831268a4d96620d3662065376c316353614b3db631e41866babc2c2803d0af7ed59af93e985114d3a68aacd43e4696a3dbc06e21a514fa78
+  metadata.gz: 371cfce0682a1cd6e7cee8a5e4c092c2a11267de7740f020aa34e0a91271b381de5e91bc5286ea1b738aefce19ce1c2f550b635c97871d87129cf926b1308cfa
+  data.tar.gz: 781dc113635b85f326176738295ee4a4c72da3dc65c77ed230b406c06425f1542077918a6dbf1ab279875e4459feb03596bbdb3610380f5cbd3d1453a342b8ab

data/lib/harmony/service.rb

@@ -21,5 +21,8 @@ require 'harmony/service/form/get_response'
 
 require 'harmony/service/flow/ended_request'
 
+require 'harmony/service/notification/request'
+require 'harmony/service/notification/app_response'
+
 require "harmony/service/rpc_service"
 

data/lib/harmony/service/rpc_service.rb

@@ -16,11 +16,11 @@ module Harmony
           logger.debug "Request: #{message}"
           request = Oj.load(message)
           request_class = request.class
-          response_class = request_response_mapping[request_class]
-          raise "Unacceptable request class: #{request_class}" if response_class.nil?
+          response_classes = request_response_mapping[request_class]
+          raise "Unacceptable request class: #{request_class}" if response_classes.nil?
           
           result = new_handler.work_with_request(request)
-          raise "Unacceptable response class: #{result.class}" unless response_class === result
+          raise "Unacceptable response class: #{result.class}" unless response_classes.include?(result.class)
           
           json = Oj.dump(result)
           logger.debug "Response: #{json}"
@@ -76,13 +76,14 @@ module Harmony
       private
       def request_response_mapping
         {
-          Calculator::Request => Calculator::Response,
-          ActionList::ListRequest => Array,
-          ActionList::ItemRequest => ActionList::Item,
-          ActionList::ActionRequest => Response,
-          Chart::Request => Chart::Response,
-          Form::GetRequest => Form::GetResponse,
-          Flow::EndedRequest => Response
+          Calculator::Request => [Calculator::Response],
+          ActionList::ListRequest => [Array],
+          ActionList::ItemRequest => [ActionList::Item],
+          ActionList::ActionRequest => [Response],
+          Chart::Request => [Chart::Response],
+          Form::GetRequest => [Form::GetResponse],
+          Flow::EndedRequest => [Response],
+          Notification::Request => [Notification::AppResponse, Response]
         }
       end
       

data/lib/harmony/service/version.rb

@@ -1,6 +1,6 @@
 module Harmony
   module Service
-    VERSION = "0.3.7"
+    VERSION = "0.3.8"
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: harmony-service
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Matt Brooke-Smith
@@ -148,7 +148,6 @@ files:
 - lib/harmony/service/response.rb
 - lib/harmony/service/rpc_service.rb
 - lib/harmony/service/version.rb
-- spec/harmony/rpc_service_spec.rb
 - spec/harmony/service/rpc_service_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/HarmonyMobile/harmony-service
@@ -176,6 +175,5 @@ signing_key:
 specification_version: 4
 summary: Gem which helps you to build Harmony services
 test_files:
-- spec/harmony/rpc_service_spec.rb
 - spec/harmony/service/rpc_service_spec.rb
 - spec/spec_helper.rb

data/spec/harmony/rpc_service_spec.rb

@@ -1,93 +0,0 @@
-require 'spec_helper'
-
-describe Harmony::Service::RpcService do
-  
-  describe "#work_with_params" do
-    let(:metadata) { instance_double("Metadata", reply_to: "harmony.trello", correlation_id: "abc123") }
-    let(:handler) { handler = double("Object") }
-      
-    context "ack!" do
-      before(:each) do
-        expect(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!)          
-        subject.work_with_params(Oj.dump(request), {}, metadata)
-      end    
-      
-      context "calculation" 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(:ack!) }
-      end
-      
-      context "action list" do
-        context "list" 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(:ack!) }
-        end
-        
-        context "item" 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(:ack!) }
-        end
-        
-        context "action" do
-          let(:request) { Harmony::Service::ActionList::ActionRequest.new(harmony_user_email: "matt@futureworkshops.com", id: 1, action: "Done") }
-          let(:response) { nil }
-      
-          it { expect(subject).to have_received(:send_response).with("null", "harmony.trello", "abc123") }
-          it { expect(subject).to have_received(:ack!) }
-        end
-      end
-      
-      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(:ack!) }
-      end
-      
-      context "form" 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(:ack!) }
-        end
-      end
-      
-      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(:ack!) }
-      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(: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 occured.\",\"detailed_message\":\"Unacceptable request class: Hash\"}", "harmony.trello", "abc123") }
-      it { expect(subject).to have_received(:reject!) }
-    end
-  end
-  
-
-end