facebooker 1.0.31 → 1.0.41

data/CHANGELOG.rdoc

@@ -1,3 +1,10 @@
+=== HEAD
+
+* New Features
+
+  * Facebooker::User#publish_to for publishing to a Wall or News Stream
+  * Optionally parses with Nokogiri.  Just require 'nokogiri' in your app.
+
 === 1.0.13 / 2009-02-26
 
 * Modified fql_query to return results as Hashes as a last resort [Alan Larkin]

data/Manifest.txt

@@ -75,6 +75,7 @@ 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
@@ -84,6 +85,7 @@ 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
@@ -114,9 +116,12 @@ 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

data/README.rdoc

@@ -56,6 +56,12 @@ Your application users will need to have added the application in facebook to ac
 
 to your application controller.
 
+To prevent a violation of Facebook Terms of Service while reducing log bloat, you should also add 
+
+  filter_parameter_logging :fb_sig_friends
+
+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:
@@ -71,6 +77,9 @@ class CGI
   end
 end
 
+== Other versions
+ 
+ A facebooker port for Sinatra is available at http://github.com/jsmestad/frankie/tree/master
 
 == LICENSE:
 

data/facebooker.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{facebooker}
-  s.version = "1.0.31"
+  s.version = "1.0.41"
 
   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-04-30}
+  s.date = %q{2009-07-15}
   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
@@ -15,15 +15,14 @@ Gem::Specification.new do |s|
 * Well tested}
   s.email = %q{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/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_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/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/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/net/http_multipart_post_test.rb", "test/rack/facebook_test.rb", "test/rails_test_helper.rb", "test/test_helper.rb"]
-  s.has_rdoc = true
+  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/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/service_test.rb"]
   s.homepage = %q{http://facebooker.rubyforge.org}
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{facebooker}
-  s.rubygems_version = %q{1.3.2}
+  s.rubygems_version = %q{1.3.4}
   s.summary = %q{Facebooker is a Ruby wrapper over the Facebook[http://facebook.com] {REST API}[http://wiki.developers.facebook.com/index.php/API]}
-  s.test_files = ["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/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/net/http_multipart_post_test.rb", "test/rack/facebook_test.rb"]
+  s.test_files = ["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/facebook_request_fix_2-3_test.rb", "test/facebooker/rails/facebook_url_rewriting_test.rb", "test/facebooker/rails/publisher_test.rb", "test/facebooker/rails_integration_test.rb", "test/facebooker/server_cache_test.rb", "test/facebooker/service_test.rb", "test/facebooker/session_test.rb", "test/facebooker_test.rb", "test/net/http_multipart_post_test.rb", "test/rack/facebook_test.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
@@ -31,13 +30,13 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<json>, [">= 1.0.0"])
-      s.add_development_dependency(%q<hoe>, [">= 1.12.1"])
+      s.add_development_dependency(%q<hoe>, [">= 2.3.2"])
     else
       s.add_dependency(%q<json>, [">= 1.0.0"])
-      s.add_dependency(%q<hoe>, [">= 1.12.1"])
+      s.add_dependency(%q<hoe>, [">= 2.3.2"])
     end
   else
     s.add_dependency(%q<json>, [">= 1.0.0"])
-    s.add_dependency(%q<hoe>, [">= 1.12.1"])
+    s.add_dependency(%q<hoe>, [">= 2.3.2"])
   end
 end

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

@@ -48,7 +48,7 @@ function encodeURIComponent(str) {
 
 var Form = {};
 Form.serialize = function(form_element) {
-  return $(form_element).serialize();
+  return  $(form_element).serialize();  
 };
 
 Ajax.Updater = function (container,url,options) {
@@ -69,22 +69,16 @@ Ajax.Updater = function (container,url,options) {
     this.ajax.onerror = options["onFailure"];
   }
 
-  // Yes, this is an excercise in undoing what we just did
-  // FB doesn't provide encodeURI, but they will encode things passed as a hash
-  // so we turn it into a string, esaping & and =
-  // then we split it all back out here
-  // this could be killed if encodeURIComponent was available
-  parameters={};
-  if (options['parameters']) {
-    pairs=options['parameters'].split('&'); 
-    for (var i=0; i<pairs.length; i++) {
-      kv=pairs[i].split('=');
-      key=kv[0].replace(/%3D/g,'=').replace(/%26/g,'&');
-      val=kv[1].replace(/%3D/g,'=').replace(/%26/g,'&');
-      parameters[key]=val;
-    }
+  if (!options['parameters']) {
+    options['parameters'] = {}
+  }
+
+  // simulate other verbs over post
+  if (options['method']) {
+    options['parameters']['_method'] = options['method'];
   }
-  this.ajax.post(url,parameters); 
+
+  this.ajax.post(url,options['parameters']); 
   if (options["onLoading"]) {
      options["onLoading"].call() 
   }

data/init.rb

@@ -5,19 +5,22 @@ facebook_config = "#{RAILS_ROOT}/config/facebooker.yml"
 require 'facebooker'
 FACEBOOKER = Facebooker.load_configuration(facebook_config)
 
-# enable logger before including everything else, in case we ever want to log initialization 
+# enable logger before including everything else, in case we ever want to log initialization
 Facebooker.logger = RAILS_DEFAULT_LOGGER if Object.const_defined? :RAILS_DEFAULT_LOGGER
 
 require 'net/http_multipart_post'
 if defined? Rails
+  require 'facebooker/rails/backwards_compatible_param_checks'
   require 'facebooker/rails/controller'
   require 'facebooker/rails/facebook_url_rewriting'
   require 'facebooker/rails/facebook_session_handling' if Rails.version < '2.3'
   require 'facebooker/rails/facebook_request_fix' if Rails.version < '2.3'
+  require 'facebooker/rails/facebook_request_fix_2-3' if Rails.version >= '2.3'
   require 'facebooker/rails/routing'
   require 'facebooker/rails/facebook_pretty_errors' rescue nil
   require 'facebooker/rails/facebook_url_helper'
   require 'facebooker/rails/extensions/rack_setup' if Rails.version > '2.3'
   require 'facebooker/rails/extensions/action_controller'
+  #require 'facebooker/rails/extensions/action_view'
   require 'facebooker/rails/extensions/routing'
 end

data/install.rb

@@ -9,4 +9,4 @@ script = File.join('public', 'javascripts', 'facebooker.js')
 [config, script].each do |path| 
   FileUtils.cp File.join(templates, path), File.join(RAILS_ROOT, path) unless File.exist?(File.join(RAILS_ROOT, path))
 end
-puts IO.read(File.join(dir, 'README'))
+puts IO.read(File.join(dir, 'README.rdoc'))

data/lib/facebooker.rb

@@ -1,29 +1,33 @@
-begin
-  unless Object.const_defined?("ActiveSupport") and ActiveSupport.const_defined?("JSON")
-    require 'json'
-    module Facebooker
-      def self.json_decode(str)
-        JSON.parse(str)
-      end
+unless defined?(ActiveSupport) and defined?(ActiveSupport::JSON)
+  require 'json'
+  module Facebooker
+    def self.json_decode(str)
+      JSON.parse(str)
     end
-  else
-    module Facebooker
-      def self.json_decode(str)
-        ActiveSupport::JSON.decode(str)
-      end
+
+    def self.json_encode(o)
+      JSON.dump(o)
+    end
+  end
+else
+  module Facebooker
+    def self.json_decode(str)
+      ActiveSupport::JSON.decode(str)
+    end
+
+    def self.json_encode(o)
+      ActiveSupport::JSON.encode(o)
     end
   end
-rescue
-  require 'json'
 end
+
 require 'zlib'
 require 'digest/md5'
 
-
-
 module Facebooker
 
     @facebooker_configuration = {}
+    @raw_facebooker_configuration = {}
     @current_adapter = nil
     @set_asset_host_to_callback_url = true
     @path_prefix = nil
@@ -33,12 +37,12 @@ module Facebooker
 
     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
-          config = YAML.load_file(facebooker_yaml_file)[RAILS_ENV] 
-        else
-          config = YAML.load_file(facebooker_yaml_file)           
+          @raw_facebooker_configuration = @raw_facebooker_configuration[RAILS_ENV]
         end
-        apply_configuration(config)
+        Thread.current[:fb_api_config] = @raw_facebooker_configuration unless Thread.current[:fb_api_config]
+        apply_configuration(@raw_facebooker_configuration)
       end
     end
 
@@ -64,6 +68,42 @@ module Facebooker
       @facebooker_configuration
     end
 
+    def with_application(api_key, &block)
+      config = fetch_config_for( api_key )
+
+      unless config
+        self.logger.info "Can't find facebooker config: '#{api_key}'" if self.logger
+        yield if block_given?
+        return
+      end
+
+      # Save the old config to handle nested activation. If no app context is
+      # set yet, use default app's configuration.
+      old = Thread.current[:fb_api_config] ? Thread.current[:fb_api_config].dup : @raw_facebooker_configuration
+
+      if block_given?
+        begin
+          self.logger.info "Swapping facebooker config: '#{api_key}'" if self.logger
+          Thread.current[:fb_api_config] = apply_configuration(config)
+          yield
+        ensure
+          Thread.current[:fb_api_config] = old if old
+          apply_configuration(Thread.current[:fb_api_config])
+        end
+      end
+    end
+
+    def fetch_config_for(api_key)
+      if @raw_facebooker_configuration['api_key'] == api_key
+        return @raw_facebooker_configuration
+      elsif @raw_facebooker_configuration['alternative_keys'] and
+            @raw_facebooker_configuration['alternative_keys'].keys.include?(api_key)
+        return @raw_facebooker_configuration['alternative_keys'][api_key].merge(
+                'api_key' => api_key )
+      end
+      return false
+    end
+
     # TODO: This should be converted to attr_accessor, but we need to
     # get all the require statements at the top of the file to work.
 
@@ -146,6 +186,21 @@ require 'facebooker/logging'
 require 'facebooker/model'
 require 'facebooker/parser'
 require 'facebooker/service'
+require 'facebooker/service/base_service'
+#optional HTTP service adapters
+begin
+  require 'facebooker/service/curl_service' 
+rescue LoadError
+  nil
+end
+begin
+  require 'facebooker/service/typhoeus_service'
+  require 'facebooker/service/typhoeus_multi_service'
+rescue LoadError
+  nil
+end
+
+require 'facebooker/service/net_http_service'
 require 'facebooker/server_cache'
 require 'facebooker/data'
 require 'facebooker/admin'

data/lib/facebooker/adapters/bebo_adapter.rb

@@ -1,14 +1,14 @@
 module Facebooker
   class BeboAdapter < AdapterBase
-      
+
     def canvas_server_base
       "apps.bebo.com"
     end
-      
+
     def api_server_base
       'apps.bebo.com'
     end
-    
+
     def api_rest_path
       "/restserver.php"
     end
@@ -44,9 +44,9 @@ module Facebooker
     end
     alias_method :set_profile_fbml_without_bebo_adapter, :set_profile_fbml
     alias_method :set_profile_fbml, :set_profile_fbml_with_bebo_adapter
-    
+
     private
-    
+
     BEBO_FIELDS = FIELDS - [:meeting_sex, :wall_count, :meeting_for]
 
     remove_method :collect
@@ -57,15 +57,15 @@ module Facebooker
       else
          FIELDS.reject{|field_name| !fields.empty? && !fields.include?(field_name)}.join(',')
       end
-    end   
+    end
   end
-  
-  
+
+
    class PublishTemplatizedAction < Parser#:nodoc:
     class <<self
      def process_with_bebo_adapter(data)
        if(Facebooker.is_for?(:bebo))
-       element('feed_publishTemplatizedAction_response', data).text_value
+       element('feed_publishTemplatizedAction_response', data).content
        else
          process_without_bebo_adapter(data)
        end

data/lib/facebooker/data.rb

@@ -3,7 +3,7 @@ module Facebooker
     def initialize(session)
       @session = session
     end
-    
+
     ##
     # ** BETA ***
     # Sets a cookie on Facebook
@@ -11,32 +11,32 @@ module Facebooker
     # +name+ Name of the cookie
     # +value+ Value of the cookie
     # Optional:
-    # +expires+ Time when the cookie should expire. If not specified, the cookie never expires. 
+    # +expires+ Time when the cookie should expire. If not specified, the cookie never expires.
     # +path+ Path relative to the application's callback URL, with which the cookie should be associated. (default value is /?
     def set_cookie(user, name, value, expires=nil, path=nil)
-      @session.post('facebook.data.setCookie', 
-        :uid => User.cast_to_facebook_id(user), 
-        :name => name, 
-        :value => value, 
-        :expires => expires, 
+      @session.post('facebook.data.setCookie',
+        :uid => User.cast_to_facebook_id(user),
+        :name => name,
+        :value => value,
+        :expires => expires,
         :path => path) {|response| response == '1'}
     end
-    
+
     ##
     # ** BETA ***
     # Gets a cookie stored on Facebook
-    # +user+	The user from whom to get the cookies.	
-    # Optional:   
+    # +user+	The user from whom to get the cookies.
+    # Optional:
     # +name+ The name of the cookie. If not specified, all the cookies for the given user get returned.
     def get_cookies(user, name=nil)
-      @cookies = @session.post( 
+      @cookies = @session.post(
         'facebook.data.getCookies', :uid => User.cast_to_facebook_id(user), :name => name) do |response|
           response.map do |hash|
             Cookie.from_hash(hash)
           end
       end
-    end   
-    
+    end
+
     ##
     # ** BETA ***
     # Gets a preference stored on Facebook
@@ -54,4 +54,4 @@ module Facebooker
       @session.post('facebook.data.setUserPreference', :pref_id=>pref_id, :value=>value)
     end
   end
-end
+end

data/lib/facebooker/models/page.rb

@@ -1,6 +1,14 @@
 require 'facebooker/model'
 module Facebooker
   class Page
+    
+    def initialize(*args)
+      if args.size == 1 and (args.first.is_a?(Integer) or args.first.is_a?(String))
+        self.page_id=args.first
+      else
+        super
+      end
+    end
 
     class Genre
       include Model
@@ -24,5 +32,13 @@ module Facebooker
     def genre=(value)
       @genre = value.kind_of?(Hash) ? Genre.from_hash(value) : value
     end
+    
+    def user_is_admin?(user)
+      Session.current.post('facebook.pages.isAdmin', :page_id=>self.page_id, :uid=>Facebooker::User.cast_to_facebook_id(user))
+    end
+    
+    def user_is_fan?(user)
+      Session.current.post('facebook.pages.isFan', :page_id=>self.page_id, :uid=>Facebooker::User.cast_to_facebook_id(user))
+    end
   end
 end