abhiyerra-refacebook 0.3.3 → 0.4.0

data/Rakefile

@@ -12,6 +12,7 @@ begin
     gemspec.homepage = "http://github.com/abhiyerra/refacebook"
     gemspec.description = "ReFacebook is a facebook library and Sinatra extension."
     gemspec.authors = ["Abhi Yerra"]
+    gemspec.rubyforge_project = "refacebook"
 
     if defined?(JRUBY_VERSION)
       gemspec.add_dependency("json-jruby", [">= 1.1.3"])
@@ -25,4 +26,30 @@ rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
 end
 
+begin
+  require 'rake/contrib/sshpublisher'
+  namespace :rubyforge do
+
+    desc "Release gem and RDoc documentation to RubyForge"
+    task :release => ["rubyforge:release:gem", "rubyforge:release:docs"]
+
+    namespace :release do
+      desc "Publish RDoc to RubyForge."
+      task :docs => [:rdoc] do
+        config = YAML.load(
+            File.read(File.expand_path('~/.rubyforge/user-config.yml'))
+        )
+
+        host = "#{config['username']}@rubyforge.org"
+        remote_dir = "/var/www/gforge-projects/the-perfect-gem/"
+        local_dir = 'rdoc'
+
+        Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
+      end
+    end
+  end
+rescue LoadError
+  puts "Rake SshDirPublisher is unavailable or your rubyforge environment is not configured."
+end
+
 # vim: syntax=Ruby

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:minor: 3
+:minor: 4
 :major: 0
-:patch: 3
+:patch: 0

data/lib/refacebook.rb

@@ -3,9 +3,8 @@ require 'uri'
 require 'md5'
 require 'json'
 
+# ReFacebook the main store for a facebook session.
 module ReFacebook
-  VERSION = "0.3.2"
-
   APIRestServer = "http://api.facebook.com/restserver.php"
   LoginUrl = "http://www.facebook.com/login.php"
 
@@ -25,40 +24,16 @@ module ReFacebook
       end
     end
 
-    # FIXME: Currently the store is relying on the idea that we have a memcache
-    #        store. Abstract this so that it uses rack/session/abstract/id.
-    def self.create api_key, secret, params, *args
-      store = args[0][:store]
-      unless store
-        # TODO: Exception or error.
-      end
-      
-      session = nil
-
-      if params['fb_sig_session_key']
-        # TODO: Maybe we can only reset the items that need to be reset,
-        #       since I doubt that all of these change all the time.
-        session = store.get(params['fb_sig_session_key'])
-        session = new(api_key, secret) if session.nil?
-
-        session.user = params['fb_sig_user']
-        session.friends = params['fb_sig_friends'].split(',')
+    def update_session_params params
+      @user = params['fb_sig_user']
+      @friends = params['fb_sig_friends'].split(',')
 
-        session.session_key = params['fb_sig_session_key']
+      @session_key = params['fb_sig_session_key']
 
-        session.expires = params['fb_sig_expires']
-        session.time = params['fb_sig_time']
-
-        session.profile_update_time = params['fb_sig_profile_update_time']
-
-        expiry = session.expires.to_i - session.time.to_i
-        store.set(params['fb_sig_session_key'], session, expiry)
-      else
-        # Just return a session, even if it's not a lasting session.
-        session = new(api_key, secret)
-      end
+      @expires = params['fb_sig_expires']
+      @time = params['fb_sig_time']
 
-      session
+      @profile_update_time = params['fb_sig_profile_update_time']
     end
 
     def get_login_url *args

data/lib/refacebook/sinatra.rb

@@ -1,5 +1,4 @@
 require 'sinatra/base'
-require 'rack'
 require 'refacebook'
 
 module Sinatra
@@ -30,10 +29,21 @@ module Sinatra
       before do 
         # Passes the request to the correct request method since canvas requests
         # come in as POSTs.
-        request.env['REQUEST_METHOD'] = 'GET' if params["fb_sig_in_canvas"].eql? "1" \
-                                             and params["fb_sig_request_method"].eql? "GET"
+        if params["fb_sig_in_canvas"].eql? "1" and params["fb_sig_request_method"].eql? "GET"
+          request.env['REQUEST_METHOD'] = 'GET' 
+        end
+
+        if params['fb_sig_session_key']
+          @fbsession = settings[:store].get(params['fb_sig_session_key'])
+          @fbsession = ReFacebook::Session.new(settings[:api_key], settings[:secret_key]) unless @fbsession
+          @fbsession.update_session_params(params)
 
-        @fbsession = ReFacebook::Session.create(settings[:api_key], settings[:secret_key], params, :store => settings[:store])
+          expiry = @fbsession.expires.to_i - @fbsession.time.to_i
+          settings[:store].set(params['fb_sig_session_key'], @fbsession, expiry)
+        else
+          # Just return a session, even if it's not a lasting session.
+          @fbsession = ReFacebook::Session.new(settings[:api_key], settings[:secret_key])
+        end
 
         if settings[:require_login] and !params['fb_sig_session_key']
           fbml_redirect(@fbsession.get_login_url(:next => link_from_canvas(request.fullpath),

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: abhiyerra-refacebook
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors: 
 - Abhi Yerra
@@ -72,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: refacebook
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2