fb_graph 1.7.0.alpha → 1.7.0.alpha2

data/Rakefile

@@ -10,10 +10,7 @@ begin
     gem.email = 'nov@matake.jp'
     gem.homepage = 'http://github.com/nov/fb_graph'
     gem.authors = ['nov matake']
-    gem.add_dependency 'json', '>= 1.4.3'
-    gem.add_dependency 'activesupport', '>= 2.3'
-    gem.add_dependency 'restclient_with_cert'
-    gem.add_dependency 'oauth2', '>= 0.1.0'
+    gem.add_dependency 'rack-oauth2', '>= 0.6.5'
     gem.add_development_dependency 'rspec', '~> 1.3'
     gem.add_development_dependency 'rcov'
     gem.add_development_dependency 'fakeweb', '>= 1.3.0'

data/VERSION

@@ -1 +1 @@
-1.6.8
+1.7.0.alpha2

data/fb_graph.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fb_graph}
-  s.version = "1.7.0.alpha"
+  s.version = "1.7.0.alpha2"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["nov matake"]

data/lib/fb_graph/application.rb

@@ -30,12 +30,7 @@ module FbGraph
     def get_access_token(secret = nil)
       self.secret ||= secret
       auth = Auth.new(self.identifier, self.secret)
-      response_string = auth.client.request(:post, auth.client.access_token_url, {
-        :client_id => self.identifier,
-        :client_secret => self.secret,
-        :type => 'client_cred'
-      })
-      self.access_token = response_string.split('=').last
+      self.access_token = auth.client.access_token!
     end
 
   end

data/lib/fb_graph/auth/cookie.rb

@@ -7,7 +7,7 @@ module FbGraph
     class Cookie
       def self.parse(client, cookie)
         fb_cookie_string = if cookie.is_a?(Hash)
-          cookie["fbs_#{client.id}"]
+          cookie["fbs_#{client.identifier}"]
         else
           cookie
         end

data/lib/fb_graph/auth.rb

@@ -5,9 +5,13 @@ module FbGraph
     attr_accessor :client, :access_token, :user, :data
 
     def initialize(client_id, client_secret, options = {})
-      @client = OAuth2::Client.new(client_id, client_secret, options.merge(
-        :site => ROOT_URL
-      ))
+      @client = Rack::OAuth2::Client.new(
+        :identifier             => client_id,
+        :secret                 => client_secret,
+        :host                   => URI.parse(ROOT_URL).host,
+        :authorization_endpoint => '/oauth/authorize',
+        :token_endpoint         => '/oauth/access_token'
+      )
       if options[:cookie]
         from_cookie options[:cookie]
       elsif options[:signed_request]
@@ -22,7 +26,7 @@ module FbGraph
     def authorize_uri(canvas_uri, options = {})
       endpoint = URI.parse SignedRequest::OAUTH_DIALOG_ENDPOINT
       params = options.merge(
-        :client_id => self.client.id,
+        :client_id    => self.client.identifier,
         :redirect_uri => canvas_uri
       )
       params[:scope] = Array(params[:scope]).join(',') if params[:scope].present?
@@ -54,11 +58,9 @@ module FbGraph
       expires_in = unless data[:expires].zero?
         data[:expires] - Time.now.to_i
       end
-      OAuth2::AccessToken.new(
-        self.client,
-        data[:oauth_token] || data[:access_token],
-        nil,
-        expires_in
+      Rack::OAuth2::AccessToken::Legacy.new(
+        :access_token => data[:oauth_token] || data[:access_token],
+        :expires_in   => expires_in
       )
     end
   end

data/lib/fb_graph/node.rb

@@ -75,8 +75,8 @@ module FbGraph
     def stringfy_params(params)
       _params_ = params.dup
       _params_[:access_token] ||= self.access_token
-      if _params_[:access_token].is_a?(OAuth2::AccessToken)
-        _params_[:access_token] = _params_[:access_token].token
+      if _params_[:access_token].is_a?(Rack::OAuth2::AccessToken::Legacy)
+        _params_[:access_token] = _params_[:access_token].access_token
       end
       _params_.each do |key, value|
         if value.present? && ![Symbol, String, Numeric, IO].any? { |klass| value.is_a? klass }

data/lib/fb_graph.rb

@@ -1,8 +1,5 @@
 require 'rubygems'
-require 'json'
-require 'restclient_with_cert'
-require 'oauth2'
-require 'active_support/all'
+require 'rack/oauth2'
 
 module FbGraph
   ROOT_URL = "https://graph.facebook.com"

data/spec/fb_graph/application_spec.rb

@@ -29,7 +29,8 @@ describe FbGraph::Application, '.get_access_token' do
   it 'should POST oauth/token' do
     @app.access_token.should be_nil
     @app.get_access_token
-    @app.access_token.should == 'token'
+    @app.access_token.should be_instance_of(Rack::OAuth2::AccessToken::Legacy)
+    @app.access_token.access_token.should == 'token'
   end
 
   after do

data/spec/fb_graph/auth/cookie_spec.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), '../../spec_helper')
 
 describe FbGraph::Auth::Cookie, '.parse' do
   before do
-    @client = OAuth2::Client.new('client_id', 'client_secret')
+    @client = Rack::OAuth2::Client.new(:identifier => 'client_id', :secret => 'client_secret')
     @cookie = {
       'fbs_client_id' => "access_token=t&expires=0&secret=s&session_key=k&sig=f4bae8ec88ba11440e3bdcc1bcf78317&uid=12345"
     }

data/spec/fb_graph/auth/signed_request_spec.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), '../../spec_helper')
 
 describe FbGraph::Auth::SignedRequest, '.parse' do
   before do
-    @client = OAuth2::Client.new('client_id', 'client_secret')
+    @client = Rack::OAuth2::Client.new(:identifier => 'client_id', :secret => 'client_secret')
     @signed_request = "LqsgnfcsRdfjOgyW6ZuSLpGBVsxUBegEqai4EcrWS0A=.eyJhbGdvcml0aG0iOiJITUFDLVNIQTI1NiIsImV4cGlyZXMiOjAsImlzc3VlZF9hdCI6MTI5ODc4MzczOSwib2F1dGhfdG9rZW4iOiIxMzQxNDU2NDMyOTQzMjJ8MmI4YTZmOTc1NTJjNmRjZWQyMDU4MTBiLTU3OTYxMjI3NnxGS1o0akdKZ0JwN2k3bFlrOVhhUk1QZ3lhNnMiLCJ1c2VyIjp7ImNvdW50cnkiOiJqcCIsImxvY2FsZSI6ImVuX1VTIiwiYWdlIjp7Im1pbiI6MjF9fSwidXNlcl9pZCI6IjU3OTYxMjI3NiJ9"
   end
 

data/spec/fb_graph/auth_spec.rb

@@ -1,10 +1,10 @@
 require File.join(File.dirname(__FILE__), '../spec_helper')
 
 describe FbGraph::Auth, '.new' do
-  it 'should setup OAuth2::Client' do
+  it 'should setup Rack::OAuth2::Client' do
     auth = FbGraph::Auth.new('client_id', 'client_secret')
-    auth.client.should be_a(OAuth2::Client)
-    auth.client.id.should     == 'client_id'
+    auth.client.should be_a(Rack::OAuth2::Client)
+    auth.client.identifier.should     == 'client_id'
     auth.client.secret.should == 'client_secret'
   end
 
@@ -38,11 +38,10 @@ describe FbGraph::Auth, '#from_cookie' do
     @auth.access_token.should be_nil
     @auth.user.should be_nil
     @auth.from_cookie(@cookie)
-    @auth.access_token.token.should      == 't'
-    @auth.access_token.expires_in.should be_close @expires_at - Time.now, 1
-    @auth.access_token.expires_at.should be_close @expires_at, 1
-    @auth.user.identifier.should         == '12345'
-    @auth.user.access_token.token.should == 't'
+    @auth.access_token.access_token.should      == 't'
+    @auth.access_token.expires_in.should        be_close @expires_at - Time.now, 1
+    @auth.user.identifier.should                == '12345'
+    @auth.user.access_token.access_token.should == 't'
   end
 
   context 'when invalid cookie given' do
@@ -64,9 +63,9 @@ describe FbGraph::Auth, '#from_signed_request' do
     @auth.access_token.should be_nil
     @auth.user.should be_nil
     @auth.from_signed_request(@signed_request)
-    @auth.access_token.token.should      == '134145643294322|2b8a6f97552c6dced205810b-579612276|FKZ4jGJgBp7i7lYk9XaRMPgya6s'
-    @auth.user.identifier.should         == '579612276'
-    @auth.user.access_token.token.should == '134145643294322|2b8a6f97552c6dced205810b-579612276|FKZ4jGJgBp7i7lYk9XaRMPgya6s'
+    @auth.access_token.access_token.should      == '134145643294322|2b8a6f97552c6dced205810b-579612276|FKZ4jGJgBp7i7lYk9XaRMPgya6s'
+    @auth.user.identifier.should                == '579612276'
+    @auth.user.access_token.access_token.should == '134145643294322|2b8a6f97552c6dced205810b-579612276|FKZ4jGJgBp7i7lYk9XaRMPgya6s'
     @auth.data.should include(
       "expires"=>0,
       "algorithm"=>"HMAC-SHA256",

data/spec/fb_graph/node_spec.rb

@@ -14,24 +14,24 @@ end
 
 describe FbGraph::Node, '#stringfy_params' do
   it 'should make all values to JSON' do
-    client = OAuth2::Client.new('client_id', 'client_secret')
+    client = Rack::OAuth2::Client.new(:identifier => 'client_id', :secret => 'client_secret')
     node = FbGraph::Node.new('identifier')
     params = node.send :stringfy_params, {:hash => {:a => :b}, :array => [:a, :b]}
     params[:hash].should == '{"a":"b"}'
     params[:array].should == '["a","b"]'
   end
 
-  it 'should support OAuth2::AccessToken as self.access_token' do
-    client = OAuth2::Client.new('client_id', 'client_secret')
-    node = FbGraph::Node.new('identifier', :access_token => OAuth2::AccessToken.new(client, 'token', 'secret'))
+  it 'should support Rack::OAuth2::AccessToken as self.access_token' do
+    client = Rack::OAuth2::Client.new(:identifier => 'client_id', :secret => 'client_secret')
+    node = FbGraph::Node.new('identifier', :access_token => Rack::OAuth2::AccessToken::Legacy.new(:access_token => 'token'))
     params = node.send :stringfy_params, {}
     params[:access_token].should == 'token'
   end
 
   it 'should support OAuth2::AccessToken as options[:access_token]' do
-    client = OAuth2::Client.new('client_id', 'client_secret')
+    client = Rack::OAuth2::Client.new(:identifier => 'client_id', :secret => 'client_secret')
     node = FbGraph::Node.new('identifier')
-    params = node.send :stringfy_params, {:access_token => OAuth2::AccessToken.new(client, 'token', 'secret')}
+    params = node.send :stringfy_params, {:access_token => Rack::OAuth2::AccessToken::Legacy.new(:access_token => 'token')}
     params[:access_token].should == 'token'
   end
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: fb_graph
 version: !ruby/object:Gem::Version 
-  hash: -1851332202
+  hash: -3702664440
   prerelease: 6
   segments: 
   - 1
   - 7
   - 0
   - alpha
-  version: 1.7.0.alpha
+  - 2
+  version: 1.7.0.alpha2
 platform: ruby
 authors: 
 - nov matake