freddy 0.5.6 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b44c437c95066c2386f67bc9077fb0194376958
-  data.tar.gz: 8e4dc3ae45c00ff027a7eccd10609c77f146b715
+  metadata.gz: 80d6defa2644f870ae4f4ac27ea804b072f37da2
+  data.tar.gz: fc9f2e3229d2eb40c4344a424b4edc38ee26c233
 SHA512:
-  metadata.gz: 8fc4ef697700812b814402e02892a5aea60348e6e8550f21de356fe68d22e2c354c785a5f09b18184c61de373b0e03bb203f6aa8f57c4e34d33c1c0dab2fbfcd
-  data.tar.gz: cd13ca536d3b50a2f650d9bfc6f32639b23273f3233de316ea1e87825aa73d6eebdeec816114bd149c245c9406238dcbb5458777b3bf4042e81be55e1d6bdd44
+  metadata.gz: 58b59901aa633d9c782699e0388aa9260f97e4bf3d0ea3af07d3bd1814997a125b30cfaf1edce53f4d2516cd2cb94e4386e6df4b38e345cecca7b4c56a23ce0c
+  data.tar.gz: 67ddf7fe5f6007f4dca7d7e757a4b1878622520165d300cc172b16ae2fb7f3c7fb3440cc6d9ff6bfdcfcdca6abe1995b51889d45457455cd0373e34691cd1cd5

data/freddy.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   else
     spec.name          = "freddy"
   end
-  spec.version       = '0.5.6'
+  spec.version       = '0.5.7'
   spec.authors       = ["Urmas Talimaa"]
   spec.email         = ["urmas.talimaa@gmail.com"]
   spec.description   = %q{Messaging API}

data/lib/freddy/consumers.rb

@@ -1,11 +1,12 @@
 class Freddy
   module Consumers
     def self.log_receive_event(logger, queue_name, delivery)
-      if defined?(Logasm) && logger.is_a?(Logasm)
-        logger.debug "Received message", queue: queue_name, payload: delivery.payload, correlation_id: delivery.correlation_id
-      else
-        logger.debug "Received message on #{queue_name} with payload #{delivery.payload} with correlation_id #{delivery.correlation_id}"
-      end
+      logger.debug(
+        message: 'Received message',
+        queue: queue_name,
+        payload: delivery.payload,
+        correlation_id: delivery.correlation_id
+      )
     end
   end
 end

data/lib/freddy/producers.rb

@@ -1 +1,9 @@
+class Freddy
+  module Producers
+    def self.log_send_event(logger, payload, destination)
+      logger.debug message: 'Sending message', queue: destination, payload: payload
+    end
+  end
+end
+
 Dir[File.dirname(__FILE__) + '/producers/*.rb'].each(&method(:require))

data/lib/freddy/producers/reply_producer.rb

@@ -9,7 +9,7 @@ class Freddy
       end
 
       def produce(destination, payload, properties)
-        @logger.debug "Sending message #{payload.inspect} to #{destination}"
+        Producers.log_send_event(@logger, payload, destination)
 
         properties = properties.merge(
           routing_key: destination, content_type: CONTENT_TYPE

data/lib/freddy/producers/send_and_forget_producer.rb

@@ -10,7 +10,7 @@ class Freddy
       end
 
       def produce(destination, payload, properties)
-        @logger.debug "Sending message #{payload.inspect} to #{destination}"
+        Producers.log_send_event(@logger, payload, destination)
 
         properties = properties.merge(routing_key: destination, content_type: CONTENT_TYPE)
         json_payload = Payload.dump(payload)

data/lib/freddy/producers/send_and_wait_response_producer.rb

@@ -45,9 +45,13 @@ class Freddy
         )
         json_payload = Payload.dump(payload)
 
-        @logger.debug "Publishing request with payload #{payload.inspect} "\
-                      "to #{destination}, waiting for response on "\
-                      "#{@response_queue.name} with correlation_id #{correlation_id}"
+        @logger.debug(
+          message: 'Publishing request',
+          queue: destination,
+          payload: payload,
+          response_queue: @response_queue.name,
+          correlation_id: correlation_id
+        )
 
         # Connection adapters handle thread safety for #publish themselves. No
         # need to lock these.

data/spec/integration/logging_spec.rb

@@ -24,14 +24,21 @@ describe 'Logging' do
   it 'logs all consumed messages' do
     expect(logger1).to have_received(:info).with(/Listening for requests on \S+/)
     expect(logger1).to have_received(:debug).with(
-      /Received message on \S+ with payload {:pay=>"load"}/
+      message: 'Received message',
+      queue: destination,
+      payload: payload,
+      correlation_id: anything
     )
   end
 
   it 'logs all produced messages' do
     expect(logger2).to have_received(:debug).with(/Consuming messages on \S+/)
     expect(logger2).to have_received(:debug).with(
-      /Publishing request with payload {:pay=>"load"} to \S+, waiting for response on amq.gen-\S+ with correlation_id .*/
+      message: 'Publishing request',
+      queue: destination,
+      payload: payload,
+      response_queue: anything,
+      correlation_id: anything
     )
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: freddy
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors:
 - Urmas Talimaa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-26 00:00:00.000000000 Z
+date: 2016-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,7 +136,6 @@ files:
 - lib/freddy/timeout_error.rb
 - lib/freddy/utils.rb
 - spec/freddy/consumers/respond_to_consumer_spec.rb
-- spec/freddy/consumers_spec.rb
 - spec/freddy/error_response_spec.rb
 - spec/freddy/freddy_spec.rb
 - spec/freddy/message_handler_spec.rb
@@ -167,13 +166,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: API for inter-application messaging supporting acknowledgements and request-response
 test_files:
 - spec/freddy/consumers/respond_to_consumer_spec.rb
-- spec/freddy/consumers_spec.rb
 - spec/freddy/error_response_spec.rb
 - spec/freddy/freddy_spec.rb
 - spec/freddy/message_handler_spec.rb

data/spec/freddy/consumers_spec.rb

@@ -1,43 +0,0 @@
-require 'spec_helper'
-
-describe Freddy::Consumers do
-  describe '.log_receive_event' do
-    subject { described_class.log_receive_event(logger, queue_name, delivery) }
-
-    let(:queue_name) { 'salemove' }
-    let(:delivery) do
-      instance_double(Freddy::Delivery,
-        payload: {key: 'value'},
-        correlation_id: 'a1b2'
-      )
-    end
-
-    context 'when configured with logasm logger' do
-      let(:logger) { logasm_class.new }
-      let(:logasm_class) { Class.new }
-
-      before do
-        stub_const('::Logasm', logasm_class)
-      end
-
-      it 'logs the received event' do
-        expect(logger).to receive(:debug).with('Received message',
-          queue: 'salemove', payload: {key: 'value'}, correlation_id: 'a1b2'
-        )
-
-        subject
-      end
-    end
-
-    context 'when configured with regular logger' do
-      let(:logger) { Logger.new('/dev/null') }
-
-      it 'logs the received event' do
-        expect(logger).to receive(:debug)
-          .with('Received message on salemove with payload {:key=>"value"} with correlation_id a1b2')
-
-        subject
-      end
-    end
-  end
-end