mmangino-facebooker 1.0.15 → 1.0.16

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

@@ -33,9 +33,31 @@ module Facebooker
             javascript_tag init_string
           end
         end
-        
-        def fb_login_button(callback=nil)
-          content_tag("fb:login-button",nil,(callback.nil? ? {} : {:onlogin=>callback}))
+  
+        # Render an <fb:login-button> element
+        # 
+        # ==== Examples
+        #
+        # <%= fb_login_button%>
+        # => <fb:login-button></fb:login-button>
+        #
+        # Specifying a javascript callback
+        #
+        # <%= fb_login_button 'update_something();'%>
+        # => <fb:login-button onlogin='update_something();'></fb:login-button>
+        #
+        # Adding options <em>See:</em> http://wiki.developers.facebook.com/index.php/Fb:login-button
+        #
+        # <%= fb_login_button 'update_something();', :size => :small, :background => :dark%>
+        # => <fb:login-button background='dark' onlogin='update_something();' size='small'></fb:login-button>
+        #
+        def fb_login_button(*args)
+
+          callback = args.first
+          options = args.second || {}
+          options.merge!(:onlogin=>callback)if callback
+
+          content_tag("fb:login-button",nil, options)
         end
         def fb_login_and_redirect(url)
           js = update_page do |page|

data/lib/facebooker/rails/integration_session.rb

@@ -0,0 +1,40 @@
+require 'action_controller/integration'
+
+class Facebooker::Rails::IntegrationSession < ActionController::Integration::Session
+  include Facebooker::Rails::TestHelpers
+  attr_accessor :default_request_params, :canvas
+  
+  def process(method, path, parameters = nil, headers = nil)
+    if canvas
+      parameters = facebook_params(@default_request_params.merge(parameters || {}))
+    end
+    super method, path, parameters, headers
+  end
+  
+  def reset!
+    self.default_request_params = {:fb_sig_in_canvas => '1'}.with_indifferent_access
+    self.canvas = true
+    super
+  end
+  
+  def get_with_canvas(path, parameters = nil, headers = nil)
+    if canvas
+      post path, (parameters || {}).merge('fb_sig_request_method' => 'GET'), headers
+    else
+      get_without_canvas path, parameters, headers
+    end
+  end
+  alias_method_chain :get, :canvas
+  
+  %w(put delete).each do |method|
+    define_method "#{method}_with_canvas" do |*args|
+      if canvas
+        path, parameters, headers = *args
+        post path, (parameters || {}).merge('_method' => method.upcase), headers
+      else
+        send "#{method}_without_canvas", *args
+      end
+    end
+    alias_method_chain method, :canvas
+  end
+end

data/lib/facebooker/rails/publisher.rb

@@ -312,10 +312,23 @@ module Facebooker
         end
       end
       
-      def image(src,target)
-        {:src=>image_path(src),:href=> target.respond_to?(:to_str) ? target : url_for(target)}
+      # work around the fact that facebook cares about the order of the keys in the hash
+      class ImageHolder
+        attr_accessor :src,:href
+        def initialize(src,href)
+          self.src=src
+          self.href=href
+        end
+
+        def to_json
+          "{\"src\":#{src.to_json}, \"href\":#{href.to_json}}"
+        end
       end
       
+      def image(src,target)
+        ImageHolder.new(image_path(src),target.respond_to?(:to_str) ? target : url_for(target))
+      end
+           
       def action_link(text,target)
         {:text=>text, :href=>target}
       end

data/lib/facebooker/rails/test_helpers.rb

@@ -22,25 +22,22 @@ module Facebooker
       def facebook_put(path,params={})
         facebook_verb(:put,path,params)
       end
+      
       def facebook_delete(path,params={})
         facebook_verb(:delete,path,params)
       end
       
       def facebook_verb(verb,path, params={})
-        params = default_facebook_parameters.update(params)
-        params.merge!(:fb_sig => generate_signature(facebook_params(params).stringify_keys))
-
-        params = params.update(:canvas => true).update(params)
-        send verb, path, params
+        send verb, path, facebook_params(params).reverse_merge(:canvas => true)
       end
       
-      def facebook_parameters(overrides=nil)
-        overrides ||= {}
-        params = default_facebook_parameters.merge(overrides)
-        params.merge(:fb_sig => generate_signature(params.stringify_keys))
+      def facebook_params(params = {})
+        params = default_facebook_parameters.with_indifferent_access.merge(params || {})
+        sig = generate_signature params
+        params.merge(:fb_sig => sig)
       end
 
-      private
+    private
 
       def default_facebook_parameters
         {
@@ -53,28 +50,16 @@ module Facebooker
         }
       end
 
-      def facebook_params(params)
-        params.inject({}) do |fb_params, pair| 
-          unless pair.first.to_s.match(/^fb_sig_/).nil?
-            fb_params[pair.first] = pair.last
-          end
-          fb_params
-        end
-      end
-
       def facebook_redirect_url
         match = @response.body.match(/<fb:redirect url="([^"]+)"/)
         match.nil? ? nil : match.captures[0]
       end
 
-      def generate_signature(facebook_params)
-        facebook_sig_params = facebook_params.inject({}) do |collection, pair|
-          collection[pair.first.sub(/^fb_sig_/, '')] = pair.last
-          collection
+      def generate_signature(params)
+        facebook_params = params.select { |param,_| param =~ /^fb_sig_/ }.map do |param, value|
+          [param.sub(/^fb_sig_/, ''), value].join('=')
         end
-
-        raw_string = facebook_sig_params.map{ |*args| args.join('=') }.sort.join
-        Digest::MD5.hexdigest([raw_string, Facebooker::Session.secret_key].join)
+        Digest::MD5.hexdigest([facebook_params.sort.join, Facebooker::Session.secret_key].join)
       end
       
     end

data/lib/facebooker/service.rb

@@ -58,12 +58,15 @@ module Facebooker
     end
     
     def post_file(params)
-      Parser.parse(params[:method], post_multipart_form(url, params))
+      service_url = url(params.delete(:base))
+      result = post_multipart_form(service_url, params)
+      Parser.parse(params[:method], result)
     end
     
     private
-    def url
-      URI.parse('http://'+ @api_base + @api_path)
+    def url(base = nil)
+      base ||= @api_base
+      URI.parse('http://'+ base + @api_path)
     end
     
     # Net::HTTP::MultipartPostFile

data/lib/facebooker/session.rb

@@ -94,6 +94,19 @@ module Facebooker
       "#{Facebooker.install_url_base(@api_key)}#{install_url_optional_parameters(options)}"
     end
     
+    # The url to get user to approve extended permissions
+    # http://wiki.developers.facebook.com/index.php/Extended_permission
+    #
+    # permissions:
+    # * email
+    # * offline_access
+    # * status_update
+    # * photo_upload
+    # * video_upload
+    # * create_listing
+    # * create_event
+    # * rsvp_event
+    # * 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)}"
@@ -176,6 +189,10 @@ module Facebooker
             user
           when 'photo'
             Photo.from_hash(hash)
+          when 'page'
+            Page.from_hash(hash)
+          when 'page_admin'
+            Page.from_hash(hash)
           when 'event_member'
             Event::Attendance.from_hash(hash)
           else
@@ -492,10 +509,11 @@ module Facebooker
     end
     
     def post_file(method, params = {})
+      base = params.delete(:base)
       Logging.log_fb_api(method, params) do
         add_facebook_params(params, method)
         @session_key && params[:session_key] ||= @session_key
-        service.post_file(params.merge(:sig => signature_for(params.reject{|key, value| key.nil?})))
+        service.post_file(params.merge(:base => base, :sig => signature_for(params.reject{|key, value| key.nil?})))
       end
     end
     

data/lib/tasks/tunnel.rake

@@ -7,13 +7,13 @@ namespace :facebooker do
     desc "Create a reverse ssh tunnel from a public server to a private development server." 
     task :start => [ :environment, :config ] do  
       puts @notification 
-      exec @ssh_command
+      system @ssh_command
     end 
 
     desc "Create a reverse ssh tunnel in the background. Requires ssh keys to be setup." 
     task :background_start => [ :environment, :config ] do  
       puts @notification 
-      exec "#{@ssh_command} > /dev/null 2>&1 &" 
+      system "#{@ssh_command} > /dev/null 2>&1 &" 
     end 
     
     # Adapted from Evan Weaver: http://blog.evanweaver.com/articles/2007/07/13/developing-a-facebook-app-locally/ 

data/test/{adapters_test.rb → facebooker/adapters_test.rb}

@@ -1,8 +1,6 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-require 'facebooker'
-class SessionTest < Test::Unit::TestCase
-
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
+class Facebooker::SessionTest < Test::Unit::TestCase
   def setup
     ENV['FACEBOOK_API_KEY'] = '1234567'
     ENV['FACEBOOK_SECRET_KEY'] = '7654321'   

data/test/{facebook_admin_test.rb → facebooker/admin_test.rb}

@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
-class FacebookAdminTest < Test::Unit::TestCase
+class Facebooker::AdminTest < Test::Unit::TestCase
   def setup
     @session = Facebooker::Session.create('apikey', 'secretkey')
     Facebooker.use_curl=false

data/test/{batch_request_test.rb → facebooker/batch_request_test.rb}

@@ -1,5 +1,6 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-class BatchRequestTest < Test::Unit::TestCase
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+
+class Facebooker::BatchRequestTest < Test::Unit::TestCase
   
   def setup
     @proc_called=false

data/test/{facebook_data_test.rb → facebooker/data_test.rb}

@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
-class FacebookDataTest < Test::Unit::TestCase
+class Facebooker::DataTest < Test::Unit::TestCase
   def setup
     @session = Facebooker::Session.create('apikey', 'secretkey')
     #make sure we use net::http since that's what the tests expect

data/test/{logging_test.rb → facebooker/logging_test.rb}

@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+require 'logger'
 
-
-class LoggingTest < Test::Unit::TestCase
+class Facebooker::LoggingTest < Test::Unit::TestCase
   def setup
     super
     Facebooker.logger = Logger.new(STDERR)

data/test/{model_test.rb → facebooker/model_test.rb}

@@ -1,8 +1,6 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-require 'rubygems'
-require 'flexmock/test_unit'
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
-class TestFacebooker < Test::Unit::TestCase
+class Facebooker::ModelTest < Test::Unit::TestCase
   
   class ComplexThing
     include Facebooker::Model

data/test/{event_test.rb → facebooker/models/event_test.rb}

@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
 
-class EventTest< Test::Unit::TestCase
+class Facebooker::EventTest < Test::Unit::TestCase
   def test_attendance_will_query_for_event_when_asked_for_full_event_object
     session = flexmock("a session object")
     eid = 123

data/test/{user_test.rb → facebooker/models/user_test.rb}

@@ -1,8 +1,7 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-require 'rubygems'
-require 'flexmock/test_unit'
+require File.expand_path(File.dirname(__FILE__) + '/../../test_helper')
+require 'active_support'
 
-class UserTest < Test::Unit::TestCase
+class Facebooker::UserTest < Test::Unit::TestCase
   
   def setup
     @session = Facebooker::Session.create('apikey', 'secretkey')
@@ -165,8 +164,13 @@ class UserTest < Test::Unit::TestCase
     assert_equal("1234",@user.to_s)
   end
   
-  def test_equality
+  def test_equality_with_same_id
     assert_equal @user, @user.dup
+    assert_equal @user, Facebooker::User.new(:id => @user.id)
+  end
+  
+  def test_not_equal_to_differnt_class
+    assert_not_equal @user, flexmock(:id => @user.id)
   end
   
   def test_hash_email
@@ -287,4 +291,5 @@ class UserTest < Test::Unit::TestCase
       xsi:schemaLocation="http://api.facebook.com/1.0/ http://api.facebook.com/1.0/facebook.xsd">1</users_hasAppPermission_response>
     XML
   end
+  
 end

data/test/{publisher_test.rb → facebooker/rails/publisher_test.rb}

@@ -1,15 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-require 'rubygems'
-require 'flexmock/test_unit'
-require 'action_controller'
-require 'action_controller/test_process'
-require 'active_record'
-require File.dirname(__FILE__)+'/../init'
-require 'facebooker/rails/controller'
-require 'facebooker/rails/helpers/fb_connect'
-require 'facebooker/rails/helpers'
-require 'facebooker/rails/publisher'
-
+require File.expand_path(File.dirname(__FILE__) + '/../../rails_test_helper')
 
 module SymbolHelper
   def symbol_helper_loaded
@@ -143,7 +132,7 @@ class TestPublisher < Facebooker::Rails::Publisher
   
 end
 
-class FacebookTemplateTest < Test::Unit::TestCase
+class Facebooker::Rails::Publisher::FacebookTemplateTest < Test::Unit::TestCase
   FacebookTemplate = Facebooker::Rails::Publisher::FacebookTemplate
   
   def setup
@@ -207,7 +196,7 @@ class FacebookTemplateTest < Test::Unit::TestCase
   end
 end
 
-class PublisherTest < Test::Unit::TestCase
+class Facebooker::Rails::Publisher::PublisherTest < Test::Unit::TestCase
   FacebookTemplate = Facebooker::Rails::Publisher::FacebookTemplate
   
   def setup
@@ -410,12 +399,17 @@ class PublisherTest < Test::Unit::TestCase
   
   def test_image_urls
     Facebooker.expects(:facebook_path_prefix).returns("/mike")
-    assert_equal({:src => '/images/image.png', :href => 'raw_string' },
-        TestPublisher.new.image('image.png', 'raw_string'))
-    assert_equal({:src => '/images/image.png', :href => 'http://apps.facebook.com/mike/pokes/do/1' },
-        TestPublisher.new.image('image.png', {:controller => :pokes, :action => :do, :id => 1}))
+    string_image = TestPublisher.new.image('image.png', 'raw_string')
+    assert_equal('/images/image.png',string_image.src)
+    assert_equal('raw_string',string_image.href)
+    route_image = TestPublisher.new.image('image.png', {:controller => :pokes, :action => :do, :id => 1})
+    assert_equal('http://apps.facebook.com/mike/pokes/do/1',route_image.href)
   end
   
+  def test_image_to_json_puts_src_first
+    string_image = TestPublisher.new.image('image.png', 'raw_string')
+    assert_equal "{\"src\":\"/images/image.png\", \"href\":\"raw_string\"}",string_image.to_json
+  end
   def test_action_link
     assert_equal({:text=>"text", :href=>"href"}, TestPublisher.new.action_link("text","href"))
   end

data/test/{rails_integration_test.rb → facebooker/rails_integration_test.rb}

@@ -1,14 +1,5 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.expand_path(File.dirname(__FILE__) + '/../rails_test_helper')
 begin
-  require 'action_controller'
-  require 'action_controller/test_process'
-  require 'facebooker/rails/controller'
-  require 'facebooker/rails/helpers/fb_connect'
-  require 'facebooker/rails/helpers'
-  require 'facebooker/rails/facebook_form_builder'
-  require File.dirname(__FILE__)+'/../init'
-  require 'mocha'
-  
   ActionController::Routing::Routes.draw do |map|
     map.connect '', :controller=>"facebook",:conditions=>{:canvas=>true}
     map.connect '', :controller=>"plain_old_rails"
@@ -41,6 +32,7 @@ begin
     ensure_authenticated_to_facebook
     before_filter :ensure_has_status_update
     before_filter :ensure_has_photo_upload
+    before_filter :ensure_has_video_upload
     before_filter :ensure_has_create_listing
     def index
       render :text => 'score!'
@@ -144,6 +136,11 @@ begin
     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
     def test_detects_in_canvas
@@ -195,36 +192,28 @@ begin
     end
 
     def test_url_for_links_to_callback_if_canvas_is_false_and_in_canvas
-      get :link_test, example_rails_params
+      get :link_test
       assert_match /test.host/,@response.body
     end
     
     def test_named_route_doesnt_include_canvas_path_when_not_in_canvas
-      get :named_route_test, example_rails_params
+      get :named_route_test
       assert_equal "http://test.host/comments",@response.body
     end
     def test_named_route_includes_canvas_path_when_in_canvas
-      get :named_route_test, example_rails_params_including_fb
+      get :named_route_test, facebook_params
       assert_equal "http://apps.facebook.com/facebook_app_name/comments",@response.body
     end
    
     def test_named_route_doesnt_include_canvas_path_when_in_canvas_with_canvas_equals_false
-      get :canvas_false_test, example_rails_params_including_fb
+      get :canvas_false_test, facebook_params
       assert_equal "http://test.host/comments",@response.body
     end
     def test_named_route_does_include_canvas_path_when_not_in_canvas_with_canvas_equals_true
-      get :canvas_true_test, example_rails_params
+      get :canvas_true_test
       assert_equal "http://apps.facebook.com/facebook_app_name/comments",@response.body
     end
     
-    private
-    def example_rails_params
-      { "action"=>"index", "controller"=>"plain_old_rails_controller" }    
-    end
-    def example_rails_params_including_fb(options={})
-      {"fb_sig_time"=>"1186588275.5988", "fb_sig"=>"8d9e9dd2cb0742a5a2bfe35563134585", "action"=>"index", "fb_sig_in_canvas"=>"1", "fb_sig_session_key"=>"c452b5d5d60cbd0a0da82021-744961110", "controller"=>"controller_which_requires_facebook_authentication", "fb_sig_expires"=>"0", "fb_sig_friends"=>"417358,702720,1001170,1530839,3300204,3501584,6217936,9627766,9700907,22701786,33902768,38914148,67400422,135301144,157200364,500103523,500104930,500870819,502149612,502664898,502694695,502852293,502985816,503254091,504510130,504611551,505421674,509229747,511075237,512548373,512830487,517893818,517961878,518890403,523589362,523826914,525812984,531555098,535310228,539339781,541137089,549405288,552706617,564393355,564481279,567640762,568091401,570201702,571469972,573863097,574415114,575543081,578129427,578520568,582262836,582561201,586550659,591631962,592318318,596269347,596663221,597405464,599764847,602995438,606661367,609761260,610544224,620049417,626087078,628803637,632686250,641422291,646763898,649678032,649925863,653288975,654395451,659079771,661794253,665861872,668960554,672481514,675399151,678427115,685772348,686821151,687686894,688506532,689275123,695551670,710631572,710766439,712406081,715741469,718976395,719246649,722747311,725327717,725683968,725831016,727580320,734151780,734595181,737944528,748881410,752244947,763868412,768578853,776596978,789728437,873695441", "fb_sig_added"=>"0", "fb_sig_api_key"=>"b6c9c857ac543ca806f4d3187cd05e09", "fb_sig_user"=>"744961110", "fb_sig_profile_update_time"=>"1180712453"}.merge(options)
-    end
-  
   end
   
 class RailsIntegrationTestForExtendedPermissions < Test::Unit::TestCase
@@ -238,32 +227,32 @@ class RailsIntegrationTestForExtendedPermissions < Test::Unit::TestCase
   end
   
   def test_redirects_without_set_status
-    post :index,example_rails_params_including_fb
+    post :index, facebook_params
     assert_response :success
     assert_equal("<fb:redirect url=\"http://www.facebook.com/authorize.php?api_key=1234567&v=1.0&ext_perm=status_update\" />", @response.body)
   end
   def test_redirects_without_photo_upload
-    post :index,example_rails_params_including_fb.merge(:fb_sig_ext_perms=>"status_update")
+    post :index, facebook_params(:fb_sig_ext_perms=>"status_update")
     assert_response :success
     assert_equal("<fb:redirect url=\"http://www.facebook.com/authorize.php?api_key=1234567&v=1.0&ext_perm=photo_upload\" />", @response.body)
   end
+  def test_redirects_without_video_upload
+    post :index, facebook_params(:fb_sig_ext_perms=>"status_update,photo_upload")
+    assert_response :success
+    assert_equal("<fb:redirect url=\"http://www.facebook.com/authorize.php?api_key=1234567&v=1.0&ext_perm=video_upload\" />", @response.body)
+  end
   def test_redirects_without_create_listing
-    post :index,example_rails_params_including_fb.merge(:fb_sig_ext_perms=>"status_update,photo_upload")
+    post :index, facebook_params(:fb_sig_ext_perms=>"status_update,photo_upload,video_upload")
     assert_response :success
     assert_equal("<fb:redirect url=\"http://www.facebook.com/authorize.php?api_key=1234567&v=1.0&ext_perm=create_listing\" />", @response.body)
   end
   
   def test_renders_with_permission
-    post :index,example_rails_params_including_fb.merge(:fb_sig_ext_perms=>"status_update,photo_upload,create_listing")
+    post :index, facebook_params(:fb_sig_ext_perms=>"status_update,photo_upload,create_listing,video_upload")
     assert_response :success
     assert_equal("score!", @response.body)
     
   end
-  private
-    def example_rails_params_including_fb
-      {"fb_sig_time"=>"1186588275.5988", "fb_sig"=>"7371a6400329b229f800a5ecafe03b0a", "action"=>"index", "fb_sig_in_canvas"=>"1", "fb_sig_session_key"=>"c452b5d5d60cbd0a0da82021-744961110", "controller"=>"controller_which_requires_facebook_authentication", "fb_sig_expires"=>"0", "fb_sig_friends"=>"417358,702720,1001170,1530839,3300204,3501584,6217936,9627766,9700907,22701786,33902768,38914148,67400422,135301144,157200364,500103523,500104930,500870819,502149612,502664898,502694695,502852293,502985816,503254091,504510130,504611551,505421674,509229747,511075237,512548373,512830487,517893818,517961878,518890403,523589362,523826914,525812984,531555098,535310228,539339781,541137089,549405288,552706617,564393355,564481279,567640762,568091401,570201702,571469972,573863097,574415114,575543081,578129427,578520568,582262836,582561201,586550659,591631962,592318318,596269347,596663221,597405464,599764847,602995438,606661367,609761260,610544224,620049417,626087078,628803637,632686250,641422291,646763898,649678032,649925863,653288975,654395451,659079771,661794253,665861872,668960554,672481514,675399151,678427115,685772348,686821151,687686894,688506532,689275123,695551670,710631572,710766439,712406081,715741469,718976395,719246649,722747311,725327717,725683968,725831016,727580320,734151780,734595181,737944528,748881410,752244947,763868412,768578853,776596978,789728437,873695441", "fb_sig_added"=>"0", "fb_sig_api_key"=>"b6c9c857ac543ca806f4d3187cd05e09", "fb_sig_user"=>"744961110", "fb_sig_profile_update_time"=>"1180712453"}
-    end
-  
 end  
   
 class RailsIntegrationTestForApplicationInstallation < Test::Unit::TestCase
@@ -283,21 +272,16 @@ class RailsIntegrationTestForApplicationInstallation < Test::Unit::TestCase
   end
   
   def test_if_controller_requires_application_installation_authenticated_requests_without_installation_will_redirect_to_install_page
-    get :index, example_rails_params_including_fb
+    get :index, facebook_params(:fb_sig_added => nil)
     assert_response :success
     assert_equal("<fb:redirect url=\"http://www.facebook.com/install.php?api_key=1234567&v=1.0\" />", @response.body)
   end
   
   def test_if_controller_requires_application_installation_authenticated_requests_with_installation_will_render
-    get :index, example_rails_params_including_fb.merge('fb_sig_added' => "1")
+    get :index, facebook_params('fb_sig_added' => "1")
     assert_response :success
     assert_equal("installed!", @response.body)
   end
-  
-  private
-    def example_rails_params_including_fb
-      {"fb_sig_time"=>"1186588275.5988", "fb_sig"=>"7371a6400329b229f800a5ecafe03b0a", "action"=>"index", "fb_sig_in_canvas"=>"1", "fb_sig_session_key"=>"c452b5d5d60cbd0a0da82021-744961110", "controller"=>"controller_which_requires_facebook_authentication", "fb_sig_expires"=>"0", "fb_sig_friends"=>"417358,702720,1001170,1530839,3300204,3501584,6217936,9627766,9700907,22701786,33902768,38914148,67400422,135301144,157200364,500103523,500104930,500870819,502149612,502664898,502694695,502852293,502985816,503254091,504510130,504611551,505421674,509229747,511075237,512548373,512830487,517893818,517961878,518890403,523589362,523826914,525812984,531555098,535310228,539339781,541137089,549405288,552706617,564393355,564481279,567640762,568091401,570201702,571469972,573863097,574415114,575543081,578129427,578520568,582262836,582561201,586550659,591631962,592318318,596269347,596663221,597405464,599764847,602995438,606661367,609761260,610544224,620049417,626087078,628803637,632686250,641422291,646763898,649678032,649925863,653288975,654395451,659079771,661794253,665861872,668960554,672481514,675399151,678427115,685772348,686821151,687686894,688506532,689275123,695551670,710631572,710766439,712406081,715741469,718976395,719246649,722747311,725327717,725683968,725831016,727580320,734151780,734595181,737944528,748881410,752244947,763868412,768578853,776596978,789728437,873695441", "fb_sig_added"=>"0", "fb_sig_api_key"=>"b6c9c857ac543ca806f4d3187cd05e09", "fb_sig_user"=>"744961110", "fb_sig_profile_update_time"=>"1180712453"}
-    end
 end
   
 class RailsIntegrationTest < Test::Unit::TestCase
@@ -315,7 +299,7 @@ class RailsIntegrationTest < Test::Unit::TestCase
   end
   
    def test_named_route_includes_new_canvas_path_when_in_new_canvas
-      get :named_route_test, example_rails_params_including_fb.merge("fb_sig_in_new_facebook"=>"1")
+      get :named_route_test, facebook_params("fb_sig_in_new_facebook"=>"1")
       assert_equal "http://apps.facebook.com/root/comments",@response.body
     end
 
@@ -326,67 +310,66 @@ class RailsIntegrationTest < Test::Unit::TestCase
   end
 
   def test_facebook_params_are_parsed_into_a_separate_hash
-    get :index, example_rails_params_including_fb
-    facebook_params = @controller.facebook_params
-    assert_equal([8, 8], [facebook_params['time'].day, facebook_params['time'].mon])
+    get :index, facebook_params(:fb_sig_user => '9')
+    assert_not_nil @controller.facebook_params['time']
   end
   
   def test_facebook_params_convert_in_canvas_to_boolean
-    get :index, example_rails_params_including_fb
+    get :index, facebook_params
     assert_equal(true, @controller.facebook_params['in_canvas'])    
   end
   
   def test_facebook_params_convert_added_to_boolean_false
-    get :index, example_rails_params_including_fb
+    get :index, facebook_params(:fb_sig_added => '0')
     assert_equal(false, @controller.facebook_params['added'])
   end
   
   def test_facebook_params_convert_added_to_boolean_true
-    get :index, example_rails_params_including_fb.merge('fb_sig_added' => "1")
+    get :index, facebook_params('fb_sig_added' => "1")
     assert_equal(true, @controller.facebook_params['added'])
   end
   
-  def test_facebook_params_convert_expirey_into_time_or_nil
-    get :index, example_rails_params_including_fb
+  def test_facebook_params_convert_expirey_into_nil
+    get :index, facebook_params(:fb_sig_expires => '0')
     assert_nil(@controller.facebook_params['expires'])
-    modified_params = example_rails_params_including_fb
-    modified_params['fb_sig_expires'] = modified_params['fb_sig_time']
-    setup # reset session and cached params
-    get :index, modified_params
-    assert_equal([8, 8], [@controller.facebook_params['time'].day, @controller.facebook_params['time'].mon])    
+  end
+  
+  def test_facebook_params_convert_expirey_into_time
+    get :index, facebook_params(:fb_sig_expires => 5.minutes.from_now.to_f)
+    assert_instance_of Time, @controller.facebook_params['expires']
   end
   
   def test_facebook_params_convert_friend_list_to_parsed_array_of_friend_ids
-    get :index, example_rails_params_including_fb
+    get :index, facebook_params(:fb_sig_friends => '1,2,3,4,5')
     assert_kind_of(Array, @controller.facebook_params['friends'])    
-    assert_equal(111, @controller.facebook_params['friends'].size)
+    assert_equal(5, @controller.facebook_params['friends'].size)
   end
   
   def test_session_can_be_resecured_from_facebook_params
-    get :index, example_rails_params_including_fb
-    assert_equal(744961110, @controller.facebook_session.user.id)    
+    get :index, facebook_params(:fb_sig_user => 10)
+    assert_equal(10, @controller.facebook_session.user.id)    
   end
   
   def test_existing_secured_session_is_used_if_available
-    session = Facebooker::Session.create(ENV['FACEBOOK_API_KEY'], ENV['FACEBOOK_SECRET_KEY'])
-    session.secure_with!("c452b5d5d60cbd0a0da82021-744961110", "1111111", Time.now.to_i + 60)
-    get :index, example_rails_params_including_fb, {:facebook_session => session}
-    assert_equal(1111111, @controller.facebook_session.user.id)
+    session = Facebooker::Session.create(Facebooker::Session.api_key, Facebooker::Session.secret_key)
+    session.secure_with!("session_key", "111", Time.now.to_i + 60)
+    get :index, facebook_params(:fb_sig_session_key => 'session_key', :fb_sig_user => '987'), {:facebook_session => session}
+    assert_equal(111, @controller.facebook_session.user.id)
   end
 
   def test_facebook_params_used_if_existing_secured_session_key_does_not_match
-    session = Facebooker::Session.create(ENV['FACEBOOK_API_KEY'], ENV['FACEBOOK_SECRET_KEY'])
-    session.secure_with!("a session key", "1111111", Time.now.to_i + 60)
-    get :index, example_rails_params_including_fb, {:facebook_session => session}
-    assert_equal(744961110, @controller.facebook_session.user.id)
+    session = Facebooker::Session.create(Facebooker::Session.api_key, Facebooker::Session.secret_key)
+    session.secure_with!("different session key", "111", Time.now.to_i + 60)
+    get :index, facebook_params(:fb_sig_session_key => '', :fb_sig_user => '123'), {:facebook_session => session}
+    assert_equal(123, @controller.facebook_session.user.id)
   end
 
   def test_existing_secured_session_is_NOT_used_if_available_and_facebook_params_session_key_is_nil_and_in_canvas
-    session = Facebooker::Session.create(ENV['FACEBOOK_API_KEY'], ENV['FACEBOOK_SECRET_KEY'])
+    session = Facebooker::Session.create(Facebooker::Session.api_key, Facebooker::Session.secret_key)
+    session.secure_with!("session_key", "111", Time.now.to_i + 60)
     session.secure_with!("a session key", "1111111", Time.now.to_i + 60)
-    get :index, example_rails_params_including_fb.merge("fb_sig_session_key" => ''), {:facebook_session => session}
-    
-    assert_equal(744961110, @controller.facebook_session.user.id)
+    get :index, facebook_params(:fb_sig_session_key => '', :fb_sig_user => '987'), {:facebook_session => session}
+    assert_equal(987, @controller.facebook_session.user.id)
   end
 
   def test_existing_secured_session_IS_used_if_available_and_facebook_params_session_key_is_nil_and_NOT_in_canvas
@@ -400,7 +383,7 @@ class RailsIntegrationTest < Test::Unit::TestCase
 
   def test_session_can_be_secured_with_auth_token
     auth_token = 'ohaiauthtokenhere111'
-    modified_params = example_rails_params_including_fb
+    modified_params = facebook_params
     modified_params.delete('fb_sig_session_key')
     modified_params['auth_token'] = auth_token
     session_mock = flexmock(session = Facebooker::Session.create(ENV['FACEBOOK_API_KEY'], ENV['FACEBOOK_SECRET_KEY']))
@@ -412,7 +395,7 @@ class RailsIntegrationTest < Test::Unit::TestCase
   
   def test_session_secured_with_auth_token_if_cookies_expired
       auth_token = 'ohaiauthtokenhere111'
-      modified_params = example_rails_params_including_fb
+      modified_params = facebook_params
       modified_params.delete('fb_sig_session_key')
       modified_params['auth_token'] = auth_token
       session_mock = flexmock(session = Facebooker::Session.create(ENV['FACEBOOK_API_KEY'], ENV['FACEBOOK_SECRET_KEY']))
@@ -426,91 +409,90 @@ class RailsIntegrationTest < Test::Unit::TestCase
           
   def test_session_can_be_secured_with_cookies
     setup_fb_connect_cookies
-    get :index, example_rails_params_for_fb_connect
+    get :index
     assert_equal(77777, @controller.facebook_session.user.id)
     end
   
   def test_session_does_NOT_secure_with_expired_cookies
     setup_fb_connect_cookies(expired_cookie_hash_for_auth)
-    get :index, example_rails_params_for_fb_connect
+    get :index
     assert_nil(@controller.facebook_session)
   end
       
   def test_user_friends_can_be_populated_from_facebook_params_if_available
-    get :index, example_rails_params_including_fb
-    assert_not_nil(friends = @controller.facebook_session.user.friends)
-    assert_equal(111, friends.size)    
+    get :index, facebook_params(:fb_sig_friends => '1,2,3,4')
+    friends = @controller.facebook_session.user.friends
+    assert_not_nil(friends)
+    assert_equal(4, friends.size)    
   end
   
   def test_fbml_redirect_tag_handles_hash_parameters_correctly
-    get :index, example_rails_params_including_fb
+    get :index, facebook_params
     assert_equal "<fb:redirect url=\"http://apps.facebook.com/root/require_auth\" />", @controller.send(:fbml_redirect_tag, :action => :index,:canvas=>true)
   end
   
   def test_redirect_to_renders_fbml_redirect_tag_if_request_is_for_a_facebook_canvas
-    get :index, example_rails_params_including_fb_for_user_not_logged_into_application
+    get :index, facebook_params(:fb_sig_user => nil)
     assert_response :success
     assert_equal("<fb:redirect url=\"http://www.facebook.com/login.php?api_key=1234567&v=1.0\" />", @response.body)
   end
   
   def test_url_for_links_to_canvas_if_canvas_is_true_and_not_in_canvas
-    get :link_test,example_rails_params_including_fb.merge(:fb_sig_in_canvas=>0,:canvas=>true)
+    get :link_test, facebook_params(:fb_sig_in_canvas=>0,:canvas=>true)
     assert_match /apps.facebook.com/,@response.body
   end
   
   def test_includes_relative_url_root_when_linked_to_canvas
-    get :link_test,example_rails_params_including_fb.merge(:fb_sig_in_canvas=>0,:canvas=>true)
+    get :link_test,facebook_params(:fb_sig_in_canvas=>0,:canvas=>true)
     assert_match /root/,@response.body
   end
 
   def test_url_for_links_to_callback_if_canvas_is_false_and_in_canvas
-    get :link_test,example_rails_params_including_fb.merge(:fb_sig_in_canvas=>0,:canvas=>false)
+    get :link_test,facebook_params(:fb_sig_in_canvas=>0,:canvas=>false)
     assert_match /test.host/,@response.body
   end
 
   def test_url_for_doesnt_include_url_root_when_not_linked_to_canvas
-    get :link_test,example_rails_params_including_fb.merge(:fb_sig_in_canvas=>0,:canvas=>false)
+    get :link_test,facebook_params(:fb_sig_in_canvas=>0,:canvas=>false)
     assert !@response.body.match(/root/)
   end
   
   def test_url_for_links_to_canvas_if_canvas_is_not_set
-    get :link_test,example_rails_params_including_fb
+    get :link_test,facebook_params
     assert_match /apps.facebook.com/,@response.body
   end
   
   def test_image_tag
-    get :image_test, example_rails_params_including_fb
+    get :image_test, facebook_params
     assert_equal "<img alt=\"Image\" src=\"http://root.example.com/images/image.png\" />",@response.body
   end
   
   def test_wants_interface_is_available_and_detects_method
-    get :publisher_test, example_rails_params_including_fb.merge(:method=>"publisher_getInterface")
+    get :publisher_test, facebook_params(:method=>"publisher_getInterface")
     assert_equal "interface",@response.body
   end
   def test_wants_interface_is_available_and_detects_not_interface
-    get :publisher_test, example_rails_params_including_fb.merge(:method=>"publisher_getFeedStory")
+    get :publisher_test, facebook_params(:method=>"publisher_getFeedStory")
     assert_equal "not interface",@response.body
   end
   
   def test_publisher_test_error
-    get :publisher_test_error, example_rails_params_including_fb
+    get :publisher_test_error, facebook_params
     assert_equal JSON.parse("{\"errorCode\": 1, \"errorTitle\": \"Title\", \"errorMessage\": \"Body\"}"), JSON.parse(@response.body)
   end
   
   def test_publisher_test_interface
-    get :publisher_test_interface, example_rails_params_including_fb
+    get :publisher_test_interface, facebook_params
     assert_equal JSON.parse("{\"method\": \"publisher_getInterface\", \"content\": {\"fbml\": \"This is a test\", \"publishEnabled\": false, \"commentEnabled\": true}}"), JSON.parse(@response.body)
   end
   
   def test_publisher_test_reponse
-    get :publisher_test_response, example_rails_params_including_fb
+    get :publisher_test_response, facebook_params
     assert_equal JSON.parse("{\"method\": \"publisher_getFeedStory\", \"content\": {\"feed\": {\"template_data\": {\"params\": true}, \"template_id\": 1234}}}"), JSON.parse(@response.body)
     
   end
   
-  def example_rails_params_for_fb_connect
-    {"action"=>"index", "controller"=>"controller_which_requires_facebook_authentication"}
-  end
+  private
 
   def expired_cookie_hash_for_auth
     {"_ss" => "not_used", "_session_key"=> "whatever", "_user"=>"77777", "_expires"=>"#{1.day.ago.to_i}"}
@@ -520,13 +502,6 @@ class RailsIntegrationTest < Test::Unit::TestCase
     {"_ss" => "not_used", "_session_key"=> "whatever", "_user"=>"77777", "_expires"=>"#{1.day.from_now.to_i}"}
   end
    
-  def example_rails_params_including_fb_for_user_not_logged_into_application
-    {"fb_sig_time"=>"1186588275.5988", "fb_sig"=>"7371a6400329b229f800a5ecafe03b0a", "action"=>"index", "fb_sig_in_canvas"=>"1", "controller"=>"controller_which_requires_facebook_authentication", "fb_sig_added"=>"0", "fb_sig_api_key"=>"b6c9c857ac543ca806f4d3187cd05e09"}
-  end
-  
-  def example_rails_params_including_fb
-    {"fb_sig_time"=>"1186588275.5988", "fb_sig"=>"7371a6400329b229f800a5ecafe03b0a", "action"=>"index", "fb_sig_in_canvas"=>"1", "fb_sig_session_key"=>"c452b5d5d60cbd0a0da82021-744961110", "controller"=>"controller_which_requires_facebook_authentication", "fb_sig_expires"=>"0", "fb_sig_friends"=>"417358,702720,1001170,1530839,3300204,3501584,6217936,9627766,9700907,22701786,33902768,38914148,67400422,135301144,157200364,500103523,500104930,500870819,502149612,502664898,502694695,502852293,502985816,503254091,504510130,504611551,505421674,509229747,511075237,512548373,512830487,517893818,517961878,518890403,523589362,523826914,525812984,531555098,535310228,539339781,541137089,549405288,552706617,564393355,564481279,567640762,568091401,570201702,571469972,573863097,574415114,575543081,578129427,578520568,582262836,582561201,586550659,591631962,592318318,596269347,596663221,597405464,599764847,602995438,606661367,609761260,610544224,620049417,626087078,628803637,632686250,641422291,646763898,649678032,649925863,653288975,654395451,659079771,661794253,665861872,668960554,672481514,675399151,678427115,685772348,686821151,687686894,688506532,689275123,695551670,710631572,710766439,712406081,715741469,718976395,719246649,722747311,725327717,725683968,725831016,727580320,734151780,734595181,737944528,748881410,752244947,763868412,768578853,776596978,789728437,873695441", "fb_sig_added"=>"0", "fb_sig_api_key"=>"b6c9c857ac543ca806f4d3187cd05e09", "fb_sig_user"=>"744961110", "fb_sig_profile_update_time"=>"1180712453"}
-  end
 end
 
 
@@ -543,7 +518,7 @@ class RailsSignatureTest < Test::Unit::TestCase
   
   def test_should_raise_too_old_for_replayed_session
     begin
-      get :fb_params_test,example_rails_params_including_fb
+      get :fb_params_test, facebook_params('fb_sig_time' => Time.now.to_i - 49.hours)
       fail "No SignatureTooOld raised"
     rescue Facebooker::Session::SignatureTooOld=>e
     end
@@ -551,7 +526,7 @@ class RailsSignatureTest < Test::Unit::TestCase
   
   def test_should_raise_on_bad_sig
     begin
-      get :fb_params_test,example_rails_params_including_fb("fb_sig"=>'incorrect')
+      get :fb_params_test, facebook_params.merge('fb_sig' => 'incorrect')
       fail "No IncorrectSignature raised"
     rescue Facebooker::Session::IncorrectSignature=>e
     end
@@ -559,14 +534,10 @@ class RailsSignatureTest < Test::Unit::TestCase
   
   def test_valid_signature
     @controller.expects(:earliest_valid_session).returns(Time.at(1186588275.5988)-1)
-    get :fb_params_test,example_rails_params_including_fb
+    get :fb_params_test, facebook_params
     
   end
   
-  def example_rails_params_including_fb(options={})
-    {"fb_sig_time"=>"1186588275.5988", "fb_sig"=>"8d9e9dd2cb0742a5a2bfe35563134585", "action"=>"index", "fb_sig_in_canvas"=>"1", "fb_sig_session_key"=>"c452b5d5d60cbd0a0da82021-744961110", "controller"=>"controller_which_requires_facebook_authentication", "fb_sig_expires"=>"0", "fb_sig_friends"=>"417358,702720,1001170,1530839,3300204,3501584,6217936,9627766,9700907,22701786,33902768,38914148,67400422,135301144,157200364,500103523,500104930,500870819,502149612,502664898,502694695,502852293,502985816,503254091,504510130,504611551,505421674,509229747,511075237,512548373,512830487,517893818,517961878,518890403,523589362,523826914,525812984,531555098,535310228,539339781,541137089,549405288,552706617,564393355,564481279,567640762,568091401,570201702,571469972,573863097,574415114,575543081,578129427,578520568,582262836,582561201,586550659,591631962,592318318,596269347,596663221,597405464,599764847,602995438,606661367,609761260,610544224,620049417,626087078,628803637,632686250,641422291,646763898,649678032,649925863,653288975,654395451,659079771,661794253,665861872,668960554,672481514,675399151,678427115,685772348,686821151,687686894,688506532,689275123,695551670,710631572,710766439,712406081,715741469,718976395,719246649,722747311,725327717,725683968,725831016,727580320,734151780,734595181,737944528,748881410,752244947,763868412,768578853,776596978,789728437,873695441", "fb_sig_added"=>"0", "fb_sig_api_key"=>"b6c9c857ac543ca806f4d3187cd05e09", "fb_sig_user"=>"744961110", "fb_sig_profile_update_time"=>"1180712453"}.merge(options)
-  end
-
 end
 class RailsHelperTest < Test::Unit::TestCase
   class HelperClass
@@ -1040,6 +1011,16 @@ class RailsHelperTest < Test::Unit::TestCase
     user=flexmock("user", :facebook_id => "5678")
     assert_equal '<fb:user-status linked="false" uid="5678"></fb:user-status>',@h.fb_user_status(user,false)
   end
+  
+  def test_fb_time
+    time = Time.now
+    assert_equal %Q{<fb:time preposition="true" t="#{time.to_i}" tz="America/New York" />}, @h.fb_time(time, :tz => 'America/New York', :preposition => true)
+  end
+  
+  def test_fb_time_defaults
+    time = Time.now
+    assert_equal %Q{<fb:time t="#{time.to_i}" />}, @h.fb_time(time)
+  end
 end
 class TestModel
   attr_accessor :name,:facebook_id
@@ -1134,21 +1115,16 @@ class RailsPrettyErrorsTest < Test::Unit::TestCase
   
   def test_pretty_errors
     Facebooker.facebooker_config.stubs(:pretty_errors).returns(false)
-    post :pass, example_rails_params_including_fb
+    post :pass, facebook_params
     assert_response :success    
-    post :fail, example_rails_params_including_fb
+    post :fail, facebook_params
     assert_response :error
     Facebooker.facebooker_config.stubs(:pretty_errors).returns(true)
-    post :pass, example_rails_params_including_fb
+    post :pass, facebook_params
     assert_response :success    
-    post :fail, example_rails_params_including_fb
+    post :fail, facebook_params
     assert_response :error
   end
-  private
-    def example_rails_params_including_fb
-      {"fb_sig_time"=>"1186588275.5988", "fb_sig"=>"7371a6400329b229f800a5ecafe03b0a", "action"=>"index", "fb_sig_in_canvas"=>"1", "fb_sig_session_key"=>"c452b5d5d60cbd0a0da82021-744961110", "controller"=>"controller_which_requires_facebook_authentication", "fb_sig_expires"=>"0", "fb_sig_friends"=>"417358,702720,1001170,1530839,3300204,3501584,6217936,9627766,9700907,22701786,33902768,38914148,67400422,135301144,157200364,500103523,500104930,500870819,502149612,502664898,502694695,502852293,502985816,503254091,504510130,504611551,505421674,509229747,511075237,512548373,512830487,517893818,517961878,518890403,523589362,523826914,525812984,531555098,535310228,539339781,541137089,549405288,552706617,564393355,564481279,567640762,568091401,570201702,571469972,573863097,574415114,575543081,578129427,578520568,582262836,582561201,586550659,591631962,592318318,596269347,596663221,597405464,599764847,602995438,606661367,609761260,610544224,620049417,626087078,628803637,632686250,641422291,646763898,649678032,649925863,653288975,654395451,659079771,661794253,665861872,668960554,672481514,675399151,678427115,685772348,686821151,687686894,688506532,689275123,695551670,710631572,710766439,712406081,715741469,718976395,719246649,722747311,725327717,725683968,725831016,727580320,734151780,734595181,737944528,748881410,752244947,763868412,768578853,776596978,789728437,873695441", "fb_sig_added"=>"0", "fb_sig_api_key"=>"b6c9c857ac543ca806f4d3187cd05e09", "fb_sig_user"=>"744961110", "fb_sig_profile_update_time"=>"1180712453"}
-    end
-  
 end
 
 class RailsUrlHelperExtensionsTest < Test::Unit::TestCase
@@ -1293,7 +1269,42 @@ class RailsUrlHelperExtensionsTest < Test::Unit::TestCase
   
 end
 
+class RailsRequestFormatTest < Test::Unit::TestCase
+  class FacebookController < NoisyController
+    def index
+      respond_to do |format|
+        format.html { render :text => 'html' }
+        format.fbml { render :text => 'fbml' }
+        format.fbjs { render :text => 'fbjs' }
+      end
+    end
+  end
+  
+  def setup
+    @controller = FacebookController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    @controller.stubs(:verify_signature).returns(true)
+  end
+  
+  def test_responds_to_html_without_canvas
+    get :index
+    assert_equal 'html', @response.body
+  end
+
+  def test_responds_to_fbml_in_canvas
+    get :index, facebook_params(:fb_sig_in_canvas => '1')
+    assert_equal 'fbml', @response.body
+  end
+
+  def test_responds_to_fbjs_when_is_ajax
+    get :index, facebook_params(:fb_sig_is_ajax => '1')
+    assert_equal 'fbjs', @response.body
+  end
+  
+end
 
 # rescue LoadError
 #   $stderr.puts "Couldn't find action controller.  That's OK.  We'll skip it."
 end
+