You can now add about information.

steveklabnik · steveklabnik · commit 5313ed31fd46 · 2010-08-15T04:12:26.000-04:00
diff --git a/Rakefile b/Rakefile
@@ -45,7 +45,8 @@ namespace :db do
 			:email => "steve@steveklabnik.com",
 			:password => "password",
 			:password_confirmation => "password",
-			:admin => true
+			:admin => true,
+			:about => "I hack on Hackety Hack!"
 		})
 
 		#we're also going to make a regular user too
@@ -54,6 +55,7 @@ namespace :db do
 			:email => "somebody@example.com",
 			:password => "password",
 			:password_confirmation => "password",
+			:about => "I'm just a regular person!"
 		})
 		#make an initial Post, with a comment
 		require 'models/post'
diff --git a/controllers/hacker.rb b/controllers/hacker.rb
@@ -10,6 +10,30 @@
 	haml :"hackers/show"
 end
 
+#update a hacker's information
+post '/hackers/update' do
+	#you have to be logged in to update your info
+	require_login! :return => "/hackers/update"
+
+	#do they want to update their password
+	unless params[:password].nil?
+		if params[:password][:new] == params[:password][:confirm]
+			current_user.password = params[:password][:new]
+			current_user.save
+			flash[:notice] = "Password updated!"
+		else
+			flash[:notice] = "Password confirmation didn't match!"
+		end
+	else
+		current_user.update_attributes(:about => params[:hacker][:about])
+		current_user.save
+		flash[:notice] = "About information updated!"
+	end
+
+	redirect "/hackers/#{current_user.username}"
+	
+end
+
 #this lets you follow a Hacker
 get '/hackers/:name/follow' do
 	#we have to be logged in to follow someone
diff --git a/models/hacker.rb b/models/hacker.rb
@@ -9,6 +9,9 @@ class Hacker
 	#and a unique email
 	key :email, String, :unique => true
 
+	#a little bit about the Hacker
+	key :about, String
+
 	#we don't store the passwords themselves, we store a 'hash' of them. More about this down in password=
 	key :hashed_password, String
 	key :salt, String
diff --git a/views/hackers/show.haml b/views/hackers/show.haml
@@ -1,12 +1,44 @@
-%p= @hacker.username + "'s page"
-%p
-	%img{:src => @hacker.gravatar_url}
+%h1= @hacker.username + "'s page"
+%img{:src => @hacker.gravatar_url}
+%h2 About #{@hacker.username}:
+%p= @hacker.about
+%hr
 %p Following: <a href="/hackers/#{@hacker.username}/following">#{@hacker.following.count}</a>
 %p Followers: <a href="/hackers/#{@hacker.username}/followers">#{@hacker.followers.count}</a>
-
-- if logged_in? && @hacker.username != current_user.username
-	%a{:href => "/messages/new/to/#{@hacker.username}" }= "Send #{@hacker.username} a message"
-	- if current_user.following? @hacker
-		%a{:href => "/hackers/#{@hacker.username}/unfollow"} Unfollow #{@hacker.username}
+%hr
+- if logged_in? 
+	- if @hacker.username != current_user.username
+		%a{:href => "/messages/new/to/#{@hacker.username}" }= "Send #{@hacker.username} a message"
+		- if current_user.following? @hacker
+			%a{:href => "/hackers/#{@hacker.username}/unfollow"} Unfollow #{@hacker.username}
+		- else
+			%a{:href => "/hackers/#{@hacker.username}/follow"} Follow #{@hacker.username}
 	- else
-		%a{:href => "/hackers/#{@hacker.username}/follow"} Follow #{@hacker.username}
+		%h2 Your Account
+		%p You can use these forms to update your information:
+		%br
+		%p
+			%form{:action => "/hackers/update", :method => "POST"}
+				%table
+					%tr
+						%td
+							%label{:for => "password[new]"} New Password
+						%td
+							%input{:type => "password", :name => "password[new]"}
+					%tr
+						%td
+							%label{:for => "password[confirm]"} Confirm New Password
+						%td
+							%input{:type => "password", :name => "password[confirm]"}
+					%tr
+						%td
+						%td
+							%input{:type => "submit", :value => "Change password"}
+		%hr
+		%p
+			%form{:action => "/hackers/update", :method => "POST"}
+				%label{:for => "hacker[about]"} About Me
+				%br
+				%textarea{:name => "hacker[about]", :rows => 10, :cols => 40}
+				%br
+				%input{:type => "submit", :value => "Update About"}
