facebook_rails 0.1.2 → 0.2.0

data/app/controllers/facebook_rails_controller.rb

@@ -9,6 +9,26 @@ module FacebookRailsController
     FACEBOOK['f8app_callback'].to_s + path
   end
 
+  def microsite_href(path = '/')
+    FACEBOOK['microsite_home'].to_s + path
+  end
+
+  def smart_href(path = '/')
+    if in_facebook_app?
+      direct_href(path)
+    else
+      microsite_href(path)
+    end
+  end
+
+  def in_facebook_app?
+    FACEBOOK['f8app_host'].blank? or request.host == FACEBOOK['f8app_host']
+  end
+
+  def in_microsite?
+    !in_facebook_app?
+  end
+
   def facebook_api
     @facebook_api ||= Koala::Facebook::API.new(session[:access_token])
   end
@@ -136,7 +156,8 @@ module FacebookRailsController
     #First check we received the call with a signed_request parameter, as that means a fresh token
     if params[:signed_request]
       fb_oauth = Koala::Facebook::OAuth.new
-      f8_params = fb_oauth.parse_signed_request(params.delete(:signed_request))
+      @f8_params = f8_params = fb_oauth.parse_signed_request(params.delete(:signed_request))
+      session[:fan_page_id] = f8_params["page"]["id"] if f8_params["page"]
       session[:f8_locale] = (f8_params and f8_params["user"]) ? f8_params["user"]["locale"] : nil
       #puts "request params: #{ f8_params.inspect }"
       if f8_params["oauth_token"]

data/app/helpers/facebook_rails_helper.rb

@@ -3,17 +3,31 @@ module FacebookRailsHelper
     return '<script>' +
         'if (top == self)' +
         '{' +
-        "top.location = '#{facebook_href(url_for( { :controller => controller.controller_name, :action => controller.action_name}.merge params.reject {|k,v| k == 'signed_request'}))}';" +
+        "top.location = '#{facebook_href(url_for({ :controller => controller.controller_name, :action => controller.action_name }.merge params.reject{ |k,v| k == 'signed_request' }))}';" +
         '}' +
         '</script>'
   end
 
-  def facebook_initialization resize = :auto, app_id = FACEBOOK['app_id'], user_f8id = nil
+  def reload_back_to_microsite_if_needed_js
+    return '<script>' +
+        'if (top != self)' +
+        '{' +
+        "top.location = '#{microsite_href(url_for({ :controller => controller.controller_name, :action => controller.action_name }.merge params.reject{ |k,v| k == 'signed_request' }))}';" +
+        '}' +
+        '</script>'
+  end
+
+  def facebook_initialization options = {}
+    options[:resize] = :auto unless options.has_key?(:resize)
+    options[:init] ||= {}
+    options[:init][:appId] ||= FACEBOOK['app_id'].to_s
+    options[:init][:status] = true unless options.has_key?(:status)
+    options[:init][:cookie] = true unless options.has_key?(:cookie)
     begin
-      user ||= current_user_f8id
+      options[:user_f8id] = current_user_f8id
     rescue Exception => e
       logger.info "current_user_f8id exception #{ e.to_s }"
-    end
+    end unless options.has_key?(:user_f8id)
     onload_resize = %{
         var domLoaded = false;
         var facebookLoaded = false;
@@ -48,11 +62,11 @@ module FacebookRailsHelper
         });
     }
 
-    login_status = if user_f8id
+    login_status = if options[:user_f8id]
       %{
           FB.getLoginStatus(function(response) {
-            if ((response.authResponse && response.authResponse.userID == '#{ user_f8id }') ||
-                (response.session && response.session.uid == '#{ user_f8id }')) {
+            if ((response.authResponse && response.authResponse.userID == '#{ options[:user_f8id] }') ||
+                (response.session && response.session.uid == '#{ options[:user_f8id] }')) {
               // logged in and connected user - continue
               $(document).trigger('got_facebook_status');
             } else {
@@ -72,15 +86,12 @@ module FacebookRailsHelper
     %{
       <div id="fb-root"></div>
       <script type="text/javascript">
-        #{ onload_resize if resize == :onload }
+        #{ onload_resize if options[:resize] == :onload }
         window.fbAsyncInit = function() {
-          FB.init({ appId: '#{ app_id }',
-                    status: true,
-                    cookie: true,
-                    xfbml: true });
+          FB.init({ #{ options[:init].collect{ |key, value| "#{ key }: #{ value }" }.join(', ') } });
           $(document).trigger('facebook_init');
-          #{ 'facebookLoaded = true; pageLoad();' if resize == :onload }
-          #{ 'FB.Canvas.setAutoGrow();' if resize == :auto }
+          #{ 'facebookLoaded = true; pageLoad();' if options[:resize] == :onload }
+          #{ 'FB.Canvas.setAutoGrow();' if options[:resize] == :auto }
           #{ login_status }
         };
 

data/lib/facebook_rails/engine.rb

@@ -59,6 +59,11 @@ module FacebookRails
 
       ActionController::Base.send :helper_method, :facebook_href
       ActionController::Base.send :helper_method, :direct_href
+      ActionController::Base.send :helper_method, :microsite_href
+      ActionController::Base.send :helper_method, :smart_href
+      ActionController::Base.send :helper_method, :in_facebook_app?
+      ActionController::Base.send :helper_method, :in_microsite?
+      ActionController::Base.send :helper_method, :authenticated_by_facebook?
       ActionController::Base.send :helper_method, :current_user_f8id
       ActionController::Base.send :helper_method, :get_facebook_locale
     end

data/lib/facebook_rails/version.rb

@@ -1,3 +1,3 @@
 module FacebookRails
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/lib/generators/facebook_rails/facebook_rails_generator.rb

@@ -1,4 +1,4 @@
-#require 'rails/generators'
+require 'rails/generators'
 
 class FacebookRailsGenerator < Rails::Generators::Base
   def self.source_root

data/lib/generators/facebook_rails/templates/facebook.yml

@@ -7,6 +7,8 @@ development:
   #Slijede drap dodaci
   f8app_home: http://apps.facebook.com/CANVAS_NAME #bez zadnjeg '/'
   f8app_callback: CALLBACK_URL #bez zadnjeg '/'
+  #f8app_host: HOST_NAME #needed only when microsite exists
+  #microsite_home: http://microsite.com #bez zadnjeg '/'
   #server_subdir:
   timeout: 3
 
@@ -16,6 +18,8 @@ test:
   #Slijede drap dodaci
   f8app_home: CANVAS_URL #bez zadnjeg '/'
   f8app_callback: CALLBACK_URL #bez zadnjeg '/'
+  #f8app_host: HOST_NAME #needed only when microsite exists
+  #microsite_home: http://microsite.com #bez zadnjeg '/'
   #server_subdir:
   timeout: 3
 
@@ -25,5 +29,7 @@ production:
   #Slijede drap dodaci
   f8app_home: CANVAS_URL #bez zadnjeg '/'
   f8app_callback: CALLBACK_URL #bez zadnjeg '/'
+  #f8app_host: HOST_NAME #needed only when microsite exists
+  #microsite_home: http://microsite.com #bez zadnjeg '/'
   #server_subdir:
   timeout: 3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: facebook_rails
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-04 00:00:00.000000000Z
+date: 2012-05-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70284682468040 !ruby/object:Gem::Requirement
+  requirement: &70276425465420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70284682468040
+  version_requirements: *70276425465420
 - !ruby/object:Gem::Dependency
   name: koala
-  requirement: &70284682467360 !ruby/object:Gem::Requirement
+  requirement: &70276425464920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70284682467360
+  version_requirements: *70276425464920
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70284682466860 !ruby/object:Gem::Requirement
+  requirement: &70276425464540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70284682466860
+  version_requirements: *70276425464540
 description: Manages collecting of facebook authentication and provides helpers. It
   uses koala and is built for Rails 3.
 email: