appoxy_sessions 0.0.3 → 0.0.4

data/lib/sessions/application_controller.rb

@@ -31,7 +31,7 @@ module Appoxy
 
             def login_from_session
                 #puts 'Login from session=' + session[:user_id].inspect
-                User.find_by_id(session[:user_id]) if session[:user_id]
+                ::User.find_by_id(session[:user_id]) if session[:user_id]
             end
 
 #

data/lib/sessions/sessions_controller.rb

@@ -18,9 +18,9 @@ module Appoxy
                 end
 
                 if @has_password == "true"
-                    @user = User.find_by_email(@email)
+                    user = ::User.find_by_email(@email)
 #                    user = User.authenticate(@email, params[:password])
-                    if @user && @user.authenticate(params[:password])
+                    if user && user.authenticate(params[:password])
                         self.current_user = user
                         flash[:info] = "Logged in successfully."
                         orig_url = session[:return_to]

data/lib/sessions/user.rb

@@ -55,7 +55,7 @@ module Appoxy
                     self.save
                 end
 
-                (self.password == password) ? u : nil
+                (self.password == password) ? self : nil
             end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: appoxy_sessions
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Travis Reeder
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-02 00:00:00 -08:00
+date: 2010-02-03 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency