From 2a362edaf5f14a3c4237de4c1580af6c33bafa96 Mon Sep 17 00:00:00 2001
From: Pablo Cantero <pablo@pablocantero.com>
Date: Thu, 2 Mar 2017 07:53:49 -0500
Subject: [PATCH 1/2] Remove deprecation warnings.

Fix #325
---
 lib/shoryuken/environment_loader.rb     | 19 -------------------
 lib/shoryuken/message.rb                | 17 ++++-------------
 lib/shoryuken/middleware/chain.rb       | 19 +------------------
 spec/shoryuken/middleware/chain_spec.rb | 24 ------------------------
 4 files changed, 5 insertions(+), 74 deletions(-)

diff --git a/lib/shoryuken/environment_loader.rb b/lib/shoryuken/environment_loader.rb
index d957d1de..298de96b 100644
--- a/lib/shoryuken/environment_loader.rb
+++ b/lib/shoryuken/environment_loader.rb
@@ -30,7 +30,6 @@ def load
       require_workers
       validate_queues
       validate_workers
-      patch_deprecated_workers
     end
 
     private
@@ -108,24 +107,6 @@ def parse_queues
       end
     end
 
-    def patch_deprecated_workers
-      Shoryuken.worker_registry.queues.each do |queue|
-        Shoryuken.worker_registry.workers(queue).each do |worker_class|
-          if worker_class.instance_method(:perform).arity == 1
-            Shoryuken.logger.warn { "[DEPRECATION] #{worker_class.name}#perform(sqs_msg) is deprecated. Please use #{worker_class.name}#perform(sqs_msg, body)" }
-
-            worker_class.class_eval do
-              alias_method :deprecated_perform, :perform
-
-              def perform(sqs_msg, body = nil)
-                deprecated_perform(sqs_msg)
-              end
-            end
-          end
-        end
-      end
-    end
-
     def require_workers
       required = Shoryuken.options[:require]
 
diff --git a/lib/shoryuken/message.rb b/lib/shoryuken/message.rb
index 3e2abc61..e9e84019 100644
--- a/lib/shoryuken/message.rb
+++ b/lib/shoryuken/message.rb
@@ -3,19 +3,10 @@ class Message
     attr_accessor :client, :queue_url, :queue_name, :data
 
     def initialize(client, queue, data)
-      self.client = client
-      self.data = data
-
-      if queue.is_a?(Shoryuken::Queue)
-        self.queue_url = queue.url
-        self.queue_name = queue.name
-      else
-        # TODO: Remove next major release
-        Shoryuken.logger.warn do
-          '[DEPRECATION] Passing a queue url into Shoryuken::Message is deprecated, please pass the queue itself'
-        end
-        self.queue_url = queue
-      end
+      self.client     = client
+      self.data       = data
+      self.queue_url  = queue.url
+      self.queue_name = queue.name
     end
 
     def delete
diff --git a/lib/shoryuken/middleware/chain.rb b/lib/shoryuken/middleware/chain.rb
index 7d73865c..9f61554b 100644
--- a/lib/shoryuken/middleware/chain.rb
+++ b/lib/shoryuken/middleware/chain.rb
@@ -102,32 +102,15 @@ def invoke(*args, &final_action)
 
     class Entry
       attr_reader :klass
+
       def initialize(klass, *args)
         @klass = klass
         @args  = args
-
-        patch_deprecated_middleware!(klass)
       end
 
       def make_new
         @klass.new(*@args)
       end
-
-      private
-
-      def patch_deprecated_middleware!(klass)
-        if klass.instance_method(:call).arity == 3
-          Shoryuken.logger.warn { "[DEPRECATION] #{klass.name}#call(worker_instance, queue, sqs_msg) is deprecated. Please use #{klass.name}#call(worker_instance, queue, sqs_msg, body)" }
-
-          klass.class_eval do
-            alias_method :deprecated_call, :call
-
-            def call(worker_instance, queue, sqs_msg, body = nil, &block)
-              deprecated_call(worker_instance, queue, sqs_msg, &block)
-            end
-          end
-        end
-      end
     end
   end
 end
diff --git a/spec/shoryuken/middleware/chain_spec.rb b/spec/shoryuken/middleware/chain_spec.rb
index 3a5b8749..640db568 100644
--- a/spec/shoryuken/middleware/chain_spec.rb
+++ b/spec/shoryuken/middleware/chain_spec.rb
@@ -44,28 +44,4 @@ def call(*args); end
     expect(final_action).to eq nil
     expect(recorder).to eq []
   end
-
-  class DeprecatedMiddleware
-    def call(worker_instance, queue, sqs_msg)
-      @@success = true
-    end
-
-    def self.success?
-      !!@@success
-    end
-  end
-
-  it 'patches deprecated middleware' do
-    subject.clear
-
-    expect(Shoryuken.logger).to receive(:warn) do |&block|
-      expect(block.call).to eq('[DEPRECATION] DeprecatedMiddleware#call(worker_instance, queue, sqs_msg) is deprecated. Please use DeprecatedMiddleware#call(worker_instance, queue, sqs_msg, body)')
-    end
-
-    subject.add DeprecatedMiddleware
-
-    subject.invoke TestWorker, 'test', double('SQS msg', body: 'test'), 'test'
-
-    expect(DeprecatedMiddleware.success?).to eq true
-  end
 end

From c59656f19ad1ac5e4ce44cf4ba76bad8625a527a Mon Sep 17 00:00:00 2001
From: Pablo Cantero <pablo@pablocantero.com>
Date: Thu, 2 Mar 2017 07:56:31 -0500
Subject: [PATCH 2/2] Trying to fix "uninitialized constant SecureRandom"

---
 spec/integration/launcher_spec.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spec/integration/launcher_spec.rb b/spec/integration/launcher_spec.rb
index e4a84cd8..321fcdf9 100644
--- a/spec/integration/launcher_spec.rb
+++ b/spec/integration/launcher_spec.rb
@@ -1,6 +1,7 @@
 require 'spec_helper'
 require 'shoryuken/manager'
 require 'shoryuken/launcher'
+require 'securerandom'
 
 RSpec.describe Shoryuken::Launcher do
   describe 'Consuming messages', slow: :true do