authlogic_facebook 1.0.4 → 1.0.5

data/VERSION

@@ -1 +1 @@
-1.0.4
+1.0.5

data/authlogic_facebook.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{authlogic_facebook}
-  s.version = "1.0.4"
+  s.version = "1.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rusty Burchfield"]
-  s.date = %q{2009-12-10}
+  s.date = %q{2010-02-23}
   s.description = %q{Authlogic plugin to support Facebook without Facebooker.  A small unobtrusive gem (mini_fb) is used instead.}
   s.email = %q{GICodeWarrior@gmail.com}
   s.extra_rdoc_files = [

data/lib/authlogic_facebook/session.rb

@@ -81,6 +81,10 @@ module AuthlogicFacebook
           !self.class.facebook_secret_key.blank?
       end
 
+      def redirect_to_facebook
+        controller.redirect_to(facebook_login_url)
+      end
+
       private
       def validate_by_facebook
         if facebook_callback?
@@ -99,7 +103,7 @@ module AuthlogicFacebook
             return self.attempted_record.save(false)
           end
         else
-          controller.redirect_to(facebook_login_url)
+          redirect_to_facebook
           return false
         end
       end
@@ -116,13 +120,13 @@ module AuthlogicFacebook
                               self.class.facebook_secret_key,
                               'Users.getLoggedInUser', params)
             break
-          rescue Errno::ECONNRESET
-            # Try again
+          rescue Errno::ECONNRESET, EOFError => e
+            exception = e
           end
         end
 
         if !uid
-          raise 'Unable to reach Facebook after 10 tries.'
+          raise exception
         end
 
         @facebook_session = {'uid' => uid, 'session_key' => session_key}
@@ -158,17 +162,22 @@ module AuthlogicFacebook
         self.class.facebook_uid_field
       end
 
+      def facebook_login_params
+        {'api_key' => self.class.facebook_api_key,
+         'req_perms' => self.class.facebook_permissions.join(','),
+         'next' => controller.request.url,
+         'v' => '1.0',
+         'connect_display' => 'popup',
+         'fbconnect' => 'true',
+         'return_session' => 'true'}
+      end
+
       def facebook_login_url
-        params = {'api_key' => self.class.facebook_api_key,
-                  'req_perms' => self.class.facebook_permissions.join(','),
-                  'next' => controller.request.url,
-                  'v' => '1.0',
-                  'connect_display' => 'popup',
-                  'fbconnect' => 'true',
-                  'return_session' => 'true'}
-
-        url = 'http://www.facebook.com/login.php?'
-        url << params.map{|k,v| "#{k}=#{CGI.escape(v)}"}.join('&')
+        params = facebook_login_params.map do |key, value|
+          "#{CGI.escape(key)}=#{CGI.escape(value)}"
+        end
+
+        "http://www.facebook.com/login.php?#{params.join('&')}"
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: authlogic_facebook
 version: !ruby/object:Gem::Version 
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors: 
 - Rusty Burchfield
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-10 00:00:00 -08:00
+date: 2010-02-23 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency