merbful-auth-ar/spec/models/user_spec.rb merbful-auth-ar/spec/user_spec_helper.rb merbful-auth/app/models/user.rb @@ -1,2 +1,2 @@ class Application < Merb::Controller -end \ No newline at end of file +end merbful-auth/app/controllers/application.rb @@ -1,4 +1,5 @@ -class MerbfulAuth::Main < MerbfulAuth::Application +module MerbfulAuth ; end +class MerbfulAuth::Main < Application def index render merbful-auth/app/controllers/main.rb @@ -1,5 +1,5 @@ -require 'merb_helpers' -require 'merb-mailer' +require "merb_helpers" +require "merb-mailer" base = File.dirname(__FILE__) merbful-auth/lib/authenticated_system/authenticated_dependencies.rb @@ -16,7 +16,7 @@ module AuthenticatedSystem # before filter def encrypt_password return if password.blank? - self.salt = Digest::SHA1.hexdigest("--#{Time.now.to_s}--#{login}--") if new_record? + self.salt = Digest::SHA2.hexdigest("--#{Time.now.to_s}--#{login}--") if new_record? self.crypted_password = encrypt(password) end @@ -67,7 +67,7 @@ module AuthenticatedSystem protected def make_activation_code - self.activation_code = Digest::SHA1.hexdigest( Time.now.to_s.split(//).sort_by {rand}.join ) + self.activation_code = Digest::SHA2.hexdigest( Time.now.to_s.split(//).sort_by {rand}.join ) end def password_required? @@ -79,7 +79,7 @@ module AuthenticatedSystem module ClassMethods # Encrypts some data with the salt. def encrypt(password, salt) - Digest::SHA1.hexdigest("--#{salt}--#{password}--") + Digest::SHA2.hexdigest("--#{salt}--#{password}--") end # Authenticates a user by their login name and unencrypted password. Returns the user or nil. merbful-auth/lib/authenticated_system/authenticated_system_model.rb @@ -1,5 +1,5 @@ if defined?(Merb::Plugins) - + require 'merb-slices' Merb::Plugins.add_rakefiles "merbful-auth/merbtasks" merbful-auth/lib/merbful-auth.rb @@ -1,7 +1,7 @@ -require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb') +require File.join(File.dirname(__FILE__), "..", "spec_helper.rb") require File.join( File.dirname(__FILE__), "..", "user_spec_helper") require File.join( File.dirname(__FILE__), "..", "authenticated_system_spec_helper") -require 'cgi' +require "cgi" describe "Sessions Controller", "index action" do include UserSpecHelper merbful-auth/spec/controllers/sessions_spec.rb merbful-auth/lib/authenticated_system/authenticated_system/authenticated_dependencies.rb merbful-auth/lib/authenticated_system/authenticated_system/authenticated_routes.rb merbful-auth/lib/authenticated_system/authenticated_system/authenticated_system_controller.rb merbful-auth/lib/authenticated_system/authenticated_system/authenticated_system_model.rb merbful-auth/lib/authenticated_system/authenticated_system/authenticated_system_orm_map.rb merbful-auth/spec/models/user_spec.rb a4ff13e66f61e3916afa16125fb28b87c76513b7 Wayne E. Seguin wayneeseguin@gmail.com http://github.com/hassox/merb-auth/commit/c5084ff69511fc141a32c56b00282569cd96aae2 c5084ff69511fc141a32c56b00282569cd96aae2 2008-05-25T19:23:21-07:00 2008-05-25T19:23:21-07:00 Well... the specs run... fe0ee292fe94c8e7b9ad5647a313a3c500a358ad Wayne E. Seguin wayneeseguin@gmail.com