doesfacebook 0.4.1 → 0.4.2

data/app/helpers/does_facebook_helper.rb

@@ -27,12 +27,13 @@ module DoesFacebookHelper
   
   # Return the full canvas URL:
   def app_canvas_url
-    "http://apps.facebook.com/#{app_canvas_name}"
+    request.ssl? ? "https://apps.facebook.com/#{app_canvas_name}" : "http://apps.facebook.com/#{app_canvas_name}"
   end
   
   # Generate a URL that points within the Facebook canvas
   def url_for_canvas(url_opts={})
-    canvas_root = File.join("http://apps.facebook.com", app_canvas_name)
+    apps_root = request.ssl? ? "https://apps.facebook.com/" : "http://apps.facebook.com/"
+    canvas_root = File.join(apps_root, app_canvas_name)
     if url_opts.is_a?(Hash)
       return File.join(canvas_root, url_for(url_opts))
     elsif url_opts.include?("://")

data/lib/doesfacebook/controls.rb

@@ -16,6 +16,8 @@ module DoesFacebook
     def redirect_to_canvas_old(opts={})
       raise MalformedUrlOptions.new("Options passed to `redirect_to_canvas` must be a URL options Hash") unless opts.is_a?(Hash)
       dest = File.join("http://apps.facebook.com/", facebook_config[:canvas_name], url_for(opts.merge(:only_path=>true))) 
+      logger.warn "DoesFacebook: redirect_to_canvas_old method is deprecated and does not support HTTPS."
+      logger.warn "DoesFacebook: Use redirect_to_canvas for HTTPS-support and JavaScript-based redirection."
       logger.info "Canvas Redirect to #{opts.inspect}=>#{dest}"
       redirect_to dest
     end
@@ -23,7 +25,8 @@ module DoesFacebook
     # Purer, JavaScript-based solution for redirecting within the Facebook canvas:
     def redirect_to_canvas(opts={})
       raise MalformedUrlOptions.new("Options passed to `redirect_to_canvas` must be a URL options Hash") unless opts.is_a?(Hash)
-      dest = File.join("http://apps.facebook.com/", facebook_config[:canvas_name], url_for(opts.merge(:only_path=>true))) 
+      apps_root = request.ssl? ? "https://apps.facebook.com/" : "http://apps.facebook.com/"
+      dest = File.join(apps_root, facebook_config[:canvas_name], url_for(opts.merge(:only_path=>true))) 
       @facebook_redirect_url = dest
       logger.info "Canvas Redirect to #{opts.inspect}=>#{dest}"
       begin

metadata

@@ -2,7 +2,7 @@
 name: doesfacebook
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - mccolin
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-01 00:00:00 -04:00
+date: 2011-09-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency