Merge pull request #74 from tadyjp/wip/140401_fix_devise

Devideのエラー修正2

app/models/user.rb

@@ -41,10 +41,12 @@ class User < ActiveRecord::Base
     user = User.where(email: info['email']).first
 
     unless user
+      new_nickname = (("a".."z").to_a + ("A".."Z").to_a + (0..9).to_a).shuffle[0..4].join
       user = User.create(name: info['name'],
                          image_url: info['image'],
                          email: info['email'],
-                         password: Devise.friendly_token[0, 20]
+                         password: Devise.friendly_token[0, 20],
+                         nickname: new_nickname
       )
     end
 

config/routes.rb

@@ -25,7 +25,7 @@ Rendezvous::Application.routes.draw do
 
   # devise_for :users , controllers: { omniauth_callbacks: 'users/omniauth_callbacks' }
   # devise_for :users , only: [:sign_in, :sign_out, :session]
-  devise_for :users, controllers: { omniauth_callbacks: "users/omniauth_callbacks" }, skip: [:sessions]
+  devise_for :users, controllers: { omniauth_callbacks: 'users/omniauth_callbacks' }, skip: [:sessions]
   devise_scope :user do
     # get 'sign_in', to: 'users/sessions#new', as: :new_user_session
     delete 'sign_out', to: 'devise/sessions#destroy', as: :sign_out