fb_graph 1.7.1 → 1.7.2

data/lib/fb_graph/user.rb

@@ -10,6 +10,7 @@ module FbGraph
     include Connections::Feed
     include Connections::FriendLists
     include Connections::Friends
+    include Connections::Family
     include Connections::Games
     include Connections::Groups
     include Connections::Home
@@ -20,6 +21,7 @@ module FbGraph
     include Connections::Music
     include Connections::Notes
     include Connections::Payments
+    include Connections::Permissions
     include Connections::Photos
     include Connections::Picture
     include Connections::Posts
@@ -30,7 +32,7 @@ module FbGraph
     include Connections::Videos
     extend Searchable
 
-    attr_accessor :first_name, :last_name, :name, :link, :about, :birthday, :work, :education, :email, :website, :hometown, :location, :bio, :quotes, :gender, :interested_in, :meeting_for, :relationship_status, :religion, :political, :verified, :significant_other, :timezone, :updated_time, :sports, :favorite_teams, :favorite_athletes, :inspirational_people, :locale, :languages, :third_party_id, :address, :mobile_phone
+    attr_accessor :first_name, :last_name, :name, :link, :about, :birthday, :work, :education, :email, :website, :hometown, :location, :bio, :quotes, :gender, :interested_in, :meeting_for, :relationship, :relationship_status, :religion, :political, :verified, :significant_other, :timezone, :updated_time, :sports, :favorite_teams, :favorite_athletes, :inspirational_people, :locale, :languages, :third_party_id, :address, :mobile_phone
 
     def initialize(identifier, attributes = {})
       super
@@ -93,6 +95,7 @@ module FbGraph
       @gender              = attributes[:gender]
       @interested_in       = Array(attributes[:interested_in])
       @meeting_for         = Array(attributes[:meeting_for])
+      @relationship        = attributes[:relationship]
       @relationship_status = attributes[:relationship_status]
       @religion            = attributes[:religion]
       @political           = attributes[:political]

data/lib/fb_graph.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'rack/oauth2'
 
 module FbGraph

data/spec/fb_graph/application_spec.rb

@@ -21,19 +21,13 @@ describe FbGraph::Application, '.new' do
 end
 
 describe FbGraph::Application, '.get_access_token' do
-  before do
-    fake_json :post, 'oauth/access_token', 'token_response'
-    @app = FbGraph::Application.new('client_id', :secret => 'client_secret')
-  end
-
-  it 'should POST oauth/token' do
-    @app.access_token.should be_nil
-    @app.get_access_token
-    @app.access_token.should be_instance_of(Rack::OAuth2::AccessToken::Legacy)
-    @app.access_token.access_token.should == 'token'
-  end
-
-  after do
-    FakeWeb.clean_registry
+  let(:app) { FbGraph::Application.new('client_id', :secret => 'client_secret') }
+  it 'should return Rack::OAuth2::AccessToken::Legacy' do
+    mock_graph :post, 'oauth/access_token', 'token_response' do
+      app.access_token.should be_nil
+      app.get_access_token
+      app.access_token.should be_instance_of(Rack::OAuth2::AccessToken::Legacy)
+      app.access_token.access_token.should == 'token'
+    end
   end
 end

data/spec/fb_graph/auth_spec.rb

@@ -39,7 +39,7 @@ describe FbGraph::Auth, '#from_cookie' do
     @auth.user.should be_nil
     @auth.from_cookie(@cookie)
     @auth.access_token.access_token.should      == 't'
-    @auth.access_token.expires_in.should        be_close @expires_at - Time.now, 1
+    @auth.access_token.expires_in.should        be_within(1).of(@expires_at - Time.now)
     @auth.user.identifier.should                == '12345'
     @auth.user.access_token.access_token.should == 't'
   end

data/spec/fb_graph/checkin_spec.rb

@@ -15,24 +15,28 @@ describe FbGraph::Checkin, '.new' do
 end
 
 describe FbGraph::Checkin, '.search' do
-  before do
-    fake_json(:get, 'search?type=checkin', 'checkins/search_public', :status => [401, 'Unauthorized'])
-    fake_json(:get, 'search?type=checkin&access_token=access_token', 'checkins/search_private')
-  end
-
   context 'when no access_token given' do
     it 'should raise FbGraph::Unauthorized' do
-      lambda do
-        FbGraph::Checkin.search
-      end.should raise_exception(FbGraph::Unauthorized)
+      mock_graph :get, 'search', 'checkins/search_public', :params => {
+        :type => 'checkin'
+      }, :status => [401, 'Unauthorized'] do
+        lambda do
+          FbGraph::Checkin.search
+        end.should raise_exception(FbGraph::Unauthorized)
+      end
     end
   end
 
   context 'when access_token is given' do
     it 'should return checkins as FbGraph::Checkin' do
-      checkins = FbGraph::Checkin.search(:access_token => 'access_token')
-      checkins.each do |checkin|
-        checkin.should be_instance_of(FbGraph::Checkin)
+      mock_graph :get, 'search', 'checkins/search_private', :params => {
+        :type => 'checkin',
+        :access_token => 'access_token'
+      } do
+        checkins = FbGraph::Checkin.search(:access_token => 'access_token')
+        checkins.each do |checkin|
+          checkin.should be_instance_of(FbGraph::Checkin)
+        end
       end
     end
   end

data/spec/fb_graph/collection_spec.rb

@@ -1,15 +1,16 @@
 require 'spec_helper'
 
 describe FbGraph::Collection, '.new' do
-  before do
-    fake_json(:get, 'platform/statuses?access_token=access_token', 'pages/statuses/platform_private')
-  end
 
   it 'should return an array with pagination info' do
-    collection = FbGraph::Page.new('platform', :access_token => 'access_token').statuses.collection
-    collection.should be_kind_of(Array)
-    collection.previous.should be_kind_of(Hash)
-    collection.next.should be_kind_of(Hash)
+    mock_graph :get, 'platform/statuses', 'pages/statuses/platform_private', :params => {
+      :access_token => 'access_token'
+    } do
+      collection = FbGraph::Page.new('platform', :access_token => 'access_token').statuses.collection
+      collection.should be_kind_of(Array)
+      collection.previous.should be_kind_of(Hash)
+      collection.next.should be_kind_of(Hash)
+    end
   end
 
   it 'should allow blank data' do

data/spec/fb_graph/connection_spec.rb

@@ -1,37 +1,48 @@
 require 'spec_helper'
 
 describe FbGraph::Connection, '.new' do
-  before do
-    fake_json(:get, 'platform/statuses?access_token=access_token', 'pages/statuses/platform_private')
-  end
-
   it 'should return an array with connection info' do
-    page = FbGraph::Page.new('platform', :access_token => 'access_token')
-    statuses = page.statuses
-    statuses.should be_kind_of(Array)
-    statuses.collection.should be_kind_of(FbGraph::Collection)
-    statuses.owner.should == page
-    statuses.connection.should == :statuses
+    mock_graph :get, 'platform/statuses', 'pages/statuses/platform_private', :params => {
+      :access_token => 'access_token'
+    } do
+      page = FbGraph::Page.new('platform', :access_token => 'access_token')
+      statuses = page.statuses
+      statuses.should be_kind_of(Array)
+      statuses.collection.should be_kind_of(FbGraph::Collection)
+      statuses.owner.should == page
+      statuses.connection.should == :statuses
+    end
   end
 end
 
 describe FbGraph::Connection do
-  before do
-    fake_json(:get, 'me/home?access_token=access_token', 'users/home/me_private')
-    fake_json(:get, 'me/home?limit=25&since=2010-04-27T13%3A06%3A14%2B0000&access_token=access_token', 'users/home/me_private_previous')
-    fake_json(:get, 'me/home?limit=25&access_token=access_token&until=2010-04-27T11%3A07%3A48%2B0000', 'users/home/me_private_next')
-  end
-
   it 'should be useful for pagenation' do
     me = FbGraph::User.new('me', :access_token => 'access_token')
-    posts = me.home
-    posts.first.created_time.should == Time.parse('2010-04-27T13:06:14+0000')
-    posts.last.created_time.should  == Time.parse('2010-04-27T11:07:48+0000')
-    previous_posts = posts.previous
-    previous_posts.first.created_time.should == Time.parse('2010-04-27T13:23:08+0000')
-    previous_posts.last.created_time.should  == Time.parse('2010-04-27T13:10:56+0000')
-    next_posts = posts.next
-    next_posts.first.created_time.should == Time.parse('2010-04-27T11:06:29+0000')
-    next_posts.last.created_time.should  == Time.parse('2010-04-27T09:44:28+0000')
+    posts = nil
+    mock_graph :get, 'me/home', 'users/home/me_private', :params => {
+      :access_token => 'access_token'
+    } do
+      posts = me.home
+      posts.first.created_time.should == Time.parse('2010-04-27T13:06:14+0000')
+      posts.last.created_time.should  == Time.parse('2010-04-27T11:07:48+0000')
+    end
+    mock_graph :get, 'me/home', 'users/home/me_private_previous', :params => {
+      :access_token => 'access_token',
+      :limit => '25',
+      :since => '2010-04-27T13:06:14+0000'
+    } do
+      previous_posts = posts.previous
+      previous_posts.first.created_time.should == Time.parse('2010-04-27T13:23:08+0000')
+      previous_posts.last.created_time.should  == Time.parse('2010-04-27T13:10:56+0000')
+    end
+    mock_graph :get, 'me/home', 'users/home/me_private_next', :params => {
+      :access_token => 'access_token',
+      :limit => '25',
+      :until => '2010-04-27T11:07:48+0000'
+    } do
+      next_posts = posts.next
+      next_posts.first.created_time.should == Time.parse('2010-04-27T11:06:29+0000')
+      next_posts.last.created_time.should  == Time.parse('2010-04-27T09:44:28+0000')
+    end
   end
 end

data/spec/fb_graph/connections/accounts_spec.rb

@@ -2,44 +2,48 @@ require 'spec_helper'
 
 describe FbGraph::Connections::Accounts, '#accounts' do
   context 'when included by FbGraph::User' do
-    before do
-      fake_json(:get, 'matake/accounts', 'users/accounts/matake_public', :status => [401, 'Unauthorized'])
-      fake_json(:get, 'matake/accounts?access_token=access_token', 'users/accounts/matake_private')
-      fake_json(:get, 'matake/accounts?access_token=access_token_with_manage_pages_permission', 'users/accounts/matake_private_with_manage_pages_permission')
-    end
-
     context 'when no access_token given' do
       it 'should raise FbGraph::Unauthorized' do
-        lambda do
-          FbGraph::User.new('matake').accounts
-        end.should raise_exception(FbGraph::Unauthorized)
+        mock_graph :get, 'matake/accounts', 'users/accounts/matake_public', :status => [401, 'Unauthorized'] do
+          lambda do
+            FbGraph::User.new('matake').accounts
+          end.should raise_exception(FbGraph::Unauthorized)
+        end
       end
     end
 
     context 'when access_token is given' do
       it 'should return accounts as FbGraph::Page' do
-        accounts = FbGraph::User.new('matake', :access_token => 'access_token').accounts
-        accounts.class.should == FbGraph::Connection
-        accounts.first.should == FbGraph::Page.new(
-          '140478125968442',
-          :access_token => 'access_token',
-          :name => 'OAuth.jp',
-          :category => 'Technology'
-        )
-        accounts.each do |account|
-          account.should be_instance_of(FbGraph::Page)
-        end
-      end
-
-      context 'when manage_pages permission given' do
-        it 'should has special access_token behalf of the page' do
-          accounts = FbGraph::User.new('matake', :access_token => 'access_token_with_manage_pages_permission').accounts
+        mock_graph :get, 'matake/accounts', 'users/accounts/matake_private', :params => {
+          :access_token => 'access_token'
+        } do
+          accounts = FbGraph::User.new('matake', :access_token => 'access_token').accounts
+          accounts.class.should == FbGraph::Connection
           accounts.first.should == FbGraph::Page.new(
             '140478125968442',
-            :access_token => 'access_token_for_oauth_jp',
+            :access_token => 'access_token',
             :name => 'OAuth.jp',
             :category => 'Technology'
           )
+          accounts.each do |account|
+            account.should be_instance_of(FbGraph::Page)
+          end
+        end
+      end
+
+      context 'when manage_pages permission given' do
+        it 'should has special access_token behalf of the page' do
+          mock_graph :get, 'matake/accounts', 'users/accounts/matake_private_with_manage_pages_permission', :params => {
+            :access_token => 'access_token_for_user'
+          } do
+            accounts = FbGraph::User.new('matake', :access_token => 'access_token_for_user').accounts
+            accounts.first.should == FbGraph::Page.new(
+              '140478125968442',
+              :access_token => 'access_token_for_oauth_jp',
+              :name => 'OAuth.jp',
+              :category => 'Technology'
+            )
+          end
         end
       end
     end

data/spec/fb_graph/connections/activities_spec.rb

@@ -3,31 +3,32 @@ require 'spec_helper'
 
 describe FbGraph::Connections::Activities, '#activities' do
   context 'when included by FbGraph::User' do
-    before do
-      fake_json(:get, 'arjun/activities', 'users/activities/arjun_public', :status => [401, 'Unauthorized'])
-      fake_json(:get, 'arjun/activities?access_token=access_token', 'users/activities/arjun_private')
-    end
-
     context 'when no access_token given' do
       it 'should raise FbGraph::Unauthorized' do
-        lambda do
-          FbGraph::User.new('arjun').activities
-        end.should raise_exception(FbGraph::Unauthorized)
+        mock_graph :get, 'arjun/activities', 'users/activities/arjun_public', :status => [401, 'Unauthorized'] do
+          lambda do
+            FbGraph::User.new('arjun').activities
+          end.should raise_exception(FbGraph::Unauthorized)
+        end
       end
     end
 
     context 'when access_token is given' do
       it 'should return activities as FbGraph::Page' do
-        activities = FbGraph::User.new('arjun', :access_token => 'access_token').activities
-        activities.class.should == FbGraph::Connection
-        activities.first.should == FbGraph::Page.new(
-          '378209722137',
-          :access_token => 'access_token',
-          :name => 'Doing Things at the Last Minute',
-          :category => '活動'
-        )
-        activities.each do |activity|
-          activity.should be_instance_of(FbGraph::Page)
+        mock_graph :get, 'arjun/activities', 'users/activities/arjun_private', :params => {
+          :access_token => 'access_token'
+        } do
+          activities = FbGraph::User.new('arjun', :access_token => 'access_token').activities
+          activities.class.should == FbGraph::Connection
+          activities.first.should == FbGraph::Page.new(
+            '378209722137',
+            :access_token => 'access_token',
+            :name => 'Doing Things at the Last Minute',
+            :category => '活動'
+          )
+          activities.each do |activity|
+            activity.should be_instance_of(FbGraph::Page)
+          end
         end
       end
     end

data/spec/fb_graph/connections/albums_spec.rb

@@ -3,40 +3,41 @@ require 'spec_helper'
 
 describe FbGraph::Connections::Albums, '#albums' do
   context 'when included by FbGraph::User' do
-    before do
-      fake_json(:get, 'matake/albums', 'users/albums/matake_public', :status => [401, 'Unauthorized'])
-      fake_json(:get, 'matake/albums?access_token=access_token', 'users/albums/matake_private')
-    end
-
     context 'when no access_token given' do
       it 'should raise FbGraph::Unauthorized' do
-        lambda do
-          FbGraph::User.new('matake').albums
-        end.should raise_exception(FbGraph::Unauthorized)
+        mock_graph :get, 'matake/albums', 'users/albums/matake_public', :status => [401, 'Unauthorized'] do
+          lambda do
+            FbGraph::User.new('matake').albums
+          end.should raise_exception(FbGraph::Unauthorized)
+        end
       end
     end
 
     context 'when access_token is given' do
       it 'should return albums as FbGraph::Album' do
-        albums = FbGraph::User.new('matake', :access_token => 'access_token').albums
-        albums.first.should == FbGraph::Album.new(
-          '19351532276',
-          :access_token => 'access_token',
-          :from => {
-            :id => '579612276',
-            :name => 'Nov Matake'
-          },
-          :name => 'モバイルアップロード',
-          :description => 'hello facebookers!',
-          :link => 'http://www.facebook.com/album.php?aid=25463&id=579612276',
-          :location => 'NYC',
-          :count => 3,
-          :privacy => 'everyone',
-          :created_time => '2008-07-27T11:38:15+0000',
-          :updated_time => '2009-02-07T16:09:53+0000'
-        )
-        albums.each do |album|
-          album.should be_instance_of(FbGraph::Album)
+        mock_graph :get, 'matake/albums', 'users/albums/matake_private', :params => {
+          :access_token => 'access_token'
+        } do
+          albums = FbGraph::User.new('matake', :access_token => 'access_token').albums
+          albums.first.should == FbGraph::Album.new(
+            '19351532276',
+            :access_token => 'access_token',
+            :from => {
+              :id => '579612276',
+              :name => 'Nov Matake'
+            },
+            :name => 'モバイルアップロード',
+            :description => 'hello facebookers!',
+            :link => 'http://www.facebook.com/album.php?aid=25463&id=579612276',
+            :location => 'NYC',
+            :count => 3,
+            :privacy => 'everyone',
+            :created_time => '2008-07-27T11:38:15+0000',
+            :updated_time => '2009-02-07T16:09:53+0000'
+          )
+          albums.each do |album|
+            album.should be_instance_of(FbGraph::Album)
+          end
         end
       end
     end
@@ -45,19 +46,21 @@ end
 
 describe FbGraph::Connections::Albums, '#album!' do
   context 'when included by FbGraph::User' do
-    before do
-      fake_json(:post, 'matake/albums', 'users/albums/post_with_valid_access_token')
-    end
-
     it 'should return generated album' do
-      album = FbGraph::User.new('matake', :access_token => 'valid').album!(
+      mock_graph :post, 'matake/albums', 'users/albums/post_with_valid_access_token', :params => {
+        :access_token => 'valid',
         :name => 'FbGraph test',
         :message => 'test test test'
-      )
-      album.identifier.should == 401096332276
-      album.access_token.should == 'valid'
-      album.name.should == 'FbGraph test'
-      album.description.should == 'test test test'
+      } do
+        album = FbGraph::User.new('matake', :access_token => 'valid').album!(
+          :name => 'FbGraph test',
+          :message => 'test test test'
+        )
+        album.identifier.should == 401096332276
+        album.access_token.should == 'valid'
+        album.name.should == 'FbGraph test'
+        album.description.should == 'test test test'
+      end
     end
   end
 end

data/spec/fb_graph/connections/app_requests_spec.rb

@@ -1,14 +1,14 @@
 require 'spec_helper'
 
 describe FbGraph::Connections::AppRequests, '#app_requests' do
-  before do
-    fake_json(:get, 'me/apprequests?access_token=access_token', 'users/app_requests/me_private')
-  end
-
   it 'should return app_requests as FbGraph::AppRequest' do
-    app_requests = FbGraph::User.me('access_token').app_requests
-    app_requests.each do |app_request|
-      app_request.should be_instance_of(FbGraph::AppRequest)
+    mock_graph :get, 'me/apprequests', 'users/app_requests/me_private', :params => {
+      :access_token => 'access_token'
+    } do
+      app_requests = FbGraph::User.me('access_token').app_requests
+      app_requests.each do |app_request|
+        app_request.should be_instance_of(FbGraph::AppRequest)
+      end
     end
   end
 end

data/spec/fb_graph/connections/attending_spec.rb

@@ -1,24 +1,24 @@
 require 'spec_helper'
 
 describe FbGraph::Connections::Attending, '#attending' do
-  before do
-    fake_json(:get, 'smartday/attending?access_token=access_token', 'events/attending/smartday_private')
-  end
-
   it 'should return attending users as FbGraph::User' do
-    users = FbGraph::Event.new('smartday', :access_token => 'access_token').attending
-    users.each do |user|
-      user.should be_instance_of(FbGraph::User)
+    mock_graph :get, 'smartday/attending', 'events/attending/smartday_private', :params => {
+      :access_token => 'access_token'
+    } do
+      users = FbGraph::Event.new('smartday', :access_token => 'access_token').attending
+      users.each do |user|
+        user.should be_instance_of(FbGraph::User)
+      end
     end
   end
 end
 
 describe FbGraph::Connections::Attending, '#attending!' do
-  before do
-    fake_json(:post, '12345/attending', 'events/attending/post_with_valid_access_token')
-  end
-
   it 'should return true' do
-    FbGraph::Event.new('12345', :access_token => 'valid').attending!.should be_true
+    mock_graph :post, '12345/attending', 'events/attending/post_with_valid_access_token', :params => {
+      :access_token => 'valid'
+    } do
+      FbGraph::Event.new('12345', :access_token => 'valid').attending!.should be_true
+    end
   end
 end

data/spec/fb_graph/connections/books_spec.rb

@@ -2,30 +2,31 @@ require 'spec_helper'
 
 describe FbGraph::Connections::Books, '#books' do
   context 'when included by FbGraph::User' do
-    before do
-      fake_json(:get, 'matake/books', 'users/books/matake_public', :status => [401, 'Unauthorized'])
-      fake_json(:get, 'matake/books?access_token=access_token', 'users/books/matake_private')
-    end
-
     context 'when no access_token given' do
       it 'should raise FbGraph::Unauthorized' do
-        lambda do
-          FbGraph::User.new('matake').books
-        end.should raise_exception(FbGraph::Unauthorized)
+        mock_graph :get, 'matake/books', 'users/books/matake_public', :status => [401, 'Unauthorized'] do
+          lambda do
+            FbGraph::User.new('matake').books
+          end.should raise_exception(FbGraph::Unauthorized)
+        end
       end
     end
 
     context 'when access_token is given' do
       it 'should return books as FbGraph::Page' do
-        books = FbGraph::User.new('matake', :access_token => 'access_token').books
-        books.first.should == FbGraph::Page.new(
-          '102253616477130',
-          :access_token => 'access_token',
-          :name => 'Momo Michael Ende',
-          :category => 'Unknown'
-        )
-        books.each do |book|
-          book.should be_instance_of(FbGraph::Page)
+        mock_graph :get, 'matake/books', 'users/books/matake_private', :params => {
+          :access_token => 'access_token'
+        } do
+          books = FbGraph::User.new('matake', :access_token => 'access_token').books
+          books.first.should == FbGraph::Page.new(
+            '102253616477130',
+            :access_token => 'access_token',
+            :name => 'Momo Michael Ende',
+            :category => 'Unknown'
+          )
+          books.each do |book|
+            book.should be_instance_of(FbGraph::Page)
+          end
         end
       end
     end