facebooker 1.0.55 → 1.0.56

data/facebooker.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{facebooker}
-  s.version = "1.0.55"
+  s.version = "1.0.56"
 
   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", "Mike Mangino"]
-  s.date = %q{2009-11-06}
+  s.date = %q{2009-12-04}
   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/models/user.rb

@@ -3,7 +3,7 @@ require 'facebooker/models/affiliation'
 require 'facebooker/models/work_info'
 require 'facebooker/models/family_relative_info'
 module Facebooker
-  # 
+  #
   # Holds attributes and behavior for a Facebook User
   class User
     include Model
@@ -76,8 +76,8 @@ module Facebooker
       result = @session.post('facebook.events.rsvp', options.merge(:eid => eid, :rsvp_status => rsvp_status))
       result == '1' ? true : false
     end
-    
-    # 
+
+    #
     # Set the list of friends, given an array of User objects.  If the list has been retrieved previously, will not set
     def friends=(list_of_friends,flid=nil)
       @friends_hash ||= {}
@@ -87,7 +87,7 @@ module Facebooker
 
       @friends_hash[cache_key] ||= list_of_friends
     end
-    
+
     def cast_to_friend_list_id(flid)
       case flid
        when String
@@ -130,6 +130,9 @@ module Facebooker
     #
     # +target+ can be the current user or some other user.
     #
+    # To publish to a Page on the Page's behave, specify the page id as
+    # :uid and set :post_as_page to 'true', use the current user as target
+    #
     # Example:
     #   # Publish a message to my own wall:
     #   me.publish_to(me, :message => 'hello world')
@@ -142,12 +145,12 @@ module Facebooker
     def publish_to(target, options = {})
       @session.post('facebook.stream.publish', prepare_publish_to_options(target, options), false)
     end
-   
+
     # Prepares options for the stream.publish
     def prepare_publish_to_options(target, options)
       opts = {:uid          => self.id,
               :target_id    => target.id,
-              :message      => options[:message]} 
+              :message      => options[:message]}
 
       if(attachment = options[:attachment] && Facebooker.json_encode(options[:attachment]))
         opts[:attachment] = attachment
@@ -155,9 +158,15 @@ module Facebooker
       if (links = options[:action_links] && Facebooker.json_encode(options[:action_links]))
         opts[:action_links] = links
       end
+      unless options[:uid].nil?
+        opts[:uid] = options[:uid]
+      end
+      if options[:post_as_page]
+        opts.delete(:target_id)
+      end
       opts
     end
-    
+
     ###
     # Publish a comment on a post
     #
@@ -168,7 +177,7 @@ module Facebooker
     def comment_on(post_id, comment)
       @session.post('facebook.stream.addComment', {:post_id=>post_id, :comment=>comment})
     end
-    
+
 
      def friend_lists
        @friend_lists ||= @session.post('facebook.friends.getLists').map do |hash|
@@ -182,11 +191,11 @@ module Facebooker
     # Subsequent calls will be retrieved from memory.
     # Optional: list of fields to retrieve as symbols
     def friends!(*fields)
-      @friends ||= session.post('facebook.users.getInfo', :fields => collect(fields), :uids => friends.map{|f| f.id}.join(',')).map do |hash|  
+      @friends ||= session.post('facebook.users.getInfo', :fields => collect(fields), :uids => friends.map{|f| f.id}.join(',')).map do |hash|
         User.new(hash['uid'], session, hash)
       end
     end
-    
+
     ###
     # Retrieve profile data for logged in user
     # Optional: list of fields to retrieve as symbols
@@ -195,11 +204,11 @@ module Facebooker
         populate_from_hash!(response.first)
       end
     end
-        
+
     def friends_with?(user_or_id)
-      friends.map{|f| f.to_i}.include?(user_or_id.to_i)  
+      friends.map{|f| f.to_i}.include?(user_or_id.to_i)
     end
-    
+
     def friends_with_this_app
       @friends_with_this_app ||= friend_ids_with_this_app.map do |uid|
         User.new(uid, session)
@@ -209,7 +218,7 @@ module Facebooker
     def friend_ids_with_this_app
       @friend_ids_with_this_app ||= session.post('facebook.friends.getAppUsers')
     end
-    
+
     def groups(gids = [])
       args = gids.empty? ? {} : {:gids => gids}
       @groups ||= session.post('facebook.groups.get', args).map do |hash|
