Remove the queue container. Premature consolidation. Set up and maintain queues in the classes that use them instead.

2 files changed, 0 insertions, 54 deletions

diff --git a/activesupport/lib/active_support/queueing.rb b/activesupport/lib/active_support/queueing.rb
index 7c352886f3..430ecbe323 100644
--- a/activesupport/lib/active_support/queueing.rb
+++ b/activesupport/lib/active_support/queueing.rb
@@ -56,32 +56,6 @@ module ActiveSupport
     end
   end
 
-  # A container for multiple queues. This class delegates to a default Queue
-  # so that <tt>Rails.queue.push</tt> and friends will Just Work. To use this class
-  # with multiple queues:
-  #
-  #   # In your configuration:
-  #   Rails.queue[:image_queue] = SomeQueue.new
-  #   Rails.queue[:mail_queue]  = SomeQueue.new
-  #
-  #   # In your app code:
-  #   Rails.queue[:mail_queue].push SomeJob.new
-  #
-  class QueueContainer < DelegateClass(::Queue)
-    def initialize(default_queue)
-      @queues = { :default => default_queue }
-      super(default_queue)
-    end
-
-    def [](queue_name)
-      @queues[queue_name]
-    end
-
-    def []=(queue_name, queue)
-      @queues[queue_name] = queue
-    end
-  end
-
   # The threaded consumer will run jobs in a background thread in
   # development mode or in a VM where running jobs on a thread in
   # production mode makes sense.
diff --git a/activesupport/test/queueing/container_test.rb b/activesupport/test/queueing/container_test.rb
deleted file mode 100644
index 7afc11e7a9..0000000000
--- a/activesupport/test/queueing/container_test.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-require 'abstract_unit'
-require 'active_support/queueing'
-
-module ActiveSupport
-  class ContainerTest < ActiveSupport::TestCase
-    def test_delegates_to_default
-      q         = Queue.new
-      container = QueueContainer.new q
-      job       = Object.new
-
-      container.push job
-      assert_equal job, q.pop
-    end
-
-    def test_access_default
-      q         = Queue.new
-      container = QueueContainer.new q
-      assert_equal q, container[:default]
-    end
-
-    def test_assign_queue
-      container = QueueContainer.new Object.new
-      q         = Object.new
-      container[:foo] = q
-      assert_equal q, container[:foo]
-    end
-  end
-end