rfacebook 0.6.3 → 0.6.4

data/lib/facebook_rails_controller_extensions.rb

@@ -5,24 +5,24 @@ module RFacebook
   module RailsControllerExtensions
     
         
-    # SECTION: Exceptions
+    # SECTION: StandardErrors
     
-    class APIKeyNeededException < Exception; end
-    class APISecretNeededException < Exception; end
-    class APIFinisherNeededException < Exception; end
+    class APIKeyNeededStandardError < StandardError; end
+    class APISecretNeededStandardError < StandardError; end
+    class APIFinisherNeededStandardError < StandardError; end
     
     # SECTION: Template Methods (must be implemented by concrete subclass)
     
     def facebook_api_key
-      raise APIKeyNeededException
+      raise APIKeyNeededStandardError
     end
     
     def facebook_api_secret
-      raise APISecretNeededException
+      raise APISecretNeededStandardError
     end
     
     def finish_facebook_login
-      raise APIFinisherNeededException
+      raise APIFinisherNeededStandardError
     end
     
     
@@ -31,7 +31,7 @@ module RFacebook
     
     def fbparams
       
-      @fbparams ||= {};
+      params = (params || {}).dup
       
       # try to get fbparams from the params hash
       if (@fbparams.length <= 0)
@@ -81,7 +81,9 @@ module RFacebook
     
     def facebook_redirect_to(url)
       if in_facebook_canvas?
-        render :text => "<fb:redirect url=\"#{url}\" />"        
+        render :text => "<fb:redirect url=\"#{url}\" />"     
+      elsif url =~ /^https?:\/\/([^\/]*\.)?facebook\.com(:\d+)?/i
+        render :text => "<script type=\"text/javascript\">\ntop.location.href = \"#{url}\";\n</script>";
       else
         redirect_to url
       end
@@ -105,9 +107,12 @@ module RFacebook
         
         # template method call upon success
         if session[:rfacebook_fbsession].is_valid?
+          RAILS_DEFAULT_LOGGER.debug "** rfacebook: Login was successful, calling finish_facebook_login"
           finish_facebook_login
         end
         
+      else
+        RAILS_DEFAULT_LOGGER.debug "** rfacebook: Didn't activate session from handle_facebook_login"
       end
       
     end
@@ -118,15 +123,23 @@ module RFacebook
       handle_facebook_login
       
       if !performed?
+        
+        RAILS_DEFAULT_LOGGER.debug "** rfacebook: Rendering has not been performed"
+        
         # try to get the session
         sess = fbsession
       
         # handle invalid sessions by forcing the user to log in      
         if !sess.is_valid?
+          
+          RAILS_DEFAULT_LOGGER.debug "** rfacebook: Session is not valid"
+          
           if in_facebook_canvas?
+            RAILS_DEFAULT_LOGGER.debug "** rfacebook: Rendering canvas redirect"
             render :text => "<fb:redirect url=\"#{sess.get_login_url(:canvas=>true)}\" />"
             return false
           else
+            RAILS_DEFAULT_LOGGER.debug "** rfacebook: Redirecting to login"
             redirect_to sess.get_login_url
             return false
           end

data/lib/facebook_session.rb

@@ -53,11 +53,11 @@ class FacebookSession
   attr_reader :last_call_was_successful, :last_error
   attr_writer :suppress_exceptions
   
-  # SECTION: Exceptions
+  # SECTION: StandardErrors
     
-  class RemoteException < Exception; end
-  class ExpiredSessionException < Exception; end
-  class NotActivatedException < Exception; end
+  class RemoteStandardError < StandardError; end
+  class ExpiredSessionStandardError < StandardError; end
+  class NotActivatedStandardError < StandardError; end
   
   # SECTION: Public Methods  
   
@@ -95,19 +95,19 @@ class FacebookSession
   # SECTION: Public Abstract Interface
 
   def is_valid?
-    raise Exception
+    raise StandardError
   end
   
   def session_key
-    raise Exception
+    raise StandardError
   end
   
   def session_user_id
-    raise Exception
+    raise StandardError
   end
   
   def session_expires
-    raise Exception
+    raise StandardError
   end
   
   def session_uid # deprecated
@@ -118,11 +118,11 @@ class FacebookSession
   protected
   
   def get_secret(params)
-    raise Exception
+    raise StandardError
   end
   
   def is_activated?
-    raise Exception
+    raise StandardError
   end
   
   # SECTION: Protected Concrete Interface
@@ -150,7 +150,7 @@ class FacebookSession
     
     # ensure that this object has been activated somehow
     if (!method.include?("auth") and !is_activated?)
-      raise NotActivatedException, "You must activate the session before using it."
+      raise NotActivatedStandardError, "You must activate the session before using it."
     end
     
     # set up params hash
@@ -189,11 +189,11 @@ class FacebookSession
       # check to see if this error was an expired session error
       if code.to_i == 102
         @session_expired = true
-        raise ExpiredSessionException, @last_error unless @suppress_exceptions == true
+        raise ExpiredSessionStandardError, @last_error unless @suppress_exceptions == true
       end
       
       # otherwise, just throw a generic expired session
-      raise RemoteException, @last_error unless @suppress_exceptions == true
+      raise RemoteStandardError, @last_error unless @suppress_exceptions == true
       
       return nil
     end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: rfacebook
 version: !ruby/object:Gem::Version 
-  version: 0.6.3
-date: 2007-07-03 00:00:00 -07:00
+  version: 0.6.4
+date: 2007-07-15 00:00:00 -07:00
 summary: A Ruby interface to the Facebook API v1.0+.  Supports the new features from F8.
 require_paths: 
 - lib