From 89edfb7ed61d260fb4b3f7d6f01dd29c4848a150 Mon Sep 17 00:00:00 2001
From: Raphael Sofaer <raphael@joindiaspora.com>
Date: Mon, 15 Aug 2011 18:59:16 -0700
Subject: [PATCH] WIP prefilling username on logout of user is almost there

---
 Gemfile                        | 3 ++-
 app/helpers/sessions_helper.rb | 6 ++++++
 app/views/sessions/new.haml    | 2 +-
 features/oauth.feature         | 2 ++
 4 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 app/helpers/sessions_helper.rb

diff --git a/Gemfile b/Gemfile
index 8b387281c..7beaf7f36 100644
--- a/Gemfile
+++ b/Gemfile
@@ -119,6 +119,7 @@ group :test do
   gem 'rspec-instafail', '>= 0.1.7', :require => false
   gem 'fuubar'
 
-  gem 'diaspora-client', :path => '~/workspace/diaspora-client' #:git => 'git://github.com/diaspora/diaspora-client.git'
+  gem 'diaspora-client', :path => '~/workspace/diaspora-client'
+                         #:git => 'git://github.com/diaspora/diaspora-client.git'
 
 end
diff --git a/app/helpers/sessions_helper.rb b/app/helpers/sessions_helper.rb
new file mode 100644
index 000000000..9f2e94b77
--- /dev/null
+++ b/app/helpers/sessions_helper.rb
@@ -0,0 +1,6 @@
+module SessionsHelper
+  def prefilled_username
+    uri = Addressable::URI.parse(session["user_return_to"])
+    uri ? uri.query_values["uid"] : nil
+  end
+end
diff --git a/app/views/sessions/new.haml b/app/views/sessions/new.haml
index de4494f1a..5da4d36db 100644
--- a/app/views/sessions/new.haml
+++ b/app/views/sessions/new.haml
@@ -26,7 +26,7 @@
 
       %p
         = f.label :username , t('username')
-        = f.text_field :username, :tabindex => 1
+        = f.text_field :username, :tabindex => 1 , :value => prefilled_username
       %br
 
       %p
diff --git a/features/oauth.feature b/features/oauth.feature
index beae15c23..22a3f4274 100644
--- a/features/oauth.feature
+++ b/features/oauth.feature
@@ -32,6 +32,8 @@ Feature: oauth
     And I fill in "Diaspora ID" with "bob@localhost:9887"
     And I press "Connect to Diaspora"
     Then I should be on the new user session page
+    And I debug
+    And I should see "bob" within "#user_username"
   
   Scenario: Not authorize Chubbies
     When I try to authorize Chubbies