facebooker 1.0.31 → 1.0.41

data/lib/facebooker/rails/backwards_compatible_param_checks.rb

@@ -0,0 +1,31 @@
+module Facebooker::Rails::BackwardsCompatibleParamChecks
+
+    def one_or_true( value )
+      case value
+        when String then
+          value == "1"
+        when Numeric then
+          value.to_f == 1.0
+        when TrueClass then
+          true
+        else
+          false
+      end
+    end
+
+    def zero_or_false( value )
+      case value
+        when String then
+          value == "0"
+        when Numeric then
+          value.to_f == 0.0
+        when FalseClass then
+          true
+        when NilClass then
+          true
+        else
+          false
+      end
+    end
+
+end

data/lib/facebooker/rails/controller.rb

@@ -3,6 +3,7 @@ require 'facebooker/rails/profile_publisher_extensions'
 module Facebooker
   module Rails
     module Controller
+      include Facebooker::Rails::BackwardsCompatibleParamChecks
       include Facebooker::Rails::ProfilePublisherExtensions
       def self.included(controller)
         controller.extend(ClassMethods)
@@ -30,6 +31,12 @@ module Facebooker
         secure_with_facebook_params! || secure_with_cookies! || secure_with_token!
       end
       
+      #this is used to proxy a connection through a rails app so the facebook secret key is not needed
+      #iphone apps use this
+      def create_facebook_session_with_secret
+        secure_with_session_secret!
+      end
+      
       def set_facebook_session
         # first, see if we already have a session
         session_set = session_already_secured?
@@ -147,6 +154,15 @@ module Facebooker
           @facebook_session
         end
       end
+    
+      def secure_with_session_secret!
+        if params['auth_token']
+          @facebook_session = new_facebook_session
+          @facebook_session.auth_token = params['auth_token']
+          @facebook_session.secure_with_session_secret!
+          @facebook_session
+        end
+      end
       
       def secure_with_facebook_params!
         return unless request_comes_from_facebook?
@@ -162,11 +178,15 @@ module Facebooker
       def after_facebook_login_url
         nil
       end
+
+      def default_after_facebook_login_url
+        url_for(:only_path => false, :overwrite_params => {})
+      end
       
       def create_new_facebook_session_and_redirect!
         session[:facebook_session] = new_facebook_session
-        url_params = after_facebook_login_url.nil? ? {} : {:next=>after_facebook_login_url}
-        top_redirect_to session[:facebook_session].login_url(url_params) unless @installation_required
+        next_url = after_facebook_login_url || default_after_facebook_login_url
+        top_redirect_to session[:facebook_session].login_url({:next => next_url}) unless @installation_required
         false
       end
       
@@ -205,6 +225,10 @@ module Facebooker
       end
       
       def verify_signature(facebook_sig_params,expected_signature)
+        # Don't verify the signature if rack has already done so.
+        if ::Rails.version >= "2.3"
+          return if ActionController::Dispatcher.middleware.include? Rack::Facebook
+        end
         raw_string = facebook_sig_params.map{ |*args| args.join('=') }.sort.join
         actual_sig = Digest::MD5.hexdigest([raw_string, Facebooker::Session.secret_key].join)
         raise Facebooker::Session::IncorrectSignature if actual_sig != expected_signature
@@ -249,14 +273,13 @@ module Facebooker
       end
       
       def request_is_facebook_ajax?
-        params["fb_sig_is_mockajax"]=="1" || params["fb_sig_is_ajax"]=="1" || params["fb_sig_is_ajax"]==true || params["fb_sig_is_mockajax"]==true
+        one_or_true(params["fb_sig_is_mockajax"]) || one_or_true(params["fb_sig_is_ajax"])
       end
+
       def xml_http_request?
         request_is_facebook_ajax? || super
       end
       
-      
-      
       def application_is_installed?
         facebook_params['added']
       end
@@ -294,8 +317,8 @@ module Facebooker
       end
       
       def application_is_not_installed_by_facebook_user
-        url_params = after_facebook_login_url.nil? ? {} : { :next => after_facebook_login_url }
-        top_redirect_to session[:facebook_session].install_url(url_params)
+        next_url = after_facebook_login_url || default_after_facebook_login_url
+        top_redirect_to session[:facebook_session].install_url({:next => next_url})
       end
       
       def set_facebook_request_format

data/lib/facebooker/rails/extensions/rack_setup.rb

