facebook-login 0.2.3 → 0.3.0

data/lib/facebook/client.rb

@@ -4,37 +4,47 @@ module Facebook
   # http://www.facebook.com/developers/apps.php?app_id=APPID
   class Client
     class << self
-      attr_accessor :app_id, :secret
+      attr_reader :last_oauth_client
     end
-    
-    def self.oauth_client(app_id = nil, secret = nil)
-      self.app_id, self.secret = app_id, secret unless app_id.nil?
-      OAuth2::Client.new(self.app_id, self.secret, :site => 'https://graph.facebook.com')
+
+    def self.oauth_client(app_id, secret, &block)
+      @last_oauth_client = OAuth2::Client.new app_id, secret,
+        :site => 'https://graph.facebook.com',
+        :token_url => '/oauth/access_token',
+        &block
+    end
+
+    def self.access_token_options
+      {:mode => :query, :param_name => 'access_token'}
+    end
+
+    def self.restore_access_token(token_string)
+      OAuth2::AccessToken.new(last_oauth_client, token_string, access_token_options)
     end
-    
-    def initialize(app_id, secret, options = {})
-      @oauth = self.class.oauth_client(app_id, secret)
+
+    attr_reader :oauth
+
+    def initialize(app_id, secret, options = {}, &block)
+      @oauth = self.class.oauth_client(app_id, secret, &block)
       @default_params = { :scope => options[:permissions], :display => options[:display] }
       @user_fields = Array(options[:user_fields])
     end
 
     # params: redirect_uri, scope, display
     def authorize_url(params = {})
-      @oauth.web_server.authorize_url(@default_params.merge(params))
+      @oauth.auth_code.authorize_url(@default_params.merge(params))
     end
 
     def get_access_token(code, redirect_uri)
-      @oauth.web_server.get_access_token(code, :redirect_uri => redirect_uri)
-    end
-    
-    def restore_access_token(token_string)
-      OAuth2::AccessToken.new(@oauth, token_string)
+      token = @oauth.auth_code.get_token(code, :redirect_uri => redirect_uri, :parse => :query)
+      token.options.update(self.class.access_token_options)
+      token
     end
 
     def login_handler(options = {})
       Login.new(self, options)
     end
-    
+
     def get_user_info(access_token, path)
       access_token.get(path, :fields => @user_fields.join(','))
     end

data/lib/facebook/login.rb

@@ -1,5 +1,4 @@
 require 'facebook/client'
-require 'yajl'
 require 'rack/request'
 require 'addressable/uri'
 
@@ -28,11 +27,11 @@ module Facebook
 
     module Helpers
       def facebook_client
-        OAuth2::AccessToken.new(facebook_oauth, session[:facebook_access_token])
+        Facebook::Client.restore_access_token session[:facebook_access_token]
       end
       
       def facebook_oauth
-        Facebook::Client.oauth_client
+        Facebook::Client.last_oauth_client
       end
       
       def facebook_user
@@ -71,13 +70,14 @@ module Facebook
     private
     
     def handle_facebook_authorization(code, callback_url, request)
+      require 'json' unless defined? ::JSON
       access_token = @client.get_access_token(code, callback_url)
       user_info = @client.get_user_info(access_token, '/me')
-    
+
       request.session[:facebook_access_token] = access_token.token
-      request.session[:facebook_user] = Yajl::Parser.parse(user_info)
+      request.session[:facebook_user] = JSON.parse(user_info.body)
       redirect_to_return_path(request)
-    end    
+    end
     
     def handle_error(error, request)
       request.session[:facebook_error] = error

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: facebook-login
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 3
-  version: 0.2.3
+  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors: 
 - "Mislav Marohni\xC4\x87"
@@ -15,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-25 00:00:00 -07:00
-default_executable: 
+date: 2011-09-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: oauth2
@@ -26,76 +20,42 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 0
-        - 6
         version: 0.0.6
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: yajl-ruby
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 0
-        - 7
-        - 5
-        version: 0.7.5
-  type: :runtime
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rack
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 2
         version: "1.2"
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: addressable
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 2
-        - 1
         version: "2.1"
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: hashie
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 0
-        - 2
-        - 0
         version: 0.2.0
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id004
 description: Easy integration with Facebook Graph for your application
 email: mislav.marohnic@gmail.com
 executables: []
@@ -107,7 +67,6 @@ extra_rdoc_files: []
 files: 
 - lib/facebook/client.rb
 - lib/facebook/login.rb
-has_rdoc: false
 homepage: http://github.com/mislav/facebook
 licenses: []
 
@@ -121,23 +80,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: REST library + Rack middleware for the Facebook Graph API