@@ -218,23 +227,23 @@ module Facebooker
         group
       end
     end
-    
+
     def notifications
       @notifications ||= Notifications.from_hash(session.post('facebook.notifications.get'))
     end
-    
+
     def publish_story(story)
       publish(story)
     end
-    
+
     def publish_action(action)
       publish(action)
     end
-    
+
     def publish_templatized_action(action)
       publish(action)
     end
-    
+
     def albums
       @albums ||= session.post('facebook.photos.getAlbums', :uid => self.id) do |response|
         response.map do |hash|
@@ -242,15 +251,15 @@ module Facebooker
         end
       end
     end
-    
+
     def create_album(params)
       @album = session.post('facebook.photos.createAlbum', params) {|response| Album.from_hash(response)}
     end
-    
+
     def profile_photos
       session.get_photos(nil, nil, profile_pic_album_id)
     end
-    
+
     # Upload a photo to the user's profile.
     #
     # In your view, create a multipart form that posts directly to your application (not through canvas):
@@ -260,8 +269,8 @@ module Facebooker
     #     Caption: <%= text_area_tag 'caption' %>
     #     <%= submit_tag 'Upload Photo', :class => 'inputsubmit' %>
     #   <% end %>
-    # 
-    # And in your controller: 
+    #
+    # And in your controller:
     #
     #   class PhotosController < ApplicationController
     #     def create
@@ -270,7 +279,7 @@ module Facebooker
     #         params[:photo].content_type,
     #         params[:photo].read
     #       )
-    #     
+    #
     #       @photo = facebook_session.user.upload_photo(file, :caption => params[:caption])
     #       redirect_to photos_url(:canvas => true)
     #     end
@@ -281,7 +290,7 @@ module Facebooker
       Photo.from_hash(session.post_file('facebook.photos.upload',
         options.merge(nil => multipart_post_file)))
     end
-    
+
     # Upload a video to the user's profile.
     #
     # In your view, create a multipart form that posts directly to your application (not through canvas):
@@ -292,8 +301,8 @@ module Facebooker
     #     Description: <%= text_area_tag 'description' %>
     #     <%= submit_tag 'Upload Video', :class => 'inputsubmit' %>
     #   <% end %>
-    # 
-    # And in your controller: 
+    #
+    # And in your controller:
     #
     #   class VideosController < ApplicationController
     #     def create
@@ -302,7 +311,7 @@ module Facebooker
     #         params[:photo].content_type,
     #         params[:photo].read
     #       )
-    #     
+    #
     #       @video = facebook_session.user.upload_video(file, :description => params[:description])
     #       redirect_to videos_url(:canvas => true)
     #     end
@@ -313,11 +322,11 @@ module Facebooker
       Video.from_hash(session.post_file('facebook.video.upload',
         options.merge(nil => multipart_post_file, :base => Facebooker.video_server_base)))
     end
-    
+
     def profile_fbml
-      session.post('facebook.profile.getFBML', :uid => id)  
-    end    
-    
+      session.post('facebook.profile.getFBML', :uid => id)
+    end
+
     ##
     # Set the profile FBML for this user
     #
@@ -325,21 +334,21 @@ module Facebooker
     def profile_fbml=(markup)
       set_profile_fbml(markup, nil, nil, nil)
     end
-    
+
     ##
     # Set the mobile profile FBML
     def mobile_fbml=(markup)
       set_profile_fbml(nil, markup, nil,nil)
     end
-    
+
     def profile_action=(markup)
       set_profile_fbml(nil, nil, markup,nil)
     end
-    
+
     def profile_main=(markup)
      set_profile_fbml(nil,nil,nil,markup)
     end
-    
+
     def set_profile_fbml(profile_fbml, mobile_fbml, profile_action_fbml, profile_main = nil)
       parameters = {:uid => id}
       parameters[:profile] = profile_fbml if profile_fbml
@@ -348,21 +357,21 @@ module Facebooker
       parameters[:profile_main] = profile_main if profile_main
       session.post('facebook.profile.setFBML', parameters,false)
     end
-    
+
     ## ** NEW PROFILE DESIGN ***
     # Set a info section for this user
     #
     # Note: using set_profile_info as I feel using user.set_info could be confused with the user.getInfo facebook method.
     #       Also, I feel it fits in line with user.set_profile_fbml.
     def set_profile_info(title, info_fields, format = :text)
-      session.post('facebook.profile.setInfo', :title => title, :uid => id, 
+      session.post('facebook.profile.setInfo', :title => title, :uid => id,
         :type => format.to_s == "text" ? 1 : 5, :info_fields => info_fields.to_json)
     end
-    
+
     def get_profile_info
       session.post('facebook.profile.getInfo', :uid => id)
     end
-    
+
     ##
     # This DOES NOT set the status of a user on Facebook
     # Use the set_status method instead
@@ -374,9 +383,9 @@ module Facebooker
         @status = Status.from_hash(message)
       end
     end
-   
 
-    ## 
+
+    ##
     # Return +limit+ statuses from the user
     def statuses( limit = 50 )
       session.post('facebook.status.get', {:uid => uid, :limit => limit}).collect { |ret| Status.from_hash(ret) }
@@ -386,65 +395,65 @@ module Facebooker
     # Set the status for a user
     # DOES NOT prepend "is" to the message
     #
-    # requires extended permission. 
+    # requires extended permission.
     def set_status(message)
       self.status=message
       session.post('facebook.users.setStatus',{:status=>message,:status_includes_verb=>1,:uid => uid}, false) do |ret|
         ret
       end
     end
-    
+
     ##
     # Checks to see if the user has enabled the given extended permission
     def has_permission?(ext_perm) # ext_perm = email, offline_access, status_update, photo_upload, create_listing, create_event, rsvp_event, sms
       session.post('facebook.users.hasAppPermission', {:ext_perm=>ext_perm, :uid => uid}, false) == "1"
-    end    
-    
+    end
+
     ##
     # Convenience method to check multiple permissions at once
     def has_permissions?(ext_perms)
       ext_perms.all?{|p| has_permission?(p)}
-    end            
-    
+    end
+
     ##
     # Convenience method to send email to the current user
     def send_email(subject, text=nil, fbml=nil)
       session.send_email([id], subject, text, fbml)
     end
-    
+
     ##
     # Convenience method to set cookie for the current user
     def set_cookie(name, value, expires=nil, path=nil)
       session.data.set_cookie(id, name, value, expires, path)
     end
-    
+
     ##
     # Convenience method to get cookies for the current user
     def get_cookies(name=nil)
       session.data.get_cookies(id, name)
     end
-    
+
     ##
     # Returns the user's id as an integer
     def to_i
       id
     end
-    
+
     def to_s
       id.to_s
     end
-    
+
     ##
     # Two Facebooker::User objects should be considered equal if their Facebook ids are equal
     def ==(other_user)
       other_user.is_a?(User) && id == other_user.id
     end
-    
-    
+
+
     # register a user with Facebook
     # users should be a hast with at least an :email field
     # you can optionally provide an :account_id field as well
-        
+
     def self.register(users)
       user_map={}
       users=users.map do |h|
@@ -487,14 +496,14 @@ module Facebooker
           raise e
         end
         ret
-      end      
+      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 
+      begin
         unregister(emails_hash.keys).collect {|r| emails_hash[r]}
       rescue
         # re-raise with emails instead of hashes.
@@ -503,14 +512,14 @@ module Facebooker
         raise e
       end
     end
-    
+
     def self.hash_email(email)
       email = email.downcase.strip
       crc=Zlib.crc32(email)
       md5=Digest::MD5.hexdigest(email)
       "#{crc}_#{md5}"
     end
-    
+
     def self.cast_to_facebook_id(object)
       if object.respond_to?(:facebook_id)
         object.facebook_id
@@ -518,35 +527,35 @@ module Facebooker
         object
       end
     end
-    
+
     def self.user_fields(fields = [])
       valid_fields(fields)
     end
-    
+
     def self.standard_fields(fields = [])
       valid_fields(fields,STANDARD_FIELDS)
     end
-    
+
     private
     def publish(feed_story_or_action)
       session.post(Facebooker::Feed::METHODS[feed_story_or_action.class.name.split(/::/).last], feed_story_or_action.to_params) == "1" ? true : false
     end
-    
+
     def self.valid_fields(fields, allowable=FIELDS)
       allowable.reject{|field_name| !fields.empty? && !fields.include?(field_name)}.join(',')
     end
-    
+
     def collect(fields, allowable=FIELDS)
       allowable.reject{|field_name| !fields.empty? && !fields.include?(field_name)}.join(',')
     end
-    
+
     def profile_pic_album_id
       merge_aid(-3, id)
     end
-    
+
     def merge_aid(aid, uid)
       (uid << 32) + (aid & 0xFFFFFFFF)
     end
-    
+
   end
 end

data/lib/facebooker/rails/helpers.rb

@@ -781,6 +781,14 @@ module Facebooker
         tag "fb:date", stringify_vals({:t => time.to_i}.merge(options))
       end
 
+      # Renders the Facebook bookmark button
+      #
+      # See http://wiki.developers.facebook.com/index.php/Fb:bookmark for
+      # more details
+      def fb_bookmark_button
+        content_tag "fb:bookmark"
+      end
+
       # Renders a fb:fbml-attribute element
       #
       # Example:

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

@@ -109,6 +109,13 @@ module Facebooker
           link_to_function text, js, *args
         end
 
+        def fb_bookmark_link(text,url,*args)
+          js = update_page do |page|
+            page.call "FB.Connect.showBookmarkDialog",url
+          end
+          link_to_function text, js, *args
+        end
+
         def fb_user_action(action, user_message = nil, prompt = "", callback = nil)
           defaulted_callback = callback || "null"
           update_page do |page|

data/lib/facebooker/rails/test_helpers.rb

@@ -11,24 +11,24 @@ module Facebooker
         facebook_post facebook_redirect_url
       end
       
-      def facebook_get(path,params={})
-        facebook_verb(:get,path,params)
+      def facebook_get(path, params={}, session=nil, flash=nil)
+        facebook_verb(:get, path, params, session, flash)
       end
       
-      def facebook_post(path,params={})
-        facebook_verb(:post,path,params)
+      def facebook_post(path,params={}, session=nil, flash=nil)
+        facebook_verb(:post, path, params, session, flash)
       end
       
-      def facebook_put(path,params={})
-        facebook_verb(:put,path,params)
+      def facebook_put(path,params={}, session=nil, flash=nil)
+        facebook_verb(:put, path, params, session, flash)
       end
       
-      def facebook_delete(path,params={})
-        facebook_verb(:delete,path,params)
+      def facebook_delete(path,params={}, session=nil, flash=nil)
+        facebook_verb(:delete, path, params, session, flash)
       end
       
-      def facebook_verb(verb,path, params={})
-        send verb, path, facebook_params(params).reverse_merge(:canvas => true)
+      def facebook_verb(verb, path, params={}, session=nil, flash=nil)
+        send verb, path, facebook_params(params).reverse_merge(:canvas => true), session, flash
       end
       
       def facebook_params(params = {})

data/lib/facebooker/session.rb

@@ -155,6 +155,8 @@ module Facebooker
       optional_parameters << "&hide_checkbox=true" if options[:hide_checkbox]
       optional_parameters << "&canvas=true" if options[:canvas]
       optional_parameters << "&fbconnect=true" if options[:fbconnect]
+      optional_parameters << "&return_session=true" if options[:return_session]
+      optional_parameters << "&session_key_only=true" if options[:session_key_only]
       optional_parameters << "&req_perms=#{options[:req_perms]}" if options[:req_perms]
       optional_parameters.join
     end
@@ -206,7 +208,7 @@ module Facebooker
     def secure_with!(session_key, uid = nil, expires = nil, secret_from_session = nil)
       @session_key = session_key
       @uid = uid ? Integer(uid) : post('facebook.users.getLoggedInUser', :session_key => session_key)
-      @expires = Integer(expires)
+      @expires = expires ? Integer(expires) : 0
       @secret_from_session = secret_from_session
     end
 

data/lib/facebooker/version.rb

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

data/test/facebooker/application_test.rb

@@ -31,7 +31,7 @@ class Facebooker::ApplicationTest < Test::Unit::TestCase
       <logo_url>http://photos-c.ak.facebook.com/photos-ak-sctm/v43/130/2413267546/app_1_2413267546_2324.gif</logo_url> 
       <developers list="true"/> 
       <company_name>iLike, inc</company_name> 
-      <description>iLike lets you add music to your profile and find your favorite concerts (not to mention see who else is going!). Bonus: Use it to get free mp3’s that match your tastes and try to beat your friends at the Music Challenge.</description> 
+      <description>iLike lets you add music to your profile and find your favorite concerts (not to mention see who else is going!). Bonus: Use it to get free mp3's that match your tastes and try to beat your friends at the Music Challenge.</description> 
       <daily_active_users>392008</daily_active_users> 
       <weekly_active_users>1341749</weekly_active_users> 
       <monthly_active_users>3922784</monthly_active_users> 

data/test/facebooker/models/user_test.rb

@@ -16,14 +16,14 @@ class Facebooker::UserTest < Test::Unit::TestCase
 
   def test_has_permission
     expect_http_posts_with_responses(has_app_permission_response_xml)
-    assert @user.has_permission?("status_update")    
+    assert @user.has_permission?("status_update")
   end
 
   def test_has_permissions
-    expect_http_posts_with_responses(has_app_permission_response_xml, has_app_permission_response_xml)    
-    assert @user.has_permissions?(["status_update", "read_stream"])    
-  end 
- 
+    expect_http_posts_with_responses(has_app_permission_response_xml, has_app_permission_response_xml)
+    assert @user.has_permissions?(["status_update", "read_stream"])
+  end
+
   def test_can_ask_user_if_he_or_she_is_friends_with_another_user
     assert(@user.friends_with?(@other_user))
   end
@@ -146,6 +146,17 @@ class Facebooker::UserTest < Test::Unit::TestCase
     assert_nil(options[:attachment])
     assert_equal(options[:action_links], [:text => 'Link', :href => 'http://example.com'].to_json )
   end
+
+  def test_prepare_publish_to_options_to_page_on_behave_of_page
+    page_id = 12345678
+    options = @user.prepare_publish_to_options(@user, {:uid => 12345678, :post_as_page => true, :message => 'Hey there', :action_links => [:text => 'Link', :href => 'http://example.com']})
+    assert_equal(options[:uid], page_id)
+    assert_nil(options[:target_id])
+    assert_equal(options[:message], 'Hey there')
+    assert_nil(options[:attachment])
+    assert_equal(options[:action_links], [:text => 'Link', :href => 'http://example.com'].to_json )
+  end
+
   def test_publish_to
     @user = Facebooker::User.new(548871286, @session)
     expect_http_posts_with_responses(example_profile_publish_to_get_xml)
@@ -162,7 +173,7 @@ class Facebooker::UserTest < Test::Unit::TestCase
     expect_http_posts_with_responses(example_comment_on_response)
     assert_equal('703826862_78463536863', @user.comment_on('703826862_78463536862', :message => 'that was hilarious!'))
   end
-  
+
   def test_can_send_email
     @user.expects(:send_email).with("subject", "body text")
     @user.send_email("subject", "body text")
@@ -378,18 +389,18 @@ class Facebooker::UserTest < Test::Unit::TestCase
 <stream_publish_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/ http://api.facebook.com/1.0/facebook.xsd">703826862_78463536862</stream_publish_response>
     eoxml
   end
-  
+
   def example_comment_on_response
     <<-eoxml
 <?xml version="1.0" encoding="UTF-8"?>
 <stream_addComment_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/ http://api.facebook.com/1.0/facebook.xsd">703826862_78463536863</stream_addComment_response>
     eoxml
-  end  
-  
+  end
+
   def example_events_rsvp_xml
       <<-E
       <?xml version="1.0" encoding="UTF-8"?>
-      <events_rsvp_response xmlns="http://api.facebook.com/1.0/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+      <events_rsvp_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/ http://api.facebook.com/1.0/facebook.xsd">1
       </events_rsvp_response>
     E

data/test/facebooker/rails_integration_test.rb

@@ -1099,6 +1099,10 @@ class RailsHelperTest < Test::Unit::TestCase
     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_bookmark_link
+    assert_equal @h.fb_bookmark_link("Bookmark","My URL"),"<a href=\"#\" onclick=\"FB.Connect.showBookmarkDialog(&quot;My URL&quot;);; return false;\">Bookmark</a>"
+  end
+
   def test_fb_user_action_with_literal_callback
     action = Facebooker::Rails::Publisher::UserAction.new
     assert_equal "FB.Connect.showFeedDialog(null, null, null, null, null, FB.RequireConnect.promptConnect, function() {alert('hi')}, \"prompt\", #{{"value" => "message"}.to_json});",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: facebooker
 version: !ruby/object:Gem::Version 
-  version: 1.0.55
+  version: 1.0.56
 platform: ruby
 authors: 
 - Chad Fowler
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-06 00:00:00 -05:00
+date: 2009-12-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency