RubyGems - djanowski-facebooker - Versions diffs - 1.0.4 → 1.0.7 - Mend

djanowski-facebooker 1.0.4 → 1.0.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (12) hide show

data/Manifest.txt +3 -0
data/generators/xd_receiver/templates/xd_receiver.html +10 -0
data/generators/xd_receiver/xd_receiver_generator.rb +9 -0
data/lib/facebooker/models/user.rb +1 -1
data/lib/facebooker/rails/controller.rb +31 -4
data/lib/facebooker/rails/helpers.rb +32 -5
data/lib/facebooker/rails/helpers/fb_connect.rb +34 -0
data/lib/facebooker/rails/publisher.rb +13 -3
data/test/publisher_test.rb +22 -0
data/test/rails_integration_test.rb +108 -13
data/test/user_test.rb +17 -0
metadata +4 -1

data/Manifest.txt CHANGED Viewed

@@ -37,6 +37,8 @@ generators/facebook_scaffold/templates/view_new.fbml.erb
 generators/facebook_scaffold/templates/view_new.html.erb
 generators/facebook_scaffold/templates/view_show.fbml.erb
 generators/facebook_scaffold/templates/view_show.html.erb
+generators/xd_receiver/xd_receiver_generator.rb
+generators/xd_receiver/templates/xd_receiver.html
 init.rb
 install.rb
 lib/facebooker.rb
@@ -75,6 +77,7 @@ lib/facebooker/rails/facebook_request_fix.rb
 lib/facebooker/rails/facebook_session_handling.rb
 lib/facebooker/rails/facebook_url_rewriting.rb
 lib/facebooker/rails/helpers.rb
+lib/facebooker/rails/helpers/fb_connect.rb
 lib/facebooker/rails/profile_publisher_extensions.rb
 lib/facebooker/rails/publisher.rb
 lib/facebooker/rails/routing.rb

data/generators/xd_receiver/templates/xd_receiver.html ADDED Viewed

@@ -0,0 +1,10 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" >
+<head>
+    <title>Cross-Domain Receiver Page</title>
+</head>
+<body>
+    <script src="http://static.ak.connect.facebook.com/js/api_lib/v0.4/XdCommReceiver.debug.js" type="text/javascript"></script>
+</body>
+</html>

data/generators/xd_receiver/xd_receiver_generator.rb ADDED Viewed

@@ -0,0 +1,9 @@
+class XdReceiverGenerator < Rails::Generator::Base
+  def manifest
+    record do |m|
+      m.template "xd_receiver.html", "public/xd_receiver.html"
+    end
+  end
+end

data/lib/facebooker/models/user.rb CHANGED Viewed

@@ -10,7 +10,7 @@ module Facebooker
       include Model
       attr_accessor :message, :time, :status_id
     end
-    FIELDS = [:status, :political, :pic_small, :name, :quotes, :is_app_user, :tv, :profile_update_time, :meeting_sex, :hs_info, :timezone, :relationship_status, :hometown_location, :about_me, :wall_count, :significant_other_id, :pic_big, :music, :uid, :work_history, :sex, :religion, :notes_count, :activities, :pic_square, :movies, :has_added_app, :education_history, :birthday, :first_name, :meeting_for, :last_name, :interests, :current_location, :pic, :books, :affiliations]
+    FIELDS = [:status, :political, :pic_small, :name, :quotes, :is_app_user, :tv, :profile_update_time, :meeting_sex, :hs_info, :timezone, :relationship_status, :hometown_location, :about_me, :wall_count, :significant_other_id, :pic_big, :music, :uid, :work_history, :sex, :religion, :notes_count, :activities, :pic_square, :movies, :has_added_app, :education_history, :birthday, :first_name, :meeting_for, :last_name, :interests, :current_location, :pic, :books, :affiliations, :locale, :profile_url, :proxied_email]
     STANDARD_FIELDS = [:uid, :first_name, :last_name, :name, :timezone, :birthday, :sex, :affiliations, :locale, :profile_url]
     attr_accessor :id, :session
     populating_attr_accessor *FIELDS

