alchemy-flux 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a1f5663035d6eeb1184e6c736d58e69f21bc27d
-  data.tar.gz: 74406464c62fcb305b4e249be9aebb3602dbf46a
+  metadata.gz: a2119580f289feaefe98aa54fcb6e7fd7e872908
+  data.tar.gz: 6bf7e68053275968c6b387279db904e34f9fe0b3
 SHA512:
-  metadata.gz: a00d810e108ef345f9585b10334cd6a8103beefe8c0d8673e9ec8ebb4201b41e8ada43d077b0e40871089b4c40c8fa3fd7e5580b4966a68ed567cf68bd81ca78
-  data.tar.gz: 620a1d74d5a34a1efa0ca670889e2f9c670598195b06f1c501056ad818dcdf869ca499977fb6849541cf9a153319649733d7abb820a3df6d33850a1602c80d89
+  metadata.gz: 4f44e1bd336a0132a25dabe3e50f8eefb9f7eca8a7cc8a061e95357c6a5aa5befd3b447648d0455a9ad074cdad5a6aeda054378da570e343c29b7b58df4280b7
+  data.tar.gz: 848529eb42bc30a46e39e097c0e6493998ebe921b571f066c57bada496f9c7bc3d69adff28cba9caccd7199f7f3c87d2fa07c69b71c5ffa5e39b880dad9d6772

data/lib/alchemy-flux.rb

@@ -214,7 +214,6 @@ module AlchemyFlux
       message_replying_to = metadata.message_id
       this_message_id = AlchemyFlux::Service.generateUUID()
       delivery_tag = metadata.delivery_tag
-      interaction_id = payload['headers']['x-interaction-id']
 
       operation = proc {
         @processing_messages += 1
@@ -222,7 +221,6 @@ module AlchemyFlux
           response = @service_fn.call(payload)
           {
             'status_code' => response['status_code'] || 200,
-            'headers' => response['headers']         || { 'x-interaction-id' => interaction_id},
             'body' => response['body']               || ""
           }
         rescue AlchemyFlux::NAckError => e
@@ -238,7 +236,6 @@ module AlchemyFlux
               'kind' =>           "Errors",
               'id' =>             AlchemyFlux::Service.generateUUID(),
               'created_at' =>     Time.now.utc.iso8601,
-              'interaction_id' => interaction_id,
               'errors' => [{'code' => 'platform.fault', 'message' => 'An unexpected error occurred'}]
             }
           }
@@ -284,10 +281,10 @@ module AlchemyFlux
 
     # END OF RECIEVING MESSAGES
 
-    public
-
     # SENDING MESSAGES
 
+    private
+
     # send a message to an exchange with routing key
     #
     # *exchange*:: A AMQP exchange
@@ -302,6 +299,17 @@ module AlchemyFlux
       end
     end
 
+    public
+
+    # send a message to queue do not wait for response
+    #
+    # *routing_key*:: The routing key to use
+    # *message*:: The message to be sent
+    # *options*:: The message options
+    def send_message_to_queue(routing_key, message)
+      send_message( @channel.default_exchange, routing_key, message, {type: 'ignore'} )
+    end
+
     # send a message to a service
     #
     # *service_name*:: the name of the service
@@ -320,17 +328,17 @@ module AlchemyFlux
 
     # send a message to a resource
     #
-    # *message*:: the message to be sent to the *path* in the message
+    # *http_message*:: the message to be sent to the *path* in the message
     #
     # This method can optionally take a block which will be executed asynchronously and yielded the response
-    def send_message_to_resource(message)
-      routing_key = path_to_routing_key(message['path'])
+    def send_message_to_resource(http_message)
+      routing_key = path_to_routing_key(http_message['path'])
       if block_given?
         EventMachine.defer do
-          yield send_message_to_resource(message)
+          yield send_message_to_resource(http_message)
         end
       else
-        send_HTTP_request_message(@resources_exchange, routing_key, message)
+        send_HTTP_request_message(@resources_exchange, routing_key, http_message)
       end
     end
 
@@ -373,10 +381,6 @@ module AlchemyFlux
         'body' =>        message['body']        || ""
       }
 
-      if !http_message['headers']['x-interaction-id']
-        http_message['headers']['x-interaction-id'] = AlchemyFlux::Service.generateUUID()
-      end
-
       message_id = AlchemyFlux::Service.generateUUID()
 
       http_message_options = {

data/spec/service_spec.rb

@@ -192,6 +192,27 @@ describe AlchemyFlux::Service do
     end
   end
 
+  describe "#send_message_to_queue" do
+    it 'should send a message to services' do
+      received = false
+      service_a = AlchemyFlux::Service.new("fluxa.service") do |message|
+        received = true
+        {}
+      end
+
+      service_b = AlchemyFlux::Service.new("fluxb.service")
+
+      service_a.start
+      service_b.start
+
+      response = service_b.send_message_to_queue("fluxa.service", {})
+      sleep(0.1)
+      expect(received).to be true
+      service_a.stop
+      service_b.stop
+    end
+
+  end
 
   describe "#send_message_to_service" do
 
@@ -271,49 +292,7 @@ describe AlchemyFlux::Service do
       service_b.stop
     end
 
-    it 'should generate transaction id if none is given' do
-      interaction_id = nil
-      service_a = AlchemyFlux::Service.new("fluxa.service") do |message|
-        expect(message['headers']).to have_key 'x-interaction-id'
-        expect(message['headers']['x-interaction-id']).not_to be_nil
-        interaction_id = message['headers']['x-interaction-id']
-        { 'body' => "here" }
-      end
-
-      service_b = AlchemyFlux::Service.new("fluxb.service")
-
-      service_a.start
-      service_b.start
-
-      response = service_b.send_message_to_service("fluxa.service", {})
-      expect(response['body']).to eq "here"
-      expect(response['headers']).to have_key 'x-interaction-id'
-      expect(response['headers']['x-interaction-id']).not_to be_nil
-      expect(response['headers']['x-interaction-id']).to eq interaction_id
-      service_a.stop
-      service_b.stop
-    end
-
-    it 'should use given transaction id if one is provided' do
-      interaction_id = 'a123'
-      service_a = AlchemyFlux::Service.new("fluxa.service") do |message|
-        expect(message['headers']['x-interaction-id']).to eq interaction_id
-        { 'body' => "here" }
-      end
-
-      service_b = AlchemyFlux::Service.new("fluxb.service")
 
-      service_a.start
-      service_b.start
-
-      response = service_b.send_message_to_service("fluxa.service", {
-        'headers' => {'x-interaction-id' => interaction_id}
-      })
-      expect(response['body']).to eq "here"
-      expect(response['headers']['x-interaction-id']).to eq interaction_id
-      service_a.stop
-      service_b.stop
-    end
 
     it 'should add to transactions and processing messages, and remove once complete' do
       service_a = AlchemyFlux::Service.new("fluxa.service") do |message|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-flux
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Loyalty New Zealand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-22 00:00:00.000000000 Z
+date: 2016-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec