facebooker 1.0.18 → 1.0.29

data/test/facebooker/logging_test.rb

@@ -19,7 +19,7 @@ class Facebooker::LoggingTest < Test::Unit::TestCase
   end
 
   def test_does_not_crash_outside_rails
-    flexmock(Facebooker.logger, :logger).should_receive(:debug).once.with(String)
+    flexmock(Facebooker.logger, :logger).should_receive(:info).once.with(String)
     Facebooker::Logging.log_fb_api('sample.api.call',
                           {'param1' => true, 'param2' => 'value2'})
   end
@@ -32,7 +32,7 @@ class Facebooker::LoggingTest < Test::Unit::TestCase
   end 
   
   def test_plain_format
-    flexmock(Facebooker.logger, :logger).should_receive(:debug).once.with(
+    flexmock(Facebooker.logger, :logger).should_receive(:info).once.with(
         'sample.api.call (0) param1 = true')
     Facebooker::Logging.log_fb_api('sample.api.call',
                           {'param1' => true})

data/test/facebooker/models/user_test.rb

@@ -76,15 +76,15 @@ class Facebooker::UserTest < Test::Unit::TestCase
   end
   
   def test_can_set_mobile_fbml
-    @user.expects(:set_profile_fbml).with(nil,"test",nil)
+    @user.expects(:set_profile_fbml).with(nil,"test",nil,nil)
     @user.mobile_fbml="test"
   end
   def test_can_set_profile_action
-    @user.expects(:set_profile_fbml).with(nil,nil,"test")
+    @user.expects(:set_profile_fbml).with(nil,nil,"test",nil)
     @user.profile_action="test"
   end
   def test_can_set_profile_fbml
-    @user.expects(:set_profile_fbml).with("test",nil,nil)
+    @user.expects(:set_profile_fbml).with("test",nil,nil,nil)
     @user.profile_fbml="test"
   end
   
@@ -185,6 +185,16 @@ class Facebooker::UserTest < Test::Unit::TestCase
     assert_equal ["4228600737_c96da02bba97aedfd26136e980ae3761"],Facebooker::User.register([{:email=>"mary@example.com",:account_id=>1}])
   end
   
+  def test_unregister_with_array
+    expect_http_posts_with_responses(unregister_response_xml)
+    assert_equal ["4228600737_c96da02bba97aedfd26136e980ae3761"],Facebooker::User.unregister(["4228600737_c96da02bba97aedfd26136e980ae3761"])
+  end
+
+  def test_unregister_emails_with_array
+    expect_http_posts_with_responses(unregister_response_xml)
+    assert_equal ["mary@example.com"],Facebooker::User.unregister_emails(["mary@example.com"])
+  end
+  
   def test_register_with_array_raises_if_not_all_success
     expect_http_posts_with_responses(register_response_xml)
     assert_equal ["4228600737_c96da02bba97aedfd26136e980ae3761"],Facebooker::User.register([{:email=>"mary@example.com",:account_id=>1},{:email=>"mike@example.com",:account_id=>2}])
@@ -193,6 +203,23 @@ class Facebooker::UserTest < Test::Unit::TestCase
     assert_equal({:email=>"mike@example.com",:account_id=>2},e.failed_users.first)
   end
   
+  def test_unregister_with_array_raises_if_not_all_success
+    expect_http_posts_with_responses(unregister_response_xml)
+    assert_equal ["4228600737_c96da02bba97aedfd26136e980ae3761"],Facebooker::User.unregister(["4228600737_c96da02bba97aedfd26136e980ae3761","3587916587_791214eb452bf4de30e957d65a0234d4"])
+    fail "Should have raised Facebooker::Session::UserUnRegistrationFailed"
+  rescue Facebooker::Session::UserUnRegistrationFailed => e
+    assert_equal("3587916587_791214eb452bf4de30e957d65a0234d4",e.failed_users.first)
+  end
+
+  def test_unregister_emails_with_array_raises_if_not_all_success
+    expect_http_posts_with_responses(unregister_response_xml)
+    assert_equal ["mary@example.com"],Facebooker::User.unregister_emails(["mary@example.com","mike@example.com"])
+    fail "Should have raised Facebooker::Session::UserUnRegistrationFailed"
+  rescue Facebooker::Session::UserUnRegistrationFailed => e
+    assert_equal("mike@example.com",e.failed_users.first)
+  end
+
+  
   def test_get_locale
     @user = Facebooker::User.new(9507801, @session)
     expect_http_posts_with_responses(example_users_get_info_xml)
@@ -283,6 +310,15 @@ class Facebooker::UserTest < Test::Unit::TestCase
     XML
   end
   
+  def unregister_response_xml
+    <<-XML
+    <?xml version="1.0" encoding="UTF-8"?> 
+    <connect_unregisterUsers_response xmlns="http://api.facebook.com/1.0/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://api.facebook.com/1.0/facebook.xsd" list="true"> 
+      <connect_unregisterUsers_response_elt>4228600737_c96da02bba97aedfd26136e980ae3761</connect_unregisterUsers_response_elt> 
+    </connect_unregisterUsers_response>
+    XML
+  end  
+  
   def has_app_permission_response_xml
     <<-XML
     <?xml version="1.0" encoding="UTF-8"?>

data/test/facebooker/rails/publisher_test.rb

@@ -108,6 +108,13 @@ class TestPublisher < Facebooker::Rails::Publisher
     from user
     data :friend=>"Mike"
   end
+  
+  def user_action_with_template_id(user)
+    send_as :user_action
+    from user
+    data :friend=>"Mike"  
+    template_id 4
+  end
   def user_action_with_story_size(user)
     send_as :user_action
     from user
@@ -335,12 +342,21 @@ class Facebooker::Rails::Publisher::PublisherTest < Test::Unit::TestCase
     ua = TestPublisher.create_user_action(@from_user)
     assert_equal "user_action", ua.template_name
   end
+  def test_create_user_action_with_template_id
+    @from_user = Facebooker::User.new
+    @session = Facebooker::Session.new("","")
+    @from_user.stubs(:session).returns(@session)
+    Facebooker::Rails::Publisher::FacebookTemplate.expects(:bundle_id_for_class_and_method).
+                                                   with(TestPublisher,'user_action').never
+    ua = TestPublisher.create_user_action_with_template_id(@from_user)
+    assert_equal 4,ua.template_id
+  end
   
   def test_publisher_user_action
     @from_user = Facebooker::User.new
     @session = Facebooker::Session.new("","")
     @from_user.stubs(:session).returns(@session)
-    @session.expects(:publish_user_action).with(20309041537,{:friend=>"Mike"},nil,nil)
+    @session.expects(:publish_user_action).with(20309041537,{:friend=>"Mike"},nil,nil,nil)
     
     Facebooker::Rails::Publisher::FacebookTemplate.expects(:bundle_id_for_class_and_method).
                                                    with(TestPublisher, 'user_action').
@@ -355,7 +371,7 @@ class Facebooker::Rails::Publisher::PublisherTest < Test::Unit::TestCase
     @from_user = Facebooker::User.new
     @session = Facebooker::Session.new("","")
     @from_user.stubs(:session).returns(@session)
-    @session.expects(:publish_user_action).with(20309041537,{:friend=>"Mike", :story_size=>2},nil,nil)
+    @session.expects(:publish_user_action).with(20309041537,{:friend=>"Mike"},nil,nil,2)
     
     Facebooker::Rails::Publisher::FacebookTemplate.expects(:bundle_id_for_class_and_method).
                                                    with(TestPublisher, 'user_action_with_story_size').
@@ -368,7 +384,7 @@ class Facebooker::Rails::Publisher::PublisherTest < Test::Unit::TestCase
     @from_user = Facebooker::User.new
     @session = Facebooker::Session.new("","")
     @from_user.stubs(:session).returns(@session)
-    @session.expects(:publish_user_action).with(20309041537,{},nil,nil)
+    @session.expects(:publish_user_action).with(20309041537,{},nil,nil,nil)
     
     Facebooker::Rails::Publisher::FacebookTemplate.stubs(:bundle_id_for_class_and_method).returns(20309041537)
     TestPublisher.deliver_user_action_no_data(@from_user)

data/test/facebooker/rails_integration_test.rb

@@ -135,14 +135,23 @@ 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
-    request = ActionController::TestRequest.new({"fb_sig_in_canvas"=>"1"}, {}, nil)
+    if Rails.version < '2.3'
+      request = ActionController::TestRequest.new({"fb_sig_in_canvas"=>"1"}, {}, nil)
+    else
+      request = ActionController::TestRequest.new
+      request.query_parameters[:fb_sig_in_canvas] = "1"
+    end
     request.path   = "/"
     ActionController::Routing::Routes.recognize(request)
     assert_equal({"controller"=>"facebook","action"=>"index"},request.path_parameters)
   end
   
   def test_routes_when_not_in_canvas
-    request = ActionController::TestRequest.new({}, {}, nil)
+    if Rails.version < '2.3'
+      request = ActionController::TestRequest.new({}, {}, nil)
+    else
+      request = ActionController::TestRequest.new
+    end
     request.path   = "/"
     ActionController::Routing::Routes.recognize(request)
     assert_equal({"controller"=>"plain_old_rails","action"=>"index"},request.path_parameters)
@@ -428,6 +437,15 @@ class RailsIntegrationTest < Test::Unit::TestCase
     assert_equal("<fb:redirect url=\"http://www.facebook.com/login.php?api_key=1234567&v=1.0\" />", @response.body)
   end
   
+  def test_redirect_to_renders_javascript_redirect_if_request_is_for_a_facebook_iframe
+    get :index, facebook_params(:fb_sig_user => nil, :fb_sig_in_iframe => 1)
+    assert_response :success
+    assert_match "javascript", @response.body
+    assert_match "http-equiv", @response.body
+    assert_match "http://www.facebook.com/login.php?api_key=1234567&v=1.0".to_json, @response.body
+    assert_match "http://www.facebook.com/login.php?api_key=1234567&amp;v=1.0", @response.body
+  end  
+  
   def test_url_for_links_to_canvas_if_canvas_is_true_and_not_in_canvas
     get :link_test, facebook_params(:fb_sig_in_canvas=>0,:canvas=>true)
     assert_match /apps.facebook.com/,@response.body
@@ -581,6 +599,10 @@ class RailsHelperTest < Test::Unit::TestCase
     assert_equal "<fb:profile-pic size=\"small\" uid=\"1234\"></fb:profile-pic>", @h.fb_profile_pic("1234", :size => :small)
   end
 
+  def test_fb_profile_pic_with_width_and_height
+    assert_equal "<fb:profile-pic height=\"200\" uid=\"1234\" width=\"100\"></fb:profile-pic>", @h.fb_profile_pic("1234", :width => 100, :height => 200)
+  end
+
   def test_fb_profile_pic_with_invalid_size
     assert_raises(ArgumentError) {@h.fb_profile_pic("1234", :size => :mediumm)}
   end
@@ -953,6 +975,20 @@ class RailsHelperTest < Test::Unit::TestCase
     end
     assert @h.output_buffer =~ /Body Content/
   end
+
+  def test_init_fb_connect_no_options
+    assert ! @h.init_fb_connect.match(/Element.observe\(window,'load',/)
+  end
+  
+  def test_init_fb_connect_with_options_js_jquery
+    assert ! @h.init_fb_connect(:js => :jquery).match(/\$\(document\).ready\(/)
+  end
+  
+  def test_init_fb_connect_with_features_and_options_js_jquery
+    assert @h.init_fb_connect("XFBML", :js => :jquery).match(/XFBML.*/)
+    assert @h.init_fb_connect("XFBML", :js => :jquery).match(/\$\(document\).ready\(/)
+  end
+
   
   def test_fb_login_and_redirect
     assert_equal @h.fb_login_and_redirect("/path"),"<fb:login-button onlogin=\"window.location.href = &quot;/path&quot;;\"></fb:login-button>"
@@ -961,6 +997,10 @@ 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
+    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\", \"message\");"
+  end
   
   
   def test_fb_connect_javascript_tag
@@ -1105,30 +1145,28 @@ class RailsPrettyErrorsTest < Test::Unit::TestCase
   end
   
   def setup
+    Facebooker.apply_configuration('api_key'=>"1234", 'secret_key'=>"34278",'canvas_page_name'=>'mike','pretty_errors'=>true)
     @controller = ControllerWhichFails.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
   end
   
   def test_pretty_errors_disabled_success
-    Facebooker.facebooker_config.stubs(:[]).with('pretty_errors').returns(false)
     post :pass, facebook_params
     assert_response 200
   end
   
   def test_pretty_errors_disabled_error
-    Facebooker.facebooker_config.stubs(:[]).with('pretty_errors').returns(false)
+    Facebooker.apply_configuration('api_key'=>"1234", 'secret_key'=>"34278",'canvas_page_name'=>'mike','pretty_errors'=>false)
     post :fail, facebook_params
     assert_response :error
   end
   
   def test_pretty_errors_enabled_success
-    Facebooker.facebooker_config.stubs(:[]).with('pretty_errors').returns(true)
     post :pass, facebook_params
     assert_response 200
   end
   def test_pretty_errors_enabled_error
-    Facebooker.facebooker_config.stubs(:[]).with('pretty_errors').returns(true)
     post :fail, facebook_params
     assert_response 200
   end
@@ -1288,6 +1326,9 @@ 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'
     @controller = FacebookController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
@@ -1309,4 +1350,9 @@ class RailsRequestFormatTest < Test::Unit::TestCase
     assert_equal 'fbjs', @response.body
   end
   
+  def test_responds_to_html_when_iframe
+    get :index, facebook_params(:fb_sig_in_iframe => '1')
+    assert_equal 'html', @response.body
+  end
+  
 end

data/test/rack/facebook_test.rb

@@ -0,0 +1,62 @@
+require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'rack/facebook'
+require 'rack/lint'
+require 'rack/mock'
+require 'ruby-debug'
+
+class Rack::FacebookTest < Test::Unit::TestCase
+  
+  def setup
+    @secret_key = 'secret'
+    @app = lambda do |env|
+      @env = env
+      Rack::Response.new().to_a
+    end
+    @facebook = Rack::Facebook.new(@app, @secret_key)
+  end
+  
+  def params(p)
+    p.map{|*args| args.join('=') }.join('&')
+  end
+  
+  def app
+    Rack::MockRequest.new(Rack::Lint.new(@facebook))
+  end
+  
+  def test_without_fb_params
+    response = app.post("/")
+    assert_equal 200, response.status
+  end
+  
+  def test_converts_request_method
+    response = app.post("/",
+      :input => params(: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'))
+    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))
+    assert_equal 400, response.status
+  end
+  
+  def test_skips_with_false_condition
+    @facebook = Rack::Facebook.new(@app, @secret_key) { false }
+    response = app.post("/", :input => params(:fb_sig_user => 'ignored'))
+    assert_equal 200, response.status
+  end
+  
+  def test_verifies_with_true_condition
+    @facebook = Rack::Facebook.new(@app, @secret_key) { true }
+    response = app.post("/", :input => params(:fb_sig_user => 'ignored'))
+    assert_equal 400, response.status
+  end
+
+end

data/test/rails_test_helper.rb

@@ -3,6 +3,8 @@ require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 require 'action_controller'
 require 'action_controller/test_process'
 require 'active_record'
+gem 'rails'
+require 'initializer'
 require File.dirname(__FILE__)+'/../init'
 require 'facebooker/rails/controller'
 require 'facebooker/rails/helpers/fb_connect'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: facebooker
 version: !ruby/object:Gem::Version 
-  version: 1.0.18
+  version: 1.0.29
 platform: ruby
 authors: 
 - Chad Fowler
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-23 00:00:00 -04:00
+date: 2009-04-21 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,32 +34,25 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.2
+        version: 1.11.0
     version: 
-description: "== DESCRIPTION:  Facebooker is a Ruby wrapper over the Facebook[http://facebook.com] {REST API}[http://wiki.developers.facebook.com/index.php/API].  Its goals are:  * Idiomatic Ruby * No dependencies outside of the Ruby standard library (This is true with Rails 2.1. Previous Rails versions require the JSON gem) * Concrete classes and methods modeling the Facebook data, so it's easy for a Rubyist to understand what's available * Well tested  == FEATURES/PROBLEMS:"
+description: "Facebooker is a Ruby wrapper over the Facebook[http://facebook.com] {REST API}[http://wiki.developers.facebook.com/index.php/API].  Its goals are:  * Idiomatic Ruby * No dependencies outside of the Ruby standard library (This is true with Rails 2.1. Previous Rails versions require the JSON gem) * Concrete classes and methods modeling the Facebook data, so it's easy for a Rubyist to understand what's available * Well tested"
 email: mmangino@elevatedrails.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- CHANGELOG.txt
-- History.txt
-- Manifest.txt
-- README.txt
-- TODO.txt
-- 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
+- CHANGELOG.rdoc
+- COPYING.rdoc
+- README.rdoc
+- TODO.rdoc
 files: 
-- CHANGELOG.txt
-- COPYING
-- History.txt
-- Manifest.txt
-- README
-- README.txt
+- COPYING.rdoc
+- CHANGELOG.rdoc
+- README.rdoc
 - Rakefile
-- TODO.txt
+- TODO.rdoc
 - generators/publisher/publisher_generator.rb
 - generators/facebook/facebook_generator.rb
 - generators/facebook/templates/config/facebooker.yml
@@ -103,9 +96,9 @@ files:
 - 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/mobile.rb
 - lib/facebooker/model.rb
 - lib/facebooker/models/affiliation.rb
 - lib/facebooker/models/album.rb
@@ -124,14 +117,15 @@ files:
 - lib/facebooker/models/photo.rb
 - lib/facebooker/models/tag.rb
 - lib/facebooker/models/user.rb
-- lib/facebooker/models/user.rb.orig
-- lib/facebooker/models/user.rb.rej
 - lib/facebooker/models/video.rb
 - lib/facebooker/models/work_info.rb
 - lib/facebooker/parser.rb
 - lib/facebooker/rails/controller.rb
 - lib/facebooker/rails/cucumber/world.rb
 - lib/facebooker/rails/cucumber.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
@@ -149,11 +143,10 @@ files:
 - lib/facebooker/server_cache.rb
 - lib/facebooker/service.rb
 - lib/facebooker/session.rb
-- lib/facebooker/session.rb.orig
-- lib/facebooker/session.rb.rej
 - lib/facebooker/version.rb
 - lib/facebooker.rb
 - lib/net/http_multipart_post.rb
+- lib/rack/facebook.rb
 - lib/tasks/facebooker.rake
 - lib/tasks/tunnel.rake
 - rails/init.rb
@@ -180,11 +173,11 @@ files:
 - test/test_helper.rb
 - test/facebooker/mobile_test.rb
 has_rdoc: true
-homepage: 
+homepage: http://facebooker.rubyforge.org
 post_install_message: 
 rdoc_options: 
 - --main
-- README.txt
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -205,7 +198,7 @@ rubyforge_project: facebooker
 rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
-summary: Pure, idiomatic Ruby wrapper for the Facebook REST API.
+summary: Facebooker is a Ruby wrapper over the Facebook[http://facebook.com] {REST API}[http://wiki.developers.facebook.com/index.php/API]
 test_files: 
 - test/facebooker_test.rb
 - test/facebooker/adapters_test.rb
@@ -222,3 +215,4 @@ test_files:
 - test/facebooker/models/user_test.rb
 - test/facebooker/rails/publisher_test.rb
 - test/net/http_multipart_post_test.rb
+- test/rack/facebook_test.rb