rfacebook 0.9.2 → 0.9.3

data/lib/facebook_web_session.rb

@@ -160,7 +160,7 @@ module RFacebook
       # handle invalidation
       if (timeout and (sigParams["time"].nil? or (Time.now.to_i - sigParams["time"].to_i > timeout.to_i)))
         # invalidate if the timeout has been reached
-        @logger.debug "** RFACEBOOK(GEM) - fbparams is empty because the signature was timed out" if @logger
+        #@logger.debug "** RFACEBOOK(GEM) - fbparams is empty because the signature was timed out" if @logger
         sigParams = {}
       end
       
@@ -168,7 +168,7 @@ module RFacebook
       expectedSig = originalParams["fb_sig"]
       if !(sigParams and expectedSig and generate_signature(sigParams, @api_secret) == expectedSig)
         # didn't match, empty out the params
-        @logger.debug "** RFACEBOOK(GEM) - fbparams is empty because the signature did not match" if @logger
+        #@logger.debug "** RFACEBOOK(GEM) - fbparams is empty because the signature did not match" if @logger
         sigParams = {}
       end
             

data/lib/rfacebook_on_rails/controller_extensions.rb

@@ -86,6 +86,12 @@ module RFacebook
           dup_cookies = (self.cookies || {}).dup
           @fbparams = rfacebook_session_holder.get_fb_sig_params(dup_cookies)
         end
+        
+        # finally, if we are an iframe app we may have saved the fbparams
+        # to the session for safekeeping
+        if (!@fbparams || @fbparams.length <= 0)
+          @fbparams = session[:rfacebook_session_iframe_fbparams] || {}
+        end
               
         return @fbparams
       
@@ -138,25 +144,28 @@ module RFacebook
       end
     
       def in_facebook_canvas?
-        return (params["fb_sig_in_canvas"] != nil)# and params["fb_sig_in_canvas"] == "1")
+        in_canvas = params["fb_sig_in_canvas"] || fbparams["in_canvas"]
+        return (in_canvas == "1" || in_canvas == true)
       end
         
       def in_facebook_frame?
-        return (params["fb_sig_in_iframe"] != nil)# and params["fb_sig_in_iframe"] == "1")
+        in_iframe = params["fb_sig_in_iframe"] || fbparams["in_iframe"]
+        return (in_iframe == "1" || in_iframe == true)
       end
       
       def in_mock_ajax?
-        return (params["fb_mockajax_url"] != nil)
+        return (params["fb_mockajax_url"] == "1" || params["fb_mockajax_url"] == true)
       end
       
       def in_external_app?
         # FIXME: once you click away in an iframe app, you are considered to be an external app
-        # TODO: read up on the RFacebook hacks for avoiding nested iframes
+        # TODO: read up on the hacks for avoiding nested iframes
         return (params["fb_sig"] == nil and !in_facebook_frame?)
       end
       
       def added_facebook_application?
-        return (params["fb_sig_added"] != nil)# and params["fb_sig_in_iframe"] == "1")
+        addedApp = params["fb_sig_added"] || fbparams["added"]
+        return (addedApp == "1" || addedApp == true)
       end
       
       def facebook_platform_signature_verified?
@@ -365,6 +374,10 @@ module RFacebook
           RAILS_DEFAULT_LOGGER.debug "** RFACEBOOK INFO: persisting Facebook session information into Rails session"
           session[:rfacebook_session] = @rfacebook_session_holder.dup
           session[:rfacebook_session].logger = nil # some session stores can't serialize the Rails logger
+          if in_facebook_frame?
+            # we need iframe apps to remember they are iframe apps
+            session[:rfacebook_session_iframe_fbparams] = fbparams
+          end
         end
       end
       
@@ -376,10 +389,13 @@ module RFacebook
       
       def url_for__RFACEBOOK(options={}, *parameters) # :nodoc:
         
-        # error check
-        if !options
-          RAILS_DEFAULT_LOGGER.info "** RFACEBOOK WARNING: options cannot be nil in call to url_for"
-        end
+        # fix problems that some Rails installations had with sending nil options
+        options ||= {}
+        
+        # # error check
+        # if !options
+        #   RAILS_DEFAULT_LOGGER.info "** RFACEBOOK WARNING: options cannot be nil in call to url_for"
+        # end
         
         # use special URL rewriting when inside the canvas
         # setting the mock_ajax option to true will override this
@@ -392,7 +408,7 @@ module RFacebook
         if (in_facebook_canvas? and !mockajaxSpecified) #TODO: do something separate for in_facebook_frame?
           
           if options.is_a? Hash
-            options[:only_path] = true
+            options[:only_path] = true if options[:only_path].nil?
           end
           
           # try to get a regular URL
@@ -400,9 +416,12 @@ module RFacebook
                           
           # replace anything that references the callback with the
           # Facebook canvas equivalent (apps.facebook.com/*)
-          if (path.starts_with?(self.facebook_callback_path) or "#{path}/".starts_with?(self.facebook_callback_path))
+          if path.starts_with?(self.facebook_callback_path)
             path.sub!(self.facebook_callback_path, self.facebook_canvas_path)
             path = "http://apps.facebook.com#{path}"
+          elsif "#{path}/".starts_with?(self.facebook_callback_path)
+            path.sub!(self.facebook_callback_path.chop, self.facebook_canvas_path.chop)
+            path = "http://apps.facebook.com#{path}"
           elsif (path.starts_with?("http://www.facebook.com") or path.starts_with?("https://www.facebook.com"))
             # be sure that URLs that go to some other Facebook service redirect back to the canvas
             if path.include?("?")

data/lib/rfacebook_on_rails/model_extensions.rb

@@ -147,6 +147,8 @@ module RFacebook
         ######################
         module InstanceMethods
           
+          # TODO: to help developers stay within the TOS, we should have a method in here like "with_facebook_scope(fbsession){...}"
+          
           def facebook_session
             if !@facebook_session
               @facebook_session = FacebookWebSession.new(self.facebook_api_key, self.facebook_api_secret)

data/lib/rfacebook_on_rails/plugin/init.rb

@@ -36,6 +36,7 @@ module RFacebook::Rails::Plugin
   
   module ControllerExtensions
     def facebook_api_key
+      # TODO: pull these overrides up into the original module, and make a FACEBOOK global in the backwards-compatibility file
       FACEBOOK["key"] || super
     end
     def facebook_api_secret

data/lib/rfacebook_on_rails/view_extensions.rb

@@ -53,7 +53,7 @@ module RFacebook
       
       def image_path(*params)
         path = super(*params)
-        if (in_facebook_canvas? or in_mock_ajax?)
+        if ((in_facebook_canvas? or in_mock_ajax?) and !(/(\w+)(\:\/\/)([\w0-9\.]+)([\:0-9]*)(.*)/.match(path)))
           path = "#{request.protocol}#{request.host_with_port}#{path}"
         end
         return path

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.1
 specification_version: 1
 name: rfacebook
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
-date: 2007-08-27 00:00:00 -04:00
+  version: 0.9.3
+date: 2007-09-03 00:00:00 -04:00
 summary: A Ruby interface to the Facebook API v1.0+.  Works with RFacebook on Rails plugin (see http://rfacebook.rubyforge.org).
 require_paths: 
 - lib