mmangino-facebooker 1.0.26 → 1.0.27

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

@@ -80,7 +80,7 @@ module Facebooker
         
         def fb_user_action(action, user_message = "", prompt = "", callback = nil)
           update_page do |page|
-            page.call "FB.Connect.showFeedDialog",action.template_id,action.data,action.target_ids,action.body_general,nil,"FB.RequireConnect.promptConnect",callback,prompt,user_message
+            page.call "FB.Connect.showFeedDialog",action.template_id,action.data,action.target_ids,action.body_general,nil,page.literal("FB.RequireConnect.promptConnect"),callback,prompt,user_message
           end
         end
         

data/lib/facebooker/rails/helpers.rb

@@ -283,14 +283,23 @@ 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 whether or not to include the facebook icon
+      # overlay using the :facebook_logo => true option. Default is false.
+      #
       def fb_profile_pic(user, options={})
         options = options.dup
         validate_fb_profile_pic_size(options)
+        options.transform_keys!(FB_PROFILE_PIC_OPTION_KEYS_TO_TRANSFORM)
+        options.assert_valid_keys(FB_PROFILE_PIC_VALID_OPTION_KEYS)
         options.merge!(:uid => cast_to_facebook_id(user))
         content_tag("fb:profile-pic", nil,stringify_vals(options))
       end
+
+      FB_PROFILE_PIC_OPTION_KEYS_TO_TRANSFORM = {:facebook_logo => 'facebook-logo'}
+      FB_PROFILE_PIC_VALID_OPTION_KEYS = [:size, :linked, 'facebook-logo']
+            
       
       # Render an fb:photo tag.
       # photo is either a Facebooker::Photo or an id of a Facebook photo or an object that responds to photo_id.

data/lib/facebooker/rails/publisher.rb

@@ -229,8 +229,7 @@ module Facebooker
           @target_ids = val.is_a?(Array) ? val.join(",") : val
         end
         def data_hash
-          default_data = story_size.nil? ? {} : {:story_size=>story_size}
-          default_data.merge(data||{})
+          data||{}
         end
       end
       
@@ -378,7 +377,7 @@ module Facebooker
         when Ref
           Facebooker::Session.create.server_cache.set_ref_handle(_body.handle,_body.fbml)
         when UserAction
-          @from.session.publish_user_action(_body.template_id,_body.data_hash,_body.target_ids,_body.body_general)
+          @from.session.publish_user_action(_body.template_id,_body.data_hash,_body.target_ids,_body.body_general,_body.story_size)
         else
           raise UnspecifiedBodyType.new("You must specify a valid send_as")
         end

data/lib/facebooker/session.rb

@@ -371,10 +371,11 @@ module Facebooker
     # publish a previously rendered template bundle
     # see http://wiki.developers.facebook.com/index.php/Feed.publishUserAction
     #
-    def publish_user_action(bundle_id,data={},target_ids=nil,body_general=nil)
+    def publish_user_action(bundle_id,data={},target_ids=nil,body_general=nil,story_size=nil)
       parameters={:template_bundle_id=>bundle_id,:template_data=>data.to_json}
       parameters[:target_ids] = target_ids unless target_ids.blank?
       parameters[:body_general] = body_general unless body_general.blank?
+      parameters[:story_size] = story_size unless story_size.nil?
       post("facebook.feed.publishUserAction", parameters)
     end
     

data/lib/facebooker/version.rb

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

data/test/facebooker/rails/publisher_test.rb

@@ -356,7 +356,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"},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').
@@ -371,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').
@@ -384,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

@@ -970,6 +970,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

metadata

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