facebooker 1.0.13 → 1.0.18

data/Manifest.txt

@@ -41,7 +41,6 @@ generators/xd_receiver/xd_receiver_generator.rb
 generators/xd_receiver/templates/xd_receiver.html
 init.rb
 install.rb
-lib/facebooker.rb
 lib/facebooker/adapters/adapter_base.rb
 lib/facebooker/adapters/bebo_adapter.rb
 lib/facebooker/adapters/facebook_adapter.rb
@@ -50,10 +49,14 @@ lib/facebooker/batch_request.rb
 lib/facebooker/data.rb
 lib/facebooker/feed.rb
 lib/facebooker/logging.rb
+lib/facebooker/mock/service.rb
+lib/facebooker/mock/session.rb
+lib/facebooker/mobile.rb
 lib/facebooker/model.rb
 lib/facebooker/models/affiliation.rb
 lib/facebooker/models/album.rb
 lib/facebooker/models/applicationproperties.rb
+lib/facebooker/models/applicationrestrictions.rb
 lib/facebooker/models/cookie.rb
 lib/facebooker/models/education_info.rb
 lib/facebooker/models/event.rb
@@ -67,18 +70,23 @@ lib/facebooker/models/page.rb
 lib/facebooker/models/photo.rb
 lib/facebooker/models/tag.rb
 lib/facebooker/models/user.rb
+lib/facebooker/models/user.rb.orig
+lib/facebooker/models/user.rb.rej
+lib/facebooker/models/video.rb
 lib/facebooker/models/work_info.rb
 lib/facebooker/parser.rb
 lib/facebooker/rails/controller.rb
-lib/facebooker/rails/facebook_asset_path.rb
+lib/facebooker/rails/cucumber/world.rb
+lib/facebooker/rails/cucumber.rb
 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
+lib/facebooker/rails/helpers.rb
+lib/facebooker/rails/integration_session.rb
 lib/facebooker/rails/profile_publisher_extensions.rb
 lib/facebooker/rails/publisher.rb
 lib/facebooker/rails/routing.rb
@@ -87,28 +95,33 @@ lib/facebooker/rails/utilities.rb
 lib/facebooker/server_cache.rb
 lib/facebooker/service.rb
 lib/facebooker/session.rb
+lib/facebooker/session.rb.orig
+lib/facebooker/session.rb.rej
 lib/facebooker/version.rb
+lib/facebooker.rb
 lib/net/http_multipart_post.rb
 lib/tasks/facebooker.rake
 lib/tasks/tunnel.rake
 rails/init.rb
 setup.rb
 templates/layout.erb
-test/adapters_test.rb
-test/batch_request_test.rb
-test/event_test.rb
-test/facebook_admin_test.rb
-test/facebook_cache_test.rb
-test/facebook_data_test.rb
+test/facebooker/adapters_test.rb
+test/facebooker/admin_test.rb
+test/facebooker/batch_request_test.rb
+test/facebooker/data_test.rb
+test/facebooker/logging_test.rb
+test/facebooker/model_test.rb
+test/facebooker/models/event_test.rb
+test/facebooker/models/user_test.rb
+test/facebooker/rails/publisher_test.rb
+test/facebooker/rails_integration_test.rb
+test/facebooker/server_cache_test.rb
+test/facebooker/session_test.rb
 test/facebooker_test.rb
 test/fixtures/multipart_post_body_with_only_parameters.txt
 test/fixtures/multipart_post_body_with_single_file.txt
 test/fixtures/multipart_post_body_with_single_file_that_has_nil_key.txt
-test/http_multipart_post_test.rb
-test/logging_test.rb
-test/model_test.rb
-test/publisher_test.rb
-test/rails_integration_test.rb
-test/session_test.rb
+test/net/http_multipart_post_test.rb
+test/rails_test_helper.rb
 test/test_helper.rb
-test/user_test.rb
+test/facebooker/mobile_test.rb

data/Rakefile

@@ -3,6 +3,12 @@
 require 'rubygems'
 ENV['RUBY_FLAGS']="-I#{%w(lib ext bin test).join(File::PATH_SEPARATOR)}"
 require 'hoe'
+begin
+  require 'load_multi_rails_rake_tasks'
+rescue LoadError
+  $stderr.puts "Install the multi_rails gem to run tests against multiple versions of Rails"
+end
+
  $: << File.dirname(__FILE__) + '/lib'
 require './lib/facebooker.rb'
 
@@ -15,7 +21,7 @@ Hoe.new('facebooker', Facebooker::VERSION::STRING) do |p|
   p.url = p.paragraphs_of('README.txt', 0).first.split(/\n/)[1..-1]
   p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
   p.remote_rdoc_dir = '' # Release to root
-  p.test_globs = 'test/*.rb'
+  p.test_globs = 'test/**/*_test.rb'
   p.extra_deps << ['json', '>= 1.0.0'] 
 end
 
@@ -29,9 +35,10 @@ namespace :test do
   desc 'Aggregate code coverage for unit, functional and integration tests'
   Rcov::RcovTask.new(:coverage) do |t|
     t.libs << "test"
-    t.test_files = FileList["test/*.rb"]
+    t.test_files = FileList["test/**/*_test.rb"]
     t.output_dir = "coverage/"
     t.verbose = true
+    t.rcov_opts = ['--exclude', 'test,/usr/lib/ruby,/Library/Ruby,/System/Library', '--sort', 'coverage']
   end
 end
 

data/generators/facebook/templates/public/javascripts/facebooker.js

@@ -48,14 +48,7 @@ function encodeURIComponent(str) {
 
 var Form = {};
 Form.serialize = function(form_element) {
-  elements=$(form_element).serialize();
-  param_string="";
-  for (var name in elements) {
-    if (param_string) 
-      param_string += "&";
-    param_string += encodeURIComponent(name)+"="+encodeURIComponent(elements[name]);
-  }
-  return param_string;
+  return $(form_element).serialize();
 };
 
 Ajax.Updater = function (container,url,options) {

data/init.rb

@@ -12,7 +12,6 @@ require 'net/http_multipart_post'
 require 'facebooker/rails/controller'
 require 'facebooker/rails/facebook_url_rewriting'
 require 'facebooker/rails/facebook_session_handling'
-require 'facebooker/rails/facebook_asset_path'
 require 'facebooker/rails/facebook_request_fix'
 require 'facebooker/rails/routing'
 require 'facebooker/rails/facebook_pretty_errors' rescue nil
@@ -68,3 +67,6 @@ end
 # pull :canvas=> into env in routing to allow for conditions
 ActionController::Routing::RouteSet.send :include,  Facebooker::Rails::Routing::RouteSetExtensions
 ActionController::Routing::RouteSet::Mapper.send :include, Facebooker::Rails::Routing::MapperExtensions
+
+Mime::Type.register_alias "text/html", :fbml
+Mime::Type.register_alias "text/javascript", :fbjs

data/lib/facebooker.rb

@@ -100,7 +100,7 @@ module Facebooker
       @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|
+    [: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, :video_server_base].each do |delegated_method|
       define_method(delegated_method){ return current_adapter.send(delegated_method)}
     end
     
@@ -147,6 +147,7 @@ require 'facebooker/service'
 require 'facebooker/server_cache'
 require 'facebooker/data'
 require 'facebooker/admin'
+require 'facebooker/mobile'
 require 'facebooker/session'
 require 'facebooker/version'
 require 'facebooker/models/location'
@@ -166,7 +167,8 @@ require 'facebooker/models/tag'
 require 'facebooker/models/user'
 require 'facebooker/models/info_item'
 require 'facebooker/models/info_section'
+require 'facebooker/models/friend_list'
+require 'facebooker/models/video'
 require 'facebooker/adapters/adapter_base'
 require 'facebooker/adapters/facebook_adapter'
 require 'facebooker/adapters/bebo_adapter'
-require 'facebooker/models/friend_list'

data/lib/facebooker/adapters/facebook_adapter.rb

@@ -11,6 +11,10 @@ module Facebooker
        "api.facebook.com"
     end
     
+    def video_server_base
+      "api-video.facebook.com"
+    end
+    
     def www_server_base_url
       "www.facebook.com"
     end

data/lib/facebooker/admin.rb

@@ -15,7 +15,7 @@ module Facebooker
     # +properties+: Hash of properties you want to view.
     def get_app_properties(*properties)
       json = @session.post('facebook.admin.getAppProperties', :properties => properties.to_json)
-      hash = JSON.parse(CGI.unescapeHTML(json))
+      hash = Facebooker.json_decode(CGI.unescapeHTML(json))
       @properties = ApplicationProperties.from_hash(hash)
     end
     
@@ -29,7 +29,7 @@ module Facebooker
     # ** BETA ***
     def get_restriction_info(*restrictions)
       json = @session.post('facebook.admin.getRestrictionInfo')
-      hash = JSON.parse(CGI.unescapeHTML(json))
+      hash = Facebooker.json_decode(CGI.unescapeHTML(json))
       @restrictions = ApplicationRestrictions.from_hash(hash)
     end
   

data/lib/facebooker/mobile.rb

@@ -0,0 +1,20 @@
+module Facebooker
+  class Mobile
+    def initialize(session)
+      @session = session
+    end
+  
+    # Used to determine whether the user identified by "uid" has enabled SMS for this application.
+    def can_send(user)
+      @session.post('facebook.sms.canSend', :uid => User.cast_to_facebook_id(user))
+    end
+    
+    # Send the given message to the user.
+    # See http://wiki.developers.facebook.com/index.php/Mobile
+    def send(user, message)
+      @session.post('facebook.sms.send', 
+        {:uid => User.cast_to_facebook_id(user), 
+        :message => message}, false)
+    end
+  end
+end

data/lib/facebooker/mock/service.rb

@@ -0,0 +1,50 @@
+require 'digest/md5'
+require 'facebooker/service'
+
+module Facebooker
+  # A mock service that reads the Facebook response from fixtures
+  # Adapted from http://gist.github.com/44344
+  #
+  #   Facebooker::MockService.fixture_path = 'path/to/dir'
+  #   Facebooker::Session.current = Facebooker::MockSession.create
+  #
+  class MockService < Service
+    class << self
+      attr_accessor :fixture_path
+    end
+
+    def read_fixture(method, filename, original = nil)
+      path = fixture_path(method, filename)
+      File.read path
+    rescue Errno::ENAMETOOLONG
+      read_fixture(method, hash_fixture_name(filename), filename)
+    rescue Errno::ENOENT => e
+      if File.exists?(fixture_path(method, 'default'))
+        File.read fixture_path(method, 'default')
+      else
+        e.message << "\n(Non-hashed path is #{original})" if original
+        e.message << "\nFacebook API Reference: http://wiki.developers.facebook.com/index.php/#{method.sub(/^facebook\./, '')}#Example_Return_XML"
+        raise e
+      end
+    end
+
+    def post(params)
+      method = params.delete(:method)
+      params.delete_if {|k,_| [:v, :api_key, :call_id, :sig].include?(k) }
+      Parser.parse(method, read_fixture(method, fixture_name(params)))
+    end
+
+  private
+    def fixture_path(method, filename)
+      File.join(self.class.fixture_path, method, "#{filename}.xml")
+    end
+
+    def hash_fixture_name(filename)
+      Digest::MD5.hexdigest(filename)
+    end
+
+    def fixture_name(params)
+      params.map {|*args| args.join('=') }.sort.join('&')
+    end
+  end
+end

data/lib/facebooker/mock/session.rb

@@ -0,0 +1,18 @@
+require 'facebooker/session'
+
+module Facebooker
+  class MockSession < Session
+    def secured?
+      true
+    end
+
+    def secure!
+      @uid = 1
+      true
+    end
+ 
+    def service
+      @service ||= MockService.new(Facebooker.api_server_base, Facebooker.api_rest_path, @api_key)
+    end
+  end
+end

data/lib/facebooker/model.rb

@@ -119,10 +119,10 @@ module Facebooker
     ##
     # Set model's attributes via Hash.  Keys should map directly to the model's attribute names.
     def populate_from_hash!(hash)
-      unless hash.empty?
+      unless hash.nil? || hash.empty?
         hash.each do |key, value|
           set_attr_method = "#{key}="
-          if respond_to?(set_attr_method)
+          if !value.nil? && respond_to?(set_attr_method)
             self.__send__(set_attr_method, value) 
           else
             Facebooker::Logging.log_info("**Warning**, Attempt to set non-attribute: #{key}",hash)
@@ -132,4 +132,4 @@ module Facebooker
       end      
     end    
   end
-end
+end

data/lib/facebooker/models/applicationrestrictions.rb

@@ -0,0 +1,10 @@
+module Facebooker
+
+  class ApplicationRestrictions
+    include Model
+    FIELDS = [ :age, :location, :age_distribution, :type ]
+    
+    attr_accessor *FIELDS
+         
+  end
+end

data/lib/facebooker/models/user.rb

@@ -10,8 +10,8 @@ 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,:email_hashes]
-    STANDARD_FIELDS = [:uid, :first_name, :last_name, :name, :timezone, :birthday, :sex, :affiliations, :locale, :profile_url]
+    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, :allowed_restrictions]
+    STANDARD_FIELDS = [:uid, :first_name, :last_name, :name, :timezone, :birthday, :sex, :affiliations, :locale, :profile_url, :pic_square]
     populating_attr_accessor *FIELDS
     attr_reader :affiliations
     populating_hash_settable_accessor :current_location, Location
@@ -204,6 +204,38 @@ module Facebooker
         options.merge(nil => multipart_post_file)))
     end
     
+    # Upload a video to the user's profile.
+    #
+    # In your view, create a multipart form that posts directly to your application (not through canvas):
+    #
+    #   <% form_tag videos_url(:canvas => false), :html => {:multipart => true, :promptpermission => 'video_upload'} do %>
+    #     Video: <%= file_field_tag 'video' %>
+    #     Title: <%= text_area_tag 'title' %>
+    #     Description: <%= text_area_tag 'description' %>
+    #     <%= submit_tag 'Upload Video', :class => 'inputsubmit' %>
+    #   <% end %>
+    # 
+    # And in your controller: 
+    #
+    #   class VideosController < ApplicationController
+    #     def create
+    #       file = Net::HTTP::MultipartPostFile.new(
+    #         params[:photo].original_filename,
+    #         params[:photo].content_type,
+    #         params[:photo].read
+    #       )
+    #     
+    #       @video = facebook_session.user.upload_video(file, :description => params[:description])
+    #       redirect_to videos_url(:canvas => true)
+    #     end
+    #   end
+    #
+    # Options correspond to http://wiki.developers.facebook.com/index.php/Video.upload
+    def upload_video(multipart_post_file, options = {})
+      Video.from_hash(session.post_file('facebook.video.upload',
+        options.merge(nil => multipart_post_file, :base => Facebooker.video_server_base)))
+    end
+    
     def profile_fbml
       session.post('facebook.profile.getFBML', :uid => id)  
     end    
@@ -314,7 +346,7 @@ module Facebooker
     ##
     # Two Facebooker::User objects should be considered equal if their Facebook ids are equal
     def ==(other_user)
-      id == other_user.id
+      other_user.is_a?(User) && id == other_user.id
     end
     
     

data/lib/facebooker/models/user.rb.orig

@@ -0,0 +1,396 @@
+require 'facebooker/model'
+require 'facebooker/models/affiliation'
+require 'facebooker/models/work_info'
+module Facebooker
+  # 
+  # Holds attributes and behavior for a Facebook User
+  class User
+    include Model
+    class Status
+      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]
+    STANDARD_FIELDS = [:uid, :first_name, :last_name, :name, :timezone, :birthday, :sex, :affiliations, :locale, :profile_url]
+    attr_accessor :id, :session
+    populating_attr_accessor *FIELDS
+    attr_reader :affiliations
+    populating_hash_settable_accessor :current_location, Location
+    populating_hash_settable_accessor :hometown_location, Location
+    populating_hash_settable_accessor :hs_info, EducationInfo::HighschoolInfo
+    populating_hash_settable_accessor :status, Status
+    populating_hash_settable_list_accessor :affiliations, Affiliation
+    populating_hash_settable_list_accessor :education_history, EducationInfo
+    populating_hash_settable_list_accessor :work_history, WorkInfo
+    
+    # Can pass in these two forms:
+    # id, session, (optional) attribute_hash
+    # attribute_hash
+    def initialize(*args)
+      if (args.first.kind_of?(String) || args.first.kind_of?(Integer)) && args.size==1
+        @id=Integer(args.shift)
+        @session = Session.current
+      elsif (args.first.kind_of?(String) || args.first.kind_of?(Integer)) && args[1].kind_of?(Session)
+        @id = Integer(args.shift)
+        @session = args.shift
+      end
+      if args.last.kind_of?(Hash)
+        populate_from_hash!(args.pop)
+      end     
+    end
+
+    # Returns a user's events, params correspond to API call parameters (except UID):
+    # http://wiki.developers.facebook.com/index.php/Events.get
+    # E.g:
+    #  @user.events(:start_time => Time.now, :end_time => 1.month.from_now)
+    #  # => Returns events betwen now and a month from now
+    def events(params={})
+      @events ||= {}
+      [:start_time,:end_time].compact.each do |key|
+        params[key] = params[key].to_i
+      end
+#      puts @events[params.to_s].nil?
+      @events[params.to_s] ||= @session.post('facebook.events.get', {:uid => self.id}.merge(params)).map do |event|
+        Event.from_hash(event)
+      end
+    end    
+    
+    # 
+    # Set the list of friends, given an array of User objects.  If the list has been retrieved previously, will not set
+    def friends=(list_of_friends,flid=nil)
+      @friends_hash ||= {}
+     	flid=cast_to_friend_list_id(flid)
+     	#use __blank instead of nil so that this is cached
+     	cache_key = flid||"__blank"
+     	
+      @friends_hash[cache_key] ||= list_of_friends
+    end
+    
+    def cast_to_friend_list_id(flid)
+      case flid
+ 	    when String
+ 	      list=friend_lists.detect {|f| f.name==flid}
+ 	      raise Facebooker::Session::InvalidFriendList unless list
+ 	      list.flid
+ 	    when FriendList
+ 	      flid.flid
+ 	    else
+ 	      flid
+ 	    end
+ 	  end
+    ##
+    # Retrieve friends
+    def friends(flid = nil)
+     	@friends_hash ||= {}
+     	flid=cast_to_friend_list_id(flid)
+      
+     	#use __blank instead of nil so that this is cached
+     	cache_key = flid||"__blank"
+     	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]
+    end
+    
+     def friend_lists    
+       @friend_lists ||= @session.post('facebook.friends.getLists').map do |hash|
+         friend_list = FriendList.from_hash(hash)                               
+         friend_list.session = session                                          
+         friend_list                                                            
+       end                                                                      
+     end
+    ###
+    # Retrieve friends with user info populated
+    # Subsequent calls will be retrieved from memory.
+    # Optional: list of fields to retrieve as symbols
+    def friends!(*fields)
+      @friends ||= session.post('facebook.users.getInfo', :fields => collect(fields), :uids => friends.map{|f| f.id}.join(',')).map do |hash|  
+        User.new(hash['uid'], session, hash)
+      end
+    end
+    
+    ###
+    # Retrieve profile data for logged in user
+    # Optional: list of fields to retrieve as symbols
+    def populate(*fields)
+      session.post('facebook.users.getInfo', :fields => collect(fields), :uids => id) do |response|
+        populate_from_hash!(response.first)
+      end
+    end
+        
+    def friends_with?(user_or_id)
+      friends.map{|f| f.to_i}.include?(user_or_id.to_i)  
+    end
+    
+    def friends_with_this_app
+      @friends_with_this_app ||= session.post('facebook.friends.getAppUsers').map do |uid|
+        User.new(uid, session)
+      end
+    end
+    
+    def groups(gids = [])
+      args = gids.empty? ? {} : {:gids => gids}
+      @groups ||= session.post('facebook.groups.get', args).map do |hash|
+        group = Group.from_hash(hash)
+        group.session = session
+        group
+      end
+    end
+    
+    def notifications
+      @notifications ||= Notifications.from_hash(session.post('facebook.notifications.get'))
+    end
+    
+    def publish_story(story)
+      publish(story)
+    end
+    
+    def publish_action(action)
+      publish(action)
+    end
+    
+    def publish_templatized_action(action)
+      publish(action)
+    end
+    
+    def albums
+      @albums ||= session.post('facebook.photos.getAlbums', :uid => self.id) do |response|
+        response.map do |hash|
+          Album.from_hash(hash)
+        end
+      end
+    end
+    
+    def create_album(params)
+      @album = session.post('facebook.photos.createAlbum', params) {|response| Album.from_hash(response)}
+    end
+    
+    def profile_photos
+      session.get_photos(nil, nil, profile_pic_album_id)
+    end
+    
+    # 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
+      session.post('facebook.profile.getFBML', :uid => @id)  
+    end    
+    
+    ##
+    # Set the profile FBML for this user
+    #
+    # This does not set profile actions, that should be done with profile_action=
+    def profile_fbml=(markup)
+      set_profile_fbml(markup, nil, nil)
+    end
+    
+    ##
+    # Set the mobile profile FBML
+    def mobile_fbml=(markup)
+      set_profile_fbml(nil, markup, nil)
+    end
+    
+    def profile_action=(markup)
+      set_profile_fbml(nil, nil, markup)
+    end
+    
+    def profile_main=(markup)
+     set_profile_fbml(nil,nil,nil,markup)
+    end
+    
+    def set_profile_fbml(profile_fbml, mobile_fbml, profile_action_fbml, profile_main = nil)
+      parameters = {:uid => @id}
+      parameters[:profile] = profile_fbml if profile_fbml
+      parameters[:profile_action] = profile_action_fbml if profile_action_fbml
+      parameters[:mobile_profile] = mobile_fbml if mobile_fbml
+      parameters[:profile_main] = profile_main if profile_main
+      session.post('facebook.profile.setFBML', parameters,false)
+    end
+    
+    ## ** NEW PROFILE DESIGN ***
+    # Set a info section for this user
+    #
+    # Note: using set_profile_info as I feel using user.set_info could be confused with the user.getInfo facebook method.
+    #       Also, I feel it fits in line with user.set_profile_fbml.
+    def set_profile_info(title, info_fields, format = :text)
+      session.post('facebook.profile.setInfo', :title => title, :uid => @id, 
+        :type => format.to_s == "text" ? 1 : 5, :info_fields => info_fields.to_json)
+    end
+    
+    def get_profile_info
+      session.post('facebook.profile.getInfo', :uid => @id)
+    end
+    
+    ##
+    # This DOES NOT set the status of a user on Facebook
+    # Use the set_status method instead
+    def status=(message)
+      case message
+      when String,Status
+        @status = message
+      when Hash
+        @status = Status.from_hash(message)
+      end
+    end
+    
+    ##
+    # Set the status for a user
+    # DOES NOT prepend "is" to the message
+    #
+    # requires extended permission. 
+    def set_status(message)
+      self.status=message
+      session.post('facebook.users.setStatus',:status=>message,:status_includes_verb=>1) do |ret|
+        ret
+      end
+    end
+    
+    ##
+    # Checks to see if the user has enabled the given extended permission
+    def has_permission?(ext_perm) # ext_perm = email, offline_access, status_update, photo_upload, create_listing, create_event, rsvp_event, sms
+      session.post('facebook.users.hasAppPermission',:ext_perm=>ext_perm) == "1"
+    end    
+    
+    ##
+    # Convenience method to send email to the current user
+    def send_email(subject, text=nil, fbml=nil)
+      session.send_email([@id], subject, text, fbml)
+    end
+    
+    ##
+    # Convenience method to set cookie for the current user
+    def set_cookie(name, value, expires=nil, path=nil)
+      session.data.set_cookie(@id, name, value, expires, path)
+    end
+    
+    ##
+    # Convenience method to get cookies for the current user
+    def get_cookies(name=nil)
+      session.data.get_cookies(@id, name)
+    end
+    
+    ##
+    # Returns the user's id as an integer
+    def to_i
+      id
+    end
+    
+    def to_s
+      id.to_s
+    end
+    
+    ##
+    # Two Facebooker::User objects should be considered equal if their Facebook ids are equal
+    def ==(other_user)
+      id == other_user.id
+    end
+    
+    
+    # register a user with Facebook
+    # users should be a hast with at least an :email field
+    # you can optionally provide an :account_id field as well
+        
+    def self.register(users)
+      user_map={}
+      users=users.map do |h|
+        returning h.dup do |d|
+          if email=d.delete(:email)
+            hash = hash_email(email)
+            user_map[hash]=h
+            d[:email_hash]=hash
+          end
+        end
+      end
+      Facebooker::Session.create.post("facebook.connect.registerUsers",:accounts=>users.to_json) do |ret|
+        ret.each do |hash|
+          user_map.delete(hash)
+        end
+        unless user_map.empty?
+          e=Facebooker::Session::UserRegistrationFailed.new
+          e.failed_users = user_map.values
+          raise e
+        end
+        ret
+      end
+    end
+    
+    def self.hash_email(email)
+      email = email.downcase.strip
+      crc=Zlib.crc32(email)
+      md5=Digest::MD5.hexdigest(email)
+      "#{crc}_#{md5}"
+    end
+    
+    def self.cast_to_facebook_id(object)
+      if object.respond_to?(:facebook_id)
+        object.facebook_id
+      else
+        object
+      end
+    end
+    
+    def facebook_id
+      @id
+    end
+    
+    def self.user_fields(fields = [])
+      valid_fields(fields)
+    end
+    
+    def self.standard_fields(fields = [])
+      valid_fields(fields,STANDARD_FIELDS)
+    end
+    
+    private
+    def publish(feed_story_or_action)
+      session.post(Facebooker::Feed::METHODS[feed_story_or_action.class.name.split(/::/).last], feed_story_or_action.to_params) == "1" ? true : false
+    end
+    
+    def self.valid_fields(fields, allowable=FIELDS)
+      allowable.reject{|field_name| !fields.empty? && !fields.include?(field_name)}.join(',')
+    end
+    
+    def collect(fields, allowable=FIELDS)
+      allowable.reject{|field_name| !fields.empty? && !fields.include?(field_name)}.join(',')
+    end
+    
+    def profile_pic_album_id
+      merge_aid(-3, @id)
+    end
+    
+    def merge_aid(aid, uid)
+      (uid << 32) + (aid & 0xFFFFFFFF)
+    end
+    
+  end
+end