Merge branch 'master' into asset-path-helper

Conflicts:
	railties/test/application/configuration_test.rb

5 files changed, 39 insertions, 62 deletions

diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index 0a12ba6cdd..23e2ce0b03 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,5 +1,16 @@
 ## Rails 4.0.0 (unreleased) ##
 
+*   Hash#extract! returns only those keys that present in the receiver.
+
+        {:a => 1, :b => 2}.extract!(:a, :x) # => {:a => 1}
+
+    *Mikhail Dieterle*
+
+*   Hash#extract! returns the same subclass, that the receiver is. I.e.
+    HashWithIndifferentAccess#extract! returns HashWithIndifferentAccess instance.
+
+    *Mikhail Dieterle*
+
 *   Optimize ActiveSupport::Cache::Entry to reduce memory and processing overhead. *Brian Durand*
 
 *   Tests tag the Rails log with the current test class and test case:
diff --git a/activesupport/lib/active_support/core_ext/hash/slice.rb b/activesupport/lib/active_support/core_ext/hash/slice.rb
index 45fec57009..de09f26f3d 100644
--- a/activesupport/lib/active_support/core_ext/hash/slice.rb
+++ b/activesupport/lib/active_support/core_ext/hash/slice.rb
@@ -32,9 +32,9 @@ class Hash
 
   # Removes and returns the key/value pairs matching the given keys.
   #
-  #   { a: 1, b: 2, c: 3, d: 4 }.extract!(:a, :b)
-  #   # => {:a => 1, :b => 2}
+  #   { a: 1, b: 2, c: 3, d: 4 }.extract!(:a, :b) # => { a: 1, b: 2 }
+  #   { a: 1, b: 2 }.extract!(:a, :x) # => { a: 1 }
   def extract!(*keys)
-    keys.each_with_object({}) { |key, result| result[key] = delete(key) }
+    keys.each_with_object(self.class.new) { |key, result| result[key] = delete(key) if has_key?(key) }
   end
 end
diff --git a/activesupport/lib/active_support/queueing.rb b/activesupport/lib/active_support/queueing.rb
index 7c352886f3..c8ba28021d 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.
@@ -90,10 +64,6 @@ module ActiveSupport
   # queue and joins the thread, which will ensure that all jobs
   # are executed before the process finally dies.
   class ThreadedQueueConsumer
-    def self.start(*args)
-      new(*args).start
-    end
-
     def initialize(queue, options = {})
       @queue = queue
       @logger = options[:logger]
diff --git a/activesupport/test/core_ext/hash_ext_test.rb b/activesupport/test/core_ext/hash_ext_test.rb
index 53ea2aad16..b208767490 100644
--- a/activesupport/test/core_ext/hash_ext_test.rb
+++ b/activesupport/test/core_ext/hash_ext_test.rb
@@ -723,8 +723,32 @@ class HashExtTest < ActiveSupport::TestCase
   def test_extract
     original = {:a => 1, :b => 2, :c => 3, :d => 4}
     expected = {:a => 1, :b => 2}
+    remaining = {:c => 3, :d => 4}
 
-    assert_equal expected, original.extract!(:a, :b)
+    assert_equal expected, original.extract!(:a, :b, :x)
+    assert_equal remaining, original
+  end
+
+  def test_extract_nils
+    original = {:a => nil, :b => nil}
+    expected = {:a => nil}
+    extracted = original.extract!(:a, :x)
+
+    assert_equal expected, extracted
+    assert_equal nil, extracted[:a]
+    assert_equal nil, extracted[:x]
+  end
+
+  def test_indifferent_extract
+    original = {:a => 1, 'b' => 2, :c => 3, 'd' => 4}.with_indifferent_access
+    expected = {:a => 1, :b => 2}.with_indifferent_access
+    remaining = {:c => 3, :d => 4}.with_indifferent_access
+
+    [['a', 'b'], [:a, :b]].each do |keys|
+      copy = original.dup
+      assert_equal expected, copy.extract!(*keys)
+      assert_equal remaining, copy
+    end
   end
 
   def test_except
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