facebook_oauth 0.2.3 → 0.3.0

data/lib/facebook_oauth/client.rb

@@ -12,47 +12,53 @@ module FacebookOAuth
   
     def authorize_url(options = {})
       options[:scope] ||= 'offline_access,publish_stream'
-      consumer.web_server.authorize_url(
+      client.auth_code.authorize_url(
+        :client_id => @application_id,
         :redirect_uri => options[:callback] || @callback,
         :scope => options[:scope]
       )
     end
     
     def authorize(options = {})
-      @access_token ||= consumer.web_server.get_access_token(
+      @access_token ||= client.auth_code.get_token(
         options[:code],
-        :redirect_uri => options[:callback] || @callback
+        :redirect_uri => options[:callback] || @callback,
+        :parse => :query
       )
+      
       @token = @access_token.token
       @access_token
     end
     
     private
-      def consumer
-        @consumer ||= OAuth2::Client.new(
+      def client
+        @client ||= OAuth2::Client.new(
           @application_id,
           @application_secret,
-          { :site=>"https://graph.facebook.com" }
+          { :site=>"https://graph.facebook.com", :token_url => "/oauth/access_token" }
         )
       end
 
       def access_token
-        OAuth2::AccessToken.new(consumer, @token)
+        @access_token ||= OAuth2::AccessToken.new(client, @token)
+        @access_token.options[:mode] = :query
+        @access_token.options[:param_name] = :access_token
+        @access_token
       end
       
       def _get(url)
-        oauth_response = access_token.get(url)
+        oauth_response = access_token.get(url).parsed
         JSON.parse(oauth_response) rescue oauth_response
       end
 
       def _post(url, params={}, headers={})
-        oauth_response = access_token.post(url, params, headers)
+        oauth_response = access_token.post(url, :params => params, :headers => headers).parsed
         puts oauth_response.inspect
         JSON.parse(oauth_response) rescue oauth_response
       end
 
       def _delete(url)
-        oauth_response = access_token.delete(url)
+        oauth_response = access_token.delete(url).parsed
         JSON.parse(oauth_response) rescue oauth_response
       end
   end

metadata

@@ -1,115 +1,107 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: facebook_oauth
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.3.0
   prerelease: 
-  version: 0.2.3
 platform: ruby
-authors: 
+authors:
 - Richard Taylor
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-29 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: oauth2
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70199995921540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.4.1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70199995921540
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &70199995920440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.5.3
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mime-types
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70199995920440
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: &70199995919700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "1.16"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.16'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70199995919700
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: &70199995919000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70199995919000
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &70199995918280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-description: facebook_oauth is a Ruby client library for the Facebook OAuth Graph API
+  prerelease: false
+  version_requirements: *70199995918280
+description: facebook_oauth is a Ruby client library for the Facebook OAuth Graph
+  API
 email: moomerman@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - LICENSE
 - README.textile
 - lib/facebook_oauth.rb
 - lib/facebook_oauth/client.rb
 - lib/facebook_oauth/objects.rb
-has_rdoc: true
 homepage: http://github.com/moomerman/facebook_oauth
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --inline-source
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: facebook_oauth
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 2
 summary: facebook_oauth is a Ruby client library for the Facebook OAuth Graph API
 test_files: []
-