Changeset 7486

Timestamp:

09/15/07 21:39:04 (2 years ago)

Author:

david

Message:

Added Array#rand (closes #9170) [norbert]

Files:

• trunk/activesupport/CHANGELOG (modified) (1 diff)
• trunk/activesupport/lib/active_support/core_ext/array.rb (modified) (1 diff)
• trunk/activesupport/Rakefile (modified) (1 diff)
• trunk/activesupport/test/abstract_unit.rb (modified) (1 diff)
• trunk/activesupport/test/core_ext/array_ext_test.rb (modified) (1 diff)

trunk/activesupport/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Added Array#rand #9170 [norbert]. Examples:
+
+    [].rand       # => nil
+    ['a'].rand    # => 'a'
+    [1,2,3].rand  # => 1 or 2 or 3
-
-* Deprecation: removed Reloadable.  [Jeremy Kemper]

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

@@ -1 +1 @@
-require File.dirname(__FILE__) + '/array/conversions'
+require File.dirname(__FILE__) + '/array/extract_options'
-require File.dirname(__FILE__) + '/array/grouping'
-extract_option
+random_acces
-
-class Array #:nodoc:
-  include ActiveSupport::CoreExtensions::Array::Conversions
+  include ActiveSupport::CoreExtensions::Array::ExtractOptions
-  include ActiveSupport::CoreExtensions::Array::Grouping
-ExtractOption
+RandomAcces
-end

trunk/activesupport/Rakefile

@@ -19 +19 @@
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-  t.warning = true
-}
-

trunk/activesupport/test/abstract_unit.rb

@@ -4 +4 @@
-require 'active_support'
-
+# Wrap tests that use Mocha and skip if unavailable.
+def uses_mocha(test_name)
+  require 'rubygems'
+  require 'mocha'
+  yield
+rescue LoadError
+  $stderr.puts "Skipping #{test_name} tests. `gem install mocha` and try again."
+end
+
-# Show backtraces for deprecated behavior for quicker cleanup.
-ActiveSupport::Deprecation.debug = true

trunk/activesupport/test/core_ext/array_ext_test.rb

@@ -201 +201 @@
-  end
-end
+
+uses_mocha "ArrayExtRandomTests" do
+
+class ArrayExtRandomTests < Test::Unit::TestCase
+  def test_random_element_from_array
+    assert_nil [].rand
+
+    Kernel.expects(:rand).with(1).returns(0)
+    assert_equal 'x', ['x'].rand
+
+    Kernel.expects(:rand).with(3).returns(1)
+    assert_equal 2, [1, 2, 3].rand
+  end
+end
+
+end