From d88cae437d031d634732cfbd49f3532afd54f4f2 Mon Sep 17 00:00:00 2001
From: chris2tof <chris.vilayphiou@gmail.com>
Date: Thu, 14 Apr 2011 13:40:16 +0800
Subject: [PATCH] update gem bson_ext and devise initializer

---
 Gemfile                       | 3 +--
 Gemfile.lock                  | 4 ++--
 config/initializers/devise.rb | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 984d11790..e87e5cb8a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,12 +4,11 @@ gem 'rails', '3.0.6'
 gem 'yajl-ruby', :require => 'yajl'
 gem 'nokogiri'
 
-gem 'bson_ext', '1.2.4'
+gem 'bson_ext'
 gem 'carrierwave'
 gem 'devise'
 gem 'mini_magick'
 
-# gem 'rblog', :path => 'lib/rblog'
 gem 'mongoid', '2.0.0'
 
 # To use debugger (ruby-debug for Ruby 1.8.7+, ruby-debug19 for Ruby 1.9.2+)
diff --git a/Gemfile.lock b/Gemfile.lock
index edddc6868..b90526435 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -31,7 +31,7 @@ GEM
     arel (2.0.9)
     bcrypt-ruby (2.1.4)
     bson (1.3.0)
-    bson_ext (1.2.4)
+    bson_ext (1.3.0)
     builder (2.1.2)
     carrierwave (0.5.3)
       activesupport (~> 3.0)
@@ -117,7 +117,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bson_ext (= 1.2.4)
+  bson_ext
   carrierwave
   delorean
   devise
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index bbafd4e66..03480dbe1 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -43,7 +43,7 @@ Devise.setup do |config|
   # from others authentication tools as :clearance_sha1, :authlogic_sha512 (then
   # you should set stretches above to 20 for default behavior) and :restful_authentication_sha1
   # (then you should set stretches to 10, and copy REST_AUTH_SITE_KEY to pepper)
-  config.encryptor = :bcrypt
+  # config.encryptor = :bcrypt
 
   # Setup a pepper to generate the encrypted password.
   config.pepper = "a5a6b41c8a259f0642f9e8a51b77f3c671be92a430e021e00f7e0bcc71381c0698d3c3e9c1dc270872a16ed2703715e3b3b817245740bbb871a3411714944dce"