add birthdate, gender, nickname

app/assets/stylesheets/application.css.less

@@ -24,7 +24,7 @@ h1,h2,h3,h4,h5 {font-family: 'Convergence', sans-serif;}
 
 .form-horizontal .help-block  {
   font-style: italic;
-  margin-top: -5px;
+  margin-top: 0px;
   color: #888;
 }
 

app/models/user.rb

@@ -40,19 +40,39 @@ class User
   ## Token authenticatable
   field :authentication_token, :type => String
 
-  field :admin, :type => Boolean
+  field :admin,     :type => Boolean
+  field :nickname,  :type => String
+  field :birthdate, :type => Date
+  field :gender,    :type => String
 
   has_many :prescriptions
 
-  attr_accessible :email, :password, :password_confirmation, :remember_me
+  attr_accessible :email, :password, :password_confirmation, :remember_me, :birthdate, :nickname, :gender
 
   def self.find_for_facebook_oauth(access_token, signed_in_resource=nil)
     data = access_token.extra.raw_info
+    logger.warn  data.inspect
+    if data.birthday
+      m, d, y = data.birthday.split("/")
+      birthday = data.birthday ? Date.parse("#{y}-#{m}-#{d}") : nil
+    else
+      birthday = nil
+    end
+    username = data.username ? data.username : nil
+    gender   = data.gender   ? data.gender   : nil 
+    logger.warn  data.username
+    logger.warn  username
+
     if user = User.where(:email => data.email).first
+      # Update user info if need be
+      user.nickname  ||= username    if username
+      user.birthdate ||= birthday    if birthday
+      user.gender    ||= data.gender if gender
+      user.save
       user
     else # Create a user with a stub password. 
       password = Devise.friendly_token[0,20]
-      User.create!(:email => data.email, :password => password, :password_confirmation => password) 
+      User.create!(:email => data.email, :password => password, :password_confirmation => password, :gender => gender, :nickname => username, :birthdate => birthday) 
     end
   end
 end

app/views/devise/registrations/edit.html.erb

@@ -3,9 +3,12 @@
 <%= simple_form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put, :class => 'form-horizontal'} ) do |f| %>
 
   <%= f.input :email, :required => true, :autofocus => true %>
-  <%= f.input :password, :autocomplete => "off", :hint => t('devise.registrations.leave_blank'), :required => false %>
-  <%= f.input :password_confirmation, :required => false %>
-  <%= f.input :current_password, :hint => t('devise.registrations.current_password_label'), :required => true %>
+  <%= f.input :nickname, :input_html => {:autocomplete => :off} %>
+  <%#= f.input :birthdate, :as => :date %>
+  <%= f.input :gender, :as => :radio_buttons,  :collection => {"#{t :male}" => "male", "#{t :female}" => "female"} %>
+  <%= f.input :password, :input_html => {:autocomplete => :off}, :hint => t('devise.registrations.leave_blank'), :required => false %>
+  <%= f.input :password_confirmation, :required => false , :input_html => {:autocomplete => :off} %>
+  <%= f.input :current_password, :hint => t('devise.registrations.current_password_label'), :required => true , :input_html => {:autocomplete => :off}%>
 
   <div class="control-group">
     <div class="controls">

app/views/medications/show.html.erb

@@ -20,7 +20,7 @@
   <% if admin? %>
     <% @prescriptions.each do |prescription| %>
       <div class="row well">
-        <%= prescription.user.email %>
+        <%= prescription.user.nickname.blank? ? t(:anonymous) : prescription.user.nickname %>
         <% prescription.secondary_effects_array.each do |tag| %>
           <span class="label label-info"><%= tag %></span>
         <% end %>

config/initializers/omniauth.rb

@@ -1,9 +1,9 @@
 require "omniauth-facebook"
 Rails.application.config.middleware.use OmniAuth::Builder do
   if Rails.env.development?
-    provider :facebook, '362807127093790', 'a3d57d6c1bd18e65c01b0e6fe2900332', :setup => true
+    provider :facebook, '362807127093790', 'a3d57d6c1bd18e65c01b0e6fe2900332', :setup => true, scope: "user_birthday,user_about_me"
   elsif Rails.env.production?
-    provider :facebook, '334294033301652', '8606d936d9557b892a5c42c605e83aa2', :setup => true    
+    provider :facebook, '334294033301652', '8606d936d9557b892a5c42c605e83aa2', :setup => true, scope: "user_birthday,user_about_me"
   end
 end
 OmniAuth.config.logger = Rails.logger

config/locales/fr.yml

@@ -9,6 +9,9 @@ fr:
   add: Ajouter
   from: Du 
   to: Au
+  male: Homme
+  female: Femme
+  anonymous: Anonyme
   devise:
     remember_me: Rester connecté
     sign_in: Se connecter