data/lib/facebooker/rails/controller.rb CHANGED Viewed

@@ -23,8 +23,7 @@ module Facebooker
       def set_facebook_session
-        returning session_set = session_already_secured? ||  secure_with_facebook_params! ||secure_with_token!  do
+        returning session_set = session_already_secured? ||  secure_with_facebook_params! || secure_with_cookies! || secure_with_token!  do
           if session_set
             capture_facebook_friends_if_available!
             Session.current = facebook_session
@@ -72,7 +71,35 @@ module Facebooker
           !session[:facebook_session].blank? &&  (params[:fb_sig_session_key].blank? || session[:facebook_session].session_key == facebook_params[:session_key])
         end
       end
+      def clear_fb_cookies!
+        fb_cookie_names.each {|name| cookies[name] = nil }
+      end
+      def fb_cookie_prefix
+        Facebooker.api_key+"_"
+      end
+      def fb_cookie_names
+        fb_cookie_names = cookies.keys.select{|k| k.starts_with?(fb_cookie_prefix)}
+      end
+      def secure_with_cookies!
+          parsed = {}
+          fb_cookie_names.each { |key| parsed[key[fb_cookie_prefix.size,key.size]] = cookies[key] }
+          #returning gracefully if the cookies aren't set or have expired
+          return unless parsed['session_key'] && parsed['user'] && parsed['expires'] && parsed['ss']
+          return unless Time.at(parsed['expires'].to_f) > Time.now
+          #if we have the unexpired cookies, we'll throw an exception if the sig doesn't verify
+          verify_signature(parsed,cookies[Facebooker.api_key])
+          @facebook_session = new_facebook_session
+          @facebook_session.secure_with!(parsed['session_key'],parsed['user'],parsed['expires'],parsed['ss'])
+      end
       def secure_with_token!
         if params['auth_token']
           @facebook_session = new_facebook_session
@@ -142,7 +169,7 @@ module Facebooker
         raw_string = facebook_sig_params.map{ |*args| args.join('=') }.sort.join
         actual_sig = Digest::MD5.hexdigest([raw_string, Facebooker::Session.secret_key].join)
         raise Facebooker::Session::IncorrectSignature if actual_sig != expected_signature
-        raise Facebooker::Session::SignatureTooOld if Time.at(facebook_sig_params['time'].to_f) < earliest_valid_session
+        raise Facebooker::Session::SignatureTooOld if facebook_sig_params['time'] && Time.at(facebook_sig_params['time'].to_f) < earliest_valid_session
         true
       end

data/lib/facebooker/rails/helpers.rb CHANGED Viewed

@@ -8,6 +8,7 @@ module Facebooker
     #
     module Helpers
+      include Facebooker::Rails::Helpers::FbConnect
       # Create an fb:dialog
       # id must be a unique name e.g. "my_dialog"
@@ -111,7 +112,7 @@ module Facebooker
       # <em> Note: </em> I don't think the block is used here.
       def fb_multi_friend_selector(message,options={},&block)
         options = options.dup
-        tag("fb:multi-friend-selector",stringify_vals(options.merge(:showborder=>false,:actiontext=>message,:max=>20)))
+        tag("fb:multi-friend-selector",stringify_vals({:showborder=>false,:actiontext=>message,:max=>20}.merge(options)))
       end
       # Render a condensed <fb:multi-friend-selector> with the passed in welcome message
@@ -196,7 +197,7 @@ module Facebooker
         options.transform_keys!(FB_NAME_OPTION_KEYS_TO_TRANSFORM)
         options.assert_valid_keys(FB_NAME_VALID_OPTION_KEYS)
         options.merge!(:uid => cast_to_facebook_id(user))
-        tag("fb:name", stringify_vals(options))
+        content_tag("fb:name",nil, stringify_vals(options))
       end
       FB_NAME_OPTION_KEYS_TO_TRANSFORM = {:first_name_only => :firstnameonly,
@@ -217,7 +218,7 @@ module Facebooker
         options.transform_keys!(FB_PRONOUN_OPTION_KEYS_TO_TRANSFORM)
         options.assert_valid_keys(FB_PRONOUN_VALID_OPTION_KEYS)
         options.merge!(:uid => cast_to_facebook_id(user))
-        tag("fb:pronoun", stringify_vals(options))
+        content_tag("fb:pronoun",nil, stringify_vals(options))
       end
       FB_PRONOUN_OPTION_KEYS_TO_TRANSFORM = {:use_you => :useyou, :use_they => :usethey}
@@ -259,7 +260,7 @@ module Facebooker
         options = options.dup
         validate_fb_profile_pic_size(options)
         options.merge!(:uid => cast_to_facebook_id(user))
-        tag("fb:profile-pic", stringify_vals(options))
+        content_tag("fb:profile-pic", nil,stringify_vals(options))
       end
       # Render an fb:photo tag.
@@ -271,7 +272,7 @@ module Facebooker
         options.merge!(:pid => cast_to_photo_id(photo))
         validate_fb_photo_size(options)
         validate_fb_photo_align_value(options)
-        tag("fb:photo", stringify_vals(options))
+        content_tag("fb:photo",nil, stringify_vals(options))
       end
       FB_PHOTO_VALID_OPTION_KEYS = [:uid, :size, :align]
@@ -544,6 +545,32 @@ module Facebooker
         content_tag("fb:prompt-permission",message,args)
       end
+      def fb_eventlink(eid)
+        content_tag "fb:eventlink",nil,:eid=>eid
+      end
+      def fb_grouplink(gid)
+        content_tag "fb:grouplink",nil,:gid=>gid
+      end
+      def fb_user_status(user,linked=true)
+        content_tag "fb:user-status",nil,stringify_vals(:uid=>cast_to_facebook_id(user), :linked=>linked)
+      end
+      def fb_share_button(url)
+        content_tag "fb:share-button",nil,:class=>"url",:href=>url
+      end
+      def fb_serverfbml(options={},&proc)
+        inner = capture(&proc)
+        concat(content_tag("fb:serverfbml",inner,options),&proc.binding)
+      end
+      def fb_container(options={},&proc)
+        inner = capture(&proc)
+        concat(content_tag("fb:container",inner,options),&proc.binding)
+      end
       protected
       def cast_to_facebook_id(object)

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

@@ -0,0 +1,34 @@
+module Facebooker
+  module Rails
+    module Helpers
+      module FbConnect
+        def fb_connect_javascript_tag
+          javascript_include_tag "http://static.ak.connect.facebook.com/js/api_lib/v0.4/FeatureLoader.js.php"
+        end
+        def init_fb_connect(*required_features)
+          init_string = "FB.Facebook.init('#{Facebooker.api_key}','/xd_receiver.html');"
+          unless required_features.blank?
+             init_string = <<-FBML
+              Element.observe(window,'load', function() {
+                FB_RequireFeatures(#{required_features.to_json}, function() {
+                  #{init_string}
+                });
+              });
+              FBML
+          end
+          javascript_tag init_string
+        end
+        def fb_login_button(callback=nil)
+          content_tag("fb:login-button",nil,(callback.nil? ? {} : {:onlogin=>callback}))
+        end
+        def fb_unconnected_friends_count
+          content_tag "fb:unconnected-friends-count",nil
+        end
+      end
+    end
+  end
+end

data/lib/facebooker/rails/publisher.rb CHANGED Viewed

@@ -34,6 +34,7 @@ module Facebooker
     #     def publish_action(f)
     #       send_as :user_action
     #       from f
+    #       story_size SHORT # or ONE_LINE or FULL
     #       data :friend=>"Mike"
     #     end
     #
@@ -87,6 +88,12 @@ module Facebooker
     #
     # Publisher makes many helpers available, including the linking and asset helpers
     class Publisher
+      #story sizes from the Facebooker API
+      ONE_LINE=1
+      SHORT=2
+      FULL=4
       def initialize
         @controller = PublisherController.new
       end
@@ -213,11 +220,14 @@ module Facebooker
         attr_accessor :body_general
         attr_accessor :template_id
         attr_accessor :template_name
+        attr_accessor :story_size
         def target_ids=(val)
           @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||{})
+        end
       end
       cattr_accessor :ignore_errors
@@ -351,7 +361,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||{},_body.target_ids,_body.body_general)
+          @from.session.publish_user_action(_body.template_id,_body.data_hash,_body.target_ids,_body.body_general)
         else
           raise UnspecifiedBodyType.new("You must specify a valid send_as")
         end

data/test/publisher_test.rb CHANGED Viewed

@@ -6,6 +6,7 @@ require 'action_controller/test_process'
 require 'active_record'
 require File.dirname(__FILE__)+'/../init'
 require 'facebooker/rails/controller'
+require 'facebooker/rails/helpers/fb_connect'
 require 'facebooker/rails/helpers'
 require 'facebooker/rails/publisher'
@@ -118,6 +119,14 @@ class TestPublisher < Facebooker::Rails::Publisher
     from user
     data :friend=>"Mike"
   end
+  def user_action_with_story_size(user)
+    send_as :user_action
+    from user
+    story_size ONE_LINE
+    story_size FULL
+    story_size SHORT
+    data :friend=>"Mike"
+  end
   def user_action_no_data(user)
     send_as :user_action
     from user
@@ -353,6 +362,19 @@ class PublisherTest < Test::Unit::TestCase
     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", :story_size=>2},nil,nil)
+    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("","")

data/test/rails_integration_test.rb CHANGED Viewed

@@ -3,6 +3,7 @@ begin
   require 'action_controller'
   require 'action_controller/test_process'
   require 'facebooker/rails/controller'
+  require 'facebooker/rails/helpers/fb_connect'
   require 'facebooker/rails/helpers'
   require 'facebooker/rails/facebook_form_builder'
   require File.dirname(__FILE__)+'/../init'
@@ -363,6 +364,32 @@ class RailsIntegrationTest < Test::Unit::TestCase
     get :index, modified_params
   end
+  def test_session_secured_with_auth_token_if_cookies_expired
+      auth_token = 'ohaiauthtokenhere111'
+      modified_params = example_rails_params_including_fb
+      modified_params.delete('fb_sig_session_key')
+      modified_params['auth_token'] = auth_token
+      session_mock = flexmock(session = Facebooker::Session.create(ENV['FACEBOOK_API_KEY'], ENV['FACEBOOK_SECRET_KEY']))
+      session_params = { 'session_key' => '123', 'uid' => '321' }
+      session_mock.should_receive(:post).with('facebook.auth.getSession', :auth_token => auth_token).once.and_return(session_params).ordered
+      flexmock(@controller).should_receive(:new_facebook_session).once.and_return(session).ordered
+      expired_cookie_hash_for_auth.each {|k,v| @request.cookies[ENV['FACEBOOK_API_KEY']+k] = CGI::Cookie.new(ENV['FACEBOOK_API_KEY']+k,v)}
+      get :index, modified_params
+      assert_equal(321, @controller.facebook_session.user.id)
+  end
+  def test_session_can_be_secured_with_cookies
+    cookie_hash_for_auth.each {|k,v| @request.cookies[ENV['FACEBOOK_API_KEY']+k] = CGI::Cookie.new(ENV['FACEBOOK_API_KEY']+k,v)}
+    get :index, example_rails_params_for_fb_connect
+    assert_equal(77777, @controller.facebook_session.user.id)
+    end
+  def test_session_does_NOT_secure_with_expired_cookies
+    expired_cookie_hash_for_auth.each {|k,v| @request.cookies[ENV['FACEBOOK_API_KEY']+k] = CGI::Cookie.new(ENV['FACEBOOK_API_KEY']+k,v)}
+    get :index, example_rails_params_for_fb_connect
+    assert_nil(@controller.facebook_session)
+  end
   def test_user_friends_can_be_populated_from_facebook_params_if_available
     get :index, example_rails_params_including_fb
     assert_not_nil(friends = @controller.facebook_session.user.friends)
