minor updates

BrianTheCoder · Apr 25, 2009 · 86df63b · 86df63b
1 parent cfa1875
commit 86df63b
Show file tree

Hide file tree

Showing 13 changed files with 6 additions and 11 deletions.
diff --git a/environment.rb b/environment.rb
@@ -3,7 +3,6 @@
 require 'couchrest'
 require 'extlib'
 require 'faker'
-require 'stringex'
 require 'ratpack'
 require 'bcrypt'
 require 'warden'

diff --git a/gems/cache/extlib-0.9.11.gem b/gems/cache/extlib-0.9.11.gem
diff --git a/gems/cache/faker-0.3.1.gem b/gems/cache/faker-0.3.1.gem
diff --git a/gems/cache/jchris-couchrest-0.23.gem b/gems/cache/jchris-couchrest-0.23.gem
diff --git a/gems/cache/json-1.1.4.gem b/gems/cache/json-1.1.4.gem
diff --git a/gems/cache/mime-types-1.16.gem b/gems/cache/mime-types-1.16.gem
diff --git a/gems/cache/ratpack-0.2.4.gem b/gems/cache/ratpack-0.2.4.gem
diff --git a/gems/cache/rest-client-0.9.2.gem b/gems/cache/rest-client-0.9.2.gem
diff --git a/gems/cache/rsl-stringex-0.9.3.gem b/gems/cache/rsl-stringex-0.9.3.gem
diff --git a/models/user.rb b/models/user.rb
@@ -55,7 +55,6 @@ def encrypt_password
   end
 
   def self.authenticate(login, password)
-    # login_param = Merb::Authentication::Strategies::Basic::Base.login_param
     @u = self.by_email(:key => login).first
     @u && @u.authenticated?(password) ? @u : nil
   end 

diff --git a/strategies.rb b/strategies.rb
@@ -1,5 +1,5 @@
-Warden::Manager.serialize_into_session{|user| p user;p user.id;user.id }
-Warden::Manager.serialize_from_session{|id| id.nil? ? nil : User.get(id) }
+Warden::Manager.serialize_into_session{|user| p "----------------";p user;p user.id; user.nil? ? nil : user.id }
+Warden::Manager.serialize_from_session{|id| p "==============#{id}"; id.nil? ? nil : User.get(id) }
 
 Warden::Strategies.add(:password) do
   def valid?

diff --git a/user_management.rb b/user_management.rb
@@ -22,23 +22,21 @@ class UserManagement < Sinatra::Default
 
   post '/login/?' do
     if env['warden'].authenticated?(:password)
-      redirect '/'
+      redirect "/user/#{env['warden'].user}"
     else
       view :login
     end
   end
 
   get '/logout/?' do
     env['warden'].logout
-    p "warden"
-    p env['warden'].inspect
-    redirect '/'
+    redirect '/login'
   end
 
   post '/register/?' do
     @user = User.new(params[:user])
     if @user.save
-      redirect '/upgrade'
+      redirect "/user/#{@user.handle}"
     else
       view :new
     end

diff --git a/views/layout.erb b/views/layout.erb
@@ -28,9 +28,8 @@
           <p class="quiet">
             <a href="/about/">About</a> |
             <a href="/contact/">Contact Us</a> |
-            <a href="/faq/">FAQ</a>
+            <a href="/faq/">FAQ</a> | 
             <a href="/logout">Logout</a>
-            <%= env['warden'].authenticated?(:password) %>
           </p>
         </div>
         <hr class="bottom "/>