taweili-facebooker 1.0.38 → 1.0.40

data/README.rdoc

@@ -77,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,37 +2,41 @@
 
 Gem::Specification.new do |s|
   s.name = %q{facebooker}
-  s.version = "1.0.38"
+  s.version = "1.0.40"
 
   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-06-23}
-  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.date = %q{2009-07-10}
+  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.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/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/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"]
-  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/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.1}
+  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_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/mobile_test.rb", "test/facebooker/model_test.rb", "test/facebooker/rails_integration_test.rb", "test/facebooker/server_cache_test.rb", "test/facebooker/session_test.rb", "test/facebooker/models/event_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/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/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
-    s.specification_version = 2
+    s.specification_version = 3
 
     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.11.0"])
+      s.add_development_dependency(%q<hoe>, [">= 2.3.2"])
     else
       s.add_dependency(%q<json>, [">= 1.0.0"])
-      s.add_dependency(%q<hoe>, [">= 1.11.0"])
+      s.add_dependency(%q<hoe>, [">= 2.3.2"])
     end
   else
     s.add_dependency(%q<json>, [">= 1.0.0"])
-    s.add_dependency(%q<hoe>, [">= 1.11.0"])
+    s.add_dependency(%q<hoe>, [">= 2.3.2"])
   end
 end

data/lib/facebooker/rails/controller.rb

@@ -31,6 +31,12 @@ module Facebooker
         secure_with_facebook_params! || secure_with_cookies! || secure_with_token!
       end
       
+      #this is used to proxy a connection through a rails app so the facebook secret key is not needed
+      #iphone apps use this
+      def create_facebook_session_with_secret
+        secure_with_session_secret!
+      end
+      
       def set_facebook_session
         # first, see if we already have a session
         session_set = session_already_secured?
@@ -148,6 +154,15 @@ module Facebooker
           @facebook_session
         end
       end
+    
+      def secure_with_session_secret!
+        if params['auth_token']
+          @facebook_session = new_facebook_session
+          @facebook_session.auth_token = params['auth_token']
+          @facebook_session.secure_with_session_secret!
+          @facebook_session
+        end
+      end
       
       def secure_with_facebook_params!
         return unless request_comes_from_facebook?

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

@@ -2,5 +2,5 @@
 require 'rack/facebook'
 ActionController::Dispatcher.middleware.insert_before( 
   ActionController::ParamsParser,
-  Rack::Facebook,
-  Facebooker.secret_key )
+  Rack::Facebook
+)

data/lib/facebooker/service.rb

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

data/lib/facebooker/session.rb

@@ -72,6 +72,7 @@ module Facebooker
 
     attr_writer :auth_token
     attr_reader :session_key
+    attr_reader :secret_from_session
 
     def self.create(api_key=nil, secret_key=nil)
       api_key ||= self.api_key
@@ -181,10 +182,14 @@ module Facebooker
       !@session_key.nil? && !expired?
     end
 
-    def secure!
-      response = post 'facebook.auth.getSession', :auth_token => auth_token
+    def secure!(args = {})
+      response = post 'facebook.auth.getSession', :auth_token => auth_token, :generate_session_secret => args[:generate_session_secret] ? "1" : "0"
       secure_with!(response['session_key'], response['uid'], response['expires'], response['secret'])
     end    
+    
+    def secure_with_session_secret!
+      self.secure!(:generate_session_secret => true)
+    end
 
     def secure_with!(session_key, uid = nil, expires = nil, secret_from_session = nil)
       @session_key = session_key
@@ -413,10 +418,10 @@ module Facebooker
 
     ##
     # Send email to as many as 100 users at a time
-    def send_email(user_ids, subject, text, fbml = nil) 			
+    def send_email(user_ids, subject, text, fbml = nil)       
       user_ids = Array(user_ids)
       params = {:fbml => fbml, :recipients => user_ids.map{ |id| User.cast_to_facebook_id(id)}.join(','), :text => text, :subject => subject} 
-      post 'facebook.notifications.sendEmail', params
+      post 'facebook.notifications.sendEmail', params, false
     end
 
     # Only serialize the bare minimum to recreate the session.

data/lib/facebooker/version.rb

@@ -2,7 +2,7 @@ module Facebooker #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 0
-    TINY  = 38
+    TINY  = 40
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/facebooker.rb

@@ -37,10 +37,9 @@ 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
-          @raw_facebooker_configuration = YAML.load_file(facebooker_yaml_file)[RAILS_ENV]
-        else
-          @raw_facebooker_configuration = YAML.load_file(facebooker_yaml_file)
+          @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)
@@ -78,8 +77,9 @@ module Facebooker
         return
       end
 
-      # Save the old config to handle nested activation
-      old = Thread.current[:fb_api_config].dup rescue false
+      # 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
@@ -186,6 +186,11 @@ require 'facebooker/logging'
 require 'facebooker/model'
 require 'facebooker/parser'
 require 'facebooker/service'
+require 'facebooker/service/base_service'
+require 'facebooker/service/curl_service' rescue nil
+require 'facebooker/service/typhoeus_service' rescue nil
+require 'facebooker/service/typhoeus_multi_service' rescue nil
+require 'facebooker/service/net_http_service'
 require 'facebooker/server_cache'
 require 'facebooker/data'
 require 'facebooker/admin'

data/lib/rack/facebook.rb

@@ -30,28 +30,35 @@ module Rack
     end
     
     def call(env)
-      if @condition.nil? || @condition.call(env)
-        request = Rack::Request.new(env)
-        fb_params = extract_fb_sig_params(request.POST)
-        unless fb_params.empty?
-          Facebooker.with_application(fb_params['api_key']) do
-            unless signature_is_valid?(fb_params, request.POST['fb_sig'])
-              return Rack::Response.new(["Invalid Facebook signature"], 400).finish
-            end
-            env['REQUEST_METHOD'] = fb_params["request_method"] if fb_params["request_method"]
-            convert_parameters!(request.POST)
-            @app.call(env)
-          end
-        else
-          @app.call(env)
+      return @app.call(env) unless @condition.nil? || @condition.call(env)
+
+      request = Rack::Request.new(env)
+      fb_sig, fb_params = nil, nil
+
+      [ request.POST, request.GET ].each do |params|
+        fb_sig, fb_params = fb_sig_and_params( params )
+        break if fb_sig
+      end
+
+      return @app.call(env) if fb_params.empty?
+
+      Facebooker.with_application(fb_params['api_key']) do
+        unless signature_is_valid?(fb_params, fb_sig)
+          return Rack::Response.new(["Invalid Facebook signature"], 400).finish
         end
-      else
+        env['REQUEST_METHOD'] = fb_params["request_method"] if fb_params["request_method"]
+        convert_parameters!(request.params)
         @app.call(env)
       end
     end
     
     private
 
+    def fb_sig_and_params( params )
+      return nil, [] unless params['fb_sig']
+      return params['fb_sig'], extract_fb_sig_params(params)
+    end
+
     def extract_fb_sig_params(params)
       params.inject({}) do |collection, (param, value)|
         collection[param.sub(/^fb_sig_/, '')] = value if param[0,7] == 'fb_sig_'

data/lib/tasks/tunnel.rake

@@ -28,7 +28,7 @@ namespace :facebooker do
 
     task :config => :environment do
      facebook_config = File.dirname(__FILE__) + '/../../../../../config/facebooker.yml'
-     FACEBOOKER = YAML.load_file(facebook_config)[RAILS_ENV]
+     FACEBOOKER = YAML.load(ERB.new(File.read(facebook_config)).result)[RAILS_ENV]
      @public_host_username = FACEBOOKER['tunnel']['public_host_username'] 
      @public_host = FACEBOOKER['tunnel']['public_host'] 
      @public_port = FACEBOOKER['tunnel']['public_port'] 

data/test/facebooker/rails/facebook_request_fix_2-3_test.rb

@@ -6,8 +6,9 @@ class Facebooker::Rails::FacebookRequestFix23Test < Test::Unit::TestCase
   def setup
     ENV['FACEBOOK_API_KEY'] = '1234567'
     ENV['FACEBOOK_SECRET_KEY'] = '7654321'
-    if Rails.version < '2.3'
+    if Rails.version < '2.3'      
       @request = ActionController::TestRequest.new({"fb_sig_is_ajax"=>"1"}, {}, nil)
+      
     else
       @request = ActionController::TestRequest.new
       @request.query_parameters[:fb_sig_is_ajax] = "1"

data/test/facebooker/rails_integration_test.rb

@@ -37,6 +37,13 @@ class FBConnectController < NoisyController
   end
 end
 
+class FBConnectControllerProxy < NoisyController
+  before_filter :create_facebook_session_with_secret
+  def index
+    render :text => 'score!'
+  end
+end
+
 class ControllerWhichRequiresFacebookAuthentication < NoisyController
   ensure_authenticated_to_facebook
   def index
@@ -372,6 +379,20 @@ class RailsIntegrationTest < Test::Unit::TestCase
     assert_equal(1111111, @controller.facebook_session.user.id)
   end
 
+  def test_session_can_be_secured_with_secret
+    @controller = FBConnectControllerProxy.new
+    auth_token = 'ohaiauthtokenhere111'
+    modified_params = facebook_params
+    modified_params.delete('fb_sig_session_key')
+    modified_params['auth_token'] = auth_token
+    modified_params['generate_session_secret'] = true
+    session_mock = flexmock(session = Facebooker::Session.create(ENV['FACEBOOK_API_KEY'], ENV['FACEBOOK_SECRET_KEY']))
+    session_params = { 'session_key' => '123', 'uid' => '321' }
+    session_mock.should_receive(:post).with('facebook.auth.getSession', :auth_token => auth_token, :generate_session_secret => "1").once.and_return(session_params).ordered
+    flexmock(@controller).should_receive(:new_facebook_session).once.and_return(session).ordered
+    get :index, modified_params
+  end
+
   def test_session_can_be_secured_with_auth_token
     auth_token = 'ohaiauthtokenhere111'
     modified_params = facebook_params
@@ -379,7 +400,7 @@ class RailsIntegrationTest < Test::Unit::TestCase
     modified_params['auth_token'] = auth_token
     session_mock = flexmock(session = Facebooker::Session.create(ENV['FACEBOOK_API_KEY'], ENV['FACEBOOK_SECRET_KEY']))
     session_params = { 'session_key' => '123', 'uid' => '321' }
-    session_mock.should_receive(:post).with('facebook.auth.getSession', :auth_token => auth_token).once.and_return(session_params).ordered
+    session_mock.should_receive(:post).with('facebook.auth.getSession', :auth_token => auth_token, :generate_session_secret => "0").once.and_return(session_params).ordered
     flexmock(@controller).should_receive(:new_facebook_session).once.and_return(session).ordered
     get :index, modified_params
   end
@@ -391,7 +412,7 @@ class RailsIntegrationTest < Test::Unit::TestCase
       modified_params['auth_token'] = auth_token
       session_mock = flexmock(session = Facebooker::Session.create(ENV['FACEBOOK_API_KEY'], ENV['FACEBOOK_SECRET_KEY']))
       session_params = { 'session_key' => '123', 'uid' => '321' }
-      session_mock.should_receive(:post).with('facebook.auth.getSession', :auth_token => auth_token).once.and_return(session_params).ordered
+      session_mock.should_receive(:post).with('facebook.auth.getSession', :auth_token => auth_token, :generate_session_secret => "0").once.and_return(session_params).ordered
       flexmock(@controller).should_receive(:new_facebook_session).once.and_return(session).ordered
       setup_fb_connect_cookies(expired_cookie_hash_for_auth)
       get :index, modified_params

data/test/facebooker/service_test.rb

@@ -0,0 +1,58 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+require 'active_support'
+# make sure the class exists
+class ::Facebooker::Service::CurlService < Facebooker::Service::BaseService
+end
+
+class ::Facebooker::Service::TyphoeusMultiService
+  def process
+  end
+end
+
+class Facebooker::ServiceTest < Test::Unit::TestCase
+  
+  def test_should_use_the_curl_service
+      Facebooker.use_curl = true
+      Facebooker::Service.active_service= nil
+      assert(Facebooker::Service::CurlService === Facebooker::Service.active_service)
+  ensure 
+    Facebooker::Service.active_service= nil
+  end
+  
+  def test_should_allow_changing_the_service_in_a_block
+    Facebooker::Service.with_service("MyService") do
+      assert_equal(Facebooker::Service.active_service,"MyService")
+    end
+    
+  end
+  
+  def test_should_restore_the_original_service_even_with_an_exception
+    original_service = Facebooker::Service.active_service
+    begin
+      Facebooker::Service.with_service("MyService") do
+        raise "This is a test"
+      end
+      fail("Should have raised")
+    rescue
+    end
+    assert_equal(original_service,Facebooker::Service.active_service)
+  end
+  
+  def test_should_allow_using_the_async_service
+    Facebooker::Service.with_async do
+      assert(Facebooker::Service::TyphoeusMultiService === Facebooker::Service.active_service)
+      @called = true
+    end
+    assert @called
+  end
+  
+  def test_should_call_process_at_the_end_of_the_block
+    Facebooker::Service.with_async do
+      Facebooker::Service.active_service.expects(:process)
+      @called = true
+    end
+    assert @called
+    
+  end
+  
+end

data/test/facebooker/session_test.rb

@@ -301,10 +301,14 @@ class Facebooker::SessionTest < Test::Unit::TestCase
     <name>query1</name>
     <results list="true">
       <user>
+<<<<<<< HEAD:test/facebooker/session_test.rb
 <<<<<<< HEAD:test/facebooker/session_test.rb
         <name>Ari Steinberg</name>
 =======
 >>>>>>> b7d143104d745caf56a73c8ed092e422c2d00508:test/facebooker/session_test.rb
+=======
+        <name>Ari Steinberg</name>
+>>>>>>> b15371bfe556124cd3ae82746a5aa0e8ba7584e6:test/facebooker/session_test.rb
         <uid>46903192</uid>
         <rsvp_status xsi:nil="true"/>
       </user>
@@ -617,30 +621,6 @@ XML
   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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: taweili-facebooker
 version: !ruby/object:Gem::Version 
-  version: 1.0.38
+  version: 1.0.40
 platform: ruby
 authors: 
 - Chad Fowler
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-23 00:00:00 -07:00
+date: 2009-07-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,7 +34,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.11.0
+        version: 2.3.2
     version: 
 description: "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"
 email: mmangino@elevatedrails.com
@@ -183,7 +183,8 @@ files:
 - test/rails_test_helper.rb
 - test/test_helper.rb
 - test/facebooker/rails/facebook_url_rewriting_test.rb
-has_rdoc: true
+- test/facebooker/service_test.rb
+has_rdoc: false
 homepage: http://facebooker.rubyforge.org
 post_install_message: 
 rdoc_options: 
@@ -208,10 +209,9 @@ requirements: []
 rubyforge_project: facebooker
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Facebooker is a Ruby wrapper over the Facebook[http://facebook.com] {REST API}[http://wiki.developers.facebook.com/index.php/API]
 test_files: 
-- test/facebooker_test.rb
 - test/facebooker/adapters_test.rb
 - test/facebooker/admin_test.rb
 - test/facebooker/batch_request_test.rb
@@ -219,14 +219,16 @@ test_files:
 - test/facebooker/logging_test.rb
 - test/facebooker/mobile_test.rb
 - test/facebooker/model_test.rb
-- test/facebooker/rails_integration_test.rb
-- test/facebooker/server_cache_test.rb
-- test/facebooker/session_test.rb
 - test/facebooker/models/event_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