mmangino-facebooker 1.0.27 → 1.0.28

data/lib/facebooker/adapters/adapter_base.rb

@@ -68,6 +68,9 @@ module Facebooker
         end
         return adapter_class.new(adapter_config)
       end
+
+      return self.default_adapter(params)
+
     end
 
     def self.default_adapter(params = {})

data/lib/facebooker/model.rb

@@ -122,10 +122,12 @@ module Facebooker
       unless hash.nil? || hash.empty?
         hash.each do |key, value|
           set_attr_method = "#{key}="
-          if !value.nil? && respond_to?(set_attr_method)
-            self.__send__(set_attr_method, value) 
-          else
-            Facebooker::Logging.log_info("**Warning**, Attempt to set non-attribute: #{key}",hash)
+          unless value.nil?
+            if respond_to?(set_attr_method)
+              self.__send__(set_attr_method, value) 
+            else
+              Facebooker::Logging.log_info("**Warning**, Attempt to set non-attribute: #{key}",hash)
+            end
           end
         end
         @populated = true

data/lib/facebooker/models/user.rb

@@ -384,22 +384,35 @@ module Facebooker
     end
 
 
-    # Unregister a bunch of users
-    def self.unregister(emails)
-      emails = emails.collect {|e| hash_email(e)}
-      Facebooker::Session.create.post("facebook.connect.unregisterUsers",:email_hashes=>emails.to_json) do |ret|
+    # Unregister an array of email hashes
+    def self.unregister(email_hashes)
+      Facebooker::Session.create.post("facebook.connect.unregisterUsers",:email_hashes=>email_hashes.to_json) do |ret|
         ret.each do |hash|
-          emails.delete(hash)
+          email_hashes.delete(hash)
         end
-        unless emails.empty?
+        unless email_hashes.empty?
           e=Facebooker::Session::UserUnRegistrationFailed.new
-          e.failed_users = emails
+          e.failed_users = email_hashes
           raise e
         end
         ret
       end      
     end
     
+    # unregister an array of email addresses
+    def self.unregister_emails(emails)
+      emails_hash  = {}
+      emails.each {|e| emails_hash[hash_email(e)] = e}
+      begin 
+        unregister(emails_hash.keys).collect {|r| emails_hash[r]}
+      rescue
+        # re-raise with emails instead of hashes.
+        e = Facebooker::Session::UserUnRegistrationFailed.new
+        e.failed_users = $!.failed_users.collect { |f| emails_hash[f] }
+        raise e
+      end
+    end
+    
     def self.hash_email(email)
       email = email.downcase.strip
       crc=Zlib.crc32(email)

data/lib/facebooker/rails/controller.rb

@@ -6,7 +6,7 @@ module Facebooker
       include Facebooker::Rails::ProfilePublisherExtensions
       def self.included(controller)
         controller.extend(ClassMethods)
-        #controller.before_filter :set_adapter <-- security hole noted by vchu
+        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?

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

@@ -54,7 +54,7 @@ module Facebooker
         def fb_login_button(*args)
 
           callback = args.first
-          options = args.second || {}
+          options = args[1] || {}
           options.merge!(:onlogin=>callback)if callback
 
           content_tag("fb:login-button",nil, options)

data/lib/facebooker/rails/helpers.rb

@@ -282,8 +282,9 @@ module Facebooker
       
       # Render an <fb:profile-pic> for the specified user.
       #
-      # You can optionally specify the size using the :size=> option.
-      # Valid sizes are :thumb, :small, :normal and :square
+      # You can optionally specify the size using the :size=> option.  Valid
+      # sizes are :thumb, :small, :normal and :square.  Or, you can specify
+      # width and height settings instead, just like an img tag.
       #
       # You can optionally specify whether or not to include the facebook icon
       # overlay using the :facebook_logo => true option. Default is false.
@@ -298,7 +299,7 @@ module Facebooker
       end
 
       FB_PROFILE_PIC_OPTION_KEYS_TO_TRANSFORM = {:facebook_logo => 'facebook-logo'}
-      FB_PROFILE_PIC_VALID_OPTION_KEYS = [:size, :linked, 'facebook-logo']
+      FB_PROFILE_PIC_VALID_OPTION_KEYS = [:size, :linked, 'facebook-logo', :width, :height]
             
       
       # Render an fb:photo tag.

data/lib/facebooker/version.rb

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

data/lib/facebooker.rb

@@ -28,27 +28,34 @@ module Facebooker
     def load_configuration(facebooker_yaml_file)
       if File.exist?(facebooker_yaml_file)
         if defined? RAILS_ENV
-          facebooker = YAML.load_file(facebooker_yaml_file)[RAILS_ENV] 
+          config = YAML.load_file(facebooker_yaml_file)[RAILS_ENV] 
         else
-          facebooker = YAML.load_file(facebooker_yaml_file)           
+          config = YAML.load_file(facebooker_yaml_file)           
         end
-        ENV['FACEBOOK_API_KEY'] = facebooker['api_key']
-        ENV['FACEBOOK_SECRET_KEY'] = facebooker['secret_key']
-        ENV['FACEBOOKER_RELATIVE_URL_ROOT'] = facebooker['canvas_page_name']
-        ENV['FACEBOOKER_API'] = facebooker['api']
-        if facebooker.has_key?('set_asset_host_to_callback_url')
-          Facebooker.set_asset_host_to_callback_url = facebooker['set_asset_host_to_callback_url'] 
-        end
-        Facebooker.timeout = facebooker['timeout']
-        if Object.const_defined?("ActionController")
-          ActionController::Base.asset_host = facebooker['callback_url'] if(ActionController::Base.asset_host.blank?)  && Facebooker.set_asset_host_to_callback_url
-        end
-        @facebooker_configuration = facebooker
+        apply_configuration(config)
+      end
+    end
+    
+    # Sets the Facebook environment based on a hash of options. 
+    # By default the hash passed in is loaded from facebooker.yml, but it can also be passed in
+    # manually every request to run multiple Facebook apps off one Rails app. 
+    def apply_configuration(config)
+      ENV['FACEBOOK_API_KEY']             = config['api_key']
+      ENV['FACEBOOK_SECRET_KEY']          = config['secret_key']
+      ENV['FACEBOOKER_RELATIVE_URL_ROOT'] = config['canvas_page_name']
+      ENV['FACEBOOKER_API']               = config['api']
+      if config.has_key?('set_asset_host_to_callback_url')
+        Facebooker.set_asset_host_to_callback_url = config['set_asset_host_to_callback_url'] 
+      end
+      if Object.const_defined?("ActionController") and Facebooker.set_asset_host_to_callback_url
+        ActionController::Base.asset_host = config['callback_url'] 
       end
+      Facebooker.timeout = config['timeout']
+      @facebooker_configuration = config
     end
     
     def facebooker_config
-      @facebooker_configuration 
+      @facebooker_configuration || {} # to prevent pretty_errors error if the config hasn't been set yet
     end
     
      def current_adapter=(adapter_class)

data/test/facebooker/models/user_test.rb

@@ -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_integration_test.rb

@@ -590,6 +590,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
@@ -1118,30 +1122,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
@@ -1301,6 +1303,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

metadata

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