freddy 1.4.1 → 1.4.2

data/spec/freddy/message_handler_spec.rb

@@ -10,7 +10,7 @@ describe Freddy::MessageHandler do
     it 'delegates to the adapter' do
       expect(adapter).to receive(:success).with(delivery, x: 'y')
 
-      subject.success(x: 'y')
+      handler.success(x: 'y')
     end
   end
 
@@ -18,7 +18,7 @@ describe Freddy::MessageHandler do
     it 'delegates to the adapter' do
       expect(adapter).to receive(:error).with(delivery, error: 'text')
 
-      subject.error(error: 'text')
+      handler.error(error: 'text')
     end
   end
 end

data/spec/freddy/payload_spec.rb

@@ -13,7 +13,7 @@ describe Freddy::Payload do
     end
 
     it 'serializes time objects in a nested hash as iso8601 format strings' do
-      expect(dump(x: {time: Time.utc(2016, 1, 4, 20, 18)}))
+      expect(dump(x: { time: Time.utc(2016, 1, 4, 20, 18) }))
         .to eq('{"x":{"time":"2016-01-04T20:18:00Z"}}')
     end
 
@@ -28,22 +28,22 @@ describe Freddy::Payload do
     end
 
     it 'serializes date objects in a nested hash as iso8601 format strings' do
-      expect(dump(x: {date: Date.new(2016, 1, 4)}))
+      expect(dump(x: { date: Date.new(2016, 1, 4) }))
         .to eq('{"x":{"date":"2016-01-04"}}')
     end
 
     it 'serializes datetime objects as iso8601 format strings' do
-      expect(dump(datetime: DateTime.new(2016, 1, 4, 20, 18)))
+      expect(dump(datetime: DateTime.new(2016, 1, 4, 20, 18))) # rubocop:disable Style/DateTime
         .to eq('{"datetime":"2016-01-04T20:18:00+00:00"}')
     end
 
     it 'serializes datetime objects in an array as iso8601 format strings' do
-      expect(dump(datetime: [DateTime.new(2016, 1, 4, 20, 18)]))
+      expect(dump(datetime: [DateTime.new(2016, 1, 4, 20, 18)])) # rubocop:disable Style/DateTime
         .to eq('{"datetime":["2016-01-04T20:18:00+00:00"]}')
     end
 
     it 'serializes datetime objects in a nested hash as iso8601 format strings' do
-      expect(dump(x: {datetime: DateTime.new(2016, 1, 4, 20, 18)}))
+      expect(dump(x: { datetime: DateTime.new(2016, 1, 4, 20, 18) })) # rubocop:disable Style/DateTime
         .to eq('{"x":{"datetime":"2016-01-04T20:18:00+00:00"}}')
     end
 

data/spec/freddy/responder_handler_spec.rb

@@ -4,7 +4,7 @@ describe Freddy::ResponderHandler do
   let(:freddy) { Freddy.build(logger, config) }
 
   let(:destination) { random_destination }
-  let(:payload)     { {pay: 'load'} }
+  let(:payload)     { { pay: 'load' } }
 
   after { freddy.close }
 

data/spec/freddy/sync_response_container_spec.rb

@@ -2,13 +2,13 @@ require 'spec_helper'
 
 describe Freddy::SyncResponseContainer do
   let(:container) { described_class.new(on_timeout) }
-  let(:on_timeout) { Proc.new {} }
+  let(:on_timeout) { proc {} }
 
   context 'when timeout' do
-    subject { container.wait_for_response(0.01) }
+    subject(:wait_for_response) { container.wait_for_response(0.01) }
 
     it 'raises timeout error' do
-      expect { subject }.to raise_error do |error|
+      expect { wait_for_response }.to raise_error do |error|
         expect(error).to be_a(Freddy::TimeoutError)
         expect(error.response).to eq(
           error: 'RequestTimeout',
@@ -22,15 +22,15 @@ describe Freddy::SyncResponseContainer do
     let(:delivery) { {} }
 
     it 'raises timeout error' do
-      expect {
+      expect do
         container.call(nil, delivery)
-      }.to raise_error(StandardError, 'unexpected nil value for response')
+      end.to raise_error(StandardError, 'unexpected nil value for response')
     end
   end
 
   describe '#wait_for_response' do
     let(:timeout) { 2 }
-    let(:response) { {msg: 'response'} }
+    let(:response) { { msg: 'response' } }
     let(:delivery) { OpenStruct.new(type: 'success') }
 
     context 'when called after #call' do
@@ -45,9 +45,9 @@ describe Freddy::SyncResponseContainer do
       end
 
       it 'does not wait for timeout' do
-        expect {
+        expect do
           container.wait_for_response(timeout)
-        }.to change(Time, :now).by_at_most(max_wait_time_in_seconds)
+        end.to change(Time, :now).by_at_most(max_wait_time_in_seconds)
       end
     end
   end

data/spec/freddy/trace_carrier_spec.rb

@@ -4,7 +4,7 @@ describe Freddy::TraceCarrier do
   subject(:carrier) { described_class.new(properties) }
 
   context 'when adding trace information' do
-    let(:properties) { {x: 'y'} }
+    let(:properties) { { x: 'y' } }
     let(:key_name) { 'some-key' }
     let(:key_value) { 'some-key' }
 
@@ -20,7 +20,7 @@ describe Freddy::TraceCarrier do
     let(:key_value) { 'some-key' }
 
     let(:properties) do
-      double(headers: {serialized_key_name => key_value})
+      double(headers: { serialized_key_name => key_value })
     end
 
     it 'extracts a header with x-trace- prefix' do
@@ -33,9 +33,9 @@ describe Freddy::TraceCarrier do
       let(:properties) do
         double(
           headers: {
-            "x-trace-key1" => "value1",
-            "x-trace-key2" => "value2",
-            "other-key" => "value3"
+            'x-trace-key1' => 'value1',
+            'x-trace-key2' => 'value2',
+            'other-key' => 'value3'
           }
         )
       end

data/spec/integration/concurrency_spec.rb

@@ -9,7 +9,7 @@ describe 'Concurrency' do
   after { [freddy1, freddy2, freddy3].each(&:close) }
 
   it 'supports multiple requests in #respond_to' do
-    freddy1.respond_to 'Concurrency1' do |payload, msg_handler|
+    freddy1.respond_to 'Concurrency1' do |_payload, msg_handler|
       begin
         freddy1.deliver_with_response 'Concurrency2', msg: 'noop'
         result2 = freddy1.deliver_with_response 'Concurrency3', msg: 'noop'
@@ -19,16 +19,16 @@ describe 'Concurrency' do
       end
     end
 
-    freddy2.respond_to 'Concurrency2' do |payload, msg_handler|
+    freddy2.respond_to 'Concurrency2' do |_payload, msg_handler|
       begin
-        msg_handler.success({from: 'Concurrency2'})
+        msg_handler.success(from: 'Concurrency2')
       rescue Freddy::InvalidRequestError => e
         msg_handler.error(e.response)
       end
     end
 
-    freddy3.respond_to 'Concurrency3' do |payload, msg_handler|
-      msg_handler.success({from: 'Concurrency3'})
+    freddy3.respond_to 'Concurrency3' do |_payload, msg_handler|
+      msg_handler.success(from: 'Concurrency3')
     end
 
     result =
@@ -51,8 +51,8 @@ describe 'Concurrency' do
       received1 = true
     end
 
-    freddy2.respond_to 'TapConcurrency' do |payload, msg_handler|
-      msg_handler.success({from: 'TapConcurrency'})
+    freddy2.respond_to 'TapConcurrency' do |_payload, msg_handler|
+      msg_handler.success(from: 'TapConcurrency')
       received2 = true
     end
 
@@ -86,9 +86,9 @@ describe 'Concurrency' do
     expect(results.count).to eq(10)
   end
 
-  context 'concurrent executions of deliver_with_response' do
+  context 'with concurrent executions of deliver_with_response' do
     let(:nr_of_threads) { 50 }
-    let(:payload) { {pay: 'load'} }
+    let(:payload) { { pay: 'load' } }
     let(:msg_counter) { Hamster::MutableSet[] }
     let(:queue_name) { random_destination }
 

data/spec/integration/reply_spec.rb

@@ -4,14 +4,14 @@ describe 'Reply' do
   let(:freddy) { Freddy.build(logger, config) }
 
   let(:destination) { random_destination }
-  let(:request_payload) { {req: 'load'} }
-  let(:response_payload) { {res: 'load'} }
+  let(:request_payload) { { req: 'load' } }
+  let(:response_payload) { { res: 'load' } }
 
   after { freddy.close }
 
   context 'when a synchronized request' do
     before do
-      freddy.respond_to(destination) do |payload, msg_handler|
+      freddy.respond_to(destination) do |_payload, msg_handler|
         msg_handler.success(response_payload)
       end
     end
@@ -22,7 +22,7 @@ describe 'Reply' do
     end
 
     it 'does not send the reply to the topic queue' do
-      freddy.tap_into 'amq.*' do |payload|
+      freddy.tap_into 'amq.*' do |_payload|
         @message_received = true
       end
 

data/spec/integration/tap_into_with_group_spec.rb

@@ -14,8 +14,8 @@ describe 'Tapping into with group identifier' do
     msg_counter = Hamster::MutableSet[]
 
     group_id = arbitrary_id
-    responder1.tap_into(destination, group: group_id) {|msg| msg_counter << 'r1' }
-    responder2.tap_into(destination, group: group_id) {|msg| msg_counter << 'r2' }
+    responder1.tap_into(destination, group: group_id) { |_msg| msg_counter << 'r1' }
+    responder2.tap_into(destination, group: group_id) { |_msg| msg_counter << 'r2' }
     deliverer.deliver(destination, {})
 
     default_sleep

data/spec/integration/tracing_spec.rb

@@ -16,23 +16,23 @@ describe 'Tracing' do
     let(:destination2) { random_destination }
 
     before do
-      freddy.respond_to(destination) do |payload, msg_handler|
-        msg_handler.success({
+      freddy.respond_to(destination) do |_payload, msg_handler|
+        msg_handler.success(
           trace_initiator: {
             trace_id: active_span.context.trace_id,
             parent_id: active_span.context.parent_id,
             span_id: active_span.context.span_id
           },
           current_receiver: freddy.deliver_with_response(destination2, {})
-        })
+        )
       end
 
-      freddy2.respond_to(destination2) do |payload, msg_handler|
-        msg_handler.success({
+      freddy2.respond_to(destination2) do |_payload, msg_handler|
+        msg_handler.success(
           trace_id: active_span.context.trace_id,
           parent_id: active_span.context.parent_id,
           span_id: active_span.context.span_id
-        })
+        )
       end
     end
 
@@ -51,15 +51,15 @@ describe 'Tracing' do
     it 'has parent_id' do
       response = freddy.deliver_with_response(destination, {})
       current_receiver = response.fetch(:current_receiver)
-      expect(current_receiver.fetch(:parent_id)).to_not be_nil
+      expect(current_receiver.fetch(:parent_id)).not_to be_nil
     end
 
     it 'has generated span_id' do
       response = freddy.deliver_with_response(destination, {})
       trace_initiator = response.fetch(:trace_initiator)
       current_receiver = response.fetch(:current_receiver)
-      expect(current_receiver.fetch(:span_id)).to_not be_nil
-      expect(current_receiver.fetch(:span_id)).to_not eq(trace_initiator.fetch(:span_id))
+      expect(current_receiver.fetch(:span_id)).not_to be_nil
+      expect(current_receiver.fetch(:span_id)).not_to eq(trace_initiator.fetch(:span_id))
     end
   end
 
@@ -73,7 +73,7 @@ describe 'Tracing' do
     let(:destination3) { random_destination }
 
     before do
-      freddy.respond_to(destination) do |payload, msg_handler|
+      freddy.respond_to(destination) do |_payload, msg_handler|
         msg_handler.success({
           trace_initiator: {
             trace_id: active_span.context.trace_id,
@@ -83,23 +83,23 @@ describe 'Tracing' do
         }.merge(freddy.deliver_with_response(destination2, {})))
       end
 
-      freddy2.respond_to(destination2) do |payload, msg_handler|
-        msg_handler.success({
+      freddy2.respond_to(destination2) do |_payload, msg_handler|
+        msg_handler.success(
           previous_receiver: {
             trace_id: active_span.context.trace_id,
             parent_id: active_span.context.parent_id,
             span_id: active_span.context.span_id
           },
           current_receiver: freddy2.deliver_with_response(destination3, {})
-        })
+        )
       end
 
-      freddy3.respond_to(destination3) do |payload, msg_handler|
-        msg_handler.success({
+      freddy3.respond_to(destination3) do |_payload, msg_handler|
+        msg_handler.success(
           trace_id: active_span.context.trace_id,
           parent_id: active_span.context.parent_id,
           span_id: active_span.context.span_id
-        })
+        )
       end
     end
 
@@ -119,15 +119,15 @@ describe 'Tracing' do
     it 'has parent_id' do
       response = freddy.deliver_with_response(destination, {})
       current_receiver = response.fetch(:current_receiver)
-      expect(current_receiver.fetch(:parent_id)).to_not be_nil
+      expect(current_receiver.fetch(:parent_id)).not_to be_nil
     end
 
     it 'has generated span_id' do
       response = freddy.deliver_with_response(destination, {})
       previous_receiver = response.fetch(:previous_receiver)
       current_receiver = response.fetch(:current_receiver)
-      expect(current_receiver.fetch(:span_id)).to_not be_nil
-      expect(current_receiver.fetch(:span_id)).to_not eq(previous_receiver.fetch(:span_id))
+      expect(current_receiver.fetch(:span_id)).not_to be_nil
+      expect(current_receiver.fetch(:span_id)).not_to eq(previous_receiver.fetch(:span_id))
     end
   end
 

data/spec/spec_helper.rb

@@ -5,9 +5,9 @@ Bundler.setup
 require 'codeclimate-test-reporter'
 SimpleCov.start do
   formatter SimpleCov::Formatter::MultiFormatter.new([
-    SimpleCov::Formatter::HTMLFormatter,
-    CodeClimate::TestReporter::Formatter
-  ])
+                                                       SimpleCov::Formatter::HTMLFormatter,
+                                                       CodeClimate::TestReporter::Formatter
+                                                     ])
   add_filter '/spec/'
 end
 
@@ -40,9 +40,9 @@ def default_sleep
   sleep 0.05
 end
 
-def wait_for(&block)
+def wait_for
   100.times do
-    return if block.call
+    return if yield
     sleep 0.005
   end
 end
@@ -57,7 +57,7 @@ def logger
 end
 
 def config
-  {host: 'localhost', port: 5672, user: 'guest', pass: 'guest'}
+  { host: 'localhost', port: 5672, user: 'guest', pass: 'guest' }
 end
 
 def spawn_echo_responder(freddy, queue_name)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: freddy
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Salemove TechMovers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-11 00:00:00.000000000 Z
+date: 2018-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,33 +67,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.13'
 - !ruby/object:Gem::Dependency
-  name: thread
+  name: opentracing
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: opentracing
+  name: thread
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.1'
 description: Messaging API
 email:
 - techmovers@salemove.com
@@ -104,6 +104,7 @@ files:
 - ".gitignore"
 - ".npmignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"