djanowski-facebooker 1.0.7 → 1.0.10

data/History.txt

@@ -1,5 +1,6 @@
-=== x.x.x / 2008-xx-xx
+=== x.x.x / 2009-xx-xx
 
+* Modified fql_query to return results as Hashes as a last resort [Alan Larkin]
 * fixed typo in set app properties parser [Andrew Grim, shane]
 * Removed actor_id param from templatized feed [shane]
 * Added admin.get_allocation [shane]

data/Manifest.txt

@@ -75,6 +75,7 @@ lib/facebooker/rails/facebook_form_builder.rb
 lib/facebooker/rails/facebook_pretty_errors.rb
 lib/facebooker/rails/facebook_request_fix.rb
 lib/facebooker/rails/facebook_session_handling.rb
+lib/facebooker/rails/facebook_url_helper.rb
 lib/facebooker/rails/facebook_url_rewriting.rb
 lib/facebooker/rails/helpers.rb
 lib/facebooker/rails/helpers/fb_connect.rb

data/README.txt

@@ -4,7 +4,7 @@
 
 == DESCRIPTION:
 
-Facebooker is a Ruby wrapper over the Facebook[http://facebook.com] {REST API}[http://developer.facebook.com].  Its goals are:
+Facebooker is a Ruby wrapper over the Facebook[http://facebook.com] {REST API}[http://wiki.developers.facebook.com/index.php/API].  Its goals are:
 
 * Idiomatic Ruby
 * No dependencies outside of the Ruby standard library (This is true with Rails 2.1. Previous Rails versions require the JSON gem)
@@ -55,6 +55,22 @@ Your application users will need to have added the application in facebook to ac
 
 to your application controller.
 
+== using MemCache session
+
+Facebook uses some non alphanum characters in the session identifier which interfere with memcache stored sessions. If you want to use MemCache for storing sessions, you can override the valid session id method on memcache by placing the following code in an initializer:
+
+# add - as an okay key
+class CGI
+  class Session
+    class MemCacheStore
+      def check_id(id) #:nodoc:#
+        /[^0-9a-zA-Z\-\._]+/ =~ id.to_s ? false : true
+      end
+    end
+  end
+end
+
+
 == LICENSE:
 
 (The MIT License)

data/generators/facebook/templates/config/facebooker.yml

@@ -1,6 +1,8 @@
 # The api key, secret key, and canvas page name are required to get started
 # Tunnel configuration is only needed if you are going to use the facebooker:tunnel Rake tasks
 # Your callback url in Facebook should be set to http://public_host:public_port
+# If you're building a Facebook connect site, 
+#    change the value of set_asset_host_to_callback_url to false
 # To develop for the new profile design, add the following key..
 # api: new
 # remove the key or set it to anything else to use the old facebook design.
@@ -12,6 +14,7 @@ development:
   canvas_page_name:
   callback_url:
   pretty_errors: true
+  set_asset_host_to_callback_url: true
   tunnel:
     public_host_username: 
     public_host: 
@@ -23,6 +26,7 @@ test:
   secret_key: 
   canvas_page_name: 
   callback_url:
+  set_asset_host_to_callback_url: true
   tunnel:
     public_host_username: 
     public_host: 
@@ -33,7 +37,8 @@ production:
   api_key: 
   secret_key: 
   canvas_page_name: 
-  callback_url:  
+  callback_url: 
+  set_asset_host_to_callback_url: true   
   tunnel:
     public_host_username: 
     public_host: 

data/lib/facebooker.rb

@@ -19,37 +19,7 @@ end
 require 'zlib'
 require 'digest/md5'
 
-require 'facebooker/batch_request'
-require 'facebooker/feed'
-require 'facebooker/logging'
-require 'facebooker/model'
-require 'facebooker/parser'
-require 'facebooker/service'
-require 'facebooker/server_cache'
-require 'facebooker/data'
-require 'facebooker/admin'
-require 'facebooker/session'
-require 'facebooker/version'
-require 'facebooker/models/location'
-require 'facebooker/models/affiliation'
-require 'facebooker/models/album'
-require 'facebooker/models/education_info'
-require 'facebooker/models/work_info'
-require 'facebooker/models/event'
-require 'facebooker/models/group'
-require 'facebooker/models/notifications'
-require 'facebooker/models/page'
-require 'facebooker/models/photo'
-require 'facebooker/models/cookie'
-require 'facebooker/models/applicationproperties'
-require 'facebooker/models/tag'
-require 'facebooker/models/user'
-require 'facebooker/models/info_item'
-require 'facebooker/models/info_section'
-require 'facebooker/adapters/adapter_base'
-require 'facebooker/adapters/facebook_adapter'
-require 'facebooker/adapters/bebo_adapter'
-require 'facebooker/models/friend_list'
+
 
 module Facebooker
       
@@ -66,8 +36,12 @@ module Facebooker
         ENV['FACEBOOK_SECRET_KEY'] = facebooker['secret_key']
         ENV['FACEBOOKER_RELATIVE_URL_ROOT'] = facebooker['canvas_page_name']
         ENV['FACEBOOKER_API'] = facebooker['api']
+        if facebooker.has_key?('set_asset_host_to_callback_url')
+          Facebooker.set_asset_host_to_callback_url = facebooker['set_asset_host_to_callback_url'] 
+        end
+        Facebooker.timeout = facebooker['timeout']
         if Object.const_defined?("ActionController")
-          ActionController::Base.asset_host = facebooker['callback_url'] if(ActionController::Base.asset_host.blank?)
+          ActionController::Base.asset_host = facebooker['callback_url'] if(ActionController::Base.asset_host.blank?)  && Facebooker.set_asset_host_to_callback_url
         end
         @facebooker_configuration = facebooker
       end
@@ -102,7 +76,29 @@ module Facebooker
       current_adapter.is_for?(application_container)
     end
     
-   
+    def set_asset_host_to_callback_url=(val)
+      @set_asset_host_to_callback_url=val
+    end
+    
+    def set_asset_host_to_callback_url
+      @set_asset_host_to_callback_url.nil? ? true : @set_asset_host_to_callback_url
+    end
+    
+    def use_curl=(val)
+      @use_curl=val
+    end
+    
+    def use_curl?
+      @use_curl
+    end
+    
+    def timeout=(val)
+      @timeout = val.to_i
+    end
+    
+    def timeout
+      @timeout
+    end
    
     [:api_key,:secret_key, :www_server_base_url,:login_url_base,:install_url_base,:api_rest_path,:api_server_base,:api_server_base_url,:canvas_server_base].each do |delegated_method|
       define_method(delegated_method){ return current_adapter.send(delegated_method)}
@@ -141,3 +137,35 @@ module Facebooker
     end
   end
 end
+
+require 'facebooker/batch_request'
+require 'facebooker/feed'
+require 'facebooker/logging'
+require 'facebooker/model'
+require 'facebooker/parser'
+require 'facebooker/service'
+require 'facebooker/server_cache'
+require 'facebooker/data'
+require 'facebooker/admin'
+require 'facebooker/session'
+require 'facebooker/version'
+require 'facebooker/models/location'
+require 'facebooker/models/affiliation'
+require 'facebooker/models/album'
+require 'facebooker/models/education_info'
+require 'facebooker/models/work_info'
+require 'facebooker/models/event'
+require 'facebooker/models/group'
+require 'facebooker/models/notifications'
+require 'facebooker/models/page'
+require 'facebooker/models/photo'
+require 'facebooker/models/cookie'
+require 'facebooker/models/applicationproperties'
+require 'facebooker/models/tag'
+require 'facebooker/models/user'
+require 'facebooker/models/info_item'
+require 'facebooker/models/info_section'
+require 'facebooker/adapters/adapter_base'
+require 'facebooker/adapters/facebook_adapter'
+require 'facebooker/adapters/bebo_adapter'
+require 'facebooker/models/friend_list'

data/lib/facebooker/models/user.rb

@@ -10,7 +10,7 @@ module Facebooker
       include Model
       attr_accessor :message, :time, :status_id
     end
-    FIELDS = [:status, :political, :pic_small, :name, :quotes, :is_app_user, :tv, :profile_update_time, :meeting_sex, :hs_info, :timezone, :relationship_status, :hometown_location, :about_me, :wall_count, :significant_other_id, :pic_big, :music, :uid, :work_history, :sex, :religion, :notes_count, :activities, :pic_square, :movies, :has_added_app, :education_history, :birthday, :first_name, :meeting_for, :last_name, :interests, :current_location, :pic, :books, :affiliations, :locale, :profile_url, :proxied_email]
+    FIELDS = [:status, :political, :pic_small, :name, :quotes, :is_app_user, :tv, :profile_update_time, :meeting_sex, :hs_info, :timezone, :relationship_status, :hometown_location, :about_me, :wall_count, :significant_other_id, :pic_big, :music, :uid, :work_history, :sex, :religion, :notes_count, :activities, :pic_square, :movies, :has_added_app, :education_history, :birthday, :first_name, :meeting_for, :last_name, :interests, :current_location, :pic, :books, :affiliations, :locale, :profile_url, :proxied_email,:email_hashes]
     STANDARD_FIELDS = [:uid, :first_name, :last_name, :name, :timezone, :birthday, :sex, :affiliations, :locale, :profile_url]
     attr_accessor :id, :session
     populating_attr_accessor *FIELDS
@@ -86,7 +86,9 @@ module Facebooker
       
      	#use __blank instead of nil so that this is cached
      	cache_key = flid||"__blank"
-     	@friends_hash[cache_key] ||= @session.post('facebook.friends.get', (flid.nil? ? {} : {:flid => flid})).map do |uid|
+     	options = {:uid=>@id}
+     	options[:flid] = flid unless flid.nil?
+     	@friends_hash[cache_key] ||= @session.post('facebook.friends.get', options,false).map do |uid|
           User.new(uid, @session)
       end
       @friends_hash[cache_key]
@@ -169,8 +171,35 @@ module Facebooker
       session.get_photos(nil, nil, profile_pic_album_id)
     end
     
-    def upload_photo(multipart_post_file)
-      Photo.from_hash(session.post_file('facebook.photos.upload', {nil => multipart_post_file}))
+    # Upload a photo to the user's profile.
+    #
+    # In your view, create a multipart form that posts directly to your application (not through canvas):
+    #
+    #   <% form_tag photos_url(:canvas => false), :html => {:multipart => true, :promptpermission => 'photo_upload'} do %>
+    #     Photo: <%= file_field_tag 'photo' %>
+    #     Caption: <%= text_area_tag 'caption' %>
+    #     <%= submit_tag 'Upload Photo', :class => 'inputsubmit' %>
+    #   <% end %>
+    # 
+    # And in your controller: 
+    #
+    #   class PhotosController < ApplicationController
+    #     def create
+    #       file = Net::HTTP::MultipartPostFile.new(
+    #         params[:photo].original_filename,
+    #         params[:photo].content_type,
+    #         params[:photo].read
+    #       )
+    #     
+    #       @photo = facebook_session.user.upload_photo(file, :caption => params[:caption])
+    #       redirect_to photos_url(:canvas => true)
+    #     end
+    #   end
+    #
+    # Options correspond to http://wiki.developers.facebook.com/index.php/Photos.upload
+    def upload_photo(multipart_post_file, options = {})
+      Photo.from_hash(session.post_file('facebook.photos.upload',
+        options.merge(nil => multipart_post_file)))
     end
     
     def profile_fbml

data/lib/facebooker/rails/controller.rb

@@ -73,9 +73,12 @@ module Facebooker
       end
       
       def clear_fb_cookies!
-        fb_cookie_names.each {|name| cookies[name] = nil }
+        domain_cookie_tag = "base_domain_#{Facebooker.api_key}"
+        cookie_domain = ".#{cookies[domain_cookie_tag]}" if cookies[domain_cookie_tag]
+        fb_cookie_names.each {|name| cookies.delete(name, :domain=>cookie_domain)}
+        cookies.delete Facebooker.api_key
       end
-      
+
       def fb_cookie_prefix
         Facebooker.api_key+"_"
       end
@@ -190,7 +193,11 @@ module Facebooker
       end
       
       def request_comes_from_facebook?
-        request_is_for_a_facebook_canvas? || request_is_facebook_ajax?
+        request_is_for_a_facebook_canvas? || request_is_facebook_ajax? || request_is_fb_ping?
+      end
+
+      def request_is_fb_ping?
+        !params['fb_sig'].blank?
       end
       
       def request_is_for_a_facebook_canvas?

data/lib/facebooker/rails/facebook_url_helper.rb

@@ -0,0 +1,191 @@
+# Extends the ActionView::Helpers::UrlHelper module.  See it for details on
+# the usual url helper methods: url_for, link_to, button_to, etc.  
+#
+# Mostly, the changes sanitize javascript into facebook javascript.  
+# It sanitizes link_to solely by altering the private methods: 
+# convert_options_to_javascript!, confirm_javascript_function, and 
+# method_javascript_function.  For button_to, it alters button_to
+# itself, as well as confirm_javascript_function.  No other methods 
+# need to be changed because of Facebook javascript.
+#
+# For button_to and link_to, adds alternate confirm options for facebook.
+# ==== Options
+# * <tt>:confirm => 'question?'</tt> - This will add a JavaScript confirm
+#   prompt with the question specified.
+#
+#   Example:
+#     # Generates: <a href="http://rubyforge.org/projects/facebooker" onclick="
+#     #			var dlg = new Dialog().showChoice('Please Confirm', 'Go to Facebooker?').setStyle();
+#     #			var a=this;dlg.onconfirm = function() {
+#     #		          document.setLocation(a.getHref()); 
+#     #			}; return false;">Facebooker</a>
+#     link_to("Facebooker", "http://rubyforge.org/projects/facebooker", :confirm=>"Go to Facebooker?")
+#
+#   Alternatively, options[:confirm] may be specified.  
+#   See the Facebook page http://wiki.developers.facebook.com/index.php/FBJS.
+#   These options are:
+#   <tt>:title</tt>::       Specifies the title of the Facebook dialog. Default is "Please Confirm".
+#   <tt>:content</tt>::       Specifies the title of the Facebook dialog. Default is "Are you sure?".
+#
+#   Example:
+#     # Generates: <a href="http://rubyforge.org/projects/facebooker" onclick="
+#     #			var dlg = new Dialog().showChoice('the page says:', 'Go to Facebooker?').setStyle();
+#     #			var a=this;dlg.onconfirm = function() {
+#     #		          document.setLocation(a.getHref()); 
+#     #			}; return false;">Facebooker</a>
+#     link_to("Facebooker", "http://rubyforge.org/projects/facebooker", :confirm=>{:title=>"the page says:", :content=>"Go to Facebooker?"})
+#
+#   Any other options passed are assumed to be css styles.
+#   Again, see the Facebook page http://wiki.developers.facebook.com/index.php/FBJS.
+#
+#   Example:
+#     # Generates: <a href="http://rubyforge.org/projects/facebooker" onclick="
+#     #			var dlg = new Dialog().showChoice('the page says:', 'Are you sure?').setStyle({color: 'pink', width: '200px'});
+#     #			var a=this;dlg.onconfirm = function() {
+#     #		          document.setLocation(a.getHref()); 
+#     #			}; return false;">Facebooker</a>
+#     link_to("Facebooker", "http://rubyforge.org/projects/facebooker", :confirm=>{:title=>"the page says:, :color=>"pink", :width=>"200px"})
+module ActionView
+  module Helpers
+    module UrlHelper
+      # Alters one and only one line of the Rails button_to.  See below.
+      def button_to_with_facebooker(name, options={}, html_options = {})
+        if !request_comes_from_facebook?
+           button_to_without_facebooker(name,options,html_options)
+        else
+          html_options = html_options.stringify_keys
+          convert_boolean_attributes!(html_options, %w( disabled ))
+
+          method_tag = ''
+          if (method = html_options.delete('method')) && %w{put delete}.include?(method.to_s)
+            method_tag = tag('input', :type => 'hidden', :name => '_method', :value => method.to_s)
+          end
+
+          form_method = method.to_s == 'get' ? 'get' : 'post'
+        
+          request_token_tag = ''
+          if form_method == 'post' && protect_against_forgery?
+            request_token_tag = tag(:input, :type => "hidden", :name => request_forgery_protection_token.to_s, :value => form_authenticity_token)
+          end
+        
+          if confirm = html_options.delete("confirm")
+            # this line is the only change => html_options["onclick"] = "return #{confirm_javascript_function(confirm)}"
+            html_options["onclick"] = "#{confirm_javascript_function(confirm, 'a.getForm().submit();')}return false;"
+          end
+
+          url = options.is_a?(String) ? options : self.url_for(options)
+          name ||= url
+ 
+          html_options.merge!("type" => "submit", "value" => name)
+
+          "<form method=\"#{form_method}\" action=\"#{escape_once url}\" class=\"button-to\"><div>" +
+            method_tag + tag("input", html_options) + request_token_tag + "</div></form>"
+        end
+      end
+
+      alias_method_chain :button_to, :facebooker
+
+      private
+
+	# Altered to throw an error on :popup and sanitize the javascript
+	# for Facebook.
+        def convert_options_to_javascript_with_facebooker!(html_options, url ='')
+          if !request_comes_from_facebook?
+            convert_options_to_javascript_without_facebooker!(html_options,url)
+   	  else
+            confirm, popup = html_options.delete("confirm"), html_options.delete("popup")
+
+            method, href = html_options.delete("method"), html_options['href']
+
+            html_options["onclick"] = case
+              when popup
+                raise ActionView::ActionViewError, "You can't use :popup"
+              when method # or maybe (confirm and method)
+                "#{method_javascript_function(method, url, href, confirm)}return false;"
+              when confirm # and only confirm
+                "#{confirm_javascript_function(confirm)}return false;"
+              else
+                html_options["onclick"]
+            end
+ 	  end
+        end
+
+	alias_method_chain :convert_options_to_javascript!, :facebooker
+
+
+	# Overrides a private method that link_to calls via convert_options_to_javascript! and
+	# also, button_to calls directly.  For Facebook, confirm can be a hash of options to 
+	# stylize the Facebook dialog.  Takes :title, :content, :style options.  See
+	# the Facebook page http://wiki.developers.facebook.com/index.php/FBJS for valid
+	# style formats like "color: 'black', background: 'white'" or like "'color','black'".
+	#
+	# == Examples ==
+	#
+	# link_to("Facebooker", "http://rubyforge.org/projects/facebooker", :confirm=>"Go to Facebooker?")
+	# link_to("Facebooker", "http://rubyforge.org/projects/facebooker", :confirm=>{:title=>"the page says:, :content=>"Go to Facebooker?"})
+	# link_to("Facebooker", "http://rubyforge.org/projects/facebooker", :confirm=>{:title=>"the page says:, :content=>"Go to Facebooker?", :color=>"pink"})
+        def confirm_javascript_function_with_facebooker(confirm, fun = nil)
+          if !request_comes_from_facebook?
+            confirm_javascript_function_without_facebooker(confirm)
+ 	  else
+  	    if(confirm.is_a?(Hash))
+                confirm_options = confirm.stringify_keys
+		title = confirm_options.delete("title") || "Please Confirm"
+		content = confirm_options.delete("content") || "Are you sure?"
+		style = confirm_options.empty? ? "" : convert_options_to_css(confirm_options)
+  	    else
+	      title,content,style = 'Please Confirm', confirm, ""
+	    end
+
+            "var dlg = new Dialog().showChoice('#{escape_javascript(title.to_s)}','#{escape_javascript(content.to_s)}').setStyle(#{style});"+
+	    "var a=this;dlg.onconfirm = function() { #{fun ? fun : 'document.setLocation(a.getHref());'} };"
+	  end
+        end
+
+	alias_method_chain :confirm_javascript_function, :facebooker
+
+	def convert_options_to_css(options)
+	  key_pair = options.shift
+	  style = "{#{key_pair[0]}: '#{key_pair[1]}'"
+	  for key in options.keys
+	    style << ", #{key}: '#{options[key]}'"
+	  end
+	  style << "}"
+	end
+
+	# Dynamically creates a form for link_to with method.  Calls confirm_javascript_function if and 
+	# only if (confirm && method) for link_to
+        def method_javascript_function_with_facebooker(method, url = '', href = nil, confirm = nil)
+          if !request_comes_from_facebook?
+            method_javascript_function_without_facebooker(method,url,href)
+ 	  else
+            action = (href && url.size > 0) ? "'#{url}'" : 'a.getHref()'
+            submit_function =
+              "var f = document.createElement('form'); f.setStyle('display','none'); " +
+              "a.getParentNode().appendChild(f); f.setMethod('POST'); f.setAction(#{action});"
+
+            unless method == :post
+              submit_function << "var m = document.createElement('input'); m.setType('hidden'); "
+              submit_function << "m.setName('_method'); m.setValue('#{method}'); f.appendChild(m);"
+            end
+
+            if protect_against_forgery?
+              submit_function << "var s = document.createElement('input'); s.setType('hidden'); "
+              submit_function << "s.setName('#{request_forgery_protection_token}'); s.setValue('#{escape_javascript form_authenticity_token}'); f.appendChild(s);"
+            end
+            submit_function << "f.submit();"
+
+	    if(confirm)
+	      confirm_javascript_function(confirm, submit_function)
+  	    else
+	      "var a=this;" + submit_function
+ 	    end
+          end
+	end
+
+	alias_method_chain :method_javascript_function, :facebooker
+
+    end
+  end
+end
+

data/lib/facebooker/rails/helpers.rb

@@ -524,20 +524,52 @@ module Facebooker
       
       #
       # Embed a discussion board named xid on the current page
-      # 
+      # <em>See</em http://wiki.developers.facebook.com/index.php/Fb:board for more details
+      # Options are:
+      #   * canpost
+      #   * candelete
+      #   * canmark
+      #   * cancreatet
+      #   * numtopics
+      #   * callbackurl
+      #   * returnurl
+      #
       def fb_board(xid,options={})
         options = options.dup
-        tag("fb:board",stringify_vals(options.merge(:xid=>xid)))
+        title = (title = options.delete(:title)) ? fb_title(title) : nil
+        content_tag("fb:board", title, stringify_vals(options.merge(:xid=>xid)))
       end
       
+      # Renders an 'Add to Profile' button
+      # The button allows a user to add condensed profile box to the main profile
       def fb_add_profile_section
         tag "fb:add-section-button",:section=>"profile"
       end
       
+      # Renders an 'Add to Info' button
+      # The button allows a user to add an application info section to her Info tab
       def fb_add_info_section
         tag "fb:add-section-button",:section=>"info"
       end
       
+      # Renders a link that, when clicked, initiates a dialog requesting the specified extended permission from the user.
+      # 
+      # You can prompt a user with the following permissions:
+      #   * email
+      #   * offline_access
+      #   * status_update
+      #   * photo_upload
+      #   * create_listing
+      #   * create_event
+      #   * rsvp_event
+      #   * sms
+      # 
+      # 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
+      #
       def fb_prompt_permission(permission,message,callback=nil)
         raise(ArgumentError, "Unknown value for permission: #{permission}") unless VALID_PERMISSIONS.include?(permission.to_sym)
         args={:perms=>permission}
@@ -545,22 +577,29 @@ module Facebooker
         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
       end
       
+      # Renders an <fb:grouplink /> tag that displays the group name and links to the group's page. 
       def fb_grouplink(gid)
         content_tag "fb:grouplink",nil,:gid=>gid
       end
       
+      # Returns the status of the user
       def fb_user_status(user,linked=true)
         content_tag "fb:user-status",nil,stringify_vals(:uid=>cast_to_facebook_id(user), :linked=>linked)
       end
       
+      # Renders a standard 'Share' button for the specified URL.
       def fb_share_button(url)
         content_tag "fb:share-button",nil,:class=>"url",:href=>url
       end
       
+      # Renders the FBML on a Facebook server inside an iframe.
+      #
+      # Meant to be used for a Facebook Connect site or an iframe application
       def fb_serverfbml(options={},&proc)
         inner = capture(&proc)
         concat(content_tag("fb:serverfbml",inner,options),&proc.binding)

data/lib/facebooker/rails/publisher.rb

@@ -174,10 +174,13 @@ module Facebooker
           
           def hashed_content(klass, method)
             publisher = setup_publisher(klass,method)
-            Digest::MD5.hexdigest [publisher.one_line_story_templates, publisher.short_story_templates, publisher.full_story_template].to_json
+            # sort the Hash elements (in the short_story and full_story) before generating MD5
+            Digest::MD5.hexdigest [publisher.one_line_story_templates,
+               (publisher.short_story_templates and publisher.short_story_templates.collect{|ss| ss.to_a.sort_by{|e| e[0]}}),
+               (publisher.full_story_template and publisher.full_story_template.to_a.sort_by{|e| e[0]})
+               ].to_json
           end
           
-          
           def template_name(klass,method)
             "#{klass.name}::#{method}"
           end

data/lib/facebooker/service.rb

@@ -1,4 +1,10 @@
-require 'net/http'
+begin
+  require 'curb'
+  Facebooker.use_curl = true
+rescue Exception=>e
+  puts e
+  require 'net/http'
+end
 require 'facebooker/parser'
 module Facebooker
   class Service
@@ -11,7 +17,7 @@ module Facebooker
     # TODO: support ssl 
     def post(params)
       attempt = 0
-      Parser.parse(params[:method], Net::HTTP.post_form(url, params))
+      Parser.parse(params[:method], post_form(url,params) )
     rescue Errno::ECONNRESET, EOFError
       if attempt == 0
         attempt += 1
@@ -19,13 +25,68 @@ module Facebooker
       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
+    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
+    end
+    
+    def post_multipart_form_with_net_http(url,params)
+      Net::HTTP.post_multipart_form(url, params)
+    end
+    
     def post_file(params)
-      Parser.parse(params[:method], Net::HTTP.post_multipart_form(url, params))
+      Parser.parse(params[:method], post_multipart_form(url, params))
     end
     
     private
     def url
       URI.parse('http://'+ @api_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

data/lib/facebooker/session.rb

@@ -178,8 +178,10 @@ module Facebooker
             Photo.from_hash(hash)
           when 'event_member'
             Event::Attendance.from_hash(hash)
+          else
+            hash
           end
-        end        
+        end
       end
     end
     
@@ -211,13 +213,13 @@ module Facebooker
     end
 
     def users_standard(user_ids, fields=[])
-      post("facebook.users.getStandardInfo",:uids=>user_ids.join(","),:fields=>User.user_fields(fields)) do |users|
+      post("facebook.users.getStandardInfo",:uids=>user_ids.join(","),:fields=>User.standard_fields(fields)) do |users|
         users.map { |u| User.new(u)}
       end
     end
 
     def users(user_ids, fields=[])
-      post("facebook.users.getInfo",:uids=>user_ids.join(","),:fields=>User.standard_fields(fields)) do |users|
+      post("facebook.users.getInfo",:uids=>user_ids.join(","),:fields=>User.user_fields(fields)) do |users|
         users.map { |u| User.new(u)}
       end
     end

data/test/facebook_admin_test.rb

@@ -3,6 +3,7 @@ require File.dirname(__FILE__) + '/test_helper.rb'
 class FacebookAdminTest < Test::Unit::TestCase
   def setup
     @session = Facebooker::Session.create('apikey', 'secretkey')
+    Facebooker.use_curl=false
   end
   
   def test_can_ask_facebook_to_set_app_properties

data/test/facebook_cache_test.rb

@@ -3,6 +3,7 @@ require File.dirname(__FILE__) + '/test_helper.rb'
 class FacebookCacheTest < Test::Unit::TestCase
   def setup
     @session = Facebooker::Session.create('apikey', 'secretkey')
+    Facebooker.use_curl=false
   end
   
   def test_can_ask_facebook_to_store_fbml_in_a_named_reference

data/test/facebook_data_test.rb

@@ -3,6 +3,8 @@ require File.dirname(__FILE__) + '/test_helper.rb'
 class FacebookDataTest < Test::Unit::TestCase
   def setup
     @session = Facebooker::Session.create('apikey', 'secretkey')
+    #make sure we use net::http since that's what the tests expect
+    Facebooker.use_curl=false
   end
   
   def test_can_ask_facebook_to_set_a_cookies

data/test/rails_integration_test.rb

@@ -894,7 +894,10 @@ class RailsHelperTest < Test::Unit::TestCase
     assert_equal "<fb:comments candelete=\"false\" canpost=\"true\" numposts=\"4\" optional=\"false\" xid=\"xxx\"><fb:title>TITLE</fb:title></fb:comments>", @h.fb_comments("xxx",true,false,4,:optional=>false, :title => "TITLE") 
   end
   def test_fb_board
-    assert_equal "<fb:board optional=\"false\" xid=\"xxx\" />", @h.fb_board("xxx",:optional => false) 
+    assert_equal "<fb:board optional=\"false\" xid=\"xxx\"></fb:board>", @h.fb_board("xxx",:optional => false) 
+  end
+  def test_fb_board_with_title
+    assert_equal "<fb:board optional=\"false\" xid=\"xxx\"><fb:title>TITLE</fb:title></fb:board>", @h.fb_board("xxx",:optional=>false, :title => "TITLE") 
   end
   
   def test_fb_dashboard

data/test/session_test.rb

@@ -8,6 +8,7 @@ class SessionTest < Test::Unit::TestCase
     ENV['FACEBOOK_SECRET_KEY'] = '7654321'   
     Facebooker.current_adapter = nil 
     @session = Facebooker::Session.create('whatever', 'doesnotmatterintest')   
+    Facebooker.use_curl=false
   end
 
   def teardown
@@ -574,6 +575,31 @@ class SessionTest < Test::Unit::TestCase
   end
 end
 
+class PostMethodTest < Test::Unit::TestCase
+  
+  def setup
+    Facebooker.use_curl = true
+    Facebooker::Parser.stubs(:parse)
+    @uri = URI.parse("http://api.facebook.com/api")
+    @service = Facebooker::Service.new("a","b","c")
+    @service.stubs("url").returns(@uri)
+  end
+  
+  def teardown
+    Facebooker.use_curl = false
+  end
+  
+  def test_use_curl_makes_post_with_curl
+    @service.expects(:post_form_with_curl).with(@uri,{:method=>"a"})
+    @service.post(:method=>"a")
+  end
+  
+  def test_use_curl_makes_post_file_use_curl_with_multipart
+    @service.expects(:post_form_with_curl).with(@uri,{:method=>"a"},true)
+    @service.post_file(:method=>"a")    
+  end
+end
+
 class CanvasSessionTest < Test::Unit::TestCase
   def setup
     ENV['FACEBOOK_API_KEY'] = '1234567'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: djanowski-facebooker
 version: !ruby/object:Gem::Version 
-  version: 1.0.7
+  version: 1.0.10
 platform: ruby
 authors: 
 - Chad Fowler
@@ -117,6 +117,7 @@ files:
 - lib/facebooker/rails/facebook_pretty_errors.rb
 - lib/facebooker/rails/facebook_request_fix.rb
 - lib/facebooker/rails/facebook_session_handling.rb
+- lib/facebooker/rails/facebook_url_helper.rb
 - lib/facebooker/rails/facebook_url_rewriting.rb
 - lib/facebooker/rails/helpers.rb
 - lib/facebooker/rails/helpers/fb_connect.rb