facebooker 1.0.44 → 1.0.48

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

@@ -3,11 +3,13 @@ module Facebooker
     module Helpers
       module FbConnect
         
-        def fb_connect_javascript_tag
+        def fb_connect_javascript_tag(options = {})
+          lang = "/#{options[:lang]}" if options[:lang]
+          # dont use the javascript_include_tag helper since it adds a .js at the end
           if request.ssl?
-            javascript_include_tag "https://www.connect.facebook.com/js/api_lib/v0.4/FeatureLoader.js.php"
+            "<script src=\"https://www.connect.facebook.com/js/api_lib/v0.4/FeatureLoader.js.php#{lang}\" type=\"text/javascript\"></script>"
           else
-            javascript_include_tag "http://static.ak.connect.facebook.com/js/api_lib/v0.4/FeatureLoader.js.php"
+            "<script src=\"http://static.ak.connect.facebook.com/js/api_lib/v0.4/FeatureLoader.js.php#{lang}\" type=\"text/javascript\"></script>"
           end
         end
         

data/lib/facebooker/rails/publisher.rb

@@ -101,10 +101,14 @@ module Facebooker
         @controller           = PublisherController.new(self)
       end
 
-      def default_url_options
+      def self.default_url_options
         {:host => Facebooker.canvas_server_base + Facebooker.facebook_path_prefix}
       end
 
+      def default_url_options
+        self.class.default_url_options
+      end
+
       # use facebook options everywhere
       def request_comes_from_facebook?
         true
@@ -126,6 +130,13 @@ module Facebooker
           end
         end
         
+        def deactivate
+          Facebooker::Session.create.deactivate_template_bundle_by_id(self.bundle_id)
+          return true
+        rescue Facebooker::Session::TemplateBundleInvalid => e
+          return false
+        end
+
         
         
         class << self
@@ -134,6 +145,7 @@ module Facebooker
             publisher = setup_publisher(klass,method)            
             template_id = Facebooker::Session.create.register_template_bundle(publisher.one_line_story_templates,publisher.short_story_templates,publisher.full_story_template,publisher.action_links)
             template = find_or_initialize_by_template_name(template_name(klass,method))
+            template.deactivate if template.bundle_id  # deactivate old templates to avoid exceeding templates/app limit
             template.bundle_id = template_id
             template.content_hash = hashed_content(klass,method) if template.respond_to?(:content_hash)
             template.save!
@@ -162,12 +174,8 @@ module Facebooker
           
           def find_in_db(klass,method)
             template = find_by_template_name(template_name(klass,method))
-            if template and template.template_changed?(hashed_content(klass,method))
-              template.destroy
-              template = nil
-            end
             
-            if template.nil?
+            if template.nil? || template.template_changed?(hashed_content(klass, method))
               template = register(klass,method)
             end
             template
@@ -189,7 +197,7 @@ module Facebooker
           end
 
           def template_name(klass,method)
-            "#{klass.name}::#{method}"
+            "#{Facebooker.api_key}: #{klass.name}::#{method}"
           end
         end
       end
@@ -462,6 +470,13 @@ module Facebooker
       ActionController::Routing::Routes.named_routes.install(self.master_helper_module)
       include self.master_helper_module
       class <<self
+
+        def register_all_templates_on_all_applications
+          Facebooker.with_all_applications do
+            puts "Registering templates for #{Facebooker.api_key}"
+            register_all_templates
+          end
+        end
         
         def register_all_templates
           all_templates = instance_methods.grep(/_template$/) - %w(short_story_template full_story_template one_line_story_template) 
@@ -472,6 +487,15 @@ module Facebooker
           end
         end
         
+        def unregister_inactive_templates
+          session = Facebooker::Session.create
+          active_template_ids = FacebookTemplate.all.map(&:bundle_id)
+          all_template_ids = session.active_template_bundles.map {|t| t["template_bundle_id"]}
+          (all_template_ids - active_template_ids).each do |template_bundle_id|
+            session.deactivate_template_bundle_by_id(template_bundle_id)
+          end
+        end
+        
         def method_missing(name,*args)
           should_send = false
           method = ''

data/lib/facebooker/service/base_service.rb

@@ -6,6 +6,7 @@ class Facebooker::Service::BaseService
   def post_params(params)
     post_params = {}
     params.each do |k,v|
+      k = k.to_s unless k.is_a?(String)
       if Array === v || Hash === v
         post_params[k] = Facebooker.json_encode(v)       
       else
@@ -15,4 +16,4 @@ class Facebooker::Service::BaseService
     post_params
   end
   
-end
+end

data/lib/facebooker/service/curl_service.rb

@@ -2,11 +2,12 @@ require 'curb'
 Facebooker.use_curl = true
 class Facebooker::Service::CurlService < Facebooker::Service::BaseService
   def post_form(url,params,multipart=false)
-    response = Curl::Easy.http_post(url.to_s, *to_curb_params(params)) do |c|
+    curl = Curl::Easy.new(url.to_s) do |c|
       c.multipart_form_post = multipart
       c.timeout = Facebooker.timeout
     end
-    response.body_str
+    curl.http_post(*to_curb_params(params)) 
+    curl.body_str
   end
   
   def post_multipart_form(url,params)

data/lib/facebooker/session.rb

@@ -100,11 +100,11 @@ module Facebooker
 
     def login_url(options={})
       options = default_login_url_options.merge(options)
-      "#{Facebooker.login_url_base(@api_key)}#{login_url_optional_parameters(options)}"
+      "#{Facebooker.login_url_base}#{login_url_optional_parameters(options)}"
     end
 
     def install_url(options={})
-      "#{Facebooker.install_url_base(@api_key)}#{install_url_optional_parameters(options)}"
+      "#{Facebooker.install_url_base}#{install_url_optional_parameters(options)}"
     end
 
     # The url to get user to approve extended permissions
@@ -122,7 +122,9 @@ module Facebooker
     # * sms
     def permission_url(permission,options={})
       options = default_login_url_options.merge(options)
-      "http://#{Facebooker.www_server_base_url}/authorize.php?api_key=#{@api_key}&v=1.0&ext_perm=#{permission}#{install_url_optional_parameters(options)}"
+      options = add_next_parameters(options)
+      options << "&ext_perm=#{permission}"
+      "#{Facebooker.permission_url_base}#{options.join}"
     end
 
     def install_url_optional_parameters(options)
@@ -145,6 +147,8 @@ module Facebooker
       optional_parameters << "&skipcookie=true" if options[:skip_cookie]
       optional_parameters << "&hide_checkbox=true" if options[:hide_checkbox]
       optional_parameters << "&canvas=true" if options[:canvas]
+      optional_parameters << "&fbconnect=true" if options[:fbconnect]
+      optional_parameters << "&req_perms=#{options[:req_perms]}" if options[:req_perms]
       optional_parameters.join
     end
 
@@ -269,6 +273,23 @@ module Facebooker
       end
     end
 
+    # Creates an event with the event_info hash and an optional Net::HTTP::MultipartPostFile for the event picture
+    # Returns the eid of the newly created event
+    # http://wiki.developers.facebook.com/index.php/Events.create
+    def create_event(event_info, multipart_post_file = nil)
+      post_file('facebook.events.create', :event_info => event_info.to_json, nil => multipart_post_file)
+    end
+    
+    # Cancel an event
+    # http://wiki.developers.facebook.com/index.php/Events.cancel
+    # E.g:
+    #  @session.cancel_event('100321123', :cancel_message => "It's raining...")
+    #  # => Returns true if all went well
+    def cancel_event(eid, options = {})
+      result = post('facebook.events.cancel', options.merge(:eid => eid))
+      result == '1' ? true : false
+    end
+
     def event_members(eid)
       @members ||= post('facebook.events.getMembers', :eid => eid) do |response|
         response.map do |attendee_hash|
@@ -347,7 +368,9 @@ module Facebooker
       if [subj_id, pids, aid].all? {|arg| arg.nil?}
         raise ArgumentError, "Can't get a photo without a picture, album or subject ID" 
       end
-      @photos = post('facebook.photos.get', :subj_id => subj_id, :pids => pids, :aid => aid ) do |response|
+      # We have to normalize params orherwise FB complain about signature
+      params = {:pids => pids, :subj_id => subj_id, :aid => aid}.delete_if { |k,v| v.nil? }
+      @photos = post('facebook.photos.get', params ) do |response|
         response.map do |hash|
           Photo.from_hash(hash)
         end
@@ -414,6 +437,18 @@ module Facebooker
       post("facebook.feed.registerTemplateBundle", parameters, false)
     end
 
+    ##
+    # Deactivate a template bundle with Facebook.
+    # Returns true if a bundle with the specified id is active and owned by this app.
+    # Useful to avoid exceeding the 100 templates/app limit.
+    def deactivate_template_bundle_by_id(template_bundle_id)
+      post("facebook.feed.deactivateTemplateBundleByID", {:template_bundle_id => template_bundle_id.to_s}, false)
+    end
+
+    def active_template_bundles
+      post("facebook.feed.getRegisteredTemplateBundles",{},false)
+    end
+
     ##
     # publish a previously rendered template bundle
     # see http://wiki.developers.facebook.com/index.php/Feed.publishUserAction

data/lib/facebooker/version.rb

@@ -2,7 +2,7 @@ module Facebooker #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 0
-    TINY  = 44
+    TINY  = 48
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   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/models/user_test.rb

@@ -137,7 +137,7 @@ class Facebooker::UserTest < Test::Unit::TestCase
   end
   def test_publish_to_converts_attachment_to_json
     @user = Facebooker::User.new(548871286, @session)
-    @user.session.expects(:post).with("facebook.stream.publish",has_entry(:attachment=>instance_of(String)))
+    @user.session.expects(:post).with("facebook.stream.publish",has_entry(:attachment=>instance_of(String)),false)
     @user.publish_to(@other_user, :message => 'i love you man',:attachment=>{:a=>"b"})
   end
 
@@ -254,6 +254,12 @@ class Facebooker::UserTest < Test::Unit::TestCase
     assert_equal "http://www.facebook.com/profile.php?id=8055", @user.profile_url
   end
 
+  def test_can_rsvp_to_event
+    expect_http_posts_with_responses(example_events_rsvp_xml)
+    result = @user.rsvp_event(1000, 'attending')
+    assert result
+  end
+
   private
   def example_profile_photos_get_xml
     "<?xml version=\"1.0\" encoding=\"UTF-8\"?>

data/test/facebooker/rails/facebook_url_rewriting_test.rb

@@ -11,7 +11,7 @@ class Facebooker::Rails::FacebookUrlRewritingTest < Test::Unit::TestCase
   def test_one_or_true_on_string_1
     assert @rewriter.one_or_true( "1" )
   end
-  
+
   def test_one_or_true_on_string_0
     assert !@rewriter.one_or_true( "0" )
   end
@@ -23,7 +23,7 @@ class Facebooker::Rails::FacebookUrlRewritingTest < Test::Unit::TestCase
   def test_one_or_true_on_float_1
     assert @rewriter.one_or_true( 1.0 )
   end
-  
+
   def test_one_or_true_on_true
     assert @rewriter.one_or_true( true )
   end
@@ -36,4 +36,41 @@ class Facebooker::Rails::FacebookUrlRewritingTest < Test::Unit::TestCase
     assert !@rewriter.one_or_true( nil )
   end
 
+
+  def test_zero_or_false_on_blank
+    assert @rewriter.zero_or_false( "" )
+  end
+
+  def test_zero_or_false_on_integer_0
+    assert @rewriter.zero_or_false( 0 )
+  end
+
+  def test_zero_or_false_on_float_0
+    assert @rewriter.zero_or_false( 0.0 )
+  end
+
+  def test_zero_or_false_on_string_0
+    assert @rewriter.zero_or_false( "0" )
+  end
+
+  def test_zero_or_false_on_false
+    assert @rewriter.zero_or_false( false )
+  end
+
+  def test_zero_or_false_on_nil
+    assert @rewriter.zero_or_false( nil )
+  end
+
+  def test_zero_or_false_on_string_1
+    assert !@rewriter.zero_or_false( "1" )
+  end
+
+  def test_zero_or_false_on_numeric_1
+    assert !@rewriter.zero_or_false( 1 )
+  end
+
+  def test_zero_or_false_on_true
+    assert !@rewriter.zero_or_false( true )
+  end
+
 end

data/test/facebooker/rails/integration_session_test.rb

@@ -1,10 +1,13 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../rails_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

@@ -141,10 +141,10 @@ end
 
 class Facebooker::Rails::Publisher::FacebookTemplateTest < Test::Unit::TestCase
   FacebookTemplate = Facebooker::Rails::Publisher::FacebookTemplate
-  include Facebooker::Rails::TestHelpers
 
   def setup
     super
+    ENV['FACEBOOK_API_KEY'] = '1234567'
     @template = mock("facebook template")
     FacebookTemplate.stubs(:register).returns(@template)
     FacebookTemplate.clear_cache!
@@ -167,13 +167,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")
 
@@ -186,22 +186,15 @@ class Facebooker::Rails::Publisher::FacebookTemplateTest < Test::Unit::TestCase
     FacebookTemplate.find_in_db(TestPublisher,"simple_user_action")
   end
 
-  def test_find_in_db_should_destroy_old_record_if_changed
-    FacebookTemplate.stubs(:find_by_template_name).returns(@template)
-    FacebookTemplate.stubs(:hashed_content).returns("MY CONTENT")
-    @template.stubs(:template_changed?).returns(true)
-    @template.expects(:destroy)
-    FacebookTemplate.find_in_db(TestPublisher,"simple_user_action")
-  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)
     FacebookTemplate.expects(:register).with(TestPublisher,"simple_user_action").returns(@template)
     FacebookTemplate.find_in_db(TestPublisher,"simple_user_action")
   end
+
 end
 
 class Facebooker::Rails::Publisher::PublisherTest < Test::Unit::TestCase
@@ -331,6 +324,20 @@ class Facebooker::Rails::Publisher::PublisherTest < Test::Unit::TestCase
    Facebooker::Rails::Publisher::FacebookTemplate.expects(:register)
     TestPublisher.register_user_action
   end
+
+  def test_register_should_deactivate_template_bundle_if_exists
+    @template = mock
+    @template.stubs(:bundle_id).returns(999)
+    @template.stubs(:bundle_id=)
+    @template.stubs(:save!)
+    @session = mock
+    @session.stubs(:register_template_bundle).returns(1000)
+    Facebooker::Session.stubs(:create).returns(@session)
+    Facebooker::Rails::Publisher::FacebookTemplate.stubs(:find_or_initialize_by_template_name).returns(@template)
+    @template.expects(:deactivate)
+    FacebookTemplate.register(TestPublisher, "simple_user_action")
+  end
+
   def test_register_user_action_with_action_links
     ActionController::Base.append_view_path("./test/../../app/views")
     Facebooker::Rails::Publisher::FacebookTemplate.expects(:register)

data/test/facebooker/rails_integration_test.rb

@@ -125,10 +125,6 @@ class PlainOldRailsController < ActionController::Base
   end
 end
 
-class Test::Unit::TestCase
-  include Facebooker::Rails::TestHelpers
-end
-
 
 # you can't use asset_recognize, because it can't pass parameters in to the requests
 class UrlRecognitionTests < Test::Unit::TestCase
@@ -160,9 +156,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 +178,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 +214,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 +254,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 +285,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 +298,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
@@ -326,6 +328,16 @@ class RailsIntegrationTest < Test::Unit::TestCase
     get :index, facebook_params('fb_sig_added' => "1")
     assert_equal(true, @controller.facebook_params['added'])
   end
+
+  def test_facebook_params_convert_added_to_boolean_false_when_already_false
+    get :index, facebook_params('fb_sig_added' => false)
+    assert_equal(false, @controller.facebook_params['added'])
+  end
+
+  def test_facebook_params_convert_added_to_boolean_true_when_already_true
+    get :index, facebook_params('fb_sig_added' => true)
+    assert_equal(true, @controller.facebook_params['added'])
+  end
   
   def test_facebook_params_convert_expirey_into_nil
     get :index, facebook_params(:fb_sig_expires => '0')
@@ -423,7 +435,7 @@ class RailsIntegrationTest < Test::Unit::TestCase
     setup_fb_connect_cookies
     get :index
     assert_equal(77777, @controller.facebook_session.user.id)
-    end
+  end
   
   def test_session_does_NOT_secure_with_expired_cookies
     setup_fb_connect_cookies(expired_cookie_hash_for_auth)
@@ -532,14 +544,32 @@ 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    
 
   end
+
+  if Rails.version < '2.3'
+  
+    def test_should_raise_on_bad_sig
+      begin
+        get :fb_params_test, facebook_params.merge('fb_sig' => 'incorrect')
+        fail "No IncorrectSignature raised"
+      rescue Facebooker::Session::IncorrectSignature=>e
+      end
+    end
+
+    def test_valid_signature
+      @controller.expects(:earliest_valid_session).returns(Time.at(1186588275.5988)-1)
+      get :fb_params_test, facebook_params 
+    end
+
+  end
   
   def test_should_raise_too_old_for_replayed_session
     begin
@@ -549,20 +579,6 @@ class RailsSignatureTest < Test::Unit::TestCase
     end
   end
   
-  def test_should_raise_on_bad_sig
-    begin
-      get :fb_params_test, facebook_params.merge('fb_sig' => 'incorrect')
-      fail "No IncorrectSignature raised"
-    rescue Facebooker::Session::IncorrectSignature=>e
-    end
-  end
-  
-  def test_valid_signature
-    @controller.expects(:earliest_valid_session).returns(Time.at(1186588275.5988)-1)
-    get :fb_params_test, facebook_params
-    
-  end
-  
 end
 class RailsHelperTest < Test::Unit::TestCase
   class HelperClass
@@ -597,10 +613,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
@@ -692,7 +708,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
 
@@ -1057,13 +1081,17 @@ 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_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\"});"
+    assert_equal "FB.Connect.showFeedDialog(null, null, null, null, null, FB.RequireConnect.promptConnect, function() {alert('hi')}, \"prompt\", #{{"value" => "message"}.to_json});",
+                 @h.fb_user_action(action,"message","prompt","function() {alert('hi')}")
   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\"});"
+    assert_equal "FB.Connect.showFeedDialog(null, null, null, null, null, FB.RequireConnect.promptConnect, null, \"prompt\", #{{"value" => "message"}.to_json});",
+                 @h.fb_user_action(action,"message","prompt")
   end
 
 
@@ -1074,6 +1102,13 @@ class RailsHelperTest < Test::Unit::TestCase
     end
   end
 
+  def test_fb_connect_javascript_tag_with_language_option
+    silence_warnings do
+      assert_equal "<script src=\"http://static.ak.connect.facebook.com/js/api_lib/v0.4/FeatureLoader.js.php/en_US\" type=\"text/javascript\"></script>",
+        @h.fb_connect_javascript_tag(:lang => "en_US")
+    end
+  end
+
   def test_fb_connect_javascript_tag_ssl
     @h.instance_eval do
       def request
@@ -1089,6 +1124,21 @@ class RailsHelperTest < Test::Unit::TestCase
     end
   end
 
+  def test_fb_connect_javascript_tag_ssl_with_language_option
+    @h.instance_eval do
+      def request
+        ssl_request = ActionController::TestRequest.new
+        ssl_request.stubs(:ssl?).returns(true)
+        ssl_request
+      end
+    end
+
+    silence_warnings do
+      assert_equal "<script src=\"https://www.connect.facebook.com/js/api_lib/v0.4/FeatureLoader.js.php/en_US\" type=\"text/javascript\"></script>",
+        @h.fb_connect_javascript_tag(:lang => "en_US")
+    end
+  end
+
   def test_fb_container
     @h.expects(:capture).returns("Inner Stuff")
     @h.fb_container(:condition=>"somejs") do
@@ -1411,9 +1461,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