@@ -1,9 +1,10 @@ class XdReceiverGenerator < Rails::Generator::Base def manifest record do |m| - m.template "xd_receiver.html", "public/xd_receiver.html" + m.template "xd_receiver.html", "public/xd_receiver.html" + m.template "xd_receiver_ssl.html", "public/xd_receiver_ssl.html" end end -end \ No newline at end of file +end generators/xd_receiver/xd_receiver_generator.rb @@ -77,6 +77,10 @@ module Facebooker end #do |hash, child| end + def self.booleanize(response) + response == "1" ? true : false + end + def self.anonymous_field_from(child, hash) if child.name == 'anon' (hash[child.name] || []) << child.text_value @@ -85,6 +89,12 @@ module Facebooker end + class RevokeAuthorization < Parser#:nodoc: + def self.process(data) + booleanize(data) + end + end + class CreateToken < Parser#:nodoc: def self.process(data) element('auth_createToken_response', data).text_value @@ -539,6 +549,7 @@ module Facebooker class Parser PARSERS = { + 'facebook.auth.revokeAuthorization' => RevokeAuthorization, 'facebook.auth.createToken' => CreateToken, 'facebook.auth.getSession' => GetSession, 'facebook.connect.registerUsers' => RegisterUsers, lib/facebooker/parser.rb @@ -22,7 +22,11 @@ module Facebooker options.merge!(required_features.pop.symbolize_keys) end - init_string = "FB.Facebook.init('#{Facebooker.api_key}','/xd_receiver.html');" + if request.ssl? + init_string = "FB.Facebook.init('#{Facebooker.api_key}','/xd_receiver_ssl.html');" + else + init_string = "FB.Facebook.init('#{Facebooker.api_key}','/xd_receiver.html');" + end unless required_features.blank? init_string = <<-FBML #{case options[:js] lib/facebooker/rails/helpers/fb_connect.rb @@ -960,7 +960,23 @@ class RailsHelperTest < Test::Unit::TestCase def test_init_fb_connect_with_features assert @h.init_fb_connect("XFBML").match(/XFBML/) end - + + def test_init_fb_connect_receiver_path + assert @h.init_fb_connect.match(/xd_receiver.html/) + end + + def test_init_fb_connect_receiver_path_ssl + @h.instance_eval do + def request + ssl_request = ActionController::TestRequest.new + ssl_request.stubs(:ssl?).returns(true) + ssl_request + end + end + + assert @h.init_fb_connect.match(/xd_receiver_ssl.html/) + end + def test_init_fb_connect_with_features_and_body @h.expects(:capture).returns("Body Content") @@ -1005,6 +1021,21 @@ class RailsHelperTest < Test::Unit::TestCase end end + def test_fb_connect_javascript_tag_ssl + @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\" type=\"text/javascript\"></script>", + @h.fb_connect_javascript_tag + end + end + def test_fb_container @h.expects(:capture).returns("Inner Stuff") @h.fb_container(:condition=>"somejs") do test/facebooker/rails_integration_test.rb @@ -359,6 +359,16 @@ class TestFacebooker < Test::Unit::TestCase } end + def test_revoke_authorization_true + expect_http_posts_with_responses(example_revoke_authorization_true) + assert_equal true, @session.post('facebook.auth.revokeAuthorization', :uid => 123) + end + + def test_revoke_authorization_false + expect_http_posts_with_responses(example_revoke_authorization_false) + assert_equal false, @session.post('facebook.auth.revokeAuthorization', :uid => 123) + end + private def populate_user_info mock_http = establish_session @@ -922,4 +932,12 @@ class TestFacebooker < Test::Unit::TestCase </video_upload_response> XML end + + def example_revoke_authorization_true + "1" + end + + def example_revoke_authorization_false + "0" + end end test/facebooker_test.rb 640889d4be1e3c97ad97a23799eb8205b07bfe31 7438cbc73e3e321ffb7e2a21e5baee98c6c298e8 Aaron Patterson aaron.patterson@gmail.com http://github.com/mmangino/facebooker/commit/57ea6d0460071165a25edd727295affe0b17cdf1 57ea6d0460071165a25edd727295affe0b17cdf1 2009-04-30T10:34:05-07:00 2009-04-30T10:34:05-07:00 Merge branch 'master' of git@github.com:mmangino/facebooker Conflicts: test/facebooker_test.rb d008a118d9593f210227f98e4b801cc7bc5d7c61 Aaron Patterson aaron.patterson@gmail.com