fb_graph 2.5.3 → 2.5.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fb_graph (2.4.20)
+    fb_graph (2.5.3)
       httpclient (>= 2.2.0.2)
       json
       rack-oauth2 (>= 0.14.4)
@@ -39,7 +39,7 @@ GEM
     erubis (2.7.0)
     hashie (1.2.0)
     hike (1.2.1)
-    httpclient (2.2.7)
+    httpclient (2.3.0.1)
     i18n (0.6.1)
     journey (1.0.4)
     json (1.7.5)
@@ -47,7 +47,7 @@ GEM
     rack (1.4.1)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-oauth2 (0.14.9)
+    rack-oauth2 (1.0.0)
       activesupport (>= 2.3)
       attr_required (>= 0.0.5)
       httpclient (>= 2.2.0.2)

data/VERSION

@@ -1 +1 @@
-2.5.3
+2.5.4

data/lib/fb_graph/application.rb

@@ -103,5 +103,16 @@ module FbGraph
     end
     alias_method_chain :access_token, :auto_fetch
 
+    def debug_token(input_token)
+      _input_token_ = case input_token
+      when Rack::OAuth2::AccessToken::Legacy
+        input_token
+      else
+        Rack::OAuth2::AccessToken::Legacy.new(
+          :access_token => input_token
+        )
+      end
+      _input_token_.introspect access_token
+    end
   end
 end

data/lib/fb_graph/node.rb

@@ -16,7 +16,7 @@ module FbGraph
 
     def fetch(options = {})
       options[:access_token] ||= self.access_token if self.access_token
-      _fetched_ = get(options)
+      _fetched_ = get options
       _fetched_[:access_token] ||= options[:access_token]
       self.class.new(_fetched_[:id], _fetched_)
     end

data/lib/fb_graph.rb

@@ -137,3 +137,5 @@ require 'fb_graph/klass'
 require 'fb_graph/project'
 
 require 'fb_graph/query'
+
+require 'patch/rack/oauth2/access_token/introspectable'

data/lib/patch/rack/oauth2/access_token/introspectable.rb

@@ -0,0 +1,37 @@
+module Rack
+  module OAuth2
+    class AccessToken
+      module Introspectable
+        class Result < FbGraph::Node
+          ATTRIBUTES = [:application, :user, :expires_at, :issued_at, :is_valid, :metadata, :scopes, :error]
+          attr_accessor *ATTRIBUTES
+
+          def initialize(identifier = nil, attributes = {})
+            super :debug_token, attributes
+            if (data = attributes[:data])
+              @application = FbGraph::Application.new data[:app_id], :name => data[:application]
+              @user        = FbGraph::User.new data[:user_id]
+              @expires_at  = Time.at data[:expires_at]
+              @issued_at   = Time.at data[:issued_at] if data[:issued_at]
+              (ATTRIBUTES - [:application, :user, :expires_at, :issued_at]).each do |key|
+                self.send :"#{key}=", data[key]
+              end
+            end
+          end
+        end
+
+        def self.included(klass)
+          klass.send :attr_accessor, *Result::ATTRIBUTES
+        end
+
+        def introspect(app_token)
+          Result.new.fetch(
+            :access_token => app_token,
+            :input_token => access_token
+          )
+        end
+      end
+      AccessToken.send :include, Introspectable
+    end
+  end
+end

data/spec/fb_graph/ad_connection_object_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe FbGraph::AdConnectionObject, '.new' do
   it 'should setup all supported attributes' do
     attributes = {

data/spec/fb_graph/ad_keyword_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe FbGraph::AdKeyword, '.search' do
   it 'should perform a search' do
     mock_graph :get, 'search', 'ad_keywords/buffy_search', :params => {:q => 'buffy', :type => 'adkeyword'} do

data/spec/fb_graph/ad_keyword_suggestion_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe FbGraph::AdKeywordSuggestion, '.search' do
   it 'should perform a search' do
     mock_graph :get, 'search', 'ad_keyword_suggestions/buffy_suggestions', :params => {:keyword_list => 'buffy+the+vampire+slayer', :type => 'adkeywordsuggestion'} do

data/spec/fb_graph/ad_keyword_valid_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe FbGraph::AdKeywordValid, '.search' do
   it 'should perform a search' do
     mock_graph :get, 'search', 'ad_keyword_valids/tige_search', :params => {:keyword_list => 'tige', :type => 'adkeywordvalid'} do

data/spec/fb_graph/application_spec.rb

@@ -195,4 +195,57 @@ describe FbGraph::Application do
       end
     end
   end
+
+  describe '#debug_token' do
+    before { app.access_token = 'app_token' }
+    let(:application) { FbGraph::Application.new(210798282372757, :name => 'gem sample') }
+    let(:user)        { FbGraph::User.new(579612276) }
+    let(:scopes)      { ['email'] }
+
+    shared_examples_for :token_debugger do
+      context 'when valid' do
+        it 'should return introspection result without error' do
+          mock_graph :get, 'debug_token', 'token_introspection/valid', :access_token => 'app_token', :params => {
+            :input_token => 'input_token'
+          } do
+            result = app.debug_token input_token
+            result.should be_instance_of Rack::OAuth2::AccessToken::Introspectable::Result
+            result.application.should == application
+            result.user.should == user
+            result.scopes.should == scopes
+            result.expires_at.should == Time.at(1350363600)
+            result.is_valid.should be_true
+            result.error.should be_nil
+          end
+        end
+      end
+
+      context 'when invalid' do
+        it 'should return introspection result with error' do
+          mock_graph :get, 'debug_token', 'token_introspection/invalid', :access_token => 'app_token', :params => {
+            :input_token => 'input_token'
+          } do
+            result = app.debug_token input_token
+            result.should be_instance_of Rack::OAuth2::AccessToken::Introspectable::Result
+            result.application.should == application
+            result.user.should == user
+            result.scopes.should == scopes
+            result.expires_at.should == Time.at(1350356400)
+            result.is_valid.should be_false
+            result.error.should be_a Hash
+          end
+        end
+      end
+    end
+
+    context 'when input_token is String' do
+      let(:input_token) { 'input_token' }
+      it_behaves_like :token_debugger
+    end
+
+    context 'when input_token is Rack::OAuth2::AccessToken::Legacy instance' do
+      let(:input_token) { Rack::OAuth2::AccessToken::Legacy.new :access_token => 'input_token' }
+      it_behaves_like :token_debugger
+    end
+  end
 end

data/spec/mock_json/token_introspection/invalid.json

@@ -0,0 +1,15 @@
+{
+  "data": {
+    "app_id": 210798282372757,
+    "error": {
+      "message": "Error validating access token: Session has expired at unix time 1350356400. The current unix time is 1350357318.",
+      "code": 190,
+      "subcode": 463
+    },
+    "is_valid": false,
+    "application": "gem sample",
+    "user_id": 579612276,
+    "expires_at": 1350356400,
+    "scopes": ["email"]
+  }
+}

data/spec/mock_json/token_introspection/valid.json

@@ -0,0 +1,10 @@
+{
+  "data": {
+    "app_id": 210798282372757,
+    "is_valid": true,
+    "application": "gem sample",
+    "user_id": 579612276,
+    "expires_at": 1350363600,
+    "scopes": ["email"]
+  }
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fb_graph
 version: !ruby/object:Gem::Version
-  version: 2.5.3
+  version: 2.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-10 00:00:00.000000000 Z
+date: 2012-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -341,6 +341,7 @@ files:
 - lib/fb_graph/video.rb
 - lib/fb_graph/work.rb
 - lib/patch/rack/oauth2/access_token.rb
+- lib/patch/rack/oauth2/access_token/introspectable.rb
 - lib/patch/rack/oauth2/client.rb
 - lib/patch/rack/oauth2/grant/fb_exchange_token.rb
 - lib/patch/rack/oauth2/util.rb
@@ -620,6 +621,8 @@ files:
 - spec/mock_json/thread/messages/private.json
 - spec/mock_json/thread/participants/private.json
 - spec/mock_json/thread/senders/private.json
+- spec/mock_json/token_introspection/invalid.json
+- spec/mock_json/token_introspection/valid.json
 - spec/mock_json/token_response.json
 - spec/mock_json/token_with_expiry.json
 - spec/mock_json/true.json
@@ -1006,6 +1009,8 @@ test_files:
 - spec/mock_json/thread/messages/private.json
 - spec/mock_json/thread/participants/private.json
 - spec/mock_json/thread/senders/private.json
+- spec/mock_json/token_introspection/invalid.json
+- spec/mock_json/token_introspection/valid.json
 - spec/mock_json/token_response.json
 - spec/mock_json/token_with_expiry.json
 - spec/mock_json/true.json