fbdoorman 0.8.0.7 → 0.8.0.8

data/Rakefile

@@ -18,7 +18,7 @@ Jeweler::Tasks.new do |gem|
   gem.summary     = "Rails authentication with facebook single sign-on OR email & password."
   gem.description = "Painless user registration and sign-in using Facebook single sign-on with JS. Typical email login still works too."
   gem.email       = "pelaez89@gmail.com"
-  gem.version     = "0.8.0.7"
+  gem.version     = "0.8.0.8"
   gem.homepage    = "http://github.com/davidpelaez/minifb-clearance"
   gem.authors     = ["Fbdoorman: David Pelaez","MiniFB: Appoxy","Clearance: Thoughtbot"]
   gem.files       = FileList["[A-Z]*", "{app,config,generators,lib,shoulda_macros,rails}/**/*"]

data/app/controllers/clearance/facebook_controller.rb

@@ -6,14 +6,16 @@ class Clearance::FacebookController < ApplicationController
         redirect_to LOGGED_PATH #Evita multiples logins y hace que solo tenga sentido llamar el metodo con un nuevo cookie
     else #If there's no signed in user
         #The code arrives here
-        if token_user(params[:token]) != nil then
-          @user = find_fbuser(fbu.id) #The one from the DB
+        user_id = token_user(params[:token])
+        if user_id != nil then
+          @user = find_fbuser(user_id) #The one from the DB
           #If the user exists
           if @user then
-            sign_in_fbu(@user, params[:token], params[:expiration])
+            sign_in(@user, params[:token], params[:expiration])
+            redirect_to LOGGED_PATH and return
           else #If theres no user with that id
             #Register this user
-            register_fbu(fbu)
+            register_fbu(token)
           end   
         else #The token isn't valid
           closed
@@ -27,14 +29,27 @@ class Clearance::FacebookController < ApplicationController
     render :template => "facebook/closed"
   end
   
-  def sign_in_fbu(myuser)
-      sign_in(myuser)
-      redirect_to LOGGED_PATH and return
-  end
+
+  
+
   
   #Here I reply the create the new user, I changed te verifications so that fbid is unique and password is optional
   # when fbid isn't blank
-  def register_fbu(new_user)
+  def register_fbu(token)
+    #get the user from FB
+    ##Works sometimes, others sends: JSON::ParserError Exception: source did not contain any JSON!  
+    #Bucle posiblemente infinito y chambon para lidiar con la excepcion mientras se soluciona  
+    incomplete = true
+    while incomplete do
+      begin  
+        incomplete = false #Intento salir del bucle
+        new_user = MiniFB::OAuthSession.new(token, 'es_ES').get "me" 
+      rescue JSON::ParserError
+        incomplete = true #Reingreso en el bucle
+      end
+    end
+    
+    #Build th user in DB
     @user = ::User.new
     @user.fbid = new_user.id
     @user.name = new_user.name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fbdoorman
 version: !ruby/object:Gem::Version
-  version: 0.8.0.7
+  version: 0.8.0.8
   prerelease: 
 platform: ruby
 authors: