sinbook 0.1.8 → 0.1.9

data/README

@@ -84,6 +84,19 @@ sinbook: simple sinatra facebook extension in 300 lines of ruby
   => [{:name => 'Sinatra Users'}]
 
 
+=== Standalone Usage
+
+  require 'sinbook'
+  fb = Sinbook.new(
+    :api_key  => '4579...cbb0',
+    :secret   => '5106...2342',
+    :app_id   => 81747826609
+  )
+
+  >> fb.friends.get :uid => 1234, :session_key => 'user-session-key'
+  => [4321,4567,9876]
+
+
 === Local Development
 
   To develop locally, use ssh to setup a reverse tunnel to your external server.
@@ -94,10 +107,21 @@ sinbook: simple sinatra facebook extension in 300 lines of ruby
   Then, simply launch sinatra on your local machine. Facebook will make requests to
   http://myserver.com:4567/ which will be forwarded to port 4567 on your local machine.
 
+  For facebook connect, I generally add a CNAME on my domain for fb.myserver.com, and setup
+  nginx on my server with the following:
+
+    server {
+      server_name fb.myserver.com;
+      location / {
+        proxy_pass http://localhost:4567;
+      }
+    }
+
+  Make sure your connect url is set to 'http://myserver.com' and the base domain is set to 'myserver.com',
+  so that the fb.myserver.com subdomain works.
 
 === TODO
 
-  * Split out facebook api client so it can be used outside sinatra
   * Add a batch mode for api calls:
 
       groups, pics = fb.batch do |b|

data/examples/connect.rb

@@ -1,5 +1,4 @@
 require 'rubygems'
-$:.unshift File.join(File.dirname(__FILE__),'../lib')
 require 'sinbook'
 require 'sinatra'
 

data/examples/simple.rb

@@ -1,5 +1,4 @@
 require 'rubygems'
-$:.unshift File.join(File.dirname(__FILE__),'../lib')
 require 'sinbook'
 require 'sinatra'
 

data/lib/sinbook.rb

@@ -15,15 +15,23 @@ module Sinatra
 
   class FacebookObject
     def initialize app
-      @app = app
+      if app.respond_to?(:options)
+        @app = app
 
-      @api_key = app.options.facebook_api_key
-      @secret = app.options.facebook_secret
-      @app_id = app.options.facebook_app_id
-      @url = app.options.facebook_url
-      @callback = app.options.facebook_callback
-      @symbolize_keys = app.options.facebook_symbolize_keys || false
+        [ :api_key, :secret, :app_id, :url, :callback, :symbolize_keys ].each do |var|
+          instance_variable_set("@#{var}", app.options.send("facebook_#{var}"))
+        end
+      else
+        [ :api_key, :secret, :app_id ].each do |var|
+          raise ArgumentError, "missing option #{var}" unless app[var]
+          instance_variable_set("@#{var}", app[var])
+        end
+        [:url, :callback, :symbolize_keys ].each do |var|
+          instance_variable_set("@#{var}", app[var]) if app.has_key?(var)
+        end
+      end
     end
+
     attr_reader :app
     attr_accessor :api_key, :secret
     attr_writer :url, :callback, :app_id
@@ -58,7 +66,11 @@ module Sinatra
 
     def redirect url
       url = self.url + url unless url =~ /^http/
-      app.body "<fb:redirect url='#{url}'/>"
+      if params[:in_iframe]
+        app.body "<script type=\"text/javascript\">top.location.href=\"#{url}\"</script>"
+      else
+        app.body "<fb:redirect url='#{url}'/>"
+      end
       throw :halt
     end
 
@@ -91,7 +103,9 @@ module Sinatra
     end
 
     def valid?
-      if app.params['fb_sig'] # canvas/iframe mode
+      if app.nil?
+        return false
+      elsif app.params['fb_sig'] # canvas/iframe mode
         prefix = 'fb_sig'
         vars = app.request.POST[prefix] ? app.request.POST : app.request.GET
       elsif app.request.cookies[api_key] # fbconnect mode
@@ -240,11 +254,10 @@ module Sinatra
     MimeImage = %[Content-Disposition: form-data; filename="%s"\r\nContent-Type: image/%s\r\n\r\n%s\r\n] + MimeBoundary
 
     require 'resolv'
-    API_SERVER = Resolv.getaddress('api.facebook.com')
     @keepalive = false
 
     def self.connect
-      sock = TCPSocket.new(API_SERVER, 80)
+      sock = TCPSocket.new(@api_server_ip ||= Resolv.getaddress('api.facebook.com'), 80)
       begin
         timeout = [3,0].pack('l_2') # 3 seconds
         sock.setsockopt Socket::SOL_SOCKET, Socket::SO_RCVTIMEO, timeout
@@ -353,9 +366,10 @@ module Sinatra
     def self.registered app
       app.helpers FacebookHelper
       app.before(&FixRequestMethod)
-      app.disable :sessions
     end
   end
 
   Application.register Facebook
 end
+
+Sinbook = Sinatra::FacebookObject

data/sinbook.gemspec

@@ -1,7 +1,7 @@
 spec = Gem::Specification.new do |s|
   s.name = 'sinbook'
-  s.version = '0.1.8'
-  s.date = '2009-12-27'
+  s.version = '0.1.9'
+  s.date = '2010-02-04'
   s.summary = 'simple sinatra facebook extension in 300 lines of ruby'
   s.description = 'A full-featured facebook extension for the sinatra webapp framework'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinbook
 version: !ruby/object:Gem::Version 
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors: 
 - Aman Gupta
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-27 00:00:00 -08:00
+date: 2010-02-04 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency