Omniauth now returns "info" instead of "user_info"

app/controllers/auth_controller.rb

@@ -27,20 +27,20 @@ def auth
         # might be a nice refactoring.
         session[:uid] = auth['uid']
         session[:provider] = auth['provider']
-        session[:name] = auth['user_info']['name']
-        session[:nickname] = auth['user_info']['nickname']
-        session[:website] = auth['user_info']['urls']['Website']
-        session[:description] = auth['user_info']['description']
-        session[:image] = auth['user_info']['image']
-        session[:email] = auth['user_info']['email']
+        session[:name] = auth['info']['name']
+        session[:nickname] = auth['info']['nickname']
+        session[:website] = auth['info']['urls']['Website']
+        session[:description] = auth['info']['description']
+        session[:image] = auth['info']['image']
+        session[:email] = auth['info']['email']
         session[:oauth_token] = auth['credentials']['token']
         session[:oauth_secret] = auth['credentials']['secret']
 
         # The username is checked to ensure it is unique, if it is not,
         # the user is informed that they need to change it.
         # Everyone is redirected to /users/new to confirm that they'd like
         # to have their username.
-        if User.first :username => auth['user_info']['nickname']
+        if User.first :username => auth['info']['nickname']
           flash[:error] = "Sorry, someone else has that username. Please pick another."
         end
 
@@ -55,7 +55,7 @@ def auth
 
     @auth.oauth_token = auth['credentials']['token']
     @auth.oauth_secret = auth['credentials']['secret']
-    @auth.nickname = auth['user_info']['nickname']
+    @auth.nickname = auth['info']['nickname']
     @auth.save
 
     session[:user_id] = @auth.user.id

app/models/author.rb

@@ -64,7 +64,7 @@ class Author
   def self.create_from_hash!(hash, domain)
 
     # Omniauth user information, as a hash
-    user  = hash['user_info']
+    user  = hash['info']
 
     # Grabs each of the important user details
     name       = user['name']

app/models/authorization.rb

@@ -55,7 +55,7 @@ def self.create_from_hash!(hash, base_uri, user = nil)
     end
 
     # Grab the user information from the hash
-    uid, provider, nickname = hash['uid'], hash['provider'], hash['user_info']['nickname']
+    uid, provider, nickname = hash['uid'], hash['provider'], hash['info']['nickname']
 
     # Grab the credentials, including token and secret, from the hash
     credentials = hash['credentials']

test/models/author_test.rb

@@ -7,7 +7,7 @@
   end
 
   it "creates an author from a hash" do
-    hash = {"user_info" => {"name" => "james", "nickname" => "jim", "urls" => {}} }
+    hash = {"info" => {"name" => "james", "nickname" => "jim", "urls" => {}} }
     assert Author.create_from_hash!(hash, "rstat.us").is_a?(Author)
   end
 

test/models/authorization_test.rb

@@ -18,7 +18,7 @@
 
     assert_equal auth["uid"], a.uid
     assert_equal auth["provider"], a.provider
-    assert_equal auth["user_info"]["nickname"], a.nickname
+    assert_equal auth["info"]["nickname"], a.nickname
     assert_equal auth['credentials']['token'], a.oauth_token
     assert_equal auth['credentials']['secret'], a.oauth_secret
   end

test/test_helper.rb

@@ -48,7 +48,7 @@ def auth_response(username, options={})
     {
       "provider" => options[:provider] || "twitter",
       "uid" => options[:uid] || 12345,
-      "user_info" => {
+      "info" => {
         "name" => "Joe Public",
         "email" => "[email protected]",
         "nickname" => options[:nickname] || username,