taweili-facebooker 1.0.41 → 1.0.45

data/Manifest.txt

@@ -99,6 +99,11 @@ 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

data/facebooker.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{facebooker}
-  s.version = "1.0.41"
+  s.version = "1.0.45"
 
   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-15}
+  s.date = %q{2009-07-24}
   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,14 +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/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.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.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.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/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"]
+  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/integration_session_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

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/models/user.rb

@@ -10,7 +10,7 @@ module Facebooker
       include Model
       attr_accessor :message, :time, :status_id
     end
-    FIELDS = [:status, :political, :pic_small, :name, :quotes, :is_app_user, :tv, :profile_update_time, :meeting_sex, :hs_info, :timezone, :relationship_status, :hometown_location, :about_me, :wall_count, :significant_other_id, :pic_big, :music, :work_history, :sex, :religion, :notes_count, :activities, :pic_square, :movies, :has_added_app, :education_history, :birthday, :first_name, :meeting_for, :last_name, :interests, :current_location, :pic, :books, :affiliations, :locale, :profile_url, :proxied_email, :email_hashes, :allowed_restrictions, :pic_with_logo, :pic_big_with_logo, :pic_small_with_logo, :pic_square_with_logo]
+    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]
     populating_attr_accessor(*FIELDS)
     attr_reader :affiliations

data/lib/facebooker/parser.rb

@@ -572,6 +572,7 @@ module Facebooker
       103 => Facebooker::Session::CallOutOfOrder,
       104 => Facebooker::Session::IncorrectSignature,
       120 => Facebooker::Session::InvalidAlbumId,
+      200 => Facebooker::Session::PermissionError,
       250 => Facebooker::Session::ExtendedPermissionRequired,
       321 => Facebooker::Session::AlbumIsFull,
       324 => Facebooker::Session::MissingOrInvalidImageFile,

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?
@@ -180,7 +179,11 @@ module Facebooker
       end
 
       def default_after_facebook_login_url
-        url_for(:only_path => false, :overwrite_params => {})
+        omit_keys = ["_method", "format"]
+        options = (params||{}).clone 
+        options = options.reject{|k,v| k.to_s.match(/^fb_sig/) or omit_keys.include?(k.to_s)} 
+        options = options.merge({:only_path => false})
+        url_for(options)
       end
       
       def create_new_facebook_session_and_redirect!
@@ -329,10 +332,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/cucumber/world.rb

@@ -4,43 +4,37 @@ require 'facebooker/rails/integration_session'
 module Facebooker
   module Rails
     module Cucumber
-      class World < ::Cucumber::Rails::World
-        def open_session
-          session = Facebooker::Rails::IntegrationSession.new
+      def open_session
+        session = Facebooker::Rails::IntegrationSession.new
 
-          # delegate the fixture accessors back to the test instance
-          extras = Module.new { attr_accessor :delegate, :test_result }
-          if self.class.respond_to?(:fixture_table_names)
-            self.class.fixture_table_names.each do |table_name|
-              name = table_name.tr(".", "_")
-              next unless respond_to?(name)
-              extras.__send__(:define_method, name) { |*args| delegate.send(name, *args) }
-            end
+        # delegate the fixture accessors back to the test instance
+        extras = Module.new { attr_accessor :delegate, :test_result }
+        if self.class.respond_to?(:fixture_table_names)
+          self.class.fixture_table_names.each do |table_name|
+            name = table_name.tr(".", "_")
+            next unless respond_to?(name)
+            extras.__send__(:define_method, name) { |*args| delegate.send(name, *args) }
           end
+        end
 
-          # delegate add_assertion to the test case
-          extras.__send__(:define_method, :add_assertion) { test_result.add_assertion }
-          session.extend(extras)
-          session.delegate = self
-          session.test_result = @_result
+        # delegate add_assertion to the test case
+        extras.__send__(:define_method, :add_assertion) { test_result.add_assertion }
+        session.extend(extras)
+        session.delegate = self
+        session.test_result = @_result
 
-          yield session if block_given?
-          session
-        end
-        
-        def without_canvas
-          in_canvas = @integration_session.canvas
-          @integration_session.canvas = false
-          yield
-          @integration_session.canvas = in_canvas
-        end
+        yield session if block_given?
+        session
+      end
+      
+      def without_canvas
+        in_canvas = @integration_session.canvas
+        @integration_session.canvas = false
+        yield
+        @integration_session.canvas = in_canvas
       end
     end
   end
 end
 
