mmangino-facebooker 1.0.44 → 1.0.45

data/facebooker.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{facebooker}
-  s.version = "1.0.44"
+  s.version = "1.0.45"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chad Fowler", "Patrick Ewing", "Mike Mangino", "Shane Vitarana", "Corey Innis"]
-  s.date = %q{2009-07-23}
+  s.date = %q{2009-07-24}
   s.description = %q{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

data/lib/facebooker.rb

@@ -36,14 +36,13 @@ module Facebooker
     class << self
 
     def load_configuration(facebooker_yaml_file)
-      if File.exist?(facebooker_yaml_file)
-        @raw_facebooker_configuration = YAML.load(ERB.new(File.read(facebooker_yaml_file)).result)
-        if defined? RAILS_ENV
-          @raw_facebooker_configuration = @raw_facebooker_configuration[RAILS_ENV]
-        end
-        Thread.current[:fb_api_config] = @raw_facebooker_configuration unless Thread.current[:fb_api_config]
-        apply_configuration(@raw_facebooker_configuration)
+      return false unless File.exist?(facebooker_yaml_file)
+      @raw_facebooker_configuration = YAML.load(ERB.new(File.read(facebooker_yaml_file)).result)
+      if defined? RAILS_ENV
+        @raw_facebooker_configuration = @raw_facebooker_configuration[RAILS_ENV]
       end
+      Thread.current[:fb_api_config] = @raw_facebooker_configuration unless Thread.current[:fb_api_config]
+      apply_configuration(@raw_facebooker_configuration)
     end
 
     # Sets the Facebook environment based on a hash of options. 
@@ -61,7 +60,10 @@ module Facebooker
         ActionController::Base.asset_host = config['callback_url'] 
       end
       Facebooker.timeout = config['timeout']
-      @facebooker_configuration = config
+
+      @facebooker_configuration = config  # must be set before adapter loaded
+      load_adapter(:fb_sig_api_key => config['api_key'])
+      facebooker_config
     end
 
     def facebooker_config
@@ -87,7 +89,7 @@ module Facebooker
           Thread.current[:fb_api_config] = apply_configuration(config)
           yield
         ensure
-          Thread.current[:fb_api_config] = old if old
+          Thread.current[:fb_api_config] = old if old && !old.empty?
           apply_configuration(Thread.current[:fb_api_config])
         end
       end

data/lib/facebooker/adapters/adapter_base.rb

@@ -12,7 +12,7 @@ module Facebooker
       @facebook_path_prefix = prefix
     end
 
-    def  facebooker_config
+    def facebooker_config
       @config
     end
 

data/lib/facebooker/rails/controller.rb

@@ -7,7 +7,6 @@ module Facebooker
       include Facebooker::Rails::ProfilePublisherExtensions
       def self.included(controller)
         controller.extend(ClassMethods)
-        controller.before_filter :set_adapter 
         controller.before_filter :set_facebook_request_format
         controller.helper_attr :facebook_session_parameters
         controller.helper_method :request_comes_from_facebook?
@@ -333,10 +332,6 @@ module Facebooker
         end
       end
       
-      def set_adapter
-        Facebooker.load_adapter(params) if(params[:fb_sig_api_key])
-      end
-
       
       module ClassMethods
         #

data/lib/facebooker/rails/helpers.rb

@@ -187,10 +187,10 @@ module Facebooker
       #     <fb:editor-button label="Save Poke"
       #    </fb:editor-buttonset>
       #  </fb:editor>
-     def facebook_form_for( record_or_name_or_array,*args, &proc)
+      def facebook_form_for( record_or_name_or_array,*args, &proc)
 
-       raise ArgumentError, "Missing block" unless block_given?
-       options = args.last.is_a?(Hash) ? args.pop : {}
+        raise ArgumentError, "Missing block" unless block_given?
+        options = args.last.is_a?(Hash) ? args.pop : {}
 
         case record_or_name_or_array
         when String, Symbol
@@ -230,8 +230,18 @@ module Facebooker
           fields_for( object_name,*(args << options), &proc)
           concat("</fb:editor>",proc.binding)
         end
-    end
+      end
       
+      # Render an fb:application-name tag
+      #
+      # This renders the current application name via fbml. See
+      # http://wiki.developers.facebook.com/index.php/Fb:application-name
+      # for a full description.
+      #
+      def fb_application_name(options={})
+        tag "fb:application-name", stringify_vals(options)
+      end
+
       # Render an fb:name tag for the given user
       # This renders the name of the user specified.  You can use this tag as both subject and object of 
       # a sentence.  <em> See </em> http://wiki.developers.facebook.com/index.php/Fb:name for full description.  

data/lib/facebooker/rails/publisher.rb

@@ -189,7 +189,7 @@ module Facebooker
           end
 
           def template_name(klass,method)
-            "#{klass.name}::#{method}"
+            "#{Facebooker.api_key}: #{klass.name}::#{method}"
           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/version.rb

@@ -2,7 +2,7 @@ module Facebooker #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 0
-    TINY  = 44
+    TINY  = 45
 
     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/rails/publisher_test.rb

@@ -145,6 +145,7 @@ class Facebooker::Rails::Publisher::FacebookTemplateTest < Test::Unit::TestCase
 
   def setup
     super
+    ENV['FACEBOOK_API_KEY'] = '1234567'
     @template = mock("facebook template")
     FacebookTemplate.stubs(:register).returns(@template)
     FacebookTemplate.clear_cache!
@@ -167,13 +168,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")
 
@@ -195,7 +196,7 @@ class Facebooker::Rails::Publisher::FacebookTemplateTest < Test::Unit::TestCase
   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)

data/test/facebooker/rails_integration_test.rb

@@ -160,9 +160,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 +182,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 +218,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 +258,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 +289,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 +302,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
@@ -532,9 +538,10 @@ 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    
@@ -597,10 +604,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 +699,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
 
@@ -1411,9 +1426,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

data/test/rack/facebook_test.rb

@@ -7,11 +7,20 @@ class Rack::FacebookTest < Test::Unit::TestCase
   
   def setup
     flexmock(Facebooker).should_receive(:secret_key).and_return('secret')
+    flexmock(Facebooker).should_receive(:load_adapter)
     @app = lambda do |env|
       @env = env
       Rack::Response.new().to_a
     end
     @facebook = Rack::Facebook.new(@app)
+    @valid_params = {
+      :fb_sig_user => '1',
+      :fb_sig => 'ignored'
+    }
+    @page = Proc.new {|options|
+      options ||= @valid_params
+      app.post "/", :input => params(options)
+    }
   end
   
   def params(p)
@@ -28,39 +37,37 @@ class Rack::FacebookTest < Test::Unit::TestCase
   end
   
   def test_converts_request_method
-    response = app.post("/",
-      :input => params(:fb_sig_request_method => 'GET', :fb_sig => '4d2a700e90b0bcbe54b9e627d2cc1417'))
+    response = @page.call(: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'))
+    response = @page.call(: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))
+    response = @page.call(:fb_sig => 'wrong', :fb_sig_user => 1)
     assert_equal 400, response.status
   end
   
   def test_skips_with_false_condition
     @facebook = Rack::Facebook.new(@app) { false }
-    response = app.post("/", :input => params(:fb_sig_user => 'ignored'))
+    response = @page.call({})
     assert_equal 200, response.status
   end
   
   def test_skips_with_true_condition_without_fb_sig
     @facebook = Rack::Facebook.new(@app) { true }
-    response = app.post("/", :input => params(:fb_sig_user => 'ignored'))
+    response = @page.call(:fb_sig_user => 'ignored')
     assert_equal 200, response.status
   end
   
   def test_verifies_with_true_condition_with_fb_sig
     @facebook = Rack::Facebook.new(@app) { true }
-    response = app.post("/", :input => params(:fb_sig => 'wrong', :fb_sig_user => 'ignored'))
+    response = @page.call(:fb_sig => 'wrong', :fb_sig_user => 'ignored')
     assert_equal 400, response.status
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mmangino-facebooker
 version: !ruby/object:Gem::Version 
-  version: 1.0.44
+  version: 1.0.45
 platform: ruby
 authors: 
 - Chad Fowler
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-23 00:00:00 -07:00
+date: 2009-07-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency