facebook_app 0.0.16 → 0.0.17

data/app/controllers/facebook_app/facebook_app_controller.rb

@@ -24,7 +24,11 @@ module FacebookApp
         # tracking is only relevant for users who will log in
         session[:oauth_expiry] = nil
         track_conversion(:see_permissions_dialogue)
-        redirect_to oauth_code_link
+        if Configurable[:canvas_app]
+          client_side_redirect(oauth_code_link)
+        else
+          redirect_to oauth_code_link
+        end
       end
     end
 
@@ -55,6 +59,15 @@ module FacebookApp
       authenticator.url_for_oauth_code(:permissions => Configurable["facebook_permissions"])
     end
 
+    def client_side_redirect(redirect_link)
+      %Q{
+      <script>
+   top.location="#{redirect_link}";
+   </script>
+      }.html_safe
+      render :inline => client_side_redirect
+    end
+
     def authenticator
       @authenticator ||= Koala::Facebook::OAuth.new(FacebookCredentials.app_id, FacebookCredentials.secret, facebook_app.oauth_callback_url(:marketing_mode => params[:marketing_type]))
     end

data/app/controllers/facebook_app/oauth_controller.rb

@@ -3,12 +3,7 @@ module FacebookApp
 
     def denied 
       track_conversion(:deny_permissions)
-      client_side_redirect= %Q{
-      <script>
-   top.location="#{identified_tracking_link}";
-   </script>
-      }.html_safe
-      render :inline => client_side_redirect
+      client_side_redirect(facebook_app.identified_tracking_link)
     end
 
     # this is the callback URL. It should handle both the case

data/facebook_app.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.version     = FacebookApp::VERSION
   s.authors     = ["Jack Kinsella"]
   s.email       = ["jack.kinsella@gmail.com"]
-  s.homepage    = ""
+  s.homepage    = "http://www.jackkinsella.ie"
   s.summary     = %q{Base Facebook for rapid development of future Facebook applications}
   s.description = %q{Includes authentication, tracking, and lots of convenience methods} 
 

data/lib/facebook_app/version.rb

@@ -1,3 +1,3 @@
 module FacebookApp
-  VERSION = "0.0.16"
+  VERSION = "0.0.17"
 end

data/lib/generators/facebook_app/templates/configurable.yml

@@ -77,3 +77,8 @@ show_splash_page:
   name: Show the splash page or redirect to main page
   default: true
   type: boolean
+
+canvas_app:
+  name: Tick if this app is a  Canvas app
+  default: false
+  type: boolean

metadata

@@ -2,7 +2,7 @@
 name: facebook_app
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors: 
 - Jack Kinsella
@@ -159,7 +159,7 @@ files:
 - lib/generators/facebook_app/templates/seeds.rb
 - pkg/facebook_app-0.0.3.gem
 - script/infographic.py
-homepage: ""
+homepage: http://www.jackkinsella.ie
 licenses: []
 
 post_install_message: