frankie 0.2.0 → 0.2.2

data/CHANGELOG

@@ -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

data/Manifest

@@ -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

data/bin/tunnel

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+
+host, remote_port, local_port = ARGV
+raise 'You must specify at least a hostname - i.e. tunnel myhost.com' unless host
+remote_port ||= 10000
+local_port  ||= 4567
+puts "Tunneling #{host}:#{remote_port} to 0.0.0.0:#{local_port}"
+begin
+  exec "autossh -M 48484 -nNT -g -R *:#{remote_port}:0.0.0.0:#{local_port} #{host}"
+rescue
+  raise "Tunnel failed to start. Do you have autossh installed?"
+end

data/frankie.gemspec

@@ -1,20 +1,22 @@
 
-# Gem::Specification for Frankie-0.2.0
+# Gem::Specification for Frankie-0.2.2
 # Originally generated by Echoe
 
 Gem::Specification.new do |s|
   s.name = %q{frankie}
-  s.version = "0.2.0"
+  s.version = "0.2.2"
 
   s.specification_version = 2 if s.respond_to? :specification_version=
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ron Evans"]
-  s.date = %q{2008-04-12}
+  s.date = %q{2008-04-21}
+  s.default_executable = %q{tunnel}
   s.description = %q{Easy creation of Facebook applications in Ruby using plugin for Sinatra web framework that integrates with Facebooker gem.}
   s.email = %q{}
-  s.extra_rdoc_files = ["CHANGELOG", "lib/frankie.rb", "LICENSE", "README.rdoc"]
-  s.files = ["CHANGELOG", "lib/frankie.rb", "LICENSE", "Manifest", "Rakefile", "README.rdoc", "test/frankie_test.rb", "frankie.gemspec"]
+  s.executables = ["tunnel"]
+  s.extra_rdoc_files = ["bin/tunnel", "CHANGELOG", "lib/frankie.rb", "LICENSE", "README.rdoc"]
+  s.files = ["bin/tunnel", "CHANGELOG", "lib/frankie.rb", "LICENSE", "Manifest", "Rakefile", "README.rdoc", "test/frankie_test.rb", "test/helper.rb", "frankie.gemspec"]
   s.has_rdoc = true
   s.homepage = %q{http://facethesinatra.com/}
   s.post_install_message = %q{*** Frankie was installed ***}

data/lib/frankie.rb

@@ -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

data/test/helper.rb

@@ -0,0 +1,4 @@
+require 'rubygems'
+require 'sinatra'
+require File.dirname(__FILE__) + '/../lib/frankie'
+require 'sinatra/test/spec'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: frankie
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors: 
 - Ron Evans
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-12 00:00:00 -07:00
+date: 2008-04-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,16 +32,18 @@ dependencies:
     version: 
 description: Easy creation of Facebook applications in Ruby using plugin for Sinatra web framework that integrates with Facebooker gem.
 email: ""
-executables: []
-
+executables: 
+- tunnel
 extensions: []
 
 extra_rdoc_files: 
+- bin/tunnel
 - CHANGELOG
 - lib/frankie.rb
 - LICENSE
 - README.rdoc
 files: 
+- bin/tunnel
 - CHANGELOG
 - lib/frankie.rb
 - LICENSE
@@ -49,6 +51,7 @@ files:
 - Rakefile
 - README.rdoc
 - test/frankie_test.rb
+- test/helper.rb
 - frankie.gemspec
 has_rdoc: true
 homepage: http://facethesinatra.com/