diff options
author | Jon Leighton <j@jonathanleighton.com> | 2011-05-23 12:02:06 +0100 |
---|---|---|
committer | Jon Leighton <j@jonathanleighton.com> | 2011-05-23 20:25:44 +0100 |
commit | d411c85a65baaf4ed268b1b1bb4df408cee4981a (patch) | |
tree | b054f3a4b95748b10e70c8d3a952e3b829366f2f /actionpack/lib/action_dispatch/middleware | |
parent | a5fb1c61755f03a8c75b0a434fb2aca57502293b (diff) | |
download | rails-d411c85a65baaf4ed268b1b1bb4df408cee4981a.tar.gz rails-d411c85a65baaf4ed268b1b1bb4df408cee4981a.tar.bz2 rails-d411c85a65baaf4ed268b1b1bb4df408cee4981a.zip |
Replace references to ActiveSupport::SecureRandom with just SecureRandom, and require 'securerandom' from the stdlib when active support is required.
Diffstat (limited to 'actionpack/lib/action_dispatch/middleware')
-rw-r--r-- | actionpack/lib/action_dispatch/middleware/cookies.rb | 2 | ||||
-rw-r--r-- | actionpack/lib/action_dispatch/middleware/session/abstract_store.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/cookies.rb b/actionpack/lib/action_dispatch/middleware/cookies.rb index 0057f64dd3..20e958c767 100644 --- a/actionpack/lib/action_dispatch/middleware/cookies.rb +++ b/actionpack/lib/action_dispatch/middleware/cookies.rb @@ -305,7 +305,7 @@ module ActionDispatch if secret.length < SECRET_MIN_LENGTH raise ArgumentError, "Secret should be something secure, " + - "like \"#{ActiveSupport::SecureRandom.hex(16)}\". The value you " + + "like \"#{SecureRandom.hex(16)}\". The value you " + "provided, \"#{secret}\", is shorter than the minimum length " + "of #{SECRET_MIN_LENGTH} characters" end diff --git a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb index 1a811ce1b1..8ad1ad1f2f 100644 --- a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb +++ b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb @@ -29,7 +29,7 @@ module ActionDispatch end def generate_sid - sid = ActiveSupport::SecureRandom.hex(16) + sid = SecureRandom.hex(16) sid.encode!('UTF-8') if sid.respond_to?(:encode!) sid end |