taweili-facebooker 1.0.37 → 1.0.38

data/README.rdoc

@@ -56,6 +56,12 @@ Your application users will need to have added the application in facebook to ac
 
 to your application controller.
 
+To prevent a violation of Facebook Terms of Service while reducing log bloat, you should also add 
+
+  filter_parameter_logging :fb_sig_friends
+
+to your application controller.
+
 == using MemCache session
 
 Facebook uses some non alphanum characters in the session identifier which interfere with memcache stored sessions. If you want to use MemCache for storing sessions, you can override the valid session id method on memcache by placing the following code in an initializer:

data/facebooker.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{facebooker}
-  s.version = "1.0.37"
+  s.version = "1.0.38"
 
   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-06-04}
+  s.date = %q{2009-06-23}
   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 * No dependencies outside of the Ruby standard library (This is true with Rails 2.1. Previous Rails versions require the JSON gem) * Concrete classes and methods modeling the Facebook data, so it's easy for a Rubyist to understand what's available * Well tested}
   s.email = %q{mmangino@elevatedrails.com}
   s.extra_rdoc_files = ["Manifest.txt", "CHANGELOG.rdoc", "COPYING.rdoc", "README.rdoc", "TODO.rdoc"]

data/generators/facebook/templates/public/javascripts/facebooker.js

@@ -46,6 +46,7 @@ function encodeURIComponent(str) {
   }
 };
 
+var Form = {};
 Form.serialize = function(form_element) {
   return  $(form_element).serialize();  
 };
@@ -68,6 +69,15 @@ Ajax.Updater = function (container,url,options) {
     this.ajax.onerror = options["onFailure"];
   }
 
+  if (!options['parameters']) {
+    options['parameters'] = {}
+  }
+
+  // simulate other verbs over post
+  if (options['method']) {
+    options['parameters']['_method'] = options['method'];
+  }
+
   this.ajax.post(url,options['parameters']); 
   if (options["onLoading"]) {
      options["onLoading"].call() 

data/init.rb

@@ -21,5 +21,6 @@ if defined? Rails
   require 'facebooker/rails/facebook_url_helper'
   require 'facebooker/rails/extensions/rack_setup' if Rails.version > '2.3'
   require 'facebooker/rails/extensions/action_controller'
+  #require 'facebooker/rails/extensions/action_view'
   require 'facebooker/rails/extensions/routing'
 end

data/lib/facebooker/models/user.rb

@@ -131,6 +131,19 @@ module Facebooker
                     :action_links => options[:action_links]
                    )
     end
+    
+    
+    ###
+    # Publish a comment on a post
+    #
+    # See: http://wiki.developers.facebook.com/index.php/Stream.addComment
+    #
+    # +post_id+ the post_id for the post that is being commented on
+    # +comment+ the text of the comment
+    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|
@@ -351,6 +364,12 @@ module Facebooker
       session.post('facebook.users.hasAppPermission',:ext_perm=>ext_perm) == "1"
     end    
     
+    ##
+    # Convenience method to check multiple permissions at once
+    def has_permissions?(ext_perms)
+      ext_perms.all?{|p| has_permission?(p)}
+    end            
+    
     ##
     # Convenience method to send email to the current user
     def send_email(subject, text=nil, fbml=nil)

data/lib/facebooker/parser.rb

@@ -59,8 +59,13 @@ module Facebooker
     def self.element(name, data)
       data = data.body rescue data # either data or an HTTP response
       begin
-        node = Nokogiri::XML(data.strip).at(name)
-        return node if node
+        xml = Nokogiri::XML(data.strip).at(name)
+        if node = xml.at(name)
+          return node
+        end
+        if xml.root.name == name
+          return xml.root
+        end
       rescue # Can't parse with Nokogiri
         doc = REXML::Document.new(data)
         doc.elements.each(name) do |element|
@@ -206,6 +211,12 @@ module Facebooker
       element('stream_publish_response', data).content.strip
     end
   end
+  
+  class StreamAddComment < Parser#:nodoc:
+    def self.process(data)
+      element('stream_addComment_response', data).content.strip
+    end
+  end  
 
   class RegisterTemplateBundle < Parser#:nodoc:
     def self.process(data)
@@ -400,6 +411,25 @@ module Facebooker
     end
   end
 
+  class FqlMultiquery < Parser#nodoc
+    def self.process(data)
+      root = element('fql_multiquery_response', data)
+      root.elements.collect do |elm|
+        [
+         elm.elements[1].text,
+          if elm.elements[2].elements[1].nil?
+            [] 
+          else
+            [
+             elm.elements[2].elements[1].name,
+             array_of_hashes(elm.elements[2], elm.elements[2].elements[1].name)
+            ]
+          end
+        ]
+      end
+    end
+  end
+
   class SetRefHandle < Parser#:nodoc:
     def self.process(data)
       element('fbml_setRefHandle_response', data).content.strip
@@ -627,6 +657,7 @@ module Facebooker
       'facebook.admin.getAllocation' => GetAllocation,
       'facebook.batch.run' => BatchRun,
       'facebook.fql.query' => FqlQuery,
+      'facebook.fql.multiquery' => FqlMultiquery,
       'facebook.photos.get' => GetPhotos,
       'facebook.photos.getAlbums' => GetAlbums,
       'facebook.photos.createAlbum' => CreateAlbum,
@@ -634,6 +665,7 @@ module Facebooker
       'facebook.photos.addTag' => AddTags,
       'facebook.photos.upload' => UploadPhoto,
       'facebook.stream.publish' => StreamPublish,
+      'facebook.stream.addComment' => StreamAddComment,      
       'facebook.events.get' => EventsGet,
       'facebook.events.getMembers' => EventMembersGet,
       'facebook.events.rsvp' => EventsRsvp,

data/lib/facebooker/rails/controller.rb

@@ -163,11 +163,15 @@ module Facebooker
       def after_facebook_login_url
         nil
       end
+
+      def default_after_facebook_login_url
+        url_for(:only_path => false, :overwrite_params => {})
+      end
       
       def create_new_facebook_session_and_redirect!
         session[:facebook_session] = new_facebook_session
-        url_params = after_facebook_login_url.nil? ? {} : {:next=>after_facebook_login_url}
-        top_redirect_to session[:facebook_session].login_url(url_params) unless @installation_required
+        next_url = after_facebook_login_url || default_after_facebook_login_url
+        top_redirect_to session[:facebook_session].login_url({:next => next_url}) unless @installation_required
         false
       end
       
@@ -298,8 +302,8 @@ module Facebooker
       end
       
       def application_is_not_installed_by_facebook_user
-        url_params = after_facebook_login_url.nil? ? {} : { :next => after_facebook_login_url }
-        top_redirect_to session[:facebook_session].install_url(url_params)
+        next_url = after_facebook_login_url || default_after_facebook_login_url
+        top_redirect_to session[:facebook_session].install_url({:next => next_url})
       end
       
       def set_facebook_request_format

data/lib/facebooker/rails/facebook_request_fix.rb

@@ -22,9 +22,7 @@ module ::ActionController
     end
     alias_method_chain :xml_http_request?, :facebooker
     # we have to re-alias xhr? since it was pointing to the old method
-    unless defined? :xhr?
-      alias xhr? :xml_http_request?
-    end
+    alias :xhr? :xml_http_request?
 
   end
 end

data/lib/facebooker/rails/facebook_request_fix_2-3.rb

@@ -25,7 +25,7 @@ module ::ActionController
     alias_method_chain :xml_http_request?, :facebooker
 
     # we have to re-alias xhr? since it was pointing to the old method
-    alias xhr? :xml_http_request?
+    alias :xhr? :xml_http_request?
 
   end
 end

data/lib/facebooker/rails/helpers.rb

@@ -24,6 +24,14 @@ module Facebooker
         end
       end
       
+      def fb_iframe(src, options = {})
+        content_tag "fb:iframe", '', options.merge({ :src => src })
+      end
+
+      def fb_swf(src, options = {})
+        tag "fb:swf", options.merge(:swfsrc => src)
+      end
+      
       def fb_dialog_title( title )
         content_tag "fb:dialog-title", title
       end
@@ -331,7 +339,8 @@ module Facebooker
       VALID_FB_SHARED_PHOTO_SIZES = [:thumb, :small, :normal, :square]
       VALID_FB_PHOTO_SIZES = VALID_FB_SHARED_PHOTO_SIZES      
       VALID_FB_PROFILE_PIC_SIZES = VALID_FB_SHARED_PHOTO_SIZES
-      VALID_PERMISSIONS=[:email, :offline_access, :status_update, :photo_upload, :create_listing, :create_event, :rsvp_event, :sms, :video_upload]
+      VALID_PERMISSIONS=[:email, :offline_access, :status_update, :photo_upload, :create_listing, :create_event, :rsvp_event, :sms, :video_upload, 
+                         :publish_stream, :read_stream]
       
       # Render an fb:tabs tag containing some number of fb:tab_item tags.
       # Example:
@@ -639,20 +648,22 @@ module Facebooker
       # 
       # You can prompt a user with the following permissions:
       #   * email
+      #   * read_stream
+      #   * publish_stream
       #   * offline_access
       #   * status_update
       #   * photo_upload
-      #   * video_upload
-      #   * create_listing
       #   * create_event
       #   * rsvp_event
       #   * sms
-      # 
+      #   * video_upload
+      #   * create_note
+      #   * share_item
       # Example:
       # <%= fb_prompt_permission('email', "Would you like to receive email from our application?" ) %>
       #
       # See http://wiki.developers.facebook.com/index.php/Fb:prompt-permission for 
-      # more details
+      # more details. Correct as of 7th June 2009.
       #
       def fb_prompt_permission(permission,message,callback=nil)
         raise(ArgumentError, "Unknown value for permission: #{permission}") unless VALID_PERMISSIONS.include?(permission.to_sym)
@@ -661,6 +672,19 @@ module Facebooker
         content_tag("fb:prompt-permission",message,args)
       end
       
+      # Renders a link to prompt for multiple permissions at once.
+      #
+      # Example:
+      # <%= fb_prompt_permissions(['email','offline_access','status_update'], 'Would you like to grant some permissions?')
+      def fb_prompt_permissions(permissions,message,callback=nil)
+        permissions.each do |p|
+          raise(ArgumentError, "Unknown value for permission: #{p}") unless VALID_PERMISSIONS.include?(p.to_sym)          
+        end
+        args={:perms=>permissions*','}
+        args[:next_fbjs]=callback unless callback.nil?
+        content_tag("fb:prompt-permission",message,args)        
+      end      
+      
       # Renders an <fb:eventlink /> tag that displays the event name and links to the event's page. 
       def fb_eventlink(eid)
         content_tag "fb:eventlink",nil,:eid=>eid

data/lib/facebooker/session.rb

@@ -193,30 +193,55 @@ module Facebooker
       @secret_from_session = secret_from_session
     end
 
+    def fql_build_object(type, hash)
+      case type
+      when 'user'
+        user = User.new
+        user.session = self
+        user.populate_from_hash!(hash)
+        user
+      when 'photo'
+        Photo.from_hash(hash)
+      when 'page'
+        Page.from_hash(hash)
+      when 'page_admin'
+        Page.from_hash(hash)
+      when 'group'
+        Group.from_hash(hash)
+      when 'event_member'
+        Event::Attendance.from_hash(hash)
+      else
+        hash
+      end
+    end
+
     def fql_query(query, format = 'XML')
       post('facebook.fql.query', :query => query, :format => format) do |response|
         type = response.shift
         return [] if type.nil?
         response.shift.map do |hash|
-          case type
-          when 'user'
-            user = User.new
-            user.session = self
-            user.populate_from_hash!(hash)
-            user
-          when 'photo'
-            Photo.from_hash(hash)
-          when 'page'
-            Page.from_hash(hash)
-          when 'page_admin'
-            Page.from_hash(hash)
-          when 'event_member'
-            Event::Attendance.from_hash(hash)
-          else
-            hash
+          fql_build_object(type, hash)
+        end
+      end
+    end
+
+    def fql_multiquery(queries, format = 'XML')
+      results = {}
+      post('facebook.fql.multiquery', :queries => queries.to_json, :format => format) do |responses|
+        responses.each do |response|
+          name = response.shift
+          response = response.shift
+          type = response.shift
+          value = [] 
+          unless type.nil?
+            value = response.shift.map do |hash|
+              fql_build_object(type, hash)
+            end
           end
+          results[name] = value
         end
       end
+      results
     end
 
     def user

data/lib/facebooker/version.rb

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

data/lib/facebooker.rb

@@ -27,6 +27,7 @@ require 'digest/md5'
 module Facebooker
 
     @facebooker_configuration = {}
+    @raw_facebooker_configuration = {}
     @current_adapter = nil
     @set_asset_host_to_callback_url = true
     @path_prefix = nil
@@ -37,11 +38,12 @@ module Facebooker
     def load_configuration(facebooker_yaml_file)
       if File.exist?(facebooker_yaml_file)
         if defined? RAILS_ENV
-          config = YAML.load_file(facebooker_yaml_file)[RAILS_ENV] 
+          @raw_facebooker_configuration = YAML.load_file(facebooker_yaml_file)[RAILS_ENV]
         else
-          config = YAML.load_file(facebooker_yaml_file)           
+          @raw_facebooker_configuration = YAML.load_file(facebooker_yaml_file)
         end
-        apply_configuration(config)
+        Thread.current[:fb_api_config] = @raw_facebooker_configuration unless Thread.current[:fb_api_config]
+        apply_configuration(@raw_facebooker_configuration)
       end
     end
 
@@ -67,6 +69,41 @@ module Facebooker
       @facebooker_configuration
     end
 
+    def with_application(api_key, &block)
+      config = fetch_config_for( api_key )
+
+      unless config
+        self.logger.info "Can't find facebooker config: '#{api_key}'" if self.logger
+        yield if block_given?
+        return
+      end
+
+      # Save the old config to handle nested activation
+      old = Thread.current[:fb_api_config].dup rescue false
+
+      if block_given?
+        begin
+          self.logger.info "Swapping facebooker config: '#{api_key}'" if self.logger
+          Thread.current[:fb_api_config] = apply_configuration(config)
+          yield
+        ensure
+          Thread.current[:fb_api_config] = old if old
+          apply_configuration(Thread.current[:fb_api_config])
+        end
+      end
+    end
+
+    def fetch_config_for(api_key)
+      if @raw_facebooker_configuration['api_key'] == api_key
+        return @raw_facebooker_configuration
+      elsif @raw_facebooker_configuration['alternative_keys'] and
+            @raw_facebooker_configuration['alternative_keys'].keys.include?(api_key)
+        return @raw_facebooker_configuration['alternative_keys'][api_key].merge(
+                'api_key' => api_key )
+      end
+      return false
+    end
+
     # TODO: This should be converted to attr_accessor, but we need to
     # get all the require statements at the top of the file to work.
 

data/lib/rack/facebook.rb

@@ -24,9 +24,8 @@ module Rack
   #   end
   #
   class Facebook
-    def initialize(app, secret_key, &condition)
+    def initialize(app, &condition)
       @app = app
-      @secret_key = secret_key
       @condition = condition
     end
     
@@ -35,14 +34,20 @@ module Rack
         request = Rack::Request.new(env)
         fb_params = extract_fb_sig_params(request.POST)
         unless fb_params.empty?
-          unless signature_is_valid?(fb_params, request.POST['fb_sig'])
-            return Rack::Response.new(["Invalid Facebook signature"], 400).finish
+          Facebooker.with_application(fb_params['api_key']) do
+            unless signature_is_valid?(fb_params, request.POST['fb_sig'])
+              return Rack::Response.new(["Invalid Facebook signature"], 400).finish
+            end
+            env['REQUEST_METHOD'] = fb_params["request_method"] if fb_params["request_method"]
+            convert_parameters!(request.POST)
+            @app.call(env)
           end
-          env['REQUEST_METHOD'] = fb_params["request_method"] if fb_params["request_method"]
-          convert_parameters!(request.POST)
+        else
+          @app.call(env)
         end
+      else
+        @app.call(env)
       end
-      @app.call(env)
     end
     
     private
@@ -56,7 +61,7 @@ module Rack
     
     def signature_is_valid?(fb_params, actual_sig)
       raw_string = fb_params.map{ |*args| args.join('=') }.sort.join
-      expected_signature = Digest::MD5.hexdigest([raw_string, @secret_key].join)
+      expected_signature = Digest::MD5.hexdigest([raw_string, Facebooker.secret_key].join)
       actual_sig == expected_signature
     end
     
@@ -74,4 +79,4 @@ module Rack
       end
     end
   end
-end
+end

data/test/facebooker/adapters_test.rb

@@ -93,4 +93,82 @@ class Facebooker::AdaptersTest < Test::Unit::TestCase
   def test_bebo_process_data
 
   end
+
+  def test_fetch_config_for_can_find_top_level_api_key
+    old = Facebooker.instance_variable_get('@raw_facebooker_configuration')
+    # Now that we've backed up the old value...
+    raw_fb_config = { 'api_key' => 'a key' }
+    Facebooker.instance_variable_set('@raw_facebooker_configuration', raw_fb_config)
+    assert_equal Facebooker.fetch_config_for( 'a key' ), raw_fb_config
+  ensure
+    # Put the old value back
+    Facebooker.instance_variable_set('@raw_facebooker_configuration', old)
+  end
+
+  def test_fetch_config_for_can_find_deep_api_key
+    old = Facebooker.instance_variable_get('@raw_facebooker_configuration')
+    # Now that we've backed up the old value...
+    raw_fb_config = { 'api_key' => 'a key',
+                      'alternative_keys' => {
+                        'another key'     => { 'secret_key' => 'sdfsd' },
+                        'yet another key' => { 'secret_key' => '9ho2h' } } }
+    Facebooker.instance_variable_set('@raw_facebooker_configuration', raw_fb_config)
+    assert_equal raw_fb_config['alternative_keys']['another key'].merge( 'api_key' => 'another key' ),
+                 Facebooker.fetch_config_for( 'another key' )
+  ensure
+    # Put the old value back
+    Facebooker.instance_variable_set('@raw_facebooker_configuration', old)
+  end
+
+  def test_fetch_config_for_returns_false_if_no_apikey_found
+    old = Facebooker.instance_variable_get('@raw_facebooker_configuration')
+    # Now that we've backed up the old value...
+    raw_fb_config = { 'api_key' => 'a key' }
+    Facebooker.instance_variable_set('@raw_facebooker_configuration', raw_fb_config)
+    assert ! Facebooker.fetch_config_for( 'another key' )
+  ensure
+    # Put the old value back
+    Facebooker.instance_variable_set('@raw_facebooker_configuration', old)
+  end
+
+  def test_with_application_yields_if_no_config_is_found
+    flexmock( Facebooker ).
+      should_receive( :fetch_config_for ).
+      and_return( false )
+    # Is there a better way to assert the block is yielded?
+    @changes_to_true = false
+    Facebooker.with_application('somekey not found') do
+      @changes_to_true = true
+    end
+    assert @changes_to_true
+  end
+
+  def test_with_application_changes_config_inside_block
+    flexmock( Facebooker ).
+      should_receive( :fetch_config_for ).
+      and_return({ 'api_key'    => 'a key',
+                   'secret_key' => 'my secret key' })
+    Facebooker.with_application('a key') do
+      @secret_in_block = Facebooker.secret_key
+    end
+    # Check outside the block, assures the assertion gets run
+    assert_equal 'my secret key', @secret_in_block
+  end
+
+  def test_with_application_restores_last_config_outside_block
+    flexmock( Facebooker ).
+      should_receive( :fetch_config_for ).
+      and_return( { 'api_key'    => 'a key',
+                    'secret_key' => 'my secret key' },
+                  { 'api_key'    => 'another key',
+                    'secret_key' => 'my other secret key' } )
+    Facebooker.with_application('a key') do
+      Facebooker.with_application('another key') do
+      end
+      @secret_in_outer_block = Facebooker.secret_key
+    end
+    # Check outside the block, assures the assertion gets run
+    assert_equal 'my secret key', @secret_in_outer_block
+  end
+
 end

data/test/facebooker/models/user_test.rb

@@ -16,9 +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 
+ 
   def test_can_ask_user_if_he_or_she_is_friends_with_another_user
     assert(@user.friends_with?(@other_user))
   end
@@ -131,6 +136,12 @@ class Facebooker::UserTest < Test::Unit::TestCase
     @user.publish_to(@other_user, :message => 'i love you man')
   end
 
+  def test_comment_on
+    @user = Facebooker::User.new(548871286, @session)
+    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")
@@ -340,4 +351,11 @@ 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

data/test/facebooker/rails/facebook_request_fix_2-3_test.rb

@@ -1,4 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../rails_test_helper')
+require 'facebooker/rails/facebook_request_fix_2-3' if Rails.version >= '2.3'
 
 class Facebooker::Rails::FacebookRequestFix23Test < Test::Unit::TestCase
 

data/test/facebooker/rails/publisher_test.rb

@@ -441,7 +441,7 @@ class Facebooker::Rails::Publisher::PublisherTest < Test::Unit::TestCase
 
   def test_default_url_options
     Facebooker.expects(:facebook_path_prefix).returns("/mike")
-    assert_equal({:host=>"apps.facebook.com/mike"},TestPublisher.default_url_options)
+    assert_equal({:host=>"apps.facebook.com/mike"},TestPublisher.new.default_url_options)
   end
 
   def test_recipients

data/test/facebooker/rails_integration_test.rb

@@ -259,13 +259,13 @@ class RailsIntegrationTestForApplicationInstallation < Test::Unit::TestCase
   def test_if_controller_requires_application_installation_unauthenticated_requests_will_redirect_to_install_page
     get :index
     assert_response :redirect
-    assert_equal("http://www.facebook.com/install.php?api_key=1234567&v=1.0", @response.headers['Location'])
+    assert_equal("http://www.facebook.com/install.php?api_key=1234567&v=1.0&next=http%3A%2F%2Ftest.host%2Frequire_install", @response.headers['Location'])
   end
   
   def test_if_controller_requires_application_installation_authenticated_requests_without_installation_will_redirect_to_install_page
     get :index, facebook_params(:fb_sig_added => nil)
     assert_response :success
-    assert_equal("<fb:redirect url=\"http://www.facebook.com/install.php?api_key=1234567&v=1.0\" />", @response.body)
+    assert(@response.body =~ /fb:redirect/)
   end
   
   def test_if_controller_requires_application_installation_authenticated_requests_with_installation_will_render
@@ -297,7 +297,7 @@ class RailsIntegrationTest < Test::Unit::TestCase
   def test_if_controller_requires_facebook_authentication_unauthenticated_requests_will_redirect
     get :index
     assert_response :redirect
-    assert_equal("http://www.facebook.com/login.php?api_key=1234567&v=1.0", @response.headers['Location'])
+    assert_equal("http://www.facebook.com/login.php?api_key=1234567&v=1.0&next=http%3A%2F%2Ftest.host%2Frequire_auth", @response.headers['Location'])
   end
 
   def test_facebook_params_are_parsed_into_a_separate_hash
@@ -425,7 +425,7 @@ class RailsIntegrationTest < Test::Unit::TestCase
   def test_redirect_to_renders_fbml_redirect_tag_if_request_is_for_a_facebook_canvas
     get :index, facebook_params(:fb_sig_user => nil)
     assert_response :success
-    assert_equal("<fb:redirect url=\"http://www.facebook.com/login.php?api_key=1234567&v=1.0\" />", @response.body)
+    assert @response.body =~ /fb:redirect/
   end
   
   def test_redirect_to_renders_javascript_redirect_if_request_is_for_a_facebook_iframe
@@ -433,7 +433,6 @@ class RailsIntegrationTest < Test::Unit::TestCase
     assert_response :success
     assert_match "javascript", @response.body
     assert_match "http-equiv", @response.body
-    assert_match "http://www.facebook.com/login.php?api_key=1234567&v=1.0".to_json, @response.body
     assert_match "http://www.facebook.com/login.php?api_key=1234567&amp;v=1.0", @response.body
   end
 
@@ -643,6 +642,22 @@ class RailsHelperTest < Test::Unit::TestCase
     
   end
   
+  def test_fb_prompt_permissions_valid_no_callback
+    assert_equal "<fb:prompt-permission perms=\"publish_stream,read_stream\">Can I read and write your streams?</fb:prompt-permission>",
+                 @h.fb_prompt_permissions(['publish_stream', 'read_stream'],"Can I read and write your streams?")    
+  end
+  
+  def test_fb_prompt_permissions_valid_with_callback
+    assert_equal "<fb:prompt-permission next_fbjs=\"do_stuff()\" perms=\"publish_stream,read_stream\">Can I read and write your streams?</fb:prompt-permission>",
+                 @h.fb_prompt_permissions(['publish_stream', 'read_stream'],"Can I read and write your streams?", "do_stuff()")    
+  end
+  
+  def test_fb_prompt_permissions_invalid_option
+    assert_raises(ArgumentError) {@h.fb_prompt_permissions(["invliad", "read_stream"], "a message")}
+    
+  end  
+ 
+  
   def test_fb_add_profile_section
     assert_equal "<fb:add-section-button section=\"profile\" />",@h.fb_add_profile_section
   end

data/test/facebooker/session_test.rb

@@ -29,12 +29,14 @@ class Facebooker::SessionTest < Test::Unit::TestCase
 
   def test_if_keys_are_not_available_via_environment_then_they_are_gotten_from_a_file
     ENV['FACEBOOK_API_KEY'], ENV['FACEBOOK_SECRET_KEY'] = nil
