fb_graph 2.3.0 → 2.3.1

data/Gemfile.lock

@@ -1,27 +1,27 @@
 PATH
   remote: .
   specs:
-    fb_graph (2.2.6)
+    fb_graph (2.3.0)
       httpclient (>= 2.2.0.2)
       rack-oauth2 (>= 0.9.4)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionpack (3.2.0)
-      activemodel (= 3.2.0)
-      activesupport (= 3.2.0)
+    actionpack (3.2.1)
+      activemodel (= 3.2.1)
+      activesupport (= 3.2.1)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.0)
+      journey (~> 1.0.1)
       rack (~> 1.4.0)
       rack-cache (~> 1.1)
       rack-test (~> 0.6.1)
       sprockets (~> 2.1.2)
-    activemodel (3.2.0)
-      activesupport (= 3.2.0)
+    activemodel (3.2.1)
+      activesupport (= 3.2.1)
       builder (~> 3.0.0)
-    activesupport (3.2.0)
+    activesupport (3.2.1)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     addressable (2.2.6)
@@ -39,13 +39,13 @@ GEM
     hike (1.2.1)
     httpclient (2.2.4)
     i18n (0.6.0)
-    journey (1.0.0)
+    journey (1.0.1)
     json (1.6.5)
     multi_json (1.0.4)
-    rack (1.4.0)
+    rack (1.4.1)
     rack-cache (1.1)
       rack (>= 0.4)
-    rack-oauth2 (0.11.0)
+    rack-oauth2 (0.12.2)
       activesupport (>= 2.3)
       attr_required (>= 0.0.3)
       httpclient (>= 2.2.0.2)

data/VERSION

@@ -1 +1 @@
-2.3.0
+2.3.1

data/lib/fb_graph.rb

@@ -1,6 +1,8 @@
 require 'httpclient'
 require 'rack/oauth2'
 require 'patch/rack/oauth2/util'
+require 'patch/rack/oauth2/client'
+require 'patch/rack/oauth2/access_token'
 
 module FbGraph
   VERSION = ::File.read(

data/lib/fb_graph/auth.rb

@@ -27,7 +27,7 @@ module FbGraph
     def authorize_uri(canvas_uri, options = {})
       endpoint = URI.parse SignedRequest::OAUTH_DIALOG_ENDPOINT
       params = options.merge(
-        :client_id    => self.client.identifier,
+        :client_id    => client.identifier,
         :redirect_uri => canvas_uri
       )
       params[:scope] = Array(params[:scope]).join(',') if params[:scope].present?
@@ -50,17 +50,13 @@ module FbGraph
       self
     end
 
-    def from_session_key(session_key)
-      response = HTTPClient.new.post "#{ROOT_URL}/oauth/exchange_sessions", {:client_id => @client.identifier, :client_secret => @client.secret, :sessions => session_key}
-      if response.body && self.data = JSON.parse(response.body)
-        if self.data[0]
-          self.access_token = build_access_token(self.data[0].with_indifferent_access)
-        else
-          # If the session key is unknown or there's an error, Facebook returns null
-          self.access_token = nil
-        end
-      end
+    def exchange_token!(access_token)
+      raise Unauthorized.new('No Access Token') unless access_token
+      client.fb_exchange_token = access_token
+      self.access_token = client.access_token!
       self
+    rescue Rack::OAuth2::Client::Error => e
+      raise Exception.new(e.status, e.message)
     end
 
     private

data/lib/fb_graph/collection.rb

@@ -18,7 +18,8 @@ module FbGraph
       # NOTE: Graph API returns {"data":{"to":[null]}} sometimes... :(
       collection[:data].delete_if(&:nil?)
 
-      result = replace(collection[:data])
+      replace collection[:data]
+
       if (summary = collection[:summary]).present?
         @total_count = summary[:total_count]
         @unread_count = summary[:unread_count]

data/lib/fb_graph/connections/subscribed_to.rb

@@ -0,0 +1,14 @@
+module FbGraph
+  module Connections
+    module SubscribedTo
+      def subscribed_to(options = {})
+        subscribees = self.connection :subscribedto, options
+        subscribees.map! do |subscribee|
+          User.new subscribee[:id], subscribee.merge(
+            :access_token => options[:access_token] || self.access_token
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fb_graph/connections/subscribers.rb

@@ -0,0 +1,14 @@
+module FbGraph
+  module Connections
+    module Subscribers
+      def subscribers(options = {})
+        subscribers = self.connection :subscribers, options
+        subscribers.map! do |subscriber|
+          User.new subscriber[:id], subscriber.merge(
+            :access_token => options[:access_token] || self.access_token
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fb_graph/connections/tabs.rb

@@ -13,6 +13,11 @@ module FbGraph
       def tab!(options = {})
         post options.merge(:connection => :tabs)
       end
+
+      def tab?(application, options = {})
+        tab = self.connection :tabs, options.merge(:connection_scope => application.identifier)
+        tab.present?
+      end
     end
   end
 end

data/lib/fb_graph/user.rb

@@ -35,6 +35,8 @@ module FbGraph
     include Connections::Questions
     include Connections::Scores
     include Connections::Statuses
+    include Connections::SubscribedTo
+    include Connections::Subscribers
     include Connections::Tagged
     include Connections::Television
     include Connections::Threads

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

@@ -0,0 +1,11 @@
+module Rack
+  module OAuth2
+    class AccessToken
+      def initialize_with_expires_support(attributes = {})
+        initialize_without_expires_support attributes
+        self.expires_in ||= attributes[:expires]
+      end
+      alias_method_chain :initialize, :expires_support
+    end
+  end
+end

data/lib/patch/rack/oauth2/client.rb

@@ -0,0 +1,13 @@
+require 'patch/rack/oauth2/grant/fb_exchange_token'
+
+module Rack
+  module OAuth2
+    class Client
+      def fb_exchange_token=(access_token)
+        @grant = Grant::FbExchangeToken.new(
+          :fb_exchange_token => access_token
+        )
+      end
+    end
+  end
+end

data/lib/patch/rack/oauth2/grant/fb_exchange_token.rb

@@ -0,0 +1,11 @@
+module Rack
+  module OAuth2
+    class Client
+      class Grant
+        class FbExchangeToken < Grant
+          attr_required :fb_exchange_token
+        end
+      end
+    end
+  end
+end

data/spec/fb_graph/auth_spec.rb

@@ -162,26 +162,13 @@ describe FbGraph::Auth do
     end
   end
 
-  describe "#from_session_key" do
-    let(:session_key) { 'my_session_key'}
-
-    it "should exchange the session key for an oauth token" do
-      mock_graph :post, '/oauth/exchange_sessions', 'exchange_sessions_response' do
-        auth.access_token.should be_nil
-
-        auth.from_session_key(session_key)
-        auth.access_token.should be_a Rack::OAuth2::AccessToken::Legacy
-        auth.access_token.access_token.should == "my_oauth_token"
-      end
-    end
-
-
-    it "should handle null responses" do
-      mock_graph :post, '/oauth/exchange_sessions', 'exchange_sessions_null_response' do
-        auth.access_token.should be_nil
-
-        auth.from_session_key(session_key)
-        auth.access_token.should be_nil
+  describe "#exchange_token!" do
+    it 'should get new token' do
+      mock_graph :post, '/oauth/access_token', 'token_with_expiry' do
+        auth.exchange_token! 'old_token'
+        puts auth.access_token
+        auth.access_token.access_token.should == 'new_token'
+        auth.access_token.expires_in.should == 3600
       end
     end
   end

data/spec/fb_graph/connections/subscribed_to_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe FbGraph::Connections::SubscribedTo do
+  it 'should return subscribees as FbGraph::User' do
+    mock_graph :get, 'me/subscribedto', 'users/subscribed_to/sample', :access_token => 'access_token' do
+      subscribees = FbGraph::User.me('access_token').subscribed_to
+      subscribees.each do |subscribee|
+        subscribee.should be_instance_of FbGraph::User
+      end
+    end
+  end
+end

data/spec/fb_graph/connections/subscribers_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe FbGraph::Connections::Subscribers do
+  it 'should return subscribers as FbGraph::User' do
+    mock_graph :get, 'me/subscribers', 'users/subscribers/sample', :access_token => 'access_token' do
+      subscribers = FbGraph::User.me('access_token').subscribers
+      subscribers.each do |subscriber|
+        subscriber.should be_instance_of FbGraph::User
+      end
+    end
+  end
+end

data/spec/fb_graph/connections/tabs_spec.rb

@@ -22,4 +22,26 @@ describe FbGraph::Connections::Tabs do
       end
     end
   end
+
+  describe '#tab?' do
+    context 'when installed' do
+      it 'shoud return true' do
+        mock_graph :get, 'FbGraph/tabs/wall', 'pages/tabs/wall', :access_token => 'page_token' do
+          page.tab?(
+            FbGraph::Application.new('wall')
+          ).should be_true
+        end
+      end
+    end
+
+    context 'otherwise' do
+      it 'shoud return false' do
+        mock_graph :get, 'FbGraph/tabs/app_id', 'pages/tabs/blank', :access_token => 'page_token' do
+          page.tab?(
+            FbGraph::Application.new('app_id')
+          ).should be_false
+        end
+      end
+    end
+  end
 end

data/spec/mock_json/pages/tabs/blank.json

@@ -0,0 +1,3 @@
+{
+  "data": []
+}

data/spec/mock_json/pages/tabs/wall.json

@@ -0,0 +1,12 @@
+{
+  "data": [
+    {
+      "id": "117513961602338/tabs/wall", 
+      "name": "Wall", 
+      "link": "https://www.facebook.com/FbGraph?sk=wall", 
+      "is_permanent": true, 
+      "position": 0, 
+      "type": "profile_tab"
+    }
+  ]
+}

data/spec/mock_json/token_with_expiry.json

@@ -1 +1 @@
-access_token=token&expires=3600
+access_token=new_token&expires=3600

data/spec/mock_json/users/subscribed_to/sample.json

@@ -0,0 +1,11 @@
+{
+  "data": [
+    {
+      "name": "Kristopher Tate", 
+      "id": "503975854"
+    }
+  ], 
+  "paging": {
+    "next": "https://graph.facebook.com/me/subscribedto?format=json&limit=5000&offset=5000&__after_id=503975854"
+  }
+}

data/spec/mock_json/users/subscribers/sample.json

@@ -0,0 +1,15 @@
+{
+  "data": [
+    {
+      "name": "Kunal Gandhre", 
+      "id": "1396637703"
+    }, 
+    {
+      "name": "Adnan S.", 
+      "id": "717005001"
+    }
+  ], 
+  "paging": {
+    "next": "https://graph.facebook.com/me/subscribers?format=json&limit=5000&offset=5000&__after_id=708124104"
+  }
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fb_graph
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-25 00:00:00.000000000Z
+date: 2012-02-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
-  requirement: &70111210190500 !ruby/object:Gem::Requirement
+  requirement: &70200070860660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70111210190500
+  version_requirements: *70200070860660
 - !ruby/object:Gem::Dependency
   name: rack-oauth2
-  requirement: &70111210190000 !ruby/object:Gem::Requirement
+  requirement: &70200070859240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.4
   type: :runtime
   prerelease: false
-  version_requirements: *70111210190000
+  version_requirements: *70200070859240
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70111210189500 !ruby/object:Gem::Requirement
+  requirement: &70200070858020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *70111210189500
+  version_requirements: *70200070858020
 - !ruby/object:Gem::Dependency
   name: cover_me
-  requirement: &70111210188980 !ruby/object:Gem::Requirement
+  requirement: &70200070857480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *70111210188980
+  version_requirements: *70200070857480
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70111210188320 !ruby/object:Gem::Requirement
+  requirement: &70200070856760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *70111210188320
+  version_requirements: *70200070856760
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70111210187720 !ruby/object:Gem::Requirement
+  requirement: &70200070855580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 1.6.2
   type: :development
   prerelease: false
-  version_requirements: *70111210187720
+  version_requirements: *70200070855580
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70111210180600 !ruby/object:Gem::Requirement
+  requirement: &70200070853500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: 3.0.6
   type: :development
   prerelease: false
-  version_requirements: *70111210180600
+  version_requirements: *70200070853500
 description: A full-stack Facebook Graph API wrapper in Ruby.
 email: nov@matake.jp
 executables: []
@@ -198,6 +198,8 @@ files:
 - lib/fb_graph/connections/senders.rb
 - lib/fb_graph/connections/settings.rb
 - lib/fb_graph/connections/statuses.rb
+- lib/fb_graph/connections/subscribed_to.rb
+- lib/fb_graph/connections/subscribers.rb
 - lib/fb_graph/connections/subscriptions.rb
 - lib/fb_graph/connections/tabs.rb
 - lib/fb_graph/connections/tagged.rb
@@ -264,6 +266,9 @@ files:
 - lib/fb_graph/venue.rb
 - lib/fb_graph/video.rb
 - lib/fb_graph/work.rb
+- lib/patch/rack/oauth2/access_token.rb
+- lib/patch/rack/oauth2/client.rb
+- lib/patch/rack/oauth2/grant/fb_exchange_token.rb
 - lib/patch/rack/oauth2/util.rb
 - spec/fb_graph/achievement_spec.rb
 - spec/fb_graph/ad_account_spec.rb
@@ -346,6 +351,8 @@ files:
 - spec/fb_graph/connections/senders_spec.rb
 - spec/fb_graph/connections/settings_spec.rb
 - spec/fb_graph/connections/statuses_spec.rb
+- spec/fb_graph/connections/subscribed_to_spec.rb
+- spec/fb_graph/connections/subscribers_spec.rb
 - spec/fb_graph/connections/subscriptions_spec.rb
 - spec/fb_graph/connections/tabs_spec.rb
 - spec/fb_graph/connections/tagged_spec.rb
@@ -446,8 +453,6 @@ files:
 - spec/mock_json/events/maybe/post_with_valid_access_token.json
 - spec/mock_json/events/maybe/smartday_private.json
 - spec/mock_json/events/noreply/smartday_private.json
-- spec/mock_json/exchange_sessions_null_response.json
-- spec/mock_json/exchange_sessions_response.json
 - spec/mock_json/friend_lists/members/sample.json
 - spec/mock_json/groups/docs/private.json
 - spec/mock_json/groups/members/emacs_private.json
@@ -480,7 +485,9 @@ files:
 - spec/mock_json/pages/settings/sample.json
 - spec/mock_json/pages/statuses/platform_private.json
 - spec/mock_json/pages/statuses/platform_public.json
+- spec/mock_json/pages/tabs/blank.json
 - spec/mock_json/pages/tabs/fb_graph.json
+- spec/mock_json/pages/tabs/wall.json
 - spec/mock_json/pages/with_token.json
 - spec/mock_json/photos/sample.json
 - spec/mock_json/photos/with_tags.json
@@ -582,6 +589,8 @@ files:
 - spec/mock_json/users/scores/sample.json
 - spec/mock_json/users/statuses/arjun_private.json
 - spec/mock_json/users/statuses/arjun_public.json
+- spec/mock_json/users/subscribed_to/sample.json
+- spec/mock_json/users/subscribers/sample.json
 - spec/mock_json/users/tagged/arjun_private.json
 - spec/mock_json/users/tagged/arjun_public.json
 - spec/mock_json/users/television/matake_private.json
@@ -699,6 +708,8 @@ test_files:
 - spec/fb_graph/connections/senders_spec.rb
 - spec/fb_graph/connections/settings_spec.rb
 - spec/fb_graph/connections/statuses_spec.rb
+- spec/fb_graph/connections/subscribed_to_spec.rb
+- spec/fb_graph/connections/subscribers_spec.rb
 - spec/fb_graph/connections/subscriptions_spec.rb
 - spec/fb_graph/connections/tabs_spec.rb
 - spec/fb_graph/connections/tagged_spec.rb
@@ -799,8 +810,6 @@ test_files:
 - spec/mock_json/events/maybe/post_with_valid_access_token.json
 - spec/mock_json/events/maybe/smartday_private.json
 - spec/mock_json/events/noreply/smartday_private.json
-- spec/mock_json/exchange_sessions_null_response.json
-- spec/mock_json/exchange_sessions_response.json
 - spec/mock_json/friend_lists/members/sample.json
 - spec/mock_json/groups/docs/private.json
 - spec/mock_json/groups/members/emacs_private.json
@@ -833,7 +842,9 @@ test_files:
 - spec/mock_json/pages/settings/sample.json
 - spec/mock_json/pages/statuses/platform_private.json
 - spec/mock_json/pages/statuses/platform_public.json
+- spec/mock_json/pages/tabs/blank.json
 - spec/mock_json/pages/tabs/fb_graph.json
+- spec/mock_json/pages/tabs/wall.json
 - spec/mock_json/pages/with_token.json
 - spec/mock_json/photos/sample.json
 - spec/mock_json/photos/with_tags.json
@@ -935,6 +946,8 @@ test_files:
 - spec/mock_json/users/scores/sample.json
 - spec/mock_json/users/statuses/arjun_private.json
 - spec/mock_json/users/statuses/arjun_public.json
+- spec/mock_json/users/subscribed_to/sample.json
+- spec/mock_json/users/subscribers/sample.json
 - spec/mock_json/users/tagged/arjun_private.json
 - spec/mock_json/users/tagged/arjun_public.json
 - spec/mock_json/users/television/matake_private.json

data/spec/mock_json/exchange_sessions_null_response.json

@@ -1 +0,0 @@
-[null]

data/spec/mock_json/exchange_sessions_response.json

@@ -1,5 +0,0 @@
-[
-  {
-    "access_token": "my_oauth_token"
-  }
-]