-World do
-  w = Facebooker::Rails::Cucumber::World.new
-  w.reset!
-  w
-end
+World(Facebooker::Rails::Cucumber)

data/lib/facebooker/rails/helpers/fb_connect.rb

@@ -107,8 +107,9 @@ module Facebooker
         end
         
         def fb_user_action(action, user_message = nil, prompt = "", callback = nil)
+          defaulted_callback = callback || "null"
           update_page do |page|
-            page.call("FB.Connect.showFeedDialog",action.template_id,action.data,action.target_ids,action.body_general,nil,page.literal("FB.RequireConnect.promptConnect"),callback,prompt,user_message.nil? ? nil : {:value=>user_message})
+            page.call("FB.Connect.showFeedDialog",action.template_id,action.data,action.target_ids,action.body_general,nil,page.literal("FB.RequireConnect.promptConnect"),page.literal(defaulted_callback),prompt,user_message.nil? ? nil : {:value=>user_message})
           end
         end
         

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.  

data/lib/facebooker/rails/integration_session.rb

@@ -12,7 +12,7 @@ class Facebooker::Rails::IntegrationSession < ActionController::Integration::Ses
   end
   
   def reset!
-    self.default_request_params = {:fb_sig_in_canvas => '1'}.with_indifferent_access
+    self.default_request_params = {:fb_sig_in_canvas => '1', :fb_sig_api_key => Facebooker::Session.api_key}.with_indifferent_access
     self.canvas = true
     super
   end

data/lib/facebooker/rails/publisher.rb

@@ -193,7 +193,7 @@ module Facebooker
           end
 
           def template_name(klass,method)
-            "#{klass.name}::#{method}"
+            "#{Facebooker.api_key}: #{klass.name}::#{method}"
           end
         end
       end

data/lib/facebooker/service/base_service.rb

@@ -0,0 +1,18 @@
+class Facebooker::Service::BaseService
+  def parse_results?
+    true
+  end
+  
+  def post_params(params)
+    post_params = {}
+    params.each do |k,v|
+      if Array === v || Hash === v
+        post_params[k] = Facebooker.json_encode(v)       
+      else
+        post_params[k] = v
+      end
+    end
+    post_params
+  end
+  
+end

data/lib/facebooker/service/curl_service.rb

@@ -0,0 +1,44 @@
+require 'curb'
+Facebooker.use_curl = true
+class Facebooker::Service::CurlService < Facebooker::Service::BaseService
+  def post_form(url,params,multipart=false)
+    curl = Curl::Easy.new(url.to_s) do |c|
+      c.multipart_form_post = multipart
+      c.timeout = Facebooker.timeout
+    end
+    curl.http_post(*to_curb_params(params)) 
+    curl.body_str
+  end
+  
+  def post_multipart_form(url,params)
+    post_form(url,params,true)
+  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 || Hash===v) ? Facebooker.json_encode(v) : v.to_s
+        )
+      end
+    end
+    parray
+  end
+  
+end
+  

data/lib/facebooker/service/net_http_service.rb

@@ -0,0 +1,12 @@
+require 'net/http'
+class Facebooker::Service::NetHttpService <Facebooker::Service::BaseService
+  def post_form(url,params)
+    Net::HTTP.post_form(url, post_params(params))
+  end
+  
+  def post_multipart_form(url,params)
+    Net::HTTP.post_multipart_form(url, params)
+  end
+  
+  
+end

data/lib/facebooker/service/typhoeus_multi_service.rb

@@ -0,0 +1,27 @@
+class Facebooker::Service::TyphoeusMultiService <  Facebooker::Service::TyphoeusService
+  
+  def initialize
+    @result_objects = []
+  end
+  
+  def parse_results?
+    false
+  end
+  
+  #define a method that returns nothing
+  define_remote_method :async_post,  :on_success => lambda {|r| puts "."}
+  
+  def perform_post(url,params)
+    add_result(self.class.async_post(:base_uri=>url,:params=>params))
+  end
+  
+  def add_result(obj)
+    @result_objects << obj
+  end
+  
+  def process
+    # we need to access all objects to make sure the proxy has made the request
+    @result_objects.each(&:nil?)
+    @result_objects = []
+  end
+end

data/lib/facebooker/service/typhoeus_service.rb

@@ -0,0 +1,17 @@
+require 'typhoeus'
+class Facebooker::Service::TyphoeusService < Facebooker::Service::BaseService
+  include Typhoeus
+  def post_form(url,params)
+    perform_post(url.to_s,post_params(params))
+  end
+  
+  def perform_post(url,params)
+    self.class.post(url,:params=>post_params)
+  end
+  
+  def post_multipart_form(url,params)
+    raise "Multipart not supported on Typhoeus"
+  end
+  
+  
+end

data/lib/facebooker/session.rb

@@ -50,6 +50,7 @@ module Facebooker
     class FQLStatementNotIndexable < StandardError; end
     class FQLFunctionDoesNotExist < StandardError; end
     class FQLWrongNumberArgumentsPassedToFunction < StandardError; end
+    class PermissionError < StandardError; end
     class InvalidAlbumId < StandardError; end
     class AlbumIsFull < StandardError; end
     class MissingOrInvalidImageFile < StandardError; end
@@ -394,14 +395,22 @@ module Facebooker
     # Register a template bundle with Facebook.
     # returns the template id to use to send using this template
     def register_template_bundle(one_line_story_templates,short_story_templates=nil,full_story_template=nil, action_links=nil)
-      parameters = {:one_line_story_templates => Array(one_line_story_templates).to_json}
-
-      parameters[:action_links] = action_links.to_json unless action_links.blank?
-
-      parameters[:short_story_templates] = Array(short_story_templates).to_json unless short_story_templates.blank?
-
-      parameters[:full_story_template] = full_story_template.to_json unless full_story_template.blank?
-
+      templates = ensure_array(one_line_story_templates)
+      parameters = {:one_line_story_templates => templates.to_json}
+      
+      unless action_links.blank?
+        parameters[:action_links] = action_links.to_json
+      end
+      
+      unless short_story_templates.blank?
+        templates = ensure_array(short_story_templates)
+        parameters[:short_story_templates] = templates.to_json
+      end
+      
+      unless full_story_template.blank?
+        parameters[:full_story_template] = full_story_template.to_json
+      end
+      
       post("facebook.feed.registerTemplateBundle", parameters, false)
     end
 
@@ -553,7 +562,7 @@ module Facebooker
     end
 
     def post(method, params = {}, use_session_key = true, &proc)
-      if batch_request?
+      if batch_request? or Facebooker::Logging.skip_api_logging
         post_without_logging(method, params, use_session_key, &proc)
       else
         Logging.log_fb_api(method, params) do
@@ -628,6 +637,10 @@ module Facebooker
         end.sort.join
         Digest::MD5.hexdigest([raw_string, secret_for_method(params[:method])].join)
       end
+      
+      def ensure_array(value)
+        value.is_a?(Array) ? value : [value]
+      end
   end
 
   class CanvasSession < Session

data/lib/facebooker/version.rb

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

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,7 +89,7 @@ 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

data/test/facebooker/adapters_test.rb

@@ -171,4 +171,21 @@ class Facebooker::AdaptersTest < Test::Unit::TestCase
     assert_equal 'my secret key', @secret_in_outer_block
   end
 
+  def test_adapter_loaded_when_config_applied
+    flexmock( Facebooker ).
+      should_receive( :fetch_config_for ).
+      and_return(
+        { 'api_key'          => 'a_key',
+          'canvas_page_name' => 'default_name' },
+        { 'api_key' => 'another_key',
+          'canvas_page_name' => 'alternative_name' }
+      )
+    Facebooker.with_application('a_key') do
+      assert_equal 'default_name', Facebooker.current_adapter.facebooker_config['canvas_page_name']
+      Facebooker.with_application('another_key') do
+        assert_equal 'alternative_name', Facebooker.current_adapter.facebooker_config['canvas_page_name']
+      end
+    end
+  end
+
 end

data/test/facebooker/rails/integration_session_test.rb