@@ -436,6 +463,18 @@ class RailsIntegrationTest < Test::Unit::TestCase
   end
   private
+  def example_rails_params_for_fb_connect
+    {"action"=>"index", "controller"=>"controller_which_requires_facebook_authentication"}
+  end
+  def expired_cookie_hash_for_auth
+    {"_ss" => "not_used", "_session_key"=> "whatever", "_user"=>"77777", "_expires"=>"#{1.day.ago.to_i}"}
+  end
+  def cookie_hash_for_auth
+    {"_ss" => "not_used", "_session_key"=> "whatever", "_user"=>"77777", "_expires"=>"#{1.day.from_now.to_i}"}
+  end
   def example_rails_params_including_fb_for_user_not_logged_into_application
     {"fb_sig_time"=>"1186588275.5988", "fb_sig"=>"7371a6400329b229f800a5ecafe03b0a", "action"=>"index", "fb_sig_in_canvas"=>"1", "controller"=>"controller_which_requires_facebook_authentication", "fb_sig_added"=>"0", "fb_sig_api_key"=>"b6c9c857ac543ca806f4d3187cd05e09"}
   end
@@ -490,6 +529,7 @@ class RailsHelperTest < Test::Unit::TestCase
     include ActionView::Helpers::CaptureHelper
     include ActionView::Helpers::TagHelper
     include ActionView::Helpers::AssetTagHelper
+    include ActionView::Helpers::JavaScriptHelper
     include Facebooker::Rails::Helpers
     attr_accessor :flash, :output_buffer
     def initialize
@@ -524,11 +564,11 @@ class RailsHelperTest < Test::Unit::TestCase
   end
   def test_fb_profile_pic
-    assert_equal "<fb:profile-pic uid=\"1234\" />", @h.fb_profile_pic("1234")
+    assert_equal "<fb:profile-pic uid=\"1234\"></fb:profile-pic>", @h.fb_profile_pic("1234")
   end
   def test_fb_profile_pic_with_valid_size
-    assert_equal "<fb:profile-pic size=\"small\" uid=\"1234\" />", @h.fb_profile_pic("1234", :size => :small)
+    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_invalid_size
@@ -536,12 +576,12 @@ class RailsHelperTest < Test::Unit::TestCase
   end
   def test_fb_photo
-    assert_equal "<fb:photo pid=\"1234\" />",@h.fb_photo("1234")
+    assert_equal "<fb:photo pid=\"1234\"></fb:photo>",@h.fb_photo("1234")
   end
   def test_fb_photo_with_object_responding_to_photo_id
     photo = flexmock("photo", :photo_id => "5678")
-    assert_equal "<fb:photo pid=\"5678\" />", @h.fb_photo(photo)
+    assert_equal "<fb:photo pid=\"5678\"></fb:photo>", @h.fb_photo(photo)
   end
   def test_fb_photo_with_invalid_size
@@ -557,14 +597,14 @@ class RailsHelperTest < Test::Unit::TestCase
   end
   def test_fb_photo_with_valid_align_value
-    assert_equal "<fb:photo align=\"right\" pid=\"1234\" />",@h.fb_photo("1234", :align => :right)
+    assert_equal "<fb:photo align=\"right\" pid=\"1234\"></fb:photo>",@h.fb_photo("1234", :align => :right)
   end
   def test_fb_photo_with_class
-    assert_equal "<fb:photo class=\"picky\" pid=\"1234\" />",@h.fb_photo("1234", :class => :picky)
+    assert_equal "<fb:photo class=\"picky\" pid=\"1234\"></fb:photo>",@h.fb_photo("1234", :class => :picky)
   end
   def test_fb_photo_with_style
-    assert_equal "<fb:photo pid=\"1234\" style=\"some=css;put=here;\" />",@h.fb_photo("1234", :style => "some=css;put=here;")
+    assert_equal "<fb:photo pid=\"1234\" style=\"some=css;put=here;\"></fb:photo>",@h.fb_photo("1234", :style => "some=css;put=here;")
   end
   def test_fb_prompt_permission_valid_no_callback
@@ -593,16 +633,16 @@ class RailsHelperTest < Test::Unit::TestCase
   end
   def test_fb_name
-    assert_equal "<fb:name uid=\"1234\" />",@h.fb_name("1234")
+    assert_equal "<fb:name uid=\"1234\"></fb:name>",@h.fb_name("1234")
   end
   def test_fb_name_with_transformed_key
-    assert_equal "<fb:name uid=\"1234\" useyou=\"true\" />", @h.fb_name(1234, :use_you => true)
+    assert_equal "<fb:name uid=\"1234\" useyou=\"true\"></fb:name>", @h.fb_name(1234, :use_you => true)
   end
   def test_fb_name_with_user_responding_to_facebook_id
     user = flexmock("user", :facebook_id => "5678")
-    assert_equal "<fb:name uid=\"5678\" />", @h.fb_name(user)
+    assert_equal "<fb:name uid=\"5678\"></fb:name>", @h.fb_name(user)
   end
   def test_fb_name_with_invalid_key
@@ -698,16 +738,16 @@ class RailsHelperTest < Test::Unit::TestCase
   end
   def test_fb_pronoun
-    assert_equal "<fb:pronoun uid=\"1234\" />", @h.fb_pronoun(1234)
+    assert_equal "<fb:pronoun uid=\"1234\"></fb:pronoun>", @h.fb_pronoun(1234)
   end
   def test_fb_pronoun_with_transformed_key
-    assert_equal "<fb:pronoun uid=\"1234\" usethey=\"true\" />", @h.fb_pronoun(1234, :use_they => true)
+    assert_equal "<fb:pronoun uid=\"1234\" usethey=\"true\"></fb:pronoun>", @h.fb_pronoun(1234, :use_they => true)
   end
   def test_fb_pronoun_with_user_responding_to_facebook_id
     user = flexmock("user", :facebook_id => "5678")
-    assert_equal "<fb:pronoun uid=\"5678\" />", @h.fb_pronoun(user)
+    assert_equal "<fb:pronoun uid=\"5678\"></fb:pronoun>", @h.fb_pronoun(user)
   end
   def test_fb_pronoun_with_invalid_key
@@ -880,6 +920,58 @@ class RailsHelperTest < Test::Unit::TestCase
     end
     assert_equal "<fb:narrow>narrow profile content</fb:narrow>", @h.output_buffer
   end
+  def test_fb_login_button
+    assert_equal "<fb:login-button onlogin=\"somejs\"></fb:login-button>",@h.fb_login_button("somejs")
+  end
+  def test_init_fb_connect_no_features
+    assert ! @h.init_fb_connect.match(/XFBML/)
+  end
+  def test_init_fb_connect_with_features
+    assert @h.init_fb_connect("XFBML").match(/XFBML/)
+  end
+  def test_fb_connect_javascript_tag
+    assert_equal "<script src=\"http://static.ak.connect.facebook.com/js/api_lib/v0.4/FeatureLoader.js.php\" type=\"text/javascript\"></script>",
+      @h.fb_connect_javascript_tag
+  end
+  def test_fb_container
+    @h.expects(:capture).returns("Inner Stuff")
+    @h.fb_container(:condition=>"somejs") do
+    end
+    assert_equal "<fb:container condition=\"somejs\">Inner Stuff</fb:container>",@h.output_buffer
+  end
+  def test_fb_eventlink
+    assert_equal '<fb:eventlink eid="21150032416"></fb:eventlink>',@h.fb_eventlink("21150032416")
+  end
+  def test_fb_grouplink
+    assert_equal '<fb:grouplink gid="2541896821"></fb:grouplink>',@h.fb_grouplink("2541896821")
+  end
+  def test_fb_serverfbml
+    @h.expects(:capture).returns("Inner Stuff")
+    @h.fb_serverfbml(:condition=>"somejs") do
+    end
+    assert_equal "<fb:serverfbml condition=\"somejs\">Inner Stuff</fb:serverfbml>",@h.output_buffer
+  end
+  def test_fb_share_button
+    assert_equal "<fb:share-button class=\"url\" href=\"http://www.elevatedrails.com\"></fb:share-button>",@h.fb_share_button("http://www.elevatedrails.com")
+  end
+  def test_fb_unconnected_friends_count_without_condition
+    assert_equal "<fb:unconnected-friends-count></fb:unconnected-friends-count>",@h.fb_unconnected_friends_count
+  end
+  def test_fb_user_status
+    user=flexmock("user", :facebook_id => "5678")
+    assert_equal '<fb:user-status linked="false" uid="5678"></fb:user-status>',@h.fb_user_status(user,false)
+  end
 end
 class TestModel
   attr_accessor :name,:facebook_id
@@ -958,6 +1050,8 @@ class RailsFacebookFormbuilderTest < Test::Unit::TestCase
   def test_multi_friend_input
     assert_equal "<fb:editor-custom label=\"Friends\"><fb:multi-friend-input></fb:multi-friend-input></fb:editor-custom>",@form_builder.multi_friend_input
   end
 end
 class RailsPrettyErrorsTest < Test::Unit::TestCase
@@ -1118,6 +1212,7 @@ class RailsUrlHelperExtensionsTest < Test::Unit::TestCase
   def test_link_to_if_with_false
        assert_equal @label, @u.link_to_if(false,@label,@url)
   end
 end

data/test/user_test.rb CHANGED Viewed

@@ -169,6 +169,17 @@ class UserTest < Test::Unit::TestCase
     assert_equal({:email=>"mike@example.com",:account_id=>2},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)
+    assert_equal "en_US", @user.locale
+  end
+  def test_get_profile_url
+    @user = Facebooker::User.new(8055, @session)
+    expect_http_posts_with_responses(example_users_get_info_xml)
+    assert_equal "http://www.facebook.com/profile.php?id=8055", @user.profile_url
+  end
   private
   def example_profile_photos_get_xml
@@ -233,6 +244,12 @@ class UserTest < Test::Unit::TestCase
     </events_get_response>"
   end
+  def example_users_get_info_xml
+    <<-XML
+    <?xml version="1.0" encoding="UTF-8"?> <users_getInfo_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" list="true"> <user> <uid>8055</uid> <about_me>This field perpetuates the glorification of the ego. Also, it has a character limit.</about_me> <activities>Here: facebook, etc. There: Glee Club, a capella, teaching.</activities> <affiliations list="true"> <affiliation> <nid>50453093</nid> <name>Facebook Developers</name> <type>work</type> <status/> <year/> </affiliation> </affiliations> <birthday>November 3</birthday> <books>The Brothers K, GEB, Ken Wilber, Zen and the Art, Fitzgerald, The Emporer's New Mind, The Wonderful Story of Henry Sugar</books> <current_location> <city>Palo Alto</city> <state>CA</state> <country>United States</country> <zip>94303</zip> </current_location> <education_history list="true"> <education_info> <name>Harvard</name> <year>2003</year> <concentrations list="true"> <concentration>Applied Mathematics</concentration> <concentration>Computer Science</concentration> </concentrations> </education_info> </education_history> <first_name>Dave</first_name> <hometown_location> <city>York</city> <state>PA</state> <country>United States</country> </hometown_location> <hs_info> <hs1_name>Central York High School</hs1_name> <hs2_name/> <grad_year>1999</grad_year> <hs1_id>21846</hs1_id> <hs2_id>0</hs2_id> </hs_info> <is_app_user>1</is_app_user> <has_added_app>1</has_added_app> <interests>coffee, computers, the funny, architecture, code breaking,snowboarding, philosophy, soccer, talking to strangers</interests> <last_name>Fetterman</last_name> <locale>en_US</locale> <meeting_for list="true"> <seeking>Friendship</seeking> </meeting_for> <meeting_sex list="true"> <sex>female</sex> </meeting_sex> <movies>Tommy Boy, Billy Madison, Fight Club, Dirty Work, Meet the Parents, My Blue Heaven, Office Space </movies> <music>New Found Glory, Daft Punk, Weezer, The Crystal Method, Rage, the KLF, Green Day, Live, Coldplay, Panic at the Disco, Family Force 5</music> <name>Dave Fetterman</name> <notes_count>0</notes_count> <pic>http://photos-055.facebook.com/ip007/profile3/1271/65/s8055_39735.jpg</pic> <pic_big>http://photos-055.facebook.com/ip007/profile3/1271/65/n8055_39735.jpg</pic_big> <pic_small>http://photos-055.facebook.com/ip007/profile3/1271/65/t8055_39735.jpg</pic_small> <pic_square>http://photos-055.facebook.com/ip007/profile3/1271/65/q8055_39735.jpg</pic_square> <political>Moderate</political> <profile_update_time>1170414620</profile_update_time> <profile_url>http://www.facebook.com/profile.php?id=8055</profile_url> <quotes/> <relationship_status>In a Relationship</relationship_status> <religion/> <sex>male</sex> <significant_other_id xsi:nil="true"/> <status> <message>Fast Company, November issue, page 84</message> <time>1193075616</time> </status> <timezone>-8</timezone> <tv>cf. Bob Trahan</tv> <wall_count>121</wall_count> <work_history list="true"> <work_info> <location> <city>Palo Alto</city> <state>CA</state> <country>United States</country> </location> <company_name>Facebook</company_name> <position>Software Engineer</position> <description>Tech Lead, Facebook Platform</description> <start_date>2006-01</start_date> <end_date/> </work_info> </work_history> </user> </users_getInfo_response>
+    XML
+  end
   def register_response_xml
     <<-XML
     <?xml version="1.0" encoding="UTF-8"?>

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: djanowski-facebooker
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.7
 platform: ruby
 authors:
 - Chad Fowler
@@ -79,6 +79,8 @@ files:
 - generators/facebook_scaffold/templates/view_new.html.erb
 - generators/facebook_scaffold/templates/view_show.fbml.erb
 - generators/facebook_scaffold/templates/view_show.html.erb
+- generators/xd_receiver/xd_receiver_generator.rb
+- generators/xd_receiver/templates/xd_receiver.html
 - init.rb
 - install.rb
 - lib/facebooker.rb
@@ -117,6 +119,7 @@ files:
 - lib/facebooker/rails/facebook_session_handling.rb
 - lib/facebooker/rails/facebook_url_rewriting.rb
 - lib/facebooker/rails/helpers.rb
+- lib/facebooker/rails/helpers/fb_connect.rb
 - lib/facebooker/rails/profile_publisher_extensions.rb
 - lib/facebooker/rails/publisher.rb
 - lib/facebooker/rails/routing.rb