Ticket #8759: array_extract_options.diff

activesupport/test/core_ext/array_ext_test.rb

@@ -191 +191 @@
-    assert xml.include?(%(<count>2</count>)), xml
-  end
-end
+
+class ArrayTests < Test::Unit::TestCase
+  def test_extract_options
+    assert_equal({}, [].extract_options!)
+    assert_equal({}, [1].extract_options!)
+    assert_equal({:a=>:b}, [1, {:a=>:b}].extract_options!)
+  end
+end

activesupport/lib/active_support/core_ext/array.rb

@@ -1 +1 @@
-require File.dirname(__FILE__) + '/array/conversions'
-require File.dirname(__FILE__) + '/array/grouping'
+require File.dirname(__FILE__) + '/array/misc'
-
-class Array #:nodoc:
-  include ActiveSupport::CoreExtensions::Array::Conversions

activesupport/lib/active_support/core_ext/array/misc.rb

@@ +1 @@
+class Array
+  # Extract options from a set of arguments. Removes and returns the last element in the array if it's a hash, otherwise returns a blank hash.
+  #
+  #   def options(*args)
+  #     args.extract_options!
+  #   end
+  #
+  #   options(1, 2)           # => {}
+  #   options(1, 2, :a => :b) # => {:a=>:b}
+  def extract_options!
+    self.last.is_a?(Hash) ? pop : {}
+  end
+end