@@ -0,0 +1,10 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../../lib/facebooker/rails/integration_session')
+class Facebooker::Rails::IntegrationSessionTest < Test::Unit::TestCase 
+  def test_include_api_key_in_default_request_params
+    ENV['FACEBOOK_API_KEY'] = 'a key'
+    integration_session = Facebooker::Rails::IntegrationSession.new
+    integration_session.reset!
+    assert_equal 'a key', integration_session.default_request_params[ :fb_sig_api_key ]
+  end
+end

data/test/facebooker/rails/publisher_test.rb

@@ -145,6 +145,7 @@ class Facebooker::Rails::Publisher::FacebookTemplateTest < Test::Unit::TestCase
 
   def setup
     super
+    ENV['FACEBOOK_API_KEY'] = '1234567'
     @template = mock("facebook template")
     FacebookTemplate.stubs(:register).returns(@template)
     FacebookTemplate.clear_cache!
@@ -167,13 +168,13 @@ class Facebooker::Rails::Publisher::FacebookTemplateTest < Test::Unit::TestCase
   end
 
   def test_find_in_db_should_run_find
-    FacebookTemplate.expects(:find_by_template_name).with("TestPublisher::simple_user_action").returns(@template)
+    FacebookTemplate.expects(:find_by_template_name).with("1234567: TestPublisher::simple_user_action").returns(@template)
     @template.stubs(:template_changed?).returns(false)
     assert_equal FacebookTemplate.find_in_db(TestPublisher,"simple_user_action"), @template
   end
 
   def test_find_in_db_should_register_if_not_found
-    FacebookTemplate.expects(:find_by_template_name).with("TestPublisher::simple_user_action").returns(nil)
+    FacebookTemplate.expects(:find_by_template_name).with("1234567: TestPublisher::simple_user_action").returns(nil)
     FacebookTemplate.expects(:register).with(TestPublisher,"simple_user_action").returns(@template)
     FacebookTemplate.find_cached(TestPublisher,"simple_user_action")
 
@@ -195,7 +196,7 @@ class Facebooker::Rails::Publisher::FacebookTemplateTest < Test::Unit::TestCase
   end
 
   def test_find_in_db_should_re_register_if_changed
-    FacebookTemplate.stubs(:find_by_template_name).with("TestPublisher::simple_user_action").returns(@template)
+    FacebookTemplate.stubs(:find_by_template_name).with("1234567: TestPublisher::simple_user_action").returns(@template)
     FacebookTemplate.stubs(:hashed_content).returns("MY CONTENT")
     @template.stubs(:template_changed?).returns(true)
     @template.stubs(:destroy)

data/test/facebooker/rails_integration_test.rb

@@ -160,9 +160,10 @@ class RailsIntegrationTestForFBConnect < Test::Unit::TestCase
   include FBConnectTestHelpers
   
   def setup
-    ENV['FACEBOOK_CANVAS_PATH'] ='facebook_app_name'
-    ENV['FACEBOOK_API_KEY'] = '1234567'
-    ENV['FACEBOOK_SECRET_KEY'] = '7654321'
+    Facebooker.apply_configuration({
+      'api_key'          => '1234567',
+      'canvas_page_name' => 'facebook_app_name',
+      'secret_key'       => '7654321' })
     @controller = FBConnectController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
@@ -181,9 +182,10 @@ end
 
 class RailsIntegrationTestForNonFacebookControllers < Test::Unit::TestCase
   def setup
-    ENV['FACEBOOK_CANVAS_PATH'] ='facebook_app_name'
-    ENV['FACEBOOK_API_KEY'] = '1234567'
-    ENV['FACEBOOK_SECRET_KEY'] = '7654321'
+    Facebooker.apply_configuration({
+      'api_key'          => '1234567',
+      'canvas_page_name' => 'facebook_app_name',
+      'secret_key'       => '7654321' })
     @controller = PlainOldRailsController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new        
@@ -216,8 +218,9 @@ end
   
 class RailsIntegrationTestForExtendedPermissions < Test::Unit::TestCase
   def setup
-    ENV['FACEBOOK_API_KEY'] = '1234567'
-    ENV['FACEBOOK_SECRET_KEY'] = '7654321'
+    Facebooker.apply_configuration({
+      'api_key'          => '1234567',
+      'secret_key'       => '7654321' })
     @controller = ControllerWhichRequiresExtendedPermissions.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
@@ -255,8 +258,9 @@ end
   
 class RailsIntegrationTestForApplicationInstallation < Test::Unit::TestCase
   def setup
-    ENV['FACEBOOK_API_KEY'] = '1234567'
-    ENV['FACEBOOK_SECRET_KEY'] = '7654321'
+    Facebooker.apply_configuration({
+      'api_key'          => '1234567',
+      'secret_key'       => '7654321' })
     @controller = ControllerWhichRequiresApplicationInstallation.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
@@ -285,10 +289,12 @@ end
 class RailsIntegrationTest < Test::Unit::TestCase
   include FBConnectTestHelpers
   def setup
-    ENV['FACEBOOK_CANVAS_PATH'] ='root'
-    ENV['FACEBOOK_API_KEY'] = '1234567'
-    ENV['FACEBOOK_SECRET_KEY'] = '7654321'
-    ActionController::Base.asset_host="http://root.example.com"
+    Facebooker.apply_configuration({
+      'api_key'          => '1234567',
+      'canvas_page_name' => 'root',
+      'secret_key'       => '7654321',
+      'set_asset_host_to_callback_url' => true,
+      'callback_url'     => "http://root.example.com" })
     @controller = ControllerWhichRequiresFacebookAuthentication.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new    
@@ -296,10 +302,10 @@ class RailsIntegrationTest < Test::Unit::TestCase
     
   end
   
-   def test_named_route_includes_new_canvas_path_when_in_new_canvas
-      get :named_route_test, facebook_params("fb_sig_in_new_facebook"=>"1")
-      assert_equal "http://apps.facebook.com/root/comments",@response.body
-    end
+  def test_named_route_includes_new_canvas_path_when_in_new_canvas
+    get :named_route_test, facebook_params("fb_sig_in_new_facebook"=>"1")
+    assert_equal "http://apps.facebook.com/root/comments",@response.body
+  end
 
   def test_if_controller_requires_facebook_authentication_unauthenticated_requests_will_redirect
     get :index
@@ -476,6 +482,11 @@ class RailsIntegrationTest < Test::Unit::TestCase
     get :link_test,facebook_params(:fb_sig_in_canvas=>0,:canvas=>false)
     assert !@response.body.match(/root/)
   end
+  
+  def test_default_url_omits_fb_params
+    get :index,facebook_params(:fb_sig_friends=>"overwriteme",:get_param=>"yes")
+    assert_equal "http://apps.facebook.com/root/require_auth?get_param=yes", @controller.send(:default_after_facebook_login_url)
+  end
 
   def test_url_for_links_to_canvas_if_canvas_is_not_set
     get :link_test,facebook_params
@@ -527,9 +538,10 @@ end
 
 class RailsSignatureTest < Test::Unit::TestCase
   def setup
-    ENV['FACEBOOKER_RELATIVE_URL_ROOT'] ='root'
-    ENV['FACEBOOK_API_KEY'] = '1234567'
-    ENV['FACEBOOK_SECRET_KEY'] = '7654321'
+    Facebooker.apply_configuration({
+      'api_key'          => '1234567',
+      'canvas_page_name' => 'root',
+      'secret_key'       => '7654321' })
     @controller = ControllerWhichRequiresFacebookAuthentication.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new    
@@ -592,10 +604,10 @@ class RailsHelperTest < Test::Unit::TestCase
   attr_accessor :_erbout
   
   def setup
-    ENV['FACEBOOK_CANVAS_PATH'] ='facebook'
-    ENV['FACEBOOK_API_KEY'] = '1234567'
-    ENV['FACEBOOK_SECRET_KEY'] = '7654321'
-    
+    Facebooker.apply_configuration({
+      'api_key'          => '1234567',
+      'canvas_page_name' => 'facebook',
+      'secret_key'       => '7654321' })
     @_erbout = ""
     @h = HelperClass.new
     #use an asset path where the canvas path equals the hostname to make sure we handle that case right
@@ -687,7 +699,15 @@ class RailsHelperTest < Test::Unit::TestCase
     assert_equal "<fb:add-section-button section=\"info\" />",@h.fb_add_info_section
   end
 
-  def test_fb_name_with_invalid_key_sizee
+  def test_fb_application_name
+    assert_equal "<fb:application-name />", @h.fb_application_name
+  end
+
+  def test_fb_application_name_with_linked_false
+    assert_equal '<fb:application-name linked="false" />', @h.fb_application_name( :linked => false )
+  end
+
+  def test_fb_name_with_invalid_key_size
     assert_raises(ArgumentError) {@h.fb_name(1234, :sizee => false)}
   end
 
@@ -1052,7 +1072,11 @@ class RailsHelperTest < Test::Unit::TestCase
   def test_fb_logout_link
     assert_equal @h.fb_logout_link("Logout","My URL"),"<a href=\"#\" onclick=\"FB.Connect.logoutAndRedirect(&quot;My URL&quot;);; return false;\">Logout</a>"
   end
-  def test_fb_user_action
+  def test_fb_user_action_with_literal_callback
+    action = Facebooker::Rails::Publisher::UserAction.new
+    assert_equal @h.fb_user_action(action,"message","prompt","function() {alert('hi')}"),"FB.Connect.showFeedDialog(null, null, null, null, null, FB.RequireConnect.promptConnect, function() {alert('hi')}, \"prompt\", {\"value\": \"message\"});"
+  end
+  def test_fb_user_action_with_nil_callback
     action = Facebooker::Rails::Publisher::UserAction.new
     assert_equal @h.fb_user_action(action,"message","prompt"),"FB.Connect.showFeedDialog(null, null, null, null, null, FB.RequireConnect.promptConnect, null, \"prompt\", {\"value\": \"message\"});"
   end
@@ -1402,9 +1426,10 @@ class RailsRequestFormatTest < Test::Unit::TestCase
   end
   
   def setup
-    ENV['FACEBOOK_CANVAS_PATH'] ='facebook_app_name'
-    ENV['FACEBOOK_API_KEY'] = '1234567'
-    ENV['FACEBOOK_SECRET_KEY'] = '7654321'
+    Facebooker.apply_configuration({
+      'api_key'          => '1234567',
+      'canvas_page_name' => 'facebook_app_name',
+      'secret_key'       => '7654321' })
     @controller = FacebookController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new

data/test/facebooker/session_test.rb

@@ -204,6 +204,47 @@ class Facebooker::SessionTest < Test::Unit::TestCase
     @session = Facebooker::Session.create(ENV['FACEBOOK_API_KEY'], ENV['FACEBOOK_SECRET_KEY'])
     assert_equal 17876842716, @session.register_template_bundle("{*actor*} did something",nil,nil,[{:text=>"text",:href=>"href"}])
   end
+  
+  def test_can_register_template_bundle_with_short_story
+    one_line = "{*actor*} did something"
+    short_story = { :title => 'title', :body => 'body' }
+    
+    @session = Facebooker::Session.create(ENV['FACEBOOK_API_KEY'], ENV['FACEBOOK_SECRET_KEY'])
+    @session.expects(:post).with(
+      'facebook.feed.registerTemplateBundle',
+      {:one_line_story_templates => [one_line].to_json, :short_story_templates => [short_story].to_json},
+      false
+    )
+    @session.register_template_bundle(one_line, short_story)
+  end
+  
+  def test_can_register_template_bundle_with_short_story_for_several_templates
+    one_line = ["{*actor*} did something", "{*actor*} did something again"]
+    short_story = [{ :title => 'title', :body => 'body' }, { :title => 'title2', :body => 'body2' }]
+    
+    @session = Facebooker::Session.create(ENV['FACEBOOK_API_KEY'], ENV['FACEBOOK_SECRET_KEY'])
+    @session.expects(:post).with(
+      'facebook.feed.registerTemplateBundle',
+      {:one_line_story_templates => one_line.to_json, :short_story_templates => short_story.to_json},
+      false
+    )
+    @session.register_template_bundle(one_line, short_story)
+  end
+  
+  def test_can_register_template_bundle_with_full_story_for_several_templates
+    one_line = ["{*actor*} did something", "{*actor*} did something again"]
+    short_story = [{ :title => 'title', :body => 'body' }, { :title => 'title2', :body => 'body2' }]
+    full_story = { :title => 'title', :body => 'body' }
+    
+    @session = Facebooker::Session.create(ENV['FACEBOOK_API_KEY'], ENV['FACEBOOK_SECRET_KEY'])
+    @session.expects(:post).with(
+      'facebook.feed.registerTemplateBundle',
+      {:one_line_story_templates => one_line.to_json, :short_story_templates => short_story.to_json, :full_story_template => full_story.to_json},
+      false
+    )
+    @session.register_template_bundle(one_line, short_story, full_story)
+  end
+  
   def test_can_publish_user_action
     expect_http_posts_with_responses(publish_user_action_return_xml)
     @session = Facebooker::Session.create(ENV['FACEBOOK_API_KEY'], ENV['FACEBOOK_SECRET_KEY'])

data/test/rack/facebook_test.rb

@@ -7,11 +7,20 @@ class Rack::FacebookTest < Test::Unit::TestCase
   
   def setup
     flexmock(Facebooker).should_receive(:secret_key).and_return('secret')
+    flexmock(Facebooker).should_receive(:load_adapter)
     @app = lambda do |env|
       @env = env
       Rack::Response.new().to_a
     end
     @facebook = Rack::Facebook.new(@app)
+    @valid_params = {
+      :fb_sig_user => '1',
+      :fb_sig => 'ignored'
+    }
+    @page = Proc.new {|options|
+      options ||= @valid_params
+      app.post "/", :input => params(options)
+    }
   end
   
   def params(p)
@@ -28,34 +37,37 @@ class Rack::FacebookTest < Test::Unit::TestCase
   end
   
   def test_converts_request_method
-    response = app.post("/",
-      :input => params(:fb_sig_request_method => 'GET', :fb_sig => '4d2a700e90b0bcbe54b9e627d2cc1417'))
+    response = @page.call(:fb_sig_request_method => 'GET', :fb_sig => '4d2a700e90b0bcbe54b9e627d2cc1417')
     assert_equal 200, response.status
     assert_equal 'GET', @env['REQUEST_METHOD']
   end
   
   def test_only_sets_request_method_if_provided
-    response = app.post("/", :input => params(:fb_sig_user => '1', :fb_sig => '313dd5caed3d0902d83225ff3ae9a950'))
+    response = @page.call(:fb_sig_user => '1', :fb_sig => '313dd5caed3d0902d83225ff3ae9a950')
     assert_equal 200, response.status
     assert_equal 'POST', @env['REQUEST_METHOD']
   end
 
   def test_renders_400_with_invalid_signature
-    response = app.post("/",
-      :input => params(:fb_sig => 'wrong', :fb_sig_user => 1))
+    response = @page.call(:fb_sig => 'wrong', :fb_sig_user => 1)
     assert_equal 400, response.status
   end
   
   def test_skips_with_false_condition
     @facebook = Rack::Facebook.new(@app) { false }
-    response = app.post("/", :input => params(:fb_sig_user => 'ignored'))
+    response = @page.call({})
     assert_equal 200, response.status
   end
   
-  def test_verifies_with_true_condition
+  def test_skips_with_true_condition_without_fb_sig
     @facebook = Rack::Facebook.new(@app) { true }
-    response = app.post("/", :input => params(:fb_sig_user => 'ignored'))
+    response = @page.call(:fb_sig_user => 'ignored')
+    assert_equal 200, response.status
+  end
+  
+  def test_verifies_with_true_condition_with_fb_sig
+    @facebook = Rack::Facebook.new(@app) { true }
+    response = @page.call(:fb_sig => 'wrong', :fb_sig_user => 'ignored')
     assert_equal 400, response.status
   end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: taweili-facebooker
 version: !ruby/object:Gem::Version 
-  version: 1.0.41
+  version: 1.0.45
 platform: ruby
 authors: 
 - Chad Fowler
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-15 00:00:00 -07:00
+date: 2009-07-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -150,6 +150,11 @@ files:
 - 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
@@ -184,9 +189,11 @@ files:
 - 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
 has_rdoc: false
 homepage: http://facebooker.rubyforge.org
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --main
@@ -208,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: facebooker
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 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]
@@ -226,6 +233,7 @@ test_files:
 - 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/integration_session_test.rb
 - test/facebooker/rails/publisher_test.rb
 - test/facebooker/rails_integration_test.rb
 - test/facebooker/server_cache_test.rb