Skip to content
Browse files

Remove hard dependency on bcrypt.

  • Loading branch information...
1 parent c0ae44c commit 2b15762384d7fb5399b8eabf4b548687de7faa46 @guilleiguaran guilleiguaran committed with tenderlove
Showing with 4 additions and 3 deletions.
  1. +1 −0 Gemfile
  2. +0 −1 activemodel/activemodel.gemspec
  3. +3 −2 activemodel/lib/active_model/secure_password.rb
View
1 Gemfile
@@ -6,6 +6,7 @@ if ENV['AREL']
gem "arel", :path => ENV['AREL']
end
+gem "bcrypt-ruby", "~> 3.0.0"
gem "jquery-rails"
# This needs to be with require false to avoid
# it being automatically loaded by sprockets
View
1 activemodel/activemodel.gemspec
@@ -19,5 +19,4 @@ Gem::Specification.new do |s|
s.add_dependency('activesupport', version)
s.add_dependency('builder', '~> 3.0.0')
s.add_dependency('i18n', '~> 0.6')
- s.add_dependency('bcrypt-ruby', '~> 3.0.0')
end
View
5 activemodel/lib/active_model/secure_password.rb
@@ -1,5 +1,3 @@
-require 'bcrypt'
-
module ActiveModel
module SecurePassword
extend ActiveSupport::Concern
@@ -30,6 +28,9 @@ module ClassMethods
# User.find_by_name("david").try(:authenticate, "notright") # => nil
# User.find_by_name("david").try(:authenticate, "mUc3m00RsqyRe") # => user
def has_secure_password
+ gem 'bcrypt-ruby', '~> 3.0.0'
+ require 'bcrypt'
+
attr_reader :password
validates_confirmation_of :password

0 comments on commit 2b15762

Please sign in to comment.
Something went wrong with that request. Please try again.