mmangino-facebooker 1.0.38 → 1.0.39

data/README.rdoc

@@ -77,6 +77,9 @@ class CGI
   end
 end
 
+== Other versions
+ 
+ A facebooker port for Sinatra is available at http://github.com/jsmestad/frankie/tree/master
 
 == LICENSE:
 

data/facebooker.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{facebooker}
-  s.version = "1.0.38"
+  s.version = "1.0.39"
 
   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-23}
+  s.date = %q{2009-07-01}
   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/lib/facebooker/rails/controller.rb

@@ -31,6 +31,12 @@ module Facebooker
         secure_with_facebook_params! || secure_with_cookies! || secure_with_token!
       end
       
+      #this is used to proxy a connection through a rails app so the facebook secret key is not needed
+      #iphone apps use this
+      def create_facebook_session_with_secret
+        secure_with_session_secret!
+      end
+      
       def set_facebook_session
         # first, see if we already have a session
         session_set = session_already_secured?
@@ -148,6 +154,15 @@ module Facebooker
           @facebook_session
         end
       end
+    
+      def secure_with_session_secret!
+        if params['auth_token']
+          @facebook_session = new_facebook_session
+          @facebook_session.auth_token = params['auth_token']
+          @facebook_session.secure_with_session_secret!
+          @facebook_session
+        end
+      end
       
       def secure_with_facebook_params!
         return unless request_comes_from_facebook?

data/lib/facebooker/session.rb

@@ -72,6 +72,7 @@ module Facebooker
 
     attr_writer :auth_token
     attr_reader :session_key
+    attr_reader :secret_from_session
 
     def self.create(api_key=nil, secret_key=nil)
       api_key ||= self.api_key
@@ -181,10 +182,14 @@ module Facebooker
       !@session_key.nil? && !expired?
     end
 
-    def secure!
-      response = post 'facebook.auth.getSession', :auth_token => auth_token
+    def secure!(args = {})
+      response = post 'facebook.auth.getSession', :auth_token => auth_token, :generate_session_secret => args[:generate_session_secret] ? "1" : "0"
       secure_with!(response['session_key'], response['uid'], response['expires'], response['secret'])
     end    
+    
+    def secure_with_session_secret!
+      self.secure!(:generate_session_secret => true)
+    end
 
     def secure_with!(session_key, uid = nil, expires = nil, secret_from_session = nil)
       @session_key = session_key
@@ -413,10 +418,10 @@ module Facebooker
 
     ##
     # Send email to as many as 100 users at a time
-    def send_email(user_ids, subject, text, fbml = nil) 			
+    def send_email(user_ids, subject, text, fbml = nil)       
       user_ids = Array(user_ids)
       params = {:fbml => fbml, :recipients => user_ids.map{ |id| User.cast_to_facebook_id(id)}.join(','), :text => text, :subject => subject} 
-      post 'facebook.notifications.sendEmail', params
+      post 'facebook.notifications.sendEmail', params, false
     end
 
     # Only serialize the bare minimum to recreate the session.

data/lib/facebooker/version.rb

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

data/test/facebooker/rails_integration_test.rb

@@ -37,6 +37,13 @@ class FBConnectController < NoisyController
   end
 end
 
+class FBConnectControllerProxy < NoisyController
+  before_filter :create_facebook_session_with_secret
+  def index
+    render :text => 'score!'
+  end
+end
+
 class ControllerWhichRequiresFacebookAuthentication < NoisyController
   ensure_authenticated_to_facebook
   def index
@@ -372,6 +379,20 @@ class RailsIntegrationTest < Test::Unit::TestCase
     assert_equal(1111111, @controller.facebook_session.user.id)
   end
 
+  def test_session_can_be_secured_with_secret
+    @controller = FBConnectControllerProxy.new
+    auth_token = 'ohaiauthtokenhere111'
+    modified_params = facebook_params
+    modified_params.delete('fb_sig_session_key')
+    modified_params['auth_token'] = auth_token
+    modified_params['generate_session_secret'] = true
+    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, :generate_session_secret => "1").once.and_return(session_params).ordered
+    flexmock(@controller).should_receive(:new_facebook_session).once.and_return(session).ordered
+    get :index, modified_params
+  end
+
   def test_session_can_be_secured_with_auth_token
     auth_token = 'ohaiauthtokenhere111'
     modified_params = facebook_params
@@ -379,7 +400,7 @@ class RailsIntegrationTest < Test::Unit::TestCase
     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
+    session_mock.should_receive(:post).with('facebook.auth.getSession', :auth_token => auth_token, :generate_session_secret => "0").once.and_return(session_params).ordered
     flexmock(@controller).should_receive(:new_facebook_session).once.and_return(session).ordered
     get :index, modified_params
   end
@@ -391,7 +412,7 @@ class RailsIntegrationTest < Test::Unit::TestCase
       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
+      session_mock.should_receive(:post).with('facebook.auth.getSession', :auth_token => auth_token, :generate_session_secret => "0").once.and_return(session_params).ordered
       flexmock(@controller).should_receive(:new_facebook_session).once.and_return(session).ordered
       setup_fb_connect_cookies(expired_cookie_hash_for_auth)
       get :index, modified_params

metadata

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