+    Facebooker.instance_variable_set('@facebooker_configuration', nil)
     flexmock(File).should_receive(:read).with(File.expand_path("~/.facebookerrc")).once.and_return('{:api => "foo"}')
     assert_equal('foo', Facebooker::Session.api_key)
   end
 
   def test_if_environment_and_file_fail_to_match_then_an_exception_is_raised
     ENV['FACEBOOK_API_KEY'], ENV['FACEBOOK_SECRET_KEY'] = nil
+    Facebooker.instance_variable_set('@facebooker_configuration', nil)
     flexmock(File).should_receive(:read).with(File.expand_path("~/.facebookerrc")).once.and_return {raise Errno::ENOENT, "No such file"}
     assert_raises(Facebooker::Session::ConfigurationMissing) {
       Facebooker::Session.api_key
@@ -160,6 +162,15 @@ class Facebooker::SessionTest < Test::Unit::TestCase
     assert_equal "Ari Steinberg", response.first.name
   end
 
+  def test_can_fql_multiquery_for_users_and_pictures
+    @session = Facebooker::Session.create(ENV['FACEBOOK_API_KEY'], ENV['FACEBOOK_SECRET_KEY'])
+    mock_http = establish_session
+    mock_http.should_receive(:post).and_return(example_fql_multiquery_xml).once.ordered(:posts)
+    response = @session.fql_multiquery({:query => 'SELECT name, pic FROM user WHERE uid=211031 OR uid=4801660'})
+    assert_kind_of Array, response
+    assert_kind_of Facebooker::User, response.first
+    assert_equal "Ari Steinberg", response.first.name
+  end
 
   def test_can_send_notification_with_object
     @session = Facebooker::Session.create(ENV['FACEBOOK_API_KEY'], ENV['FACEBOOK_SECRET_KEY'])
@@ -282,6 +293,36 @@ class Facebooker::SessionTest < Test::Unit::TestCase
 
   private
 
+  def example_fql_multiquery_xml
+    <<-XML
+<?xml version="1.0" encoding="UTF-8"?>
+<fql_multiquery_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">
+  <fql_result>
+    <name>query1</name>
+    <results list="true">
+      <user>
+<<<<<<< HEAD:test/facebooker/session_test.rb
+        <name>Ari Steinberg</name>
+=======
+>>>>>>> b7d143104d745caf56a73c8ed092e422c2d00508:test/facebooker/session_test.rb
+        <uid>46903192</uid>
+        <rsvp_status xsi:nil="true"/>
+      </user>
+    </results>
+  </fql_result>
+  <fql_result>
+    <name>query2</name>
+    <results list="true">
+      <user>
+        <name>Lisa Petrovskaia</name>
+        <pic xsi:nil="true"/>
+      </user>
+    </results>
+  </fql_result>
+</fql_multiquery_response>
+XML
+  end
+
   def example_groups_get_xml
     <<-XML
     <?xml version="1.0" encoding="UTF-8"?>

data/test/rack/facebook_test.rb

@@ -6,12 +6,12 @@ require 'rack/mock'
 class Rack::FacebookTest < Test::Unit::TestCase
   
   def setup
-    @secret_key = 'secret'
+    flexmock(Facebooker).should_receive(:secret_key).and_return('secret')
     @app = lambda do |env|
       @env = env
       Rack::Response.new().to_a
     end
-    @facebook = Rack::Facebook.new(@app, @secret_key)
+    @facebook = Rack::Facebook.new(@app)
   end
   
   def params(p)
@@ -47,13 +47,13 @@ class Rack::FacebookTest < Test::Unit::TestCase
   end
   
   def test_skips_with_false_condition
-    @facebook = Rack::Facebook.new(@app, @secret_key) { false }
+    @facebook = Rack::Facebook.new(@app) { false }
     response = app.post("/", :input => params(:fb_sig_user => 'ignored'))
     assert_equal 200, response.status
   end
   
   def test_verifies_with_true_condition
-    @facebook = Rack::Facebook.new(@app, @secret_key) { true }
+    @facebook = Rack::Facebook.new(@app) { true }
     response = app.post("/", :input => params(:fb_sig_user => 'ignored'))
     assert_equal 400, response.status
   end

metadata

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