facebooker 1.0.29 → 1.0.30

data/lib/facebooker/version.rb

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

data/test/facebooker/adapters_test.rb

@@ -1,46 +1,48 @@
 require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
-class Facebooker::SessionTest < Test::Unit::TestCase
+class Facebooker::AdaptersTest < Test::Unit::TestCase
   def setup
     ENV['FACEBOOK_API_KEY'] = '1234567'
-    ENV['FACEBOOK_SECRET_KEY'] = '7654321'   
-    Facebooker.current_adapter = nil 
-    @bebo_api_key = "bebo_api_key"; @bebo_secret_key = "bebo_secret_key"    
+    ENV['FACEBOOK_SECRET_KEY'] = '7654321'
+    @current_adapter = Facebooker.current_adapter
+    Facebooker.current_adapter = nil
+    @bebo_api_key = "bebo_api_key"; @bebo_secret_key = "bebo_secret_key"
   end
 
   def teardown
    flexmock_close
+    Facebooker.current_adapter = @current_adapter
   end
-  
+
   def test_load_default_adapter
     session = Facebooker::CanvasSession.create(ENV['FACEBOOK_API_KEY'], ENV['FACEBOOK_SECRET_KEY'])
     assert_equal(ENV['FACEBOOK_API_KEY'], Facebooker::Session.api_key)
     assert( Facebooker::FacebookAdapter === Facebooker.current_adapter)
-    
+
     ENV['FACEBOOK_API_KEY'] = nil
-    ENV['FACEBOOK_SECRET_KEY'] = nil   
-    Facebooker.current_adapter = nil 
+    ENV['FACEBOOK_SECRET_KEY'] = nil
+    Facebooker.current_adapter = nil
     Facebooker::AdapterBase.stubs(:facebooker_config).returns({"api_key" => "facebook_key", "secret_key" => "facebook_secret" })
     assert( Facebooker::FacebookAdapter === Facebooker.current_adapter)
     assert_equal("facebook_key", Facebooker::Session.api_key)
   end
-  
+
   def test_load_bebo_adapter
-   
+
     load_bebo_adapter
     assert_equal(@bebo_api_key, Facebooker::Session.api_key)
     assert_equal(@bebo_secret_key, Facebooker::Session.secret_key)
     assert(Facebooker::BeboAdapter === Facebooker.current_adapter, " Bebo adapter not loaded correctly.")
   end
-  
+
   def load_bebo_adapter
-    @bebo_api_key = "bebo_api_key"; @bebo_secret_key = "bebo_secret_key"    
+    @bebo_api_key = "bebo_api_key"; @bebo_secret_key = "bebo_secret_key"
 
     Facebooker::AdapterBase.stubs(:facebooker_config).returns({"bebo_api_key" => @bebo_api_key, "bebo_adapter" => "BeboAdapter", "bebo_secret_key" => @bebo_secret_key, "foo" => "bar"})
     Facebooker.load_adapter(:config_key_base => "bebo")
     @session = Facebooker::CanvasSession.create(@bebo_api_key, @bebo_secret_key)
   end
-  
+
   def test_adapter_details
      test_load_default_adapter
 
@@ -50,7 +52,7 @@ class Facebooker::SessionTest < Test::Unit::TestCase
      assert_equal("http://api.facebook.com", Facebooker.api_server_base_url)
      assert(Facebooker.is_for?(:facebook))
     load_bebo_adapter
-    
+
       assert_equal("apps.bebo.com", Facebooker.canvas_server_base)
      assert_equal("apps.bebo.com", Facebooker.api_server_base)
      assert_equal("www.bebo.com", Facebooker.www_server_base_url)
@@ -58,20 +60,20 @@ class Facebooker::SessionTest < Test::Unit::TestCase
      assert_equal("http://www.bebo.com/SignIn.jsp?ApiKey=bebo_api_key&v=1.0&canvas=true", @session.login_url)
      assert_equal("http://www.bebo.com/c/apps/add?ApiKey=bebo_api_key&v=1.0", @session.install_url)
      assert(Facebooker.is_for?(:bebo))
-     
+
   end
-  
+
   def test_adapter_failures
       Facebooker::AdapterBase.stubs(:facebooker_config).returns({})
-      
+
       assert_raises(Facebooker::AdapterBase::UnableToLoadAdapter){
         Facebooker.load_adapter(:config_key_base => "bebo")
       }
   end
-  
+
   def test_bebo_specific_issues
     load_bebo_adapter
-     
+
     # @session.send(:service).stubs(:post).returns([{:name => "foo"}])
      Net::HTTP.stubs(:post_form).returns("<profile_setFBML_response></profile_setFBML_response>")
      user = Facebooker::User.new(:uid => "123456")
@@ -87,10 +89,8 @@ class Facebooker::SessionTest < Test::Unit::TestCase
      Net::HTTP.stubs(:post_form).returns("<feed_publishTemplatizedAction_response>1</feed_publishTemplatizedAction_response>")
      user.publish_templatized_action(action)
   end
-  
+
   def test_bebo_process_data
-    
-  end
-  
 
+  end
 end

data/test/facebooker/model_test.rb

@@ -12,11 +12,21 @@ class Facebooker::ModelTest < Test::Unit::TestCase
     attr_accessor :name, :job
     hash_settable_accessor :complex_thing, ComplexThing
     hash_settable_list_accessor :list_of_complex_things, ComplexThing
+
+    def initialize *args
+      @session = nil
+      super
+    end
   end
 
   class PopulatingThing
     include Facebooker::Model
     populating_attr_accessor :first_name
+
+    def initialize
+      @first_name = nil
+      @populated  = false
+    end
   end
   
   def test_can_instantiate_an_object_with_a_hash

data/test/facebooker/rails/publisher_test.rb

@@ -11,32 +11,32 @@ module ModuleHelper
     true
   end
 end
- 
+
 ::RAILS_DEFAULT_LOGGER = Logger.new(STDOUT)
 
 class TestPublisher < Facebooker::Rails::Publisher
-  
+
   helper :symbol
   helper ModuleHelper
-  
+
   def action(f)
     send_as :action
     from f
     title "Action Title"
   end
-  
+
   def templatized_action(f)
     send_as :templatized_action
     from f
     title_template "Templatized Action Title"
   end
-  
+
   def story(to)
     send_as :story
     recipients to
     title 'Story Title'
   end
-  
+
   def notification(to,f)
     send_as :notification
     recipients to
@@ -52,24 +52,24 @@ class TestPublisher < Facebooker::Rails::Publisher
     fbml 'text'
     text fbml
   end
-  
+
   def render_notification(to,f)
     send_as :notification
     recipients to
     from f
     fbml render(:inline=>"<%=module_helper_loaded%>")
   end
-    
-  
+
+
   def profile_update(to,f)
     send_as :profile
     recipients to
     profile "profile"
     profile_action "profile_action"
     mobile_profile "mobile_profile"
-    
+
   end
-  
+
    def profile_update_with_profile_main(to,f)
     send_as :profile
     recipients to
@@ -79,40 +79,40 @@ class TestPublisher < Facebooker::Rails::Publisher
     mobile_profile "mobile_profile"
     profile_main "profile_main"
   end
-  
+
   def ref_update(user)
     send_as :ref
     fbml "fbml"
     handle "handle"
   end
-  
+
   def user_action_template
     one_line_story_template "{*actor*} did stuff with {*friend*}"
     short_story_template "{*actor*} has a title {*friend*}", render(:inline=>"This is a test render")
     full_story_template "{*actor*} did a lot","This is the full body",:img=>{:some_params=>true}
   end
-  
+
   def simple_user_action_template
-    one_line_story_template "{*actor*} did stuff with {*friend*}"    
+    one_line_story_template "{*actor*} did stuff with {*friend*}"
   end
-  
+
   def user_action_with_action_links_template
     one_line_story_template "{*actor*} did stuff with {*friend*}"
     short_story_template "{*actor*} has a title {*friend*}", render(:inline=>"This is a test render")
     full_story_template "{*actor*} did a lot","This is the full body",:img=>{:some_params=>true}
     action_links action_link("Source","HREF")
   end
-  
+
   def user_action(user)
     send_as :user_action
     from user
     data :friend=>"Mike"
   end
-  
+
   def user_action_with_template_id(user)
     send_as :user_action
     from user
-    data :friend=>"Mike"  
+    data :friend=>"Mike"
     template_id 4
   end
   def user_action_with_story_size(user)
@@ -127,130 +127,135 @@ class TestPublisher < Facebooker::Rails::Publisher
     send_as :user_action
     from user
   end
-  
+
   def no_send_as(to)
     recipients to
   end
-  
+
   def invalid_send_as(to)
     send_as :fake
     recipients to
   end
-  
+
 end
 
 class Facebooker::Rails::Publisher::FacebookTemplateTest < Test::Unit::TestCase
   FacebookTemplate = Facebooker::Rails::Publisher::FacebookTemplate
-  
+  include Facebooker::Rails::TestHelpers
+
   def setup
     super
     @template = mock("facebook template")
     FacebookTemplate.stubs(:register).returns(@template)
     FacebookTemplate.clear_cache!
   end
-  
+
   def test_find_or_register_calls_find_cached
     FacebookTemplate.expects(:find_cached).with(TestPublisher,"simple_user_action").returns(@template)
     assert_equal FacebookTemplate.for_class_and_method(TestPublisher,"simple_user_action"),@template
-  end  
-  
+  end
+
   def test_find_cached_should_use_cached_if_it_exists
     FacebookTemplate.cache(TestPublisher,"simple_user_action",@template)
     assert_equal FacebookTemplate.find_cached(TestPublisher,"simple_user_action"), @template
-    
+
   end
-  
+
   def test_find_cached_should_call_find_in_db_if_not_in_cache
     FacebookTemplate.expects(:find_in_db).with(TestPublisher,"simple_user_action").returns(@template)
     assert_equal FacebookTemplate.find_cached(TestPublisher,"simple_user_action"), @template
   end
-  
+
   def test_find_in_db_should_run_find
     FacebookTemplate.expects(:find_by_template_name).with("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(:register).with(TestPublisher,"simple_user_action").returns(@template)
     FacebookTemplate.find_cached(TestPublisher,"simple_user_action")
-    
+
   end
-  
+
   def test_find_in_db_should_check_for_change_if_found
     FacebookTemplate.stubs(:find_by_template_name).returns(@template)
     FacebookTemplate.stubs(:hashed_content).returns("MY CONTENT")
     @template.expects(:template_changed?).with("MY CONTENT").returns(false)
-    FacebookTemplate.find_in_db(TestPublisher,"simple_user_action")  
+    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")  
+    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(: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")    
+    FacebookTemplate.find_in_db(TestPublisher,"simple_user_action")
   end
 end
 
 class Facebooker::Rails::Publisher::PublisherTest < Test::Unit::TestCase
   FacebookTemplate = Facebooker::Rails::Publisher::FacebookTemplate
-  
+
   def setup
     super
+
+    ENV['FACEBOOK_API_KEY'] = '1234567'
+    ENV['FACEBOOK_SECRET_KEY'] = '7654321'
+
     @user = Facebooker::User.new
     @user.id=4
     @session = "session"
     @user.stubs(:session).returns(@session)
   end
-  
+
   def teardown
     super
   end
-  
+
   def test_create_action
     action=TestPublisher.create_action(@user)
     assert_equal Facebooker::Feed::Action,action.class
     assert_equal "Action Title",action.title
   end
-  
+
   def test_deliver_action
     @user.expects(:publish_action)
     TestPublisher.deliver_action(@user)
   end
-  
+
   def test_create_story
     action=TestPublisher.create_story(@user)
     assert_equal Facebooker::Feed::Story,action.class
     assert_equal "Story Title",action.title
   end
-  
+
   def test_deliver_story
     @user.expects(:publish_story)
-    TestPublisher.deliver_story(@user)    
+    TestPublisher.deliver_story(@user)
   end
-  
+
   def test_create_notification
     notification=TestPublisher.create_notification(12451752,@user)
     assert_equal Facebooker::Rails::Publisher::Notification,notification.class
     assert_equal "Not",notification.fbml
   end
-  
+
   def test_deliver_notification
     @session.expects(:send_notification)
     TestPublisher.deliver_notification("12451752",@user)
   end
-  
+
   def test_create_email
     email=TestPublisher.create_email("12451752",@user)
     assert_equal Facebooker::Rails::Publisher::Email,email.class
@@ -258,21 +263,21 @@ class Facebooker::Rails::Publisher::PublisherTest < Test::Unit::TestCase
     assert_equal "text",email.text
     assert_equal "text",email.fbml
   end
-  
+
   def test_deliver_email
     @session.expects(:send_email)
     TestPublisher.deliver_email("12451752",@user)
   end
-  
+
   def test_create_templatized_action
     ta=TestPublisher.create_templatized_action(@user)
     assert_equal Facebooker::Feed::TemplatizedAction,ta.class
     assert_equal "Templatized Action Title",ta.title_template
-    
+
   end
-  
-  
-  
+
+
+
   def test_deliver_templatized_action
     @user.expects(:publish_action)
     TestPublisher.deliver_templatized_action(@user)
@@ -292,28 +297,28 @@ class Facebooker::Rails::Publisher::PublisherTest < Test::Unit::TestCase
     assert_equal "mobile_profile",p.mobile_profile
     assert_equal "profile_main",p.profile_main
   end
-  
-  
+
+
   def test_deliver_profile
     Facebooker::User.stubs(:new).returns(@user)
     @user.expects(:set_profile_fbml).with('profile', 'mobile_profile', 'profile_action',nil)
-    TestPublisher.deliver_profile_update(@user,@user)    
+    TestPublisher.deliver_profile_update(@user,@user)
   end
-  
+
    def test_deliver_profile_with_main
     Facebooker::User.stubs(:new).returns(@user)
     @user.expects(:set_profile_fbml).with('profile', 'mobile_profile', 'profile_action','profile_main')
-    TestPublisher.deliver_profile_update_with_profile_main(@user,@user)    
+    TestPublisher.deliver_profile_update_with_profile_main(@user,@user)
   end
-  
-  
+
+
   def test_create_ref_update
     p=TestPublisher.create_ref_update(@user)
     assert_equal Facebooker::Rails::Publisher::Ref,p.class
     assert_equal "fbml",p.fbml
     assert_equal "handle",p.handle
   end
-  
+
   def test_deliver_ref_update
     Facebooker::Session.stubs(:create).returns(@session)
     @server_cache="server_cache"
@@ -321,7 +326,7 @@ class Facebooker::Rails::Publisher::PublisherTest < Test::Unit::TestCase
     @server_cache.expects(:set_ref_handle).with("handle","fbml")
     TestPublisher.deliver_ref_update(@user)
   end
-  
+
   def test_register_user_action
    Facebooker::Rails::Publisher::FacebookTemplate.expects(:register)
     TestPublisher.register_user_action
@@ -331,7 +336,7 @@ class Facebooker::Rails::Publisher::PublisherTest < Test::Unit::TestCase
     Facebooker::Rails::Publisher::FacebookTemplate.expects(:register)
     TestPublisher.register_user_action_with_action_links
   end
-  
+
   def test_create_user_action
     @from_user = Facebooker::User.new
     @session = Facebooker::Session.new("","")
@@ -351,13 +356,13 @@ class Facebooker::Rails::Publisher::PublisherTest < Test::Unit::TestCase
     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,nil)
-    
+
     Facebooker::Rails::Publisher::FacebookTemplate.expects(:bundle_id_for_class_and_method).
                                                    with(TestPublisher, 'user_action').
                                                    returns(20309041537)
@@ -366,26 +371,26 @@ class Facebooker::Rails::Publisher::PublisherTest < Test::Unit::TestCase
     # Facebooker::Rails::Publisher::FacebookTemplate.expects(:for).returns(pseudo_template)
     TestPublisher.deliver_user_action(@from_user)
   end
-  
+
   def test_publish_user_action_with_story_size
     @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,2)
-    
+
     Facebooker::Rails::Publisher::FacebookTemplate.expects(:bundle_id_for_class_and_method).
                                                    with(TestPublisher, 'user_action_with_story_size').
                                                    returns(20309041537)
     TestPublisher.deliver_user_action_with_story_size(@from_user)
-    
+
   end
-  
+
   def test_publishing_user_data_no_action_gives_nil_hash
     @from_user = Facebooker::User.new
     @session = Facebooker::Session.new("","")
     @from_user.stubs(:session).returns(@session)
     @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)
   end
@@ -394,14 +399,14 @@ class Facebooker::Rails::Publisher::PublisherTest < Test::Unit::TestCase
       TestPublisher.deliver_no_send_as(@user)
     }
   end
-  
+
   def test_invalid_send_as_raises
     assert_raises(Facebooker::Rails::Publisher::UnknownBodyType) {
       TestPublisher.deliver_invalid_send_as(@user)
     }
   end
-  
-  
+
+
   def test_keeps_class_method_missing
     assert_raises(NoMethodError) {
       TestPublisher.fake
@@ -412,7 +417,7 @@ class Facebooker::Rails::Publisher::PublisherTest < Test::Unit::TestCase
       TestPublisher.new.fake
     }
   end
-  
+
   def test_image_urls
     Facebooker.expects(:facebook_path_prefix).returns("/mike")
     string_image = TestPublisher.new.image('image.png', 'raw_string')
@@ -421,7 +426,7 @@ class Facebooker::Rails::Publisher::PublisherTest < Test::Unit::TestCase
     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
@@ -429,40 +434,44 @@ class Facebooker::Rails::Publisher::PublisherTest < Test::Unit::TestCase
   def test_action_link
     assert_equal({:text=>"text", :href=>"href"}, TestPublisher.new.action_link("text","href"))
   end
-  
+
   def test_default_url_options
     Facebooker.expects(:facebook_path_prefix).returns("/mike")
     assert_equal({:host=>"apps.facebook.com/mike"},TestPublisher.default_url_options)
   end
-  
+
   def test_recipients
     tp=TestPublisher.new
     tp.recipients "a"
     assert_equal("a",tp.recipients)
   end
-  
+
   def test_symbol_helper
     assert TestPublisher.new.symbol_helper_loaded
   end
   def test_module_helper
     assert TestPublisher.new.module_helper_loaded
   end
-  
+
   def test_with_render
     #normally Rails would do this for us
-    if ActionController::Base.respond_to?(:append_view_path)
-      ActionController::Base.append_view_path("./test/../../app/views")
+    silence_warnings do
+      if ActionController::Base.respond_to?(:append_view_path)
+        ActionController::Base.append_view_path("./test/../../app/views")
+      end
+      notification=TestPublisher.create_render_notification(12451752,@user)
+      assert_equal "true",notification.fbml
     end
-    notification=TestPublisher.create_render_notification(12451752,@user)
-    assert_equal "true",notification.fbml
   end
-  
+
   def test_notification_as_announcement
     #normally Rails would do this for us
-    if ActionController::Base.respond_to?(:append_view_path)
-      ActionController::Base.append_view_path("./test/../../app/views")
+    silence_warnings do
+      if ActionController::Base.respond_to?(:append_view_path)
+        ActionController::Base.append_view_path("./test/../../app/views")
+      end
+      notification=TestPublisher.create_render_notification(12451752,nil)
+      assert_equal "true",notification.fbml
     end
-    notification=TestPublisher.create_render_notification(12451752,nil)
-    assert_equal "true",notification.fbml
   end
 end