From ec0f64938ba9e7b23a9cd3294aafd09ca031ae4b Mon Sep 17 00:00:00 2001
From: Dan Barber <dan@new-bamboo.co.uk>
Date: Mon, 24 Mar 2014 18:02:58 +0000
Subject: [PATCH] Refactor user OAuth stuff.

---
 app/models/user.rb | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 97a5bd8..acbf24a 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -2,14 +2,14 @@ class User < ActiveRecord::Base
   dragonfly_accessor :avatar
 
   def self.find_or_create_from_auth(auth)
-    user = User.find_by(provider: auth.provider, uid: auth.uid)
-    if user.blank?
-      user = User.create(provider: auth.provider,
-                  uid: auth.uid,
-                  username: auth.info.nickname,
-                  name: auth.info.name,
-                  avatar_url: auth.info.image)
-    end
-    user
+    find_by(auth.slice(:provider, :uid)) || create_from_auth(auth)
+  end
+
+  def self.create_from_auth(auth)
+    create(provider: auth.provider,
+           uid: auth.uid,
+           username: auth.info.nickname,
+           name: auth.info.name,
+           avatar_url: auth.info.image)
   end
 end