bin/tunnel @@ -1 +1,3 @@ +v0.2.2. Updated to deal with session change in Sinatra, plus misc bug fixes with Facebooker integration + v0.2.0. Converted codebase to become Ruby Gem \ No newline at end of file CHANGELOG @@ -1,3 +1,4 @@ +bin/tunnel CHANGELOG lib/frankie.rb LICENSE @@ -5,3 +6,4 @@ Manifest Rakefile README.rdoc test/frankie_test.rb +test/helper.rb Manifest @@ -53,7 +53,7 @@ module Frankie private def session_already_secured? - (@facebook_session = session['facebook_session']) && session['facebook_session'].secured? + (@facebook_session = session[:facebook_session]) && session[:facebook_session].secured? end def secure_with_token! @@ -61,7 +61,7 @@ module Frankie @facebook_session = new_facebook_session @facebook_session.auth_token = params['auth_token'] @facebook_session.secure! - session['facebook_session'] = @facebook_session + session[:facebook_session] = @facebook_session end end @@ -76,9 +76,8 @@ module Frankie end def create_new_facebook_session_and_redirect! - s = new_facebook_session - session['facebook_session'] = s - throw :halt, do_redirect(session['facebook_session'].login_url) unless @installation_required + session[:facebook_session] = new_facebook_session + throw :halt, do_redirect(session[:facebook_session].login_url) unless @installation_required end def new_facebook_session @@ -89,7 +88,7 @@ module Frankie return unless request_is_for_a_facebook_canvas? if friends = facebook_params['friends'] facebook_session.user.friends = friends.map do |friend_uid| - User.new(friend_uid, facebook_session) + Facebooker::User.new(friend_uid, facebook_session) end end end @@ -139,7 +138,7 @@ module Frankie def do_redirect(*args) if request_is_for_a_facebook_canvas? - fbml_redirect_tag(args[0]) + fbml_redirect_tag(args) else redirect args[0] end @@ -150,8 +149,8 @@ module Frankie end def request_is_for_a_facebook_canvas? - return false if !params["fb_sig_in_canvas"] - !params["fb_sig_in_canvas"].blank? + return false if params["fb_sig_in_canvas"].nil? + params["fb_sig_in_canvas"] == "1" end def application_is_installed? @@ -170,7 +169,7 @@ module Frankie end def application_is_not_installed_by_facebook_user - throw :halt, do_redirect(session['facebook_session'].install_url) + throw :halt, do_redirect(session[:facebook_session].install_url) end def set_fbml_format lib/frankie.rb 695790c23c5f65a503c6de5c0407767a11d0f9e7 Ron Evans ron@ron-evans-computer.local http://github.com/deadprogrammer/frankie/commit/e6ca960c79c1a5a58a9aa637b713d6311569fb26 e6ca960c79c1a5a58a9aa637b713d6311569fb26 2008-04-21T20:54:01-07:00 2008-04-21T20:54:01-07:00 Update frankie for Sinatra 0.2.2, plus add ssh tunnel script to project 6c98211eb86d61d84411f7ef0714826aabaddce6 Ron Evans ron@ron-evans-computer.local