djanowski-facebooker 1.0.1 → 1.0.2

data/init.rb

@@ -41,6 +41,22 @@ class ActionController::Routing::Route
   alias_method_chain :recognition_conditions, :facebooker
 end
 
+# When making get requests, Facebook sends fb_sig parameters both in the query string
+# and also in the post body. We want to ignore the query string ones because they are one
+# request out of date
+# We only do thise when there are POST parameters so that IFrame linkage still works
+class ActionController::AbstractRequest
+  def query_parameters_with_facebooker
+    if request_parameters.blank?
+      query_parameters_without_facebooker
+    else
+      (query_parameters_without_facebooker||{}).reject {|key,value| key.to_s =~ /^fb_sig/}
+    end
+  end
+  
+  alias_method_chain :query_parameters, :facebooker
+end
+
 # We turn off route optimization to make named routes use our code for figuring out if they should go to the session
 # If this fails, it means we're on rails 1.2, we can ignore it
 begin

data/lib/facebooker/adapters/adapter_base.rb

@@ -2,7 +2,7 @@ module Facebooker
 
   class AdapterBase
     class UnableToLoadAdapter < Exception; end
-    require 'active_support'
+    require 'active_support/inflector'
     include  ActiveSupport::CoreExtensions::String::Inflections
     def facebook_path_prefix
       "/" + (@facebook_path_prefix || canvas_page_name || ENV['FACEBOOK_CANVAS_PATH'] || ENV['FACEBOOKER_RELATIVE_URL_ROOT'])

data/lib/facebooker/adapters/bebo_adapter.rb

@@ -43,7 +43,8 @@ module Facebooker
         set_profile_fbml_without_bebo_adapter(profile_fbml,mobile_fbml, profile_action_fbml, profile_main)
       end
     end
-    alias_method_chain :set_profile_fbml, :bebo_adapter
+    alias_method :set_profile_fbml_without_bebo_adapter, :set_profile_fbml
+    alias_method :set_profile_fbml, :set_profile_fbml_with_bebo_adapter
     
     private
     
@@ -67,7 +68,8 @@ module Facebooker
          process_without_bebo_adapter(data)
        end
       end
-      alias_method_chain :process, :bebo_adapter
+      alias_method :process_without_bebo_adapter, :process
+      alias_method :process, :process_with_bebo_adapter
     end
   end
-end
+end

data/lib/facebooker/models/friend_list.rb

@@ -1,7 +1,7 @@
 require 'facebooker/model'
 module Facebooker
   ##
-  # A simple representation of a photo album.
+  # A simple representation of a friend list.
   class FriendList
     include Model
     attr_accessor :flid, :name
@@ -11,4 +11,4 @@ module Facebooker
       @flid= ( f.nil? ? nil : f.to_i)
     end
   end
-end
+end

data/lib/facebooker/models/user.rb

@@ -1,7 +1,6 @@
 require 'facebooker/model'
 require 'facebooker/models/affiliation'
 require 'facebooker/models/work_info'
-require 'active_support'
 module Facebooker
   # 
   # Holds attributes and behavior for a Facebook User
@@ -219,24 +218,35 @@ module Facebooker
     end
     
     ##
-    # Set the status of the user
-    #
-    # DOES NOT prepend "is" to the message
-    #
-    # requires extended permission. 
+    # This DOES NOT set the status of a user on Facebook
+    # Use the set_status method instead
     def status=(message)
       case message
-      when String
-        session.post('facebook.users.setStatus',:status=>message,:status_includes_verb=>1) do |ret|
-          ret
-        end
-      when Status
+      when String,Status
         @status = message
       when Hash
         @status = Status.from_hash(message)
       end
     end
     
+    ##
+    # Set the status for a user
+    # DOES NOT prepend "is" to the message
+    #
+    # requires extended permission. 
+    def set_status(message)
+      self.status=message
+      session.post('facebook.users.setStatus',:status=>message,:status_includes_verb=>1) 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) == "1"
+    end    
+    
     ##
     # Convenience method to send email to the current user
     def send_email(subject, text=nil, fbml=nil)
@@ -291,7 +301,7 @@ module Facebooker
         ret.each do |hash|
           user_map.delete(hash)
         end
-        unless user_map.blank?
+        unless user_map.empty?
           e=Facebooker::Session::UserRegistrationFailed.new
           e.failed_users = user_map.values
           raise e

data/lib/facebooker/parser.rb

@@ -401,8 +401,8 @@ module Facebooker
         memo
       end
     end
-    
-    private
+
+  private
     def self.are_friends?(raw_value)
       if raw_value == '1'
         true
@@ -432,6 +432,12 @@ module Facebooker
     end
   end
     
+  class UserHasPermission < Parser
+    def self.process(data)
+      element('users_hasAppPermission_response', data).text_value
+    end
+  end  
+
   class Errors < Parser#:nodoc:
     EXCEPTIONS = {
       1 	=> Facebooker::Session::UnknownError,
@@ -492,6 +498,7 @@ module Facebooker
       'facebook.users.getStandardInfo' => UserStandardInfo,
       'facebook.users.setStatus' => SetStatus,
       'facebook.users.getLoggedInUser' => GetLoggedInUser,
+      'facebook.users.hasAppPermission' => UserHasPermission,
       'facebook.pages.isAdmin' => PagesIsAdmin,
       'facebook.pages.getInfo' => PagesGetInfo,
       'facebook.friends.get' => GetFriends,

data/test/user_test.rb

@@ -15,6 +15,11 @@ class UserTest < Test::Unit::TestCase
     @user.friends = [@other_user]
   end
   
+  def test_has_permission
+    expect_http_posts_with_responses(has_app_permission_response_xml)
+    assert @user.has_permission?("status_update")
+  end
+  
   def test_can_ask_user_if_he_or_she_is_friends_with_another_user
     assert(@user.friends_with?(@other_user))
   end
@@ -109,9 +114,13 @@ class UserTest < Test::Unit::TestCase
     @user.send_email("subject", nil, "body fbml")
   end
   
+  def test_doesnt_post_to_facebook_when_assigning_status
+    @session.expects(:post).never
+    @user.status="my status"
+  end
   def test_can_set_status_with_string
     @session.expects(:post).with('facebook.users.setStatus', :status=>"my status",:status_includes_verb=>1)
-    @user.status="my status"
+    @user.set_status("my status")
   end
   
   def test_get_events
@@ -226,4 +235,13 @@ class UserTest < Test::Unit::TestCase
     </connect_registerUsers_response>
     XML
   end
-end
+  
+  def has_app_permission_response_xml
+    <<-XML
+    <?xml version="1.0" encoding="UTF-8"?>
+    <users_hasAppPermission_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</users_hasAppPermission_response>
+    XML
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: djanowski-facebooker
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - Chad Fowler