dispatch-rider 2.0.0 → 2.2.0

data/spec/lib/dispatch-rider/notification_services/base_spec.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe DispatchRider::NotificationServices::Base do
   subject do
-    DispatchRider::NotificationServices::Base.new(topics: {})
+    described_class.new(topics: {})
   end
 
   let :channel do
@@ -15,7 +17,7 @@ describe DispatchRider::NotificationServices::Base do
     channel
   end
 
-  before :each do
+  before do
     allow_any_instance_of(described_class).to receive(:notifier_builder).and_return(OpenStruct)
     channel = DispatchRider::Registrars::SnsChannel
     allow_any_instance_of(described_class).to receive(:channel_registrar_builder).and_return(channel)
@@ -35,7 +37,7 @@ describe DispatchRider::NotificationServices::Base do
   end
 
   describe "#publish" do
-    before :each do
+    before do
       subject.register(:foo, account: 123, region: "us-east-1", topic: "PlanOfAttack")
       subject.notifier.topics['arn:aws:sns:us-east-1:123:PlanOfAttack'] = channel
     end
@@ -70,7 +72,7 @@ describe DispatchRider::NotificationServices::Base do
   end
 
   describe "#channels" do
-    before :each do
+    before do
       subject.register(:foo, account: 123, region: "us-east-1", topic: "PlanOfAttack")
       subject.notifier.topics['arn:aws:sns:us-east-1:123:PlanOfAttack'] = channel
     end

data/spec/lib/dispatch-rider/notification_services/file_system/channel_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe DispatchRider::NotificationServices::FileSystem::Channel do

data/spec/lib/dispatch-rider/notification_services/file_system/notifier_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe DispatchRider::NotificationServices::FileSystem::Notifier do

data/spec/lib/dispatch-rider/notification_services/file_system_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe DispatchRider::NotificationServices::FileSystem do

data/spec/lib/dispatch-rider/notification_services_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe DispatchRider::NotificationServices do

data/spec/lib/dispatch-rider/publisher/base_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe DispatchRider::Publisher::Base do

data/spec/lib/dispatch-rider/publisher/configuration/destination_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe DispatchRider::Publisher::Configuration::Destination do

data/spec/lib/dispatch-rider/publisher/configuration/notification_service_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe DispatchRider::Publisher::Configuration::NotificationService do

data/spec/lib/dispatch-rider/publisher/configuration_reader_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe DispatchRider::Publisher::ConfigurationReader do
@@ -55,7 +57,11 @@ describe DispatchRider::Publisher::ConfigurationReader do
         end
 
         it "calls register_notification_service with :file_system and {}" do
-          expect(publisher).to receive(:register_notification_service).with("file_system", {})
+          if RUBY_VERSION > '3'
+            expect(publisher).to receive(:register_notification_service).with("file_system").once
+          else
+            expect(publisher).to receive(:register_notification_service).with("file_system", {}).once
+          end
           subject.load_config(configuration, publisher)
         end
       end
@@ -71,8 +77,13 @@ describe DispatchRider::Publisher::ConfigurationReader do
         end
 
         it "calls register_notification_service with :file_system and {}, as well as :foo, {bar: '123'}" do
-          expect(publisher).to receive(:register_notification_service).with("file_system", {})
-          expect(publisher).to receive(:register_notification_service).with("foo", "bar" => "123")
+          if RUBY_VERSION > '3'
+            expect(publisher).to receive(:register_notification_service).with("file_system").once
+            expect(publisher).to receive(:register_notification_service).with("foo", bar: "123").once
+          else
+            expect(publisher).to receive(:register_notification_service).with("file_system", {}).once
+            expect(publisher).to receive(:register_notification_service).with("foo", "bar" => "123").once
+          end
           subject.load_config(configuration, publisher)
         end
       end
@@ -117,7 +128,7 @@ describe DispatchRider::Publisher::ConfigurationReader do
 
         it "should call register_destination with the right parameters" do
           params = ["out1", :file_system, :foo, "path" => "tmp/test/channel"]
-          expect(publisher).to receive(:register_destination).exactly(1).times.with(*params)
+          expect(publisher).to receive(:register_destination).once.with(*params)
           subject.load_config(configuration, publisher)
         end
 

data/spec/lib/dispatch-rider/publisher/configuration_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe DispatchRider::Publisher::Configuration do
@@ -131,7 +133,7 @@ describe DispatchRider::Publisher::Configuration do
       )
     end
 
-    before :each do
+    before do
       subject.parse(new_configuration_hash)
     end
 

data/spec/lib/dispatch-rider/publisher/configuration_support_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe DispatchRider::Publisher::ConfigurationSupport do
@@ -52,7 +54,7 @@ describe DispatchRider::Publisher::ConfigurationSupport do
     end
 
     context "when configuring with a hash" do
-      before :each do
+      before do
         subject.configure(configuration_hash)
       end
 
@@ -68,7 +70,7 @@ describe DispatchRider::Publisher::ConfigurationSupport do
     end
 
     context "when configuring with a block" do
-      before :each do
+      before do
         subject.configure do |config|
           config.parse(configuration_hash)
         end

data/spec/lib/dispatch-rider/publisher_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe DispatchRider::Publisher do
@@ -55,7 +57,7 @@ describe DispatchRider::Publisher do
   end
 
   describe "#register_channel" do
-    before :each do
+    before do
       subject.register_notification_service(:aws_sns)
     end
 
@@ -72,7 +74,7 @@ describe DispatchRider::Publisher do
   end
 
   describe "#register_destination" do
-    before :each do
+    before do
       subject.register_notification_service(:aws_sns)
     end
 
@@ -100,18 +102,18 @@ describe DispatchRider::Publisher do
       subject.notification_service_registrar.fetch(:aws_sns).notifier
     end
 
-    before :each do
+    before do
       subject.register_notification_service(:file_system)
       subject.register_destination(:fs_foo, :file_system, :foo, path: "tmp/test_queue")
     end
 
     around do |ex|
-      begin
-        DispatchRider.config.debug = true
-        ex.call
-      ensure
-        DispatchRider.config.debug = false
-      end
+
+      DispatchRider.config.debug = true
+      ex.call
+    ensure
+      DispatchRider.config.debug = false
+
     end
 
     it "publishes the message to the notification service" do
@@ -135,25 +137,16 @@ describe DispatchRider::Publisher do
     describe "calls publish callback" do
       describe "calls the publish callback" do
         let(:publish_callback) { double :callback }
-        let(:expected_message) {
-          DispatchRider::Message.new(
-            subject: "bar_handler",
-            body: {
-              "bar" => "baz",
-              guid: "test-mode-not-random-guid"
-            }
-          )
-        }
 
         before { DispatchRider.config.callbacks.for(:publish) << publish_callback }
 
         after { DispatchRider.config.callbacks.for(:publish).delete publish_callback }
 
         example do
-          expect(publish_callback).to receive(:call).with any_args, # first argument is the inner job
-                                                          destinations: [:fs_foo],
-                                                          message: expected_message
-
+          expect(publish_callback).to receive(:call).with(
+            an_instance_of(Proc), # first argument is the inner job
+            { destinations: [:fs_foo],
+              message: an_instance_of(DispatchRider::Message) })
           publisher.publish destinations: [:fs_foo],
                             message: {
                               subject: "bar_handler",

data/spec/lib/dispatch-rider/queue_services/aws_sqs_spec.rb

@@ -1,17 +1,23 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe DispatchRider::QueueServices::AwsSqs do
 
   subject(:aws_sqs_queue) do
-    DispatchRider::QueueServices::AwsSqs.new(:name => "normal_priority")
+    described_class.new(:name => "normal_priority")
   end
 
   let(:visibility_timeout) { 100 }
 
   before do
-    allow_any_instance_of(Aws::SQS::Client).to receive(:list_queues).and_return(OpenStruct.new({queue_urls:["the.queue.url"]}))
+    allow_any_instance_of(Aws::SQS::Client).to receive(:list_queues).and_return(OpenStruct.new({queue_urls: ["the.queue.url"]}))
     allow_any_instance_of(Aws::SQS::Client).to receive(:get_queue_attributes).and_return(
-      OpenStruct.new({attributes:{"VisibilityTimeout"=>visibility_timeout}})
+      OpenStruct.new(
+        {
+          attributes: {"VisibilityTimeout"=>visibility_timeout}
+        }
+      )
     )
   end
 
@@ -99,7 +105,7 @@ describe DispatchRider::QueueServices::AwsSqs do
     end
 
     context "when the sqs queue is empty" do
-      before :each do
+      before do
         allow_any_instance_of(Aws::SQS::Queue).to receive(:receive_messages).and_return(OpenStruct.new({first: nil }))
       end
 
@@ -134,6 +140,7 @@ describe DispatchRider::QueueServices::AwsSqs do
     end
 
     before do
+      allow(response_message).to receive(:change_visibility)
       allow_any_instance_of(Aws::SQS::Queue).to receive(:receive_messages).and_return(OpenStruct.new({first: response_message }))
     end
 

data/spec/lib/dispatch-rider/queue_services/base_spec.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe DispatchRider::QueueServices::Base do
   subject(:base_queue) do
-    allow_any_instance_of(DispatchRider::QueueServices::Base).to receive(:assign_storage).and_return([])
-    DispatchRider::QueueServices::Base.new
+    allow_any_instance_of(described_class).to receive(:assign_storage).and_return([])
+    described_class.new
   end
 
   describe "#initialize" do
@@ -34,7 +36,7 @@ describe DispatchRider::QueueServices::Base do
   describe "#pop" do
     subject(:simple_queue) { DispatchRider::QueueServices::Simple.new }
 
-    before :each do
+    before do
       simple_queue.queue.push(DispatchRider::Message.new(subject: "foo", body: "bar").to_json)
     end
 
@@ -61,7 +63,7 @@ describe DispatchRider::QueueServices::Base do
     end
 
     context "when the queue is empty" do
-      before :each do
+      before do
         simple_queue.queue = []
       end
 
@@ -90,7 +92,7 @@ describe DispatchRider::QueueServices::Base do
 
     context "when a new item exists" do
       before do
-        allow(base_queue).to receive(:construct_message_from) { |item| item.message }
+        allow(base_queue).to receive(:construct_message_from, &:message)
       end
 
       let(:new_item) { OpenStruct.new(message: new_message) }
@@ -127,12 +129,12 @@ describe DispatchRider::QueueServices::Base do
   end
 
   describe "#empty?" do
-    before :each do
+    before do
       allow(base_queue).to receive(:size) { base_queue.queue.size }
     end
 
     context "when the queue is empty" do
-      before :each do
+      before do
         base_queue.queue = []
       end
 
@@ -142,7 +144,7 @@ describe DispatchRider::QueueServices::Base do
     end
 
     context "when the queue is not empty" do
-      before :each do
+      before do
         base_queue.queue << { subject: 'foo', body: 'bar' }.to_json
       end
 

data/spec/lib/dispatch-rider/queue_services/file_system_spec.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe DispatchRider::QueueServices::FileSystem do
   subject(:file_system_queue) do
-    DispatchRider::QueueServices::FileSystem.new(:path => queue_path)
+    described_class.new(:path => queue_path)
   end
 
   let(:queue_path) { "tmp/queue" }
@@ -26,7 +28,7 @@ describe DispatchRider::QueueServices::FileSystem do
   end
 
   describe "#raw_head" do
-    before :each do
+    before do
       file_system_queue.insert({'subject' => 'foo', 'body' => 'bar'}.to_json)
     end
 
@@ -53,7 +55,7 @@ describe DispatchRider::QueueServices::FileSystem do
   end
 
   describe "#put_back" do
-    before :each do
+    before do
       file_system_queue.insert({'subject' => 'foo', 'body' => 'bar'}.to_json)
     end
 
@@ -66,7 +68,7 @@ describe DispatchRider::QueueServices::FileSystem do
   end
 
   describe "#delete" do
-    before :each do
+    before do
       file_system_queue.insert({'subject' => 'foo', 'body' => 'bar'}.to_json)
     end
 
@@ -78,7 +80,7 @@ describe DispatchRider::QueueServices::FileSystem do
   end
 
   describe "#size" do
-    before :each do
+    before do
       file_system_queue.insert({'subject' => 'foo', 'body' => 'bar'}.to_json)
     end
 

data/spec/lib/dispatch-rider/queue_services/received_message_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe DispatchRider::QueueServices::ReceivedMessage do

data/spec/lib/dispatch-rider/queue_services/simple_spec.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe DispatchRider::QueueServices::Simple do
   subject(:simple_queue) do
-    DispatchRider::QueueServices::Simple.new
+    described_class.new
   end
 
   describe "#assign_storage" do
@@ -21,7 +23,7 @@ describe DispatchRider::QueueServices::Simple do
   end
 
   describe "#raw_head" do
-    before :each do
+    before do
       simple_queue.insert({'subject' => 'foo', 'body' => 'bar'}.to_json)
     end
 
@@ -41,7 +43,7 @@ describe DispatchRider::QueueServices::Simple do
   end
 
   describe "#delete" do
-    before :each do
+    before do
       simple_queue.insert({'subject' => 'foo', 'body' => 'bar'}.to_json)
     end
 
@@ -52,7 +54,7 @@ describe DispatchRider::QueueServices::Simple do
   end
 
   describe "#size" do
-    before :each do
+    before do
       simple_queue.insert({'subject' => 'foo', 'body' => 'bar'}.to_json)
     end
 

data/spec/lib/dispatch-rider/registrars/base_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe DispatchRider::Registrars::Base do
@@ -32,7 +34,7 @@ describe DispatchRider::Registrars::Base do
   end
 
   describe "#unregister" do
-    before :each do
+    before do
       allow(subject).to receive(:value).and_return('bar')
       subject.register(:foo)
     end
@@ -49,7 +51,7 @@ describe DispatchRider::Registrars::Base do
 
   describe "#fetch" do
     context "when a key/value pair is registered" do
-      before :each do
+      before do
         allow(subject).to receive(:value).and_return('bar')
         subject.register(:foo)
       end

data/spec/lib/dispatch-rider/registrars/file_system_channel_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe DispatchRider::Registrars::FileSystemChannel do

data/spec/lib/dispatch-rider/registrars/handler_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe DispatchRider::Registrars::Handler do

data/spec/lib/dispatch-rider/registrars/notification_service_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe DispatchRider::Registrars::NotificationService do

data/spec/lib/dispatch-rider/registrars/publishing_destination_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe DispatchRider::Registrars::PublishingDestination do

data/spec/lib/dispatch-rider/registrars/queue_service_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe DispatchRider::Registrars::QueueService do

data/spec/lib/dispatch-rider/registrars/sns_channel_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe DispatchRider::Registrars::SnsChannel do

data/spec/lib/dispatch-rider/registrars_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe DispatchRider::Registrars do

data/spec/lib/dispatch-rider/runner_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe DispatchRider::Runner do
@@ -5,7 +7,7 @@ describe DispatchRider::Runner do
   describe ".run" do
     let(:subscriber) { double(:subscriber) }
 
-    before :each do
+    before do
       DispatchRider.configure do |config|
         config.subscriber = subscriber
       end

data/spec/lib/dispatch-rider/scheduled_job_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe DispatchRider::ScheduledJob do

data/spec/lib/dispatch-rider/subscriber_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe DispatchRider::Subscriber do
@@ -55,7 +57,7 @@ describe DispatchRider::Subscriber do
 
   describe "#setup_demultiplexer" do
     context "when a queue is registered" do
-      before :each do
+      before do
         subject.register_queue(:simple)
         subject.register_handler(:foo_bar)
       end
@@ -69,7 +71,7 @@ describe DispatchRider::Subscriber do
   end
 
   describe "#process" do
-    before :each do
+    before do
       subject.register_queue(:simple)
       subject.register_handler(:foo_bar)
       subject.setup_demultiplexer(:simple)
@@ -89,6 +91,7 @@ describe DispatchRider::Subscriber do
     # kills travis sometimes so leaving it here as tested documentation
     describe "process termination", if: false do
       before { allow(subject.demultiplexer).to receive(:stop) { throw :got_stopped } }
+
       let(:message_body) { { 'foo' => 'bar' } }
 
       context "when process quits" do
@@ -151,7 +154,7 @@ describe DispatchRider::Subscriber do
           allow(subject).to receive(:exit) { throw :got_forcefully_stopped }
 
           konst = Class.new(DispatchRider::Handlers::Base) do
-            def process(options)
+            def process(_options)
               2.times { Process.kill("INT", 0) }
             end
           end

data/spec/lib/dispatch-rider_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe DispatchRider do

data/spec/spec_helper.rb

@@ -3,6 +3,7 @@
 require 'bundler/setup'
 
 require 'simplecov'
+SimpleCov.minimum_coverage 85
 require 'coveralls'
 
 if RUBY_VERSION < "3.1"
@@ -33,7 +34,7 @@ Bundler.require(:default, :development)
 
 require 'dispatch-rider'
 
-Dir['./spec/support/**/*.rb'].each { |fn| require(fn) }
+Dir['./spec/support/**/*.rb'].sort.each { |fn| require(fn) }
 
 FactoryBot.definition_file_paths = %w{spec/factories/}
 FactoryBot.find_definitions

data/spec/support/crashing_handler.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CrashingHandler < DispatchRider::Handlers::Base
   def process(_params)
     raise "I crashed!"

data/spec/support/integration_support.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module IntegrationSupport
   def setup_publisher
     publisher = DispatchRider::Publisher.new

data/spec/support/null_logger.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class NullLogger
   def ignore(*_args)
   end

data/spec/support/sample_handler.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class SampleHandler < DispatchRider::Handlers::Base
   def process(_params)
     # do nothing