From 1170cceaaec8c0c8aef173913405be1456e4b2be Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Mon, 23 May 2011 19:45:49 +0100
Subject: Removed ActiveSupport::SecureRandom in favour of SecureRandom from
the standard library. (It has been deprecated in the 3-1-stable branch.)
---
activesupport/CHANGELOG | 6 ++++++
activesupport/lib/active_support.rb | 1 -
.../lib/active_support/notifications/instrumenter.rb | 1 -
activesupport/lib/active_support/secure_random.rb | 6 ------
activesupport/test/secure_random_test.rb | 19 -------------------
5 files changed, 6 insertions(+), 27 deletions(-)
delete mode 100644 activesupport/lib/active_support/secure_random.rb
delete mode 100644 activesupport/test/secure_random_test.rb
(limited to 'activesupport')
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG
index 23b0df1d5c..bfd1e91bb5 100644
--- a/activesupport/CHANGELOG
+++ b/activesupport/CHANGELOG
@@ -1,5 +1,11 @@
+*Rails 3.2.0 (unreleased)*
+
+* Removed ActiveSupport::SecureRandom in favour of SecureRandom from the standard library [Jon Leighton]
+
*Rails 3.1.0 (unreleased)*
+* Deprecated ActiveSupport::SecureRandom in favour of SecureRandom from the standard library [Jon Leighton]
+
* New reporting method Kernel#quietly. [fxn]
* Add String#inquiry as a convenience method for turning a string into a StringInquirer object [DHH]
diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb
index 63830d721a..cc9ea5cffa 100644
--- a/activesupport/lib/active_support.rb
+++ b/activesupport/lib/active_support.rb
@@ -70,7 +70,6 @@ module ActiveSupport
autoload :OrderedHash
autoload :OrderedOptions
autoload :Rescuable
- autoload :SecureRandom
autoload :StringInquirer
autoload :XmlMini
end
diff --git a/activesupport/lib/active_support/notifications/instrumenter.rb b/activesupport/lib/active_support/notifications/instrumenter.rb
index 441fefb491..3941c285a2 100644
--- a/activesupport/lib/active_support/notifications/instrumenter.rb
+++ b/activesupport/lib/active_support/notifications/instrumenter.rb
@@ -1,4 +1,3 @@
-require 'active_support/secure_random'
require 'active_support/core_ext/module/delegation'
module ActiveSupport
diff --git a/activesupport/lib/active_support/secure_random.rb b/activesupport/lib/active_support/secure_random.rb
deleted file mode 100644
index 52f8c72b77..0000000000
--- a/activesupport/lib/active_support/secure_random.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-require 'securerandom'
-
-module ActiveSupport
- # Use Ruby's SecureRandom library.
- SecureRandom = ::SecureRandom # :nodoc:
-end
diff --git a/activesupport/test/secure_random_test.rb b/activesupport/test/secure_random_test.rb
deleted file mode 100644
index 799ac2a87b..0000000000
--- a/activesupport/test/secure_random_test.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-require 'abstract_unit'
-
-class SecureRandomTest < Test::Unit::TestCase
- def test_random_bytes
- b1 = SecureRandom.random_bytes(64)
- b2 = SecureRandom.random_bytes(64)
- assert_not_equal b1, b2
- end
-
- def test_hex
- b1 = SecureRandom.hex(64)
- b2 = SecureRandom.hex(64)
- assert_not_equal b1, b2
- end
-
- def test_random_number
- assert SecureRandom.random_number(5000) < 5000
- end
-end
--
cgit v1.2.3