From 0bcf71f8df213c665c2d9cddf5442225cb630813 Mon Sep 17 00:00:00 2001
From: Paul Bellamy <paul.a.bellamy@gmail.com>
Date: Sat, 28 May 2011 14:44:54 +0100
Subject: [PATCH] Rails has removed SecureRandom from ActiveSupport in Rails
 3.2, deprecated

* Changing references in generators and encryptable_test
---
 lib/generators/devise/install_generator.rb | 4 ++--
 lib/generators/templates/devise.rb         | 2 +-
 test/models/encryptable_test.rb            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/generators/devise/install_generator.rb b/lib/generators/devise/install_generator.rb
index 6e9c2d99..dd432f13 100644
--- a/lib/generators/devise/install_generator.rb
+++ b/lib/generators/devise/install_generator.rb
@@ -1,4 +1,4 @@
-require 'active_support/secure_random'
+require 'securerandom'
 
 module Devise
   module Generators
@@ -21,4 +21,4 @@ module Devise
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/generators/templates/devise.rb b/lib/generators/templates/devise.rb
index 6ed85c4c..61d82fc9 100644
--- a/lib/generators/templates/devise.rb
+++ b/lib/generators/templates/devise.rb
@@ -54,7 +54,7 @@ Devise.setup do |config|
   config.stretches = 10
 
   # Setup a pepper to generate the encrypted password.
-  # config.pepper = <%= ActiveSupport::SecureRandom.hex(64).inspect %>
+  # config.pepper = <%= SecureRandom.hex(64).inspect %>
 
   # ==> Configuration for :confirmable
   # The time you want to give your user to confirm his account. During this time
diff --git a/test/models/encryptable_test.rb b/test/models/encryptable_test.rb
index 37f035ec..16b33804 100644
--- a/test/models/encryptable_test.rb
+++ b/test/models/encryptable_test.rb
@@ -31,7 +31,7 @@ class EncryptableTest < ActiveSupport::TestCase
 
   test 'should generate a base64 hash using SecureRandom for password salt' do
     swap_with_encryptor Admin, :sha1 do
-      ActiveSupport::SecureRandom.expects(:base64).with(15).returns('friendly_token')
+      SecureRandom.expects(:base64).with(15).returns('friendly_token')
       assert_equal 'friendly_token', create_admin.password_salt
     end
   end