@@ -1,2 +1,6 @@
+# Somewhere in 2.3 RewindableInput was removed- rack supports it natively
 require 'rack/facebook'
-ActionController::Dispatcher.middleware.insert_after 'ActionController::RewindableInput',Rack::Facebook, Facebooker.secret_key
+ActionController::Dispatcher.middleware.insert_before( 
+  ActionController::ParamsParser,
+  Rack::Facebook
+)

data/lib/facebooker/rails/facebook_request_fix.rb

@@ -1,5 +1,7 @@
 module ::ActionController
   class AbstractRequest
+    include Facebooker::Rails::BackwardsCompatibleParamChecks
+
     def request_method_with_facebooker
       if parameters[:_method].blank?
         if %w{GET HEAD}.include?(parameters[:fb_sig_request_method])
@@ -14,15 +16,13 @@ module ::ActionController
     end
 
     def xml_http_request_with_facebooker?
-      parameters["fb_sig_is_mockajax"] == "1"  ||
-      parameters["fb_sig_is_ajax"] == "1" ||
+      one_or_true(parameters["fb_sig_is_mockajax"])  ||
+      one_or_true(parameters["fb_sig_is_ajax"]) ||
       xml_http_request_without_facebooker?
     end
     alias_method_chain :xml_http_request?, :facebooker
     # we have to re-alias xhr? since it was pointing to the old method
-    unless defined? :xhr?
-      alias xhr? :xml_http_request?
-    end
+    alias :xhr? :xml_http_request?
 
   end
 end

data/lib/facebooker/rails/facebook_request_fix_2-3.rb

@@ -0,0 +1,31 @@
+module ::ActionController
+
+  class Request
+
+    include Facebooker::Rails::BackwardsCompatibleParamChecks
+
+    def request_method_with_facebooker
+      if parameters[:_method].blank?
+        if %w{GET HEAD}.include?(parameters[:fb_sig_request_method])
+          parameters[:_method] = parameters[:fb_sig_request_method]
+        end
+      end
+      request_method_without_facebooker
+    end
+
+    if new({}).methods.include?("request_method")
+      alias_method_chain :request_method, :facebooker
+    end
+
+    def xml_http_request_with_facebooker?
+      one_or_true(parameters["fb_sig_is_mockajax"])  ||
+      one_or_true(parameters["fb_sig_is_ajax"]) ||
+      xml_http_request_without_facebooker?
+    end
+    alias_method_chain :xml_http_request?, :facebooker
+
+    # we have to re-alias xhr? since it was pointing to the old method
+    alias :xhr? :xml_http_request?
+
+  end
+end

data/lib/facebooker/rails/facebook_url_rewriting.rb

@@ -23,14 +23,18 @@ module ::ActionController
   end
 
   class UrlRewriter
+    include Facebooker::Rails::BackwardsCompatibleParamChecks
+
     RESERVED_OPTIONS << :canvas
+
     def link_to_new_canvas?
-      @request.parameters["fb_sig_in_new_facebook"] == "1"
+      one_or_true @request.parameters["fb_sig_in_new_facebook"]
     end
+
     def link_to_canvas?(params, options)
       option_override = options[:canvas]
       return false if option_override == false # important to check for false. nil should use default behavior
-      option_override || (can_safely_access_request_parameters? && (@request.parameters["fb_sig_in_canvas"] == "1" ||  @request.parameters[:fb_sig_in_canvas] == "1" ))
+      option_override || (can_safely_access_request_parameters? && (one_or_true(@request.parameters["fb_sig_in_canvas"]) || one_or_true(@request.parameters[:fb_sig_in_canvas]) ))
     end
 
     #rails blindly tries to merge things that may be nil into the parameters. Make sure this won't break
@@ -51,5 +55,6 @@ module ::ActionController
     end
     
     alias_method_chain :rewrite_url, :facebooker
+
   end
 end

data/lib/facebooker/rails/helpers.rb

@@ -24,6 +24,14 @@ module Facebooker
         end
       end
       
+      def fb_iframe(src, options = {})
+        content_tag "fb:iframe", '', options.merge({ :src => src })
+      end
+
+      def fb_swf(src, options = {})
+        tag "fb:swf", options.merge(:swfsrc => src)
+      end
+      
       def fb_dialog_title( title )
         content_tag "fb:dialog-title", title
       end
@@ -331,7 +339,8 @@ module Facebooker
       VALID_FB_SHARED_PHOTO_SIZES = [:thumb, :small, :normal, :square]
       VALID_FB_PHOTO_SIZES = VALID_FB_SHARED_PHOTO_SIZES      
       VALID_FB_PROFILE_PIC_SIZES = VALID_FB_SHARED_PHOTO_SIZES
-      VALID_PERMISSIONS=[:email, :offline_access, :status_update, :photo_upload, :create_listing, :create_event, :rsvp_event, :sms, :video_upload]
+      VALID_PERMISSIONS=[:email, :offline_access, :status_update, :photo_upload, :create_listing, :create_event, :rsvp_event, :sms, :video_upload, 
+                         :publish_stream, :read_stream]
       
       # Render an fb:tabs tag containing some number of fb:tab_item tags.
       # Example:
@@ -639,20 +648,22 @@ module Facebooker
       # 
       # You can prompt a user with the following permissions:
       #   * email
+      #   * read_stream
+      #   * publish_stream
       #   * offline_access
       #   * status_update
       #   * photo_upload
-      #   * video_upload
-      #   * create_listing
       #   * create_event
       #   * rsvp_event
       #   * sms
-      # 
+      #   * video_upload
+      #   * create_note
+      #   * share_item
       # Example:
       # <%= fb_prompt_permission('email', "Would you like to receive email from our application?" ) %>
       #
       # See http://wiki.developers.facebook.com/index.php/Fb:prompt-permission for 
-      # more details
+      # more details. Correct as of 7th June 2009.
       #
       def fb_prompt_permission(permission,message,callback=nil)
         raise(ArgumentError, "Unknown value for permission: #{permission}") unless VALID_PERMISSIONS.include?(permission.to_sym)
@@ -661,6 +672,19 @@ module Facebooker
         content_tag("fb:prompt-permission",message,args)
       end
       
+      # Renders a link to prompt for multiple permissions at once.
+      #
+      # Example:
+      # <%= fb_prompt_permissions(['email','offline_access','status_update'], 'Would you like to grant some permissions?')
+      def fb_prompt_permissions(permissions,message,callback=nil)
+        permissions.each do |p|
+          raise(ArgumentError, "Unknown value for permission: #{p}") unless VALID_PERMISSIONS.include?(p.to_sym)          
+        end
+        args={:perms=>permissions*','}
+        args[:next_fbjs]=callback unless callback.nil?
+        content_tag("fb:prompt-permission",message,args)        
+      end      
+      
       # Renders an <fb:eventlink /> tag that displays the event name and links to the event's page. 
       def fb_eventlink(eid)
         content_tag "fb:eventlink",nil,:eid=>eid

data/lib/facebooker/rails/helpers/fb_connect.rb

@@ -11,26 +11,35 @@ module Facebooker
           end
         end
         
+        # 
+        # For information on the :app_settings argument see http://wiki.developers.facebook.com/index.php/JS_API_M_FB.Facebook.Init_2 
+        # While it would be nice to treat :app_settings as a hash, some of the arguments do different things if they are a string vs a javascript function
+        # and Rails' Hash#to_json always quotes strings so there is no way to indicate when the value should be a javascript function.
+        # For this reason :app_settings needs to be a string that is valid JSON (including the {}'s).
+        #
         def init_fb_connect(*required_features,&proc)
           additions = ""
           if block_given?
             additions = capture(&proc)
           end
 
-          options = {:js => :prototype}
+          # Yes, app_settings is set to a string of an empty JSON element. That's intentional.
+          options = {:js => :prototype, :app_settings => '{}'}
+
           if required_features.last.is_a?(Hash)
             options.merge!(required_features.pop.symbolize_keys)
           end
 
           if request.ssl?
-            init_string = "FB.Facebook.init('#{Facebooker.api_key}','/xd_receiver_ssl.html');"
+            init_string = "FB.Facebook.init('#{Facebooker.api_key}','/xd_receiver_ssl.html', #{options[:app_settings]});"
           else
-            init_string = "FB.Facebook.init('#{Facebooker.api_key}','/xd_receiver.html');"
+            init_string = "FB.Facebook.init('#{Facebooker.api_key}','/xd_receiver.html', #{options[:app_settings]});"
           end
           unless required_features.blank?
              init_string = <<-FBML
              #{case options[:js]
                when :jquery then "$(document).ready("
+               when :dojo then "dojo.addOnLoad("
                else "Element.observe(window,'load',"
                end} function() {
                 FB_RequireFeatures(#{required_features.to_json}, function() {
@@ -97,9 +106,9 @@ module Facebooker
           link_to_function text, js, *args
         end
         
-        def fb_user_action(action, user_message = "", prompt = "", callback = nil)
+        def fb_user_action(action, user_message = nil, prompt = "", callback = nil)
           update_page do |page|
-            page.call "FB.Connect.showFeedDialog",action.template_id,action.data,action.target_ids,action.body_general,nil,page.literal("FB.RequireConnect.promptConnect"),callback,prompt,user_message
+            page.call("FB.Connect.showFeedDialog",action.template_id,action.data,action.target_ids,action.body_general,nil,page.literal("FB.RequireConnect.promptConnect"),callback,prompt,user_message.nil? ? nil : {:value=>user_message})
           end
         end
         

data/lib/facebooker/rails/publisher.rb

@@ -56,15 +56,15 @@ module Facebooker
     #       fbml 'text'
     #       text fbml
     #     end
-    #     # This will render the profile in /users/profile.erb
+    #     # This will render the profile in /users/profile.fbml.erb
     #     #   it will set @user to user_to_update in the template
     #     #  The mobile profile will be rendered from the app/views/test_publisher/_mobile.erb
     #     #   template
     #     def profile_update(user_to_update,user_with_session_to_use)
     #       send_as :profile
     #       from user_with_session_to_use
-    #       to user_to_update
-    #       profile render(:action=>"/users/profile",:assigns=>{:user=>user_to_update})
+    #       recipients user_to_update
+    #       profile render(:file=>"users/profile.fbml.erb",:assigns=>{:user=>user_to_update})
     #       profile_action "A string"
     #       mobile_profile render(:partial=>"mobile",:assigns=>{:user=>user_to_update})
     #   end
@@ -74,7 +74,7 @@ module Facebooker
     #     def ref_update(user)
     #       send_as :ref
     #       from user
-    #       fbml render(:action=>"/users/profile",:assigns=>{:user=>user_to_update})
+    #       fbml render(:file=>"users/profile",:assigns=>{:user=>user_to_update})
     #       handle "a_ref_handle"
     #   end
     #
@@ -98,7 +98,11 @@ module Facebooker
         @from                 = nil
         @full_story_template  = nil
         @recipients           = nil
-        @controller           = PublisherController.new
+        @controller           = PublisherController.new(self)
+      end
+
+      def default_url_options
+        {:host => Facebooker.canvas_server_base + Facebooker.facebook_path_prefix}
       end
 
       # use facebook options everywhere
@@ -122,6 +126,8 @@ module Facebooker
           end
         end
         
+        
+        
         class << self
           
           def register(klass,method)
@@ -323,6 +329,10 @@ module Facebooker
           self.href=href
         end
 
+        def ==(other)
+          self.src == other.src && self.href == other.href
+        end
+
         def to_json(*args)
           "{\"src\":#{src.to_json}, \"href\":#{href.to_json}}"
         end
@@ -411,8 +421,11 @@ module Facebooker
 	          ActionController::Base.append_view_path(controller_root) 
 	          ActionController::Base.append_view_path(controller_root+"/..") 
 	        end
+          view_paths = ActionController::Base.view_paths
+        else
+          view_paths = [template_root, controller_root]
 	      end
-        returning ActionView::Base.new([template_root,controller_root], assigns, self) do |template|
+        returning ActionView::Base.new(view_paths, assigns, self) do |template|
           template.controller=self
           template.extend(self.class.master_helper_module)
           def template.request_comes_from_facebook?
@@ -483,11 +496,7 @@ module Facebooker
           
           should_send ? publisher.send_message(method) : publisher._body
         end
-    
-        def default_url_options
-          {:host => Facebooker.canvas_server_base + Facebooker.facebook_path_prefix}
-        end
-    
+        
         def controller_path
           self.to_s.underscore
         end
@@ -521,11 +530,16 @@ module Facebooker
       class PublisherController
         include Facebooker::Rails::Publisher.master_helper_module
         include ActionController::UrlWriter
+        
+        def initialize(source)
+          self.class.url_option_source = source
+        end
 
         class << self
+          attr_accessor :url_option_source
           alias :old_default_url_options :default_url_options
           def default_url_options(*args)
-            Facebooker::Rails::Publisher.default_url_options(*args)
+            url_option_source.default_url_options(*args)
           end
         end
 

data/lib/facebooker/service.rb

@@ -1,9 +1,3 @@
-begin
-  require 'curb'
-  Facebooker.use_curl = true
-rescue LoadError
-  require 'net/http'
-end
 require 'facebooker/parser'
 module Facebooker
   class Service
@@ -12,50 +6,86 @@ module Facebooker
       @api_path = api_path
       @api_key = api_key
     end
+
+    def self.active_service
+      unless @active_service
+        if Facebooker.use_curl?
+          @active_service = Facebooker::Service::CurlService.new
+        else
+          @active_service = Facebooker::Service::NetHttpService.new
+        end        
+      end
+      @active_service
+    end
+    
+    def self.active_service=(new_service)
+      @active_service = new_service
+    end
+    
+    def self.with_service(service)
+      old_service = active_service
+      self.active_service = service
+      begin
+        yield
+      ensure
+        self.active_service = old_service
+      end
+    end
+    
+    
+    # Process all calls to Facebook in th block asynchronously
+    # nil will be returned from all calls and no results will be parsed. This is mostly useful
+    # for sending large numbers of notifications or sending a lot of profile updates
+    #
+    # for example:
+    #   User.find_in_batches(:batch_size => 200) do |users|
+    #     Faceboooker::Service.with_async do
+    #       users.each {|u| u.facebook_session.send_notification(...)}
+    #     end
+    #   end
+    #
+    # Note: You shouldn't make more than about 200 api calls in a with_async block
+    # or you might exhaust all filehandles. 
+    #
+    # This functionality require the typhoeus gem
+    #
+    def self.with_async(&proc)
+      block_with_process = Proc.new { proc.call ; process_async}
+      with_service(Facebooker::Service::TyphoeusMultiService.new,&block_with_process)
+    end
     
+    def self.process_async
+      active_service.process
+    end  
+    
+
     # TODO: support ssl 
     def post(params)
       attempt = 0
-      Parser.parse(params[:method], post_form(url,params) )
+      if active_service.parse_results?
+        Parser.parse(params[:method], post_form(url,params) )
+      else
+        post_form(url,params)
+      end
     rescue Errno::ECONNRESET, EOFError
       if attempt == 0
         attempt += 1
         retry
       end
     end
-    
+
     def post_form(url,params)
-      if Facebooker.use_curl?
-        post_form_with_curl(url,params)
-      else
-        post_form_with_net_http(url,params)
-      end
-    end
-    
-    def post_form_with_net_http(url,params)
-      Net::HTTP.post_form(url, params)
-    end
-    
-    def post_form_with_curl(url,params,multipart=false)
-      response = Curl::Easy.http_post(url.to_s, *to_curb_params(params)) do |c|
-        c.multipart_form_post = multipart
-        c.timeout = Facebooker.timeout 
-      end
-      response.body_str
+      active_service.post_form(url,params)
     end
     
     def post_multipart_form(url,params)
-      if Facebooker.use_curl?
-        post_form_with_curl(url,params,true)
-      else
-        post_multipart_form_with_net_http(url,params)
-      end
+      active_service.post_multipart_form(url,params)
     end
     
-    def post_multipart_form_with_net_http(url,params)
-      Net::HTTP.post_multipart_form(url, params)
+    def active_service
+      self.class.active_service
     end
-    
+        
     def post_file(params)
       service_url = url(params.delete(:base))
       result = post_multipart_form(service_url, params)
@@ -67,28 +97,6 @@ module Facebooker
       base ||= @api_base
       URI.parse('http://'+ base + @api_path)
     end
-    
-    # Net::HTTP::MultipartPostFile
-    def multipart_post_file?(object)
-      object.respond_to?(:content_type) &&
-      object.respond_to?(:data) &&
-      object.respond_to?(:filename)
-    end
-    
-    def to_curb_params(params)
-      parray = []
-      params.each_pair do |k,v|
-        if multipart_post_file?(v)
-          # Curl doesn't like blank field names
-          field = Curl::PostField.file((k.blank? ? 'xxx' : k.to_s), nil, File.basename(v.filename))
-          field.content_type = v.content_type
-          field.content = v.data
-          parray << field
-        else
-          parray << Curl::PostField.content(k.to_s, v.to_s)
-        end
-      end
-      parray
-    end
+
   end
 end