rfacebook 0.8.7 → 0.8.8

data/lib/rfacebook_on_rails/controller_extensions.rb

@@ -336,20 +336,24 @@ module RFacebook
                 
                 # try to get a regular URL
                 path = url_for__ALIASED(options, *parameters)
-                path += "/"
                                 
                 # replace anything that references the callback with the
                 # Facebook canvas equivalent (apps.facebook.com/*)
-                if path.starts_with?(self.facebook_callback_path)
+                if (path.starts_with?(self.facebook_callback_path) or "#{path}/".starts_with?(self.facebook_callback_path))
                   path.sub!(self.facebook_callback_path, self.facebook_canvas_path)
                   path = "http://apps.facebook.com#{path}"
                 else
                   # default to a full URL (will link externally)
                   RAILS_DEFAULT_LOGGER.debug "** RFACEBOOK INFO: failed to get canvas-friendly URL ("+path+") for ["+options.inspect+"], creating an external URL instead"
-                  options[:only_path] = false
-                  path = url_for__ALIASED(options, *parameters)
+                  path = "#{request.protocol}#{request.host}:#{request.port}#{path}"
                 end
               
+              # mock-ajax rewriting
+              elsif options[:mock_ajax]
+                options.delete(:mock_ajax) # clear it so it doesnt show up in the url
+                options[:only_path] = true
+                path = "#{request.protocol}#{request.host}:#{request.port}#{url_for__ALIASED(options, *parameters)}"
+              
               # regular Rails rewriting
               else
                 path = url_for__ALIASED(options, *parameters)
@@ -363,9 +367,18 @@ module RFacebook
           
             def redirect_to(options = {}, *parameters)
               if in_facebook_canvas?
+                
                 canvasRedirUrl = url_for(options, *parameters)
+                
+                # ensure that we come back to the canvas if we redirect
+                # to somewhere else on Facebook
+                if canvasRedirUrl.starts_with?("http://www.facebook.com")
+                  canvasRedirUrl = "#{canvasRedirUrl}&canvas"
+                end
+                
                 RAILS_DEFAULT_LOGGER.debug "** RFACEBOOK INFO: Canvas redirect to #{canvasRedirUrl}"
-                render :text => "<fb:redirect url=\"#{canvasRedirUrl}\" />"     
+                render :text => "<fb:redirect url=\"#{canvasRedirUrl}\" />"
+                
               else
                 RAILS_DEFAULT_LOGGER.debug "** RFACEBOOK INFO: Regular redirect_to"
                 redirect_to__ALIASED(options, *parameters)

data/lib/rfacebook_on_rails/plugin/init.rb

@@ -40,25 +40,25 @@ module RFacebook
       #####
       module ControllerExtensions
         def facebook_api_key
-          FACEBOOK["key"]
+          FACEBOOK["key"] || super
         end
         def facebook_api_secret
-          FACEBOOK["secret"]
+          FACEBOOK["secret"] || super
         end
         def facebook_canvas_path
-          FACEBOOK["canvas_path"]
+          FACEBOOK["canvas_path"] || super
         end
         def facebook_callback_path
-          FACEBOOK["callback_path"]
+          FACEBOOK["callback_path"] || super
         end
       end  
       #####
       module ModelExtensions
         def facebook_api_key
-          FACEBOOK["key"]
+          FACEBOOK["key"] || super
         end
         def facebook_api_secret
-          FACEBOOK["secret"]
+          FACEBOOK["secret"] || super
         end
       end
       #####
@@ -85,14 +85,14 @@ def ensureLeadingAndTrailingSlashesForPath(path)
     if !path.reverse.starts_with?("/")
       path = "#{path}/"
     end
-    return path
+    return path.strip
   else
     return nil
   end
 end
 
-FACEBOOK["canvas_path"] = ensureLeadingAndTrailingSlashesForPath(FACEBOOK["canvas_path"]).strip
-FACEBOOK["callback_path"] = ensureLeadingAndTrailingSlashesForPath(FACEBOOK["callback_path"]).strip
+FACEBOOK["canvas_path"] = ensureLeadingAndTrailingSlashesForPath(FACEBOOK["canvas_path"])
+FACEBOOK["callback_path"] = ensureLeadingAndTrailingSlashesForPath(FACEBOOK["callback_path"])
 
 # inject methods
 ActionView::Base.send(:include, RFacebook::Rails::ViewExtensions)

data/lib/rfacebook_on_rails/view_extensions.rb

@@ -39,6 +39,10 @@ module RFacebook
         @controller.in_facebook_frame?
       end
       
+      def in_mock_ajax?
+        @controller.in_mock_ajax?
+      end
+      
       def fbparams
         @controller.fbparams
       end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.1
 specification_version: 1
 name: rfacebook
 version: !ruby/object:Gem::Version 
-  version: 0.8.7
-date: 2007-08-16 00:00:00 -05:00
+  version: 0.8.8
+date: 2007-08-17 00:00:00 -05:00
 summary: A Ruby interface to the Facebook API v1.0+ (F8 and beyond).  Works with RFacebook on Rails plugin (see rfacebook.rubyforge.org).
 require_paths: 
 - lib