facebooker 1.0.44 → 1.0.48

data/Manifest.txt

@@ -38,6 +38,7 @@ generators/facebook_scaffold/templates/view_new.html.erb
 generators/facebook_scaffold/templates/view_show.fbml.erb
 generators/facebook_scaffold/templates/view_show.html.erb
 generators/publisher/publisher_generator.rb
+generators/xd_receiver/templates/xd_receiver_ssl.html
 generators/xd_receiver/templates/xd_receiver.html
 generators/xd_receiver/xd_receiver_generator.rb
 init.rb

data/Rakefile

@@ -1,5 +1,5 @@
 # -*- ruby -*-
-# 
+#
 require 'rubygems'
 require 'hoe'
 begin
@@ -8,36 +8,45 @@ 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'
+require 'lib/facebooker/version'
+
+HOE = Hoe.spec('facebooker') do
+  self.version = Facebooker::VERSION::STRING
+  self.rubyforge_name = 'facebooker'
+  developer 'Chad Fowler',    'chad@chadfowlwer.com'
+  developer 'Patrick Ewing',  ''
+  developer 'Mike Mangino',   ''
+  developer 'Shane Vitarana', ''
+  developer 'Corey Innis',    ''
+  developer 'Mike Mangino',   'mmangino@elevatedrails.com'
 
-HOE = Hoe.new('facebooker', Facebooker::VERSION::STRING) do |p|
-  p.rubyforge_name = 'facebooker'
-  p.author = ['Chad Fowler', 'Patrick Ewing', 'Mike Mangino', 'Shane Vitarana', 'Corey Innis']
-  p.email = 'mmangino@elevatedrails.com'
-  p.readme_file   = 'README.rdoc'
-  p.history_file  = 'CHANGELOG.rdoc'
-  p.remote_rdoc_dir = '' # Release to root
-  p.test_globs = 'test/**/*_test.rb'
-  p.extra_deps << ['json', '>= 1.0.0']
-  p.extra_rdoc_files  = FileList['*.rdoc']
+  self.readme_file   = 'README.rdoc'
+  self.history_file  = 'CHANGELOG.rdoc'
+  self.remote_rdoc_dir = '' # Release to root
+  self.test_globs = 'test/**/*_test.rb'
+  extra_deps << ['json', '>= 1.0.0']
+  self.extra_rdoc_files  = FileList['*.rdoc']
 end
 
-require 'rcov/rcovtask'
+begin
+  require 'rcov/rcovtask'
 
-namespace :test do
-  namespace :coverage do
-    desc "Delete aggregate coverage data."
-    task(:clean) { rm_f "coverage.data" }
-  end
-  desc 'Aggregate code coverage for unit, functional and integration tests'
-  Rcov::RcovTask.new(:coverage) do |t|
-    t.libs << "test"
-    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']
+  namespace :test do
+    namespace :coverage do
+      desc "Delete aggregate coverage data."
+      task(:clean) { rm_f "coverage.data" }
+    end
+    desc 'Aggregate code coverage for unit, functional and integration tests'
+    Rcov::RcovTask.new(:coverage) do |t|
+      t.libs << "test"
+      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
+rescue LoadError
+  $stderr.puts "Install the rcov gem to enable test coverage analysis"
 end
 
 namespace :gem do

data/facebooker.gemspec

@@ -2,20 +2,20 @@
 
 Gem::Specification.new do |s|
   s.name = %q{facebooker}
-  s.version = "1.0.44"
+  s.version = "1.0.48"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Chad Fowler", "Patrick Ewing", "Mike Mangino", "Shane Vitarana", "Corey Innis"]
-  s.date = %q{2009-07-23}
+  s.authors = ["Chad Fowler", "Patrick Ewing", "Mike Mangino", "Shane Vitarana", "Corey Innis", "Mike Mangino"]
+  s.date = %q{2009-08-26}
   s.description = %q{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)
 * Concrete classes and methods modeling the Facebook data, so it's easy for a Rubyist to understand what's available
 * Well tested}
-  s.email = %q{mmangino@elevatedrails.com}
+  s.email = ["chad@chadfowlwer.com", "", "", "", "", "mmangino@elevatedrails.com"]
   s.extra_rdoc_files = ["Manifest.txt", "CHANGELOG.rdoc", "COPYING.rdoc", "README.rdoc", "TODO.rdoc"]
-  s.files = [".autotest", "CHANGELOG.rdoc", "COPYING.rdoc", "Manifest.txt", "README.rdoc", "Rakefile", "TODO.rdoc", "examples/desktop_login.rb", "facebooker.gemspec", "generators/facebook/facebook_generator.rb", "generators/facebook/templates/config/facebooker.yml", "generators/facebook/templates/public/javascripts/facebooker.js", "generators/facebook_controller/USAGE", "generators/facebook_controller/facebook_controller_generator.rb", "generators/facebook_controller/templates/controller.rb", "generators/facebook_controller/templates/functional_test.rb", "generators/facebook_controller/templates/helper.rb", "generators/facebook_controller/templates/view.fbml.erb", "generators/facebook_controller/templates/view.html.erb", "generators/facebook_publisher/facebook_publisher_generator.rb", "generators/facebook_publisher/templates/create_facebook_templates.rb", "generators/facebook_publisher/templates/publisher.rb", "generators/facebook_scaffold/USAGE", "generators/facebook_scaffold/facebook_scaffold_generator.rb", "generators/facebook_scaffold/templates/controller.rb", "generators/facebook_scaffold/templates/facebook_style.css", "generators/facebook_scaffold/templates/functional_test.rb", "generators/facebook_scaffold/templates/helper.rb", "generators/facebook_scaffold/templates/layout.fbml.erb", "generators/facebook_scaffold/templates/layout.html.erb", "generators/facebook_scaffold/templates/style.css", "generators/facebook_scaffold/templates/view_edit.fbml.erb", "generators/facebook_scaffold/templates/view_edit.html.erb", "generators/facebook_scaffold/templates/view_index.fbml.erb", "generators/facebook_scaffold/templates/view_index.html.erb", "generators/facebook_scaffold/templates/view_new.fbml.erb", "generators/facebook_scaffold/templates/view_new.html.erb", "generators/facebook_scaffold/templates/view_show.fbml.erb", "generators/facebook_scaffold/templates/view_show.html.erb", "generators/publisher/publisher_generator.rb", "generators/xd_receiver/templates/xd_receiver.html", "generators/xd_receiver/xd_receiver_generator.rb", "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", "lib/facebooker/admin.rb", "lib/facebooker/batch_request.rb", "lib/facebooker/data.rb", "lib/facebooker/feed.rb", "lib/facebooker/logging.rb", "lib/facebooker/mobile.rb", "lib/facebooker/mock/service.rb", "lib/facebooker/mock/session.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", "lib/facebooker/models/friend_list.rb", "lib/facebooker/models/group.rb", "lib/facebooker/models/info_item.rb", "lib/facebooker/models/info_section.rb", "lib/facebooker/models/location.rb", "lib/facebooker/models/notifications.rb", "lib/facebooker/models/page.rb", "lib/facebooker/models/photo.rb", "lib/facebooker/models/tag.rb", "lib/facebooker/models/user.rb", "lib/facebooker/models/video.rb", "lib/facebooker/models/work_info.rb", "lib/facebooker/parser.rb", "lib/facebooker/rails/backwards_compatible_param_checks.rb", "lib/facebooker/rails/controller.rb", "lib/facebooker/rails/cucumber.rb", "lib/facebooker/rails/cucumber/world.rb", "lib/facebooker/rails/extensions/action_controller.rb", "lib/facebooker/rails/extensions/rack_setup.rb", "lib/facebooker/rails/extensions/routing.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_request_fix_2-3.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/integration_session.rb", "lib/facebooker/rails/profile_publisher_extensions.rb", "lib/facebooker/rails/publisher.rb", "lib/facebooker/rails/routing.rb", "lib/facebooker/rails/test_helpers.rb", "lib/facebooker/rails/utilities.rb", "lib/facebooker/server_cache.rb", "lib/facebooker/service.rb", "lib/facebooker/service/base_service.rb", "lib/facebooker/service/curl_service.rb", "lib/facebooker/service/net_http_service.rb", "lib/facebooker/service/typhoeus_service.rb", "lib/facebooker/service/typhoeus_multi_service.rb", "lib/facebooker/session.rb", "lib/facebooker/version.rb", "lib/net/http_multipart_post.rb", "lib/rack/facebook.rb", "lib/tasks/facebooker.rake", "lib/tasks/tunnel.rake", "rails/init.rb", "setup.rb", "templates/layout.erb", "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/mobile_test.rb", "test/facebooker/model_test.rb", "test/facebooker/models/event_test.rb", "test/facebooker/models/page_test.rb", "test/facebooker/models/photo_test.rb", "test/facebooker/models/user_test.rb", "test/facebooker/rails/publisher_test.rb", "test/facebooker/rails_integration_test.rb", "test/facebooker/rails/facebook_request_fix_2-3_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/net/http_multipart_post_test.rb", "test/rack/facebook_test.rb", "test/rails_test_helper.rb", "test/test_helper.rb", "test/facebooker/rails/facebook_url_rewriting_test.rb", "test/facebooker/rails/integration_session_test.rb", "test/facebooker/service_test.rb"]
+  s.files = [".autotest", "CHANGELOG.rdoc", "COPYING.rdoc", "Manifest.txt", "README.rdoc", "Rakefile", "TODO.rdoc", "examples/desktop_login.rb", "facebooker.gemspec", "generators/facebook/facebook_generator.rb", "generators/facebook/templates/config/facebooker.yml", "generators/facebook/templates/public/javascripts/facebooker.js", "generators/facebook_controller/USAGE", "generators/facebook_controller/facebook_controller_generator.rb", "generators/facebook_controller/templates/controller.rb", "generators/facebook_controller/templates/functional_test.rb", "generators/facebook_controller/templates/helper.rb", "generators/facebook_controller/templates/view.fbml.erb", "generators/facebook_controller/templates/view.html.erb", "generators/facebook_publisher/facebook_publisher_generator.rb", "generators/facebook_publisher/templates/create_facebook_templates.rb", "generators/facebook_publisher/templates/publisher.rb", "generators/facebook_scaffold/USAGE", "generators/facebook_scaffold/facebook_scaffold_generator.rb", "generators/facebook_scaffold/templates/controller.rb", "generators/facebook_scaffold/templates/facebook_style.css", "generators/facebook_scaffold/templates/functional_test.rb", "generators/facebook_scaffold/templates/helper.rb", "generators/facebook_scaffold/templates/layout.fbml.erb", "generators/facebook_scaffold/templates/layout.html.erb", "generators/facebook_scaffold/templates/style.css", "generators/facebook_scaffold/templates/view_edit.fbml.erb", "generators/facebook_scaffold/templates/view_edit.html.erb", "generators/facebook_scaffold/templates/view_index.fbml.erb", "generators/facebook_scaffold/templates/view_index.html.erb", "generators/facebook_scaffold/templates/view_new.fbml.erb", "generators/facebook_scaffold/templates/view_new.html.erb", "generators/facebook_scaffold/templates/view_show.fbml.erb", "generators/facebook_scaffold/templates/view_show.html.erb", "generators/publisher/publisher_generator.rb", "generators/xd_receiver/templates/xd_receiver_ssl.html", "generators/xd_receiver/templates/xd_receiver.html", "generators/xd_receiver/xd_receiver_generator.rb", "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", "lib/facebooker/admin.rb", "lib/facebooker/batch_request.rb", "lib/facebooker/data.rb", "lib/facebooker/feed.rb", "lib/facebooker/logging.rb", "lib/facebooker/mobile.rb", "lib/facebooker/mock/service.rb", "lib/facebooker/mock/session.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", "lib/facebooker/models/friend_list.rb", "lib/facebooker/models/group.rb", "lib/facebooker/models/info_item.rb", "lib/facebooker/models/info_section.rb", "lib/facebooker/models/location.rb", "lib/facebooker/models/notifications.rb", "lib/facebooker/models/page.rb", "lib/facebooker/models/photo.rb", "lib/facebooker/models/tag.rb", "lib/facebooker/models/user.rb", "lib/facebooker/models/video.rb", "lib/facebooker/models/work_info.rb", "lib/facebooker/parser.rb", "lib/facebooker/rails/backwards_compatible_param_checks.rb", "lib/facebooker/rails/controller.rb", "lib/facebooker/rails/cucumber.rb", "lib/facebooker/rails/cucumber/world.rb", "lib/facebooker/rails/extensions/action_controller.rb", "lib/facebooker/rails/extensions/rack_setup.rb", "lib/facebooker/rails/extensions/routing.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_request_fix_2-3.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/integration_session.rb", "lib/facebooker/rails/profile_publisher_extensions.rb", "lib/facebooker/rails/publisher.rb", "lib/facebooker/rails/routing.rb", "lib/facebooker/rails/test_helpers.rb", "lib/facebooker/rails/utilities.rb", "lib/facebooker/server_cache.rb", "lib/facebooker/service.rb", "lib/facebooker/service/base_service.rb", "lib/facebooker/service/curl_service.rb", "lib/facebooker/service/net_http_service.rb", "lib/facebooker/service/typhoeus_service.rb", "lib/facebooker/service/typhoeus_multi_service.rb", "lib/facebooker/session.rb", "lib/facebooker/version.rb", "lib/net/http_multipart_post.rb", "lib/rack/facebook.rb", "lib/tasks/facebooker.rake", "lib/tasks/tunnel.rake", "rails/init.rb", "setup.rb", "templates/layout.erb", "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/mobile_test.rb", "test/facebooker/model_test.rb", "test/facebooker/models/event_test.rb", "test/facebooker/models/page_test.rb", "test/facebooker/models/photo_test.rb", "test/facebooker/models/user_test.rb", "test/facebooker/rails/publisher_test.rb", "test/facebooker/rails_integration_test.rb", "test/facebooker/rails/facebook_request_fix_2-3_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/net/http_multipart_post_test.rb", "test/rack/facebook_test.rb", "test/rails_test_helper.rb", "test/test_helper.rb", "test/facebooker/rails/facebook_url_rewriting_test.rb", "test/facebooker/rails/integration_session_test.rb", "test/facebooker/service_test.rb"]
   s.homepage = %q{http://facebooker.rubyforge.org}
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]

data/generators/xd_receiver/templates/xd_receiver_ssl.html

@@ -0,0 +1,10 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" >
+<head>
+    <title>Cross-Domain Receiver Page</title>
+</head>
+<body>
+    <script src="https://www.connect.facebook.com/js/api_lib/v0.4/XdCommReceiver.js" type="text/javascript"></script>
+</body>
+</html>

data/lib/facebooker.rb

@@ -36,14 +36,13 @@ module Facebooker
     class << self
 
     def load_configuration(facebooker_yaml_file)
-      if File.exist?(facebooker_yaml_file)
-        @raw_facebooker_configuration = YAML.load(ERB.new(File.read(facebooker_yaml_file)).result)
-        if defined? RAILS_ENV
-          @raw_facebooker_configuration = @raw_facebooker_configuration[RAILS_ENV]
-        end
-        Thread.current[:fb_api_config] = @raw_facebooker_configuration unless Thread.current[:fb_api_config]
-        apply_configuration(@raw_facebooker_configuration)
+      return false unless File.exist?(facebooker_yaml_file)
+      @raw_facebooker_configuration = YAML.load(ERB.new(File.read(facebooker_yaml_file)).result)
+      if defined? RAILS_ENV
+        @raw_facebooker_configuration = @raw_facebooker_configuration[RAILS_ENV]
       end
+      Thread.current[:fb_api_config] = @raw_facebooker_configuration unless Thread.current[:fb_api_config]
+      apply_configuration(@raw_facebooker_configuration)
     end
 
     # Sets the Facebook environment based on a hash of options. 
@@ -61,7 +60,10 @@ module Facebooker
         ActionController::Base.asset_host = config['callback_url'] 
       end
       Facebooker.timeout = config['timeout']
-      @facebooker_configuration = config
+
+      @facebooker_configuration = config  # must be set before adapter loaded
+      load_adapter(:fb_sig_api_key => config['api_key'])
+      facebooker_config
     end
 
     def facebooker_config
@@ -87,12 +89,30 @@ module Facebooker
           Thread.current[:fb_api_config] = apply_configuration(config)
           yield
         ensure
-          Thread.current[:fb_api_config] = old if old
+          Thread.current[:fb_api_config] = old if old && !old.empty?
           apply_configuration(Thread.current[:fb_api_config])
         end
       end
     end
 
+    def all_api_keys
+      [
+        @raw_facebooker_configuration['api_key']
+      ] + (
+        @raw_facebooker_configuration['alternative_keys'] ?
+        @raw_facebooker_configuration['alternative_keys'].keys :
+        []
+      )
+    end
+
+    def with_all_applications(&block)
+      all_api_keys.each do |current_api_key|
+        with_application(current_api_key) do
+          block.call
+        end
+      end
+    end
+
     def fetch_config_for(api_key)
       if @raw_facebooker_configuration['api_key'] == api_key
         return @raw_facebooker_configuration
@@ -144,7 +164,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, :video_server_base].each do |delegated_method|
+    [:api_key,:secret_key, :www_server_base_url,:login_url_base,:install_url_base,:permission_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
 

data/lib/facebooker/adapters/adapter_base.rb

@@ -12,7 +12,7 @@ module Facebooker
       @facebook_path_prefix = prefix
     end
 
-    def  facebooker_config
+    def facebooker_config
       @config
     end
 

data/lib/facebooker/adapters/facebook_adapter.rb

@@ -44,6 +44,10 @@ module Facebooker
     def install_url_base
       "http://#{www_server_base_url}/install.php?api_key=#{api_key}&v=1.0"
     end
+
+    def permission_url_base
+      "http://#{www_server_base_url}/connect/prompt_permissions.php?api_key=#{api_key}&v=1.0"
+    end
     
   end
   

data/lib/facebooker/batch_request.rb

@@ -1,6 +1,6 @@
 module Facebooker
   class BatchRequest
-    instance_methods.each { |m| undef_method m unless m =~ /(^__|^nil\?$|^send$|proxy_|^respond_to\?$|^new$)/ }
+    instance_methods.each { |m| undef_method m unless m =~ /(^__|^nil\?$|^send$|proxy_|^respond_to\?$|^new|object_id$)/ }
     attr_reader :uri
     attr_reader :method
     class UnexecutedRequest < StandardError; end

data/lib/facebooker/models/page.rb

@@ -26,7 +26,7 @@ module Facebooker
     end
 
     include Model
-    attr_accessor :page_id, :name, :pic_small, :pic_big, :pic_square, :pic_large, :type, :type, :website, :location, :hours, :band_members, :bio, :hometown, :record_label, :influences, :has_added_app, :founded, :company_overview, :mission, :products, :release_date, :starring, :written_by, :directed_by, :produced_by, :studio, :awards, :plot_outline, :network, :season, :schedule
+    attr_accessor :page_id, :name, :pic_small, :pic_big, :pic_square, :pic_large, :page_url, :type, :website, :location, :hours, :band_members, :bio, :hometown, :record_label, :influences, :has_added_app, :founded, :company_overview, :mission, :products, :release_date, :starring, :written_by, :directed_by, :produced_by, :studio, :awards, :plot_outline, :network, :season, :schedule
     attr_reader :genre
 
     def genre=(value)

data/lib/facebooker/models/user.rb

@@ -11,7 +11,7 @@ module Facebooker
       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, :work_history, :sex, :religion, :notes_count, :activities, :pic_square, :movies, :has_added_app, :education_history, :birthday, :birthday_date, :first_name, :meeting_for, :last_name, :interests, :current_location, :pic, :books, :affiliations, :locale, :profile_url, :proxied_email, :email_hashes, :allowed_restrictions, :pic_with_logo, :pic_big_with_logo, :pic_small_with_logo, :pic_square_with_logo]
-    STANDARD_FIELDS = [:uid, :first_name, :last_name, :name, :timezone, :birthday, :sex, :affiliations, :locale, :profile_url, :pic_square]
+    STANDARD_FIELDS = [:uid, :first_name, :last_name, :name, :timezone, :birthday, :sex, :affiliations, :locale, :profile_url, :proxied_email]
     populating_attr_accessor(*FIELDS)
     attr_reader :affiliations
     populating_hash_settable_accessor :current_location, Location
@@ -63,7 +63,17 @@ module Facebooker
       @events[params.to_s] ||= @session.post('facebook.events.get', {:uid => self.id}.merge(params)).map do |event|
         Event.from_hash(event)
       end
-    end    
+    end
+
+    # Rsvp to an event with the eid and rsvp_status which can be 'attending', 'unsure', or 'declined'.
+    # http://wiki.developers.facebook.com/index.php/Events.rsvp
+    # E.g:
+    #  @user.rsvp_event('100321123', 'attending')
+    #  # => Returns true if all went well
+    def rsvp_event(eid, rsvp_status, options = {})
+      result = @session.post('facebook.events.rsvp', options.merge(:eid => eid, :rsvp_status => rsvp_status))
+      result == '1' ? true : false
+    end
     
     # 
     # Set the list of friends, given an array of User objects.  If the list has been retrieved previously, will not set
@@ -104,6 +114,11 @@ module Facebooker
       @friends_hash[cache_key]
     end
 
+    def friend_ids
+      options = {:uid => self.id}
+      @session.post('facebook.friends.get', options, false)
+    end
+
     ###
     # Publish a post into the stream on the user's Wall and News Feed.  This
     # post also appears in the user's friend's streams.  The +publish_stream+
@@ -123,12 +138,16 @@ module Facebooker
     #     :href => 'http://tenderlovemaking.com/'
     #   ])
     def publish_to target, options = {}
+      
+      attachment = options[:attachment]
+      links = options[:action_links]
       @session.post('facebook.stream.publish',
-                    :uid        => self.id,
-                    :target_id  => target.id,
-                    :message    => options[:message],
-                    :attachment => Facebooker.json_encode(options[:attachment]),
-                    :action_links => Facebooker.json_encode(options[:action_links])
+                    { :uid        => self.id,
+                      :target_id  => target.id,
+                      :message    => options[:message],
+                      :attachment => attachment && Facebooker.json_encode(attachment),
+                      :action_links => links && Facebooker.json_encode(links) }, 
+                    false
                    )
     end
     
@@ -176,10 +195,14 @@ module Facebooker
     end
     
     def friends_with_this_app
-      @friends_with_this_app ||= session.post('facebook.friends.getAppUsers').map do |uid|
+      @friends_with_this_app ||= friend_ids_with_this_app.map do |uid|
         User.new(uid, session)
       end
     end
+
+    def friend_ids_with_this_app
+      @friend_ids_with_this_app ||= session.post('facebook.friends.getAppUsers')
+    end
     
     def groups(gids = [])
       args = gids.empty? ? {} : {:gids => gids}
@@ -361,7 +384,7 @@ module Facebooker
     ##
     # 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"
+      session.post('facebook.users.hasAppPermission', {:ext_perm=>ext_perm, :uid => uid}, false) == "1"
     end    
     
     ##

data/lib/facebooker/parser.rb

@@ -58,14 +58,14 @@ module Facebooker
     def self.element(name, data)
       data = data.body rescue data # either data or an HTTP response
       begin
-        xml = Nokogiri::XML(data.strip).at(name)
+        xml = Nokogiri::XML(data.strip)
         if node = xml.at(name)
           return node
         end
         if xml.root.name == name
           return xml.root
         end
-      rescue # Can't parse with Nokogiri
+      rescue NameError # Can't parse with Nokogiri
         doc = REXML::Document.new(data)
         doc.elements.each(name) do |element|
           return element
@@ -413,18 +413,19 @@ module Facebooker
   class FqlMultiquery < Parser#nodoc
     def self.process(data)
       root = element('fql_multiquery_response', data)
-      root.elements.collect do |elm|
-        [
-         elm.elements[1].text,
-          if elm.elements[2].elements[1].nil?
-            [] 
+      root.children.reject { |child| child.text? }.map do |elm|
+        elm.children.reject { |child| child.text? }.map do |query|
+          if 'name' == query.name
+            query.text
           else
-            [
-             elm.elements[2].elements[1].name,
-             array_of_hashes(elm.elements[2], elm.elements[2].elements[1].name)
-            ]
+            list = query.children.reject { |child| child.text? }
+            if list.length == 0
+              []
+            else
+              [list.first.name, array_of_hashes(query, list.first.name)]
+            end
           end
-        ]
+        end
       end
     end
   end

data/lib/facebooker/rails/backwards_compatible_param_checks.rb

@@ -16,7 +16,7 @@ module Facebooker::Rails::BackwardsCompatibleParamChecks
     def zero_or_false( value )
       case value
         when String then
-          value == "0"
+          value.empty? || value == "0"
         when Numeric then
           value.to_f == 0.0
         when FalseClass then

data/lib/facebooker/rails/controller.rb

@@ -7,7 +7,6 @@ module Facebooker
       include Facebooker::Rails::ProfilePublisherExtensions
       def self.included(controller)
         controller.extend(ClassMethods)
-        controller.before_filter :set_adapter 
         controller.before_filter :set_facebook_request_format
         controller.helper_attr :facebook_session_parameters
         controller.helper_method :request_comes_from_facebook?
@@ -206,10 +205,6 @@ module Facebooker
           end
         end
       end
-            
-      def blank?(value)
-        (value == '0' || value.nil? || value == '')        
-      end
 
       def verified_facebook_params
         facebook_sig_params = params.inject({}) do |collection, pair|
@@ -230,12 +225,11 @@ module Facebooker
       
       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
+        unless ::Rails.version >= "2.3" and ActionController::Dispatcher.middleware.include? Rack::Facebook
+          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
         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
         raise Facebooker::Session::SignatureTooOld if facebook_sig_params['time'] && Time.at(facebook_sig_params['time'].to_f) < earliest_valid_session
         true
       end
@@ -244,11 +238,11 @@ module Facebooker
         @facebook_parameter_conversions ||= Hash.new do |hash, key| 
           lambda{|value| value}
         end.merge(
-          'time' => lambda{|value| Time.at(value.to_f)},
-          'in_canvas' => lambda{|value| !blank?(value)},
-          'added' => lambda{|value| !blank?(value)},
-          'expires' => lambda{|value| blank?(value) ? nil : Time.at(value.to_f)},
-          'friends' => lambda{|value| value.split(/,/)}
+          'time'      => lambda{|value| Time.at(value.to_f)},
+          'in_canvas' => lambda{|value| one_or_true(value)},
+          'added'     => lambda{|value| one_or_true(value)},
+          'expires'   => lambda{|value| zero_or_false(value) ? nil : Time.at(value.to_f)},
+          'friends'   => lambda{|value| value.split(/,/)}
         )
       end
       
@@ -333,10 +327,6 @@ module Facebooker
         end
       end
       
-      def set_adapter
-        Facebooker.load_adapter(params) if(params[:fb_sig_api_key])
-      end
-
       
       module ClassMethods
         #

data/lib/facebooker/rails/helpers.rb

@@ -187,10 +187,10 @@ module Facebooker
       #     <fb:editor-button label="Save Poke"
       #    </fb:editor-buttonset>
       #  </fb:editor>
-     def facebook_form_for( record_or_name_or_array,*args, &proc)
+      def facebook_form_for( record_or_name_or_array,*args, &proc)
 
-       raise ArgumentError, "Missing block" unless block_given?
-       options = args.last.is_a?(Hash) ? args.pop : {}
+        raise ArgumentError, "Missing block" unless block_given?
+        options = args.last.is_a?(Hash) ? args.pop : {}
 
         case record_or_name_or_array
         when String, Symbol
@@ -230,8 +230,18 @@ module Facebooker
           fields_for( object_name,*(args << options), &proc)
           concat("</fb:editor>",proc.binding)
         end
-    end
+      end
       
+      # Render an fb:application-name tag
+      #
+      # This renders the current application name via fbml. See
+      # http://wiki.developers.facebook.com/index.php/Fb:application-name
+      # for a full description.
+      #
+      def fb_application_name(options={})
+        tag "fb:application-name", stringify_vals(options)
+      end
+
       # Render an fb:name tag for the given user
       # This renders the name of the user specified.  You can use this tag as both subject and object of 
       # a sentence.  <em> See </em> http://wiki.developers.facebook.com/index.php/Fb:name for full description.  
@@ -441,10 +451,10 @@ module Facebooker
       def facebook_messages
         message=""
         unless flash[:notice].blank?
-          message += fb_success(flash[:notice])
+          message += fb_success(*flash[:notice])
         end
         unless flash[:error].blank?
-          message += fb_error(flash[:error])
+          message += fb_error(*flash[:error])
         end
         message
       end
@@ -729,6 +739,57 @@ module Facebooker
         tag "fb:time",stringify_vals({:t => time.to_i}.merge(options))
       end
       
+      # Renders a fb:intl element
+      #
+      # Example:
+      # <%= fb_intl('Age', :desc => 'Label for the age form field', :delimiters => '[]') %>
+      #
+      # See http://wiki.developers.facebook.com/index.php/Fb:intl for
+      # more details
+      def fb_intl(text=nil, options={}, &proc)
+        raise ArgumentError, "Missing block or text" unless block_given? or text
+        content = block_given? ? capture(&proc) : text
+        content_tag("fb:intl", content, stringify_vals(options))
+      end
+
+      # Renders a fb:intl-token element
+      #
+      # Example:
+      # <%= fb_intl-token('number', 5) %>
+      #
+      # See http://wiki.developers.facebook.com/index.php/Fb:intl-token for
+      # more details
+      def fb_intl_token(name, text=nil, &proc)
+        raise ArgumentError, "Missing block or text" unless block_given? or text
+        content = block_given? ? capture(&proc) : text
+        content_tag("fb:intl-token", content, stringify_vals({:name => name}))
+      end
+
+      # Renders a fb:date element
+      #
+      # Example:
+      # <%= fb_date(Time.now, :format => 'verbose', :tz => 'America/New York') %>
+      #
+      # See http://wiki.developers.facebook.com/index.php/Fb:date for
+      # more details
+      def fb_date(time, options={})
+        tag "fb:date", stringify_vals({:t => time.to_i}.merge(options))
+      end
+
+      # Renders a fb:fbml-attribute element
+      #
+      # Example:
+      # <%= fb_fbml_attribute('title', Education) %>
+      #
+      # The options hash is passed to the fb:intl element that is generated inside this element
+      # and can have the keys available for the fb:intl element.
+      #
+      # See http://wiki.developers.facebook.com/index.php/Fb:fbml-attribute for
+      # more details
+      def fb_fbml_attribute(name, text, options={})
+        content_tag("fb:fbml-attribute", fb_intl(text, options), stringify_vals({:name => name}))
+      end
+
       protected
       
       def cast_to_facebook_id(object)