fb_graph 1.7.5 → 1.8.0.alpha

data/spec/fb_graph/connections/former_participants_spec.rb

@@ -14,8 +14,7 @@ describe FbGraph::Connections::FormerParticipants, '#former_participants' do
   end
 
   it 'should return former_participants as FbGraph::User' do
-    mock_graph :get, '12345/former_participants', 'thread/former_participants/private', :params => {
-      :access_token => 'access_token',
+    mock_graph :get, '12345/former_participants', 'thread/former_participants/private', :access_token => 'access_token', :params => {
       :no_cache => 'true'
     } do
       former_participants = FbGraph::Thread.new(12345, :access_token => 'access_token').former_participants(:no_cache => true)

data/spec/fb_graph/connections/friend_lists_spec.rb

@@ -2,9 +2,7 @@ require 'spec_helper'
 
 describe FbGraph::Connections::FriendLists, '#friend_lists' do
   it 'should return videos as FbGraph::FriendList' do
-    mock_graph :get, 'matake/friendlists', 'users/friend_lists/matake', :params => {
-      :access_token => 'access_token'
-    } do
+    mock_graph :get, 'matake/friendlists', 'users/friend_lists/matake', :access_token => 'access_token' do
       friend_lists = FbGraph::User.new('matake', :access_token => 'access_token').friend_lists
       friend_lists.each do |friend_list|
         friend_list.should be_instance_of(FbGraph::FriendList)

data/spec/fb_graph/connections/friends_spec.rb

@@ -14,9 +14,7 @@ describe FbGraph::Connections::Friends, '#friends' do
 
     context 'when identifier is not me' do
       it 'should raise FbGraph::Unauthorized' do
-        mock_graph :get, 'arjun/friends', 'users/friends/arjun_private', :params => {
-          :access_token => 'access_token'
-        }, :status => [401, 'Unauthorized'] do
+        mock_graph :get, 'arjun/friends', 'users/friends/arjun_private', :access_token => 'access_token', :status => [401, 'Unauthorized'] do
           lambda do
             FbGraph::User.new('arjun', :access_token => 'access_token').friends
           end.should raise_exception(FbGraph::Unauthorized)
@@ -36,9 +34,7 @@ describe FbGraph::Connections::Friends, '#friends' do
 
     context 'when identifier is me and access_token is given' do
       it 'should return friends as FbGraph::User' do
-        mock_graph :get, 'me/friends', 'users/friends/me_private', :params => {
-          :access_token => 'access_token'
-        } do
+        mock_graph :get, 'me/friends', 'users/friends/me_private', :access_token => 'access_token' do
           users = FbGraph::User.new('me', :access_token => 'access_token').friends
           users.first.should == FbGraph::User.new(
             '6401',

data/spec/fb_graph/connections/games_spec.rb

@@ -2,9 +2,7 @@ require 'spec_helper'
 
 describe FbGraph::Connections::Activities, '#activities' do
   it 'should return games as FbGraph::Page' do
-    mock_graph :get, 'matake/games', 'users/games/matake_private', :params => {
-      :access_token => 'access_token'
-    } do
+    mock_graph :get, 'matake/games', 'users/games/matake_private', :access_token => 'access_token' do
       games = FbGraph::User.new('matake', :access_token => 'access_token').games
       games.class.should == FbGraph::Connection
       games.first.should == FbGraph::Page.new(

data/spec/fb_graph/connections/groups_spec.rb

@@ -14,9 +14,7 @@ describe FbGraph::Connections::Groups, '#groups' do
 
     context 'when access_token is given' do
       it 'should return groups as FbGraph::Group' do
-        mock_graph :get, 'matake/groups', 'users/groups/matake_private', :params => {
-          :access_token => 'access_token'
-        } do
+        mock_graph :get, 'matake/groups', 'users/groups/matake_private', :access_token => 'access_token' do
           groups = FbGraph::User.new('matake', :access_token => 'access_token').groups
           groups.first.should == FbGraph::Group.new(
             '115286585902',

data/spec/fb_graph/connections/home_spec.rb

@@ -15,9 +15,7 @@ describe FbGraph::Connections::Home, '#home' do
 
     context 'when identifier is not me' do
       it 'should raise FbGraph::Exception' do
-        mock_graph :get, 'arjun/home', 'users/home/arjun_private', :params => {
-          :access_token => 'access_token'
-        }, :status => [400, 'BadRequest'] do
+        mock_graph :get, 'arjun/home', 'users/home/arjun_private', :access_token => 'access_token', :status => [400, 'BadRequest'] do
           lambda do
             FbGraph::User.new('arjun', :access_token => 'access_token').home
           end.should raise_exception(FbGraph::Exception)
@@ -37,9 +35,7 @@ describe FbGraph::Connections::Home, '#home' do
 
     context 'when identifier is me and access_token is given' do
       it 'should return public posts in the user\'s news feed as FbGraph::Post' do
-        mock_graph :get, 'me/home', 'users/home/me_private', :params => {
-          :access_token => 'access_token'
-        } do
+        mock_graph :get, 'me/home', 'users/home/me_private', :access_token => 'access_token' do
           posts = FbGraph::User.new('me', :access_token => 'access_token').home
           posts.first.should == FbGraph::Post.new(
             '634033380_112599768777073',

data/spec/fb_graph/connections/insights_spec.rb

@@ -15,9 +15,7 @@ describe FbGraph::Connections::Insights, '#insights' do
 
     context 'when access_token is given' do
       it 'should return insights as FbGraph::Insight' do
-        mock_graph :get, 'FbGraph/insights', 'pages/insights/FbGraph_private', :params => {
-          :access_token => 'access_token'
-        } do
+        mock_graph :get, 'FbGraph/insights', 'pages/insights/FbGraph_private', :access_token => 'access_token' do
           insights = FbGraph::Page.new('FbGraph').insights(:access_token => 'access_token')
           insights.class.should == FbGraph::Connection
           insights.first.should == FbGraph::Insight.new(
@@ -40,9 +38,7 @@ describe FbGraph::Connections::Insights, '#insights' do
 
     context 'when metrics is given' do
       it 'should treat metrics as connection scope' do
-        mock_graph :get, 'FbGraph/insights/page_like_adds', 'pages/insights/page_like_adds/FbGraph_private', :params => {
-          :access_token => 'access_token'
-        } do
+        mock_graph :get, 'FbGraph/insights/page_like_adds', 'pages/insights/page_like_adds/FbGraph_private', :access_token => 'access_token' do
           insights = FbGraph::Page.new('FbGraph').insights(:access_token => 'access_token', :metrics => :page_like_adds)
           insights.options.should == {
             :connection_scope => 'page_like_adds',
@@ -69,9 +65,7 @@ describe FbGraph::Connections::Insights, '#insights' do
       end
 
       it 'should support period also' do
-        mock_graph :get, 'FbGraph/insights/page_like_adds/day', 'pages/insights/page_like_adds/day/FbGraph_private', :params => {
-          :access_token => 'access_token'
-        } do
+        mock_graph :get, 'FbGraph/insights/page_like_adds/day', 'pages/insights/page_like_adds/day/FbGraph_private', :access_token => 'access_token' do
           insights = FbGraph::Page.new('FbGraph').insights(:access_token => 'access_token', :metrics => :page_like_adds, :period => :day)
           insights.options.should == {
             :connection_scope => 'page_like_adds/day',

data/spec/fb_graph/connections/interests_spec.rb

@@ -2,9 +2,7 @@ require 'spec_helper'
 
 describe FbGraph::Connections::Interests, '#interests' do
   it 'should return interests pages as FbGraph::Page' do
-    mock_graph :get, 'matake/interests', 'users/interests/matake_private', :params => {
-      :access_token => 'access_token'
-    } do
+    mock_graph :get, 'matake/interests', 'users/interests/matake_private', :access_token => 'access_token' do
       pages = FbGraph::User.new('matake', :access_token => 'access_token').interests
       pages.each do |page|
         page.should be_instance_of(FbGraph::Page)

data/spec/fb_graph/connections/invited_spec.rb

@@ -2,9 +2,7 @@ require 'spec_helper'
 
 describe FbGraph::Connections::Invited, '#invited' do
   it 'should return invited users as FbGraph::User' do
-    mock_graph :get, 'smartday/invited', 'events/invited/smartday_private', :params => {
-      :access_token => 'access_token'
-    } do
+    mock_graph :get, 'smartday/invited', 'events/invited/smartday_private', :access_token => 'access_token' do
       users = FbGraph::Event.new('smartday', :access_token => 'access_token').invited
       users.each do |user|
         user.should be_instance_of(FbGraph::User)

data/spec/fb_graph/connections/likes_spec.rb

@@ -15,9 +15,7 @@ describe FbGraph::Connections::Likes, '#likes' do
 
     context 'when access_token is given' do
       it 'should return liked pages as FbGraph::Page' do
-        mock_graph :get, 'arjun/likes', 'users/likes/arjun_private', :params => {
-          :access_token => 'access_token'
-        } do
+        mock_graph :get, 'arjun/likes', 'users/likes/arjun_private', :access_token => 'access_token' do
           likes = FbGraph::User.new('arjun', :access_token => 'access_token').likes
           likes.first.should == FbGraph::Page.new(
             '378209722137',
@@ -36,9 +34,7 @@ describe FbGraph::Connections::Likes, '#likes' do
   context 'when included by FbGraph::Status' do
     context 'when cached collection exists' do
       before do
-        mock_graph :get, 'with_likes', 'statuses/with_likes', :params => {
-          :access_token => 'access_token'
-        } do
+        mock_graph :get, 'with_likes', 'statuses/with_likes', :access_token => 'access_token' do
           @status = FbGraph::Status.new('with_likes').fetch(:access_token => 'access_token')
         end
       end
@@ -59,10 +55,10 @@ describe FbGraph::Connections::Likes, '#likes' do
         it 'should access to Graph API' do
           lambda do
             @status.likes(:no_cache => true) # :no_cache has no meaning, just putting some value as options
-          end.should request_to('115838235152172/likes?access_token=access_token&no_cache=true')
+          end.should request_to('115838235152172/likes?no_cache=true')
           lambda do
             @status.likes(:limit => 10)
-          end.should request_to('115838235152172/likes?access_token=access_token&limit=10')
+          end.should request_to('115838235152172/likes?limit=10')
         end
 
         context 'when next/previous are obviously blank' do

data/spec/fb_graph/connections/links_spec.rb

@@ -3,9 +3,7 @@ require 'spec_helper'
 describe FbGraph::Connections::Links, '#links' do
   context 'when included by FbGraph::User' do
     it 'should return notes as FbGraph::Link' do
-      mock_graph :get, 'matake/links', 'users/links/matake_private', :params => {
-        :access_token => 'access_token'
-      } do
+      mock_graph :get, 'matake/links', 'users/links/matake_private', :access_token => 'access_token' do
         links = FbGraph::User.new('matake', :access_token => 'access_token').links
         links.each do |link|
           link.should be_instance_of(FbGraph::Link)

data/spec/fb_graph/connections/maybe_spec.rb

@@ -2,9 +2,7 @@ require 'spec_helper'
 
 describe FbGraph::Connections::Maybe, '#maybe' do
   it 'should return maybe users as FbGraph::User' do
-    mock_graph :get, 'smartday/maybe', 'events/maybe/smartday_private', :params => {
-      :access_token => 'access_token'
-    } do
+    mock_graph :get, 'smartday/maybe', 'events/maybe/smartday_private', :access_token => 'access_token' do
       users = FbGraph::Event.new('smartday', :access_token => 'access_token').maybe
       users.each do |user|
         user.should be_instance_of(FbGraph::User)

data/spec/fb_graph/connections/members_spec.rb

@@ -2,9 +2,7 @@ require 'spec_helper'
 
 describe FbGraph::Connections::Friends, '#friends' do
   it 'should return members as FbGraph::User' do
-    mock_graph :get, 'emacs/members', 'groups/members/emacs_private', :params => {
-      :access_token => 'access_token'
-    } do
+    mock_graph :get, 'emacs/members', 'groups/members/emacs_private', :access_token => 'access_token' do
       users = FbGraph::Group.new('emacs', :access_token => 'access_token').members
       users.each do |user|
         user.should be_instance_of(FbGraph::User)

data/spec/fb_graph/connections/messages_spec.rb

@@ -14,10 +14,7 @@ describe FbGraph::Connections::Messages, '#messages' do
   end
 
   it 'should return threads as FbGraph::Message' do
-    mock_graph :get, '12345/messages', 'thread/messages/private', :params => {
-      :access_token => 'access_token',
-      :no_cache => 'true'
-    } do
+    mock_graph :get, '12345/messages', 'thread/messages/private', :params => {:no_cache => 'true'}, :access_token => 'access_token' do
       messages = FbGraph::Thread.new(12345, :access_token => 'access_token').messages(:no_cache => true)
       messages.each do |message|
         message.should be_instance_of(FbGraph::Message)

data/spec/fb_graph/connections/movies_spec.rb

@@ -2,9 +2,7 @@ require 'spec_helper'
 
 describe FbGraph::Connections::Movies, '#movies' do
   it 'should return movies pages as FbGraph::Page' do
-    mock_graph :get, 'matake/movies', 'users/movies/matake_private', :params => {
-      :access_token => 'access_token'
-    } do
+    mock_graph :get, 'matake/movies', 'users/movies/matake_private', :access_token => 'access_token' do
       pages = FbGraph::User.new('matake', :access_token => 'access_token').movies
       pages.each do |page|
         page.should be_instance_of(FbGraph::Page)

data/spec/fb_graph/connections/music_spec.rb

@@ -2,9 +2,7 @@ require 'spec_helper'
 
 describe FbGraph::Connections::Music, '#music' do
   it 'should return music pages as FbGraph::Page' do
-    mock_graph :get, 'matake/music', 'users/music/matake_private', :params => {
-      :access_token => 'access_token'
-    } do
+    mock_graph :get, 'matake/music', 'users/music/matake_private', :access_token => 'access_token' do
       pages = FbGraph::User.new('matake', :access_token => 'access_token').music
       pages.each do |page|
         page.should be_instance_of(FbGraph::Page)

data/spec/fb_graph/connections/noreply_spec.rb

@@ -2,9 +2,7 @@ require 'spec_helper'
 
 describe FbGraph::Connections::Noreply, '#noreply' do
   it 'should return noreply users as FbGraph::User' do
-    mock_graph :get, 'smartday/noreply', 'events/noreply/smartday_private', :params => {
-      :access_token => 'access_token'
-    } do
+    mock_graph :get, 'smartday/noreply', 'events/noreply/smartday_private', :access_token => 'access_token' do
       users = FbGraph::Event.new('smartday', :access_token => 'access_token').noreply
       users.each do |user|
         user.should be_instance_of(FbGraph::User)

data/spec/fb_graph/connections/notes_spec.rb

@@ -3,9 +3,7 @@ require 'spec_helper'
 describe FbGraph::Connections::Notes, '#notes' do
   context 'when included by FbGraph::User' do
     it 'should return notes as FbGraph::Note' do
-      mock_graph :get, 'matake/notes', 'users/notes/matake_private', :params => {
-        :access_token => 'access_token'
-      } do
+      mock_graph :get, 'matake/notes', 'users/notes/matake_private', :access_token => 'access_token' do
         notes = FbGraph::User.new('matake', :access_token => 'access_token').notes
         notes.each do |note|
           note.should be_instance_of(FbGraph::Note)
@@ -19,10 +17,9 @@ describe FbGraph::Connections::Notes, '#note!' do
   context 'when included by FbGraph::Page' do
     it 'should return generated note' do
       mock_graph :post, '12345/notes', 'pages/notes/post_with_valid_access_token', :params => {
-        :access_token => 'valid',
         :subject => 'test',
         :message => 'hello'
-      } do
+      }, :access_token => 'valid' do
         note = FbGraph::Page.new('12345', :access_token => 'valid').note!(:subject => 'test', :message => 'hello')
         note.identifier.should == 396664845100
         note.subject.should == 'test'

data/spec/fb_graph/connections/participants_spec.rb

@@ -14,10 +14,7 @@ describe FbGraph::Connections::Participants, '#participants' do
   end
 
   it 'should return participants as FbGraph::User' do
-    mock_graph :get, '12345/participants', 'thread/participants/private', :params => {
-      :access_token => 'access_token',
-      :no_cache => 'true'
-    } do
+    mock_graph :get, '12345/participants', 'thread/participants/private', :params => {:no_cache => 'true'}, :access_token => 'access_token' do
       participants = FbGraph::Thread.new(12345, :access_token => 'access_token').participants(:no_cache => true)
       participants.each do |participant|
         participant.should be_instance_of(FbGraph::User)

data/spec/fb_graph/connections/permissions_spec.rb

@@ -2,9 +2,7 @@ require 'spec_helper'
 
 describe FbGraph::Connections::Permissions, '#permissions' do
   let :permissions do
-    mock_graph :get, 'me/permissions', 'users/permissions/me_private', :params => {
-      :access_token => 'access_token'
-    } do
+    mock_graph :get, 'me/permissions', 'users/permissions/me_private', :access_token => 'access_token' do
       FbGraph::User.me('access_token').permissions
     end
   end

data/spec/fb_graph/connections/photos_spec.rb

@@ -3,9 +3,7 @@ require 'spec_helper'
 describe FbGraph::Connections::Photos, '#photos' do
   context 'when included by FbGraph::Album' do
     it 'should return photos as FbGraph::Photo' do
-      mock_graph :get, '12345/photos', 'albums/photos/matake_private', :params => {
-        :access_token => 'access_token'
-      } do
+      mock_graph :get, '12345/photos', 'albums/photos/matake_private', :access_token => 'access_token' do
         photos = FbGraph::Album.new('12345', :access_token => 'access_token').photos
         photos.each do |photo|
           photo.should be_instance_of(FbGraph::Photo)

data/spec/fb_graph/connections/senders_spec.rb

@@ -14,10 +14,7 @@ describe FbGraph::Connections::Senders, '#senders' do
   end
 
   it 'should return senders as FbGraph::User' do
-    mock_graph :get, '12345/senders', 'thread/senders/private', :params => {
-      :access_token => 'access_token',
-      :no_cache => 'true'
-    } do
+    mock_graph :get, '12345/senders', 'thread/senders/private', :params => {:no_cache => 'true'}, :access_token => 'access_token' do
       senders = FbGraph::Thread.new(12345, :access_token => 'access_token').senders(:no_cache => true)
       senders.each do |sender|
         sender.should be_instance_of(FbGraph::User)

data/spec/fb_graph/connections/statuses_spec.rb

@@ -15,9 +15,7 @@ describe FbGraph::Connections::Statuses, '#statuses' do
 
     context 'when access_token is given' do
       it 'should return statuses as FbGraph::Status' do
-        mock_graph :get, 'arjun/statuses', 'users/statuses/arjun_private', :params => {
-          :access_token => 'access_token'
-        } do
+        mock_graph :get, 'arjun/statuses', 'users/statuses/arjun_private', :access_token => 'access_token' do
           statuses = FbGraph::User.new('arjun', :access_token => 'access_token').statuses
           statuses.first.should == FbGraph::Status.new(
             '113559395341627',
@@ -50,9 +48,7 @@ describe FbGraph::Connections::Statuses, '#statuses' do
 
     context 'when access_token is given' do
       it 'should return statuses as FbGraph::Status' do
-        mock_graph :get, 'platform/statuses', 'pages/statuses/platform_private', :params => {
-          :access_token => 'access_token'
-        } do
+        mock_graph :get, 'platform/statuses', 'pages/statuses/platform_private', :access_token => 'access_token' do
           statuses = FbGraph::Page.new('platform', :access_token => 'access_token').statuses
           statuses.first.should == FbGraph::Status.new(
             '111081598927600',

data/spec/fb_graph/connections/subscriptions_spec.rb

@@ -4,9 +4,7 @@ describe FbGraph::Connections::Subscriptions, '#subscriptions' do
   context 'when included by FbGraph::Application' do
     context 'when access_token is given' do
       it 'should return liked pages as FbGraph::Page' do
-        mock_graph :get, 'fb_graph/subscriptions', 'applications/subscriptions/fb_graph_private', :params => {
-          :access_token => 'access_token'
-        } do
+        mock_graph :get, 'fb_graph/subscriptions', 'applications/subscriptions/fb_graph_private', :access_token => 'access_token' do
           subscriptions = FbGraph::Application.new('fb_graph', :access_token => 'access_token').subscriptions
           subscriptions.each do |subscription|
             subscription.should be_instance_of(FbGraph::Subscription)
@@ -40,10 +38,10 @@ describe FbGraph::Connections::Subscriptions, '#unsubscribe!' do
   end
 
   it 'should DELETE /:app_id/subscriptions' do
-    lambda do
+    mock_graph :delete, 'fb_graph/subscriptions', 'true', :params => {:object => 'user'}, :access_token => 'access_token' do
       @app.unsubscribe!(
         :object => 'user'
       )
-    end.should request_to 'fb_graph/subscriptions?access_token=access_token&object=user', :delete
+    end
   end
 end

data/spec/fb_graph/connections/television_spec.rb

@@ -2,9 +2,7 @@ require 'spec_helper'
 
 describe FbGraph::Connections::Television, '#television' do
   it 'should return television pages as FbGraph::Page' do
-    mock_graph :get, 'matake/television', 'users/television/matake_private', :params => {
-      :access_token => 'access_token'
-    } do
+    mock_graph :get, 'matake/television', 'users/television/matake_private', :access_token => 'access_token' do
       pages = FbGraph::User.new('matake', :access_token => 'access_token').television
       pages.each do |page|
         page.should be_instance_of(FbGraph::Page)

data/spec/fb_graph/connections/test_users_spec.rb

@@ -15,9 +15,7 @@ describe FbGraph::Connections::TestUsers, '#test_users' do
 
   context 'when access_token is given' do
     it 'should return test_users as FbGraph::TestUser' do
-      mock_graph :get, 'client_id/accounts/test-users', 'applications/test_users/private', :params => {
-        :access_token => 'access_token'
-      } do
+      mock_graph :get, 'client_id/accounts/test-users', 'applications/test_users/private', :access_token => 'access_token' do
         @app.access_token = 'access_token'
         test_users = @app.test_users
         test_users.each do |test_user|

data/spec/fb_graph/connections/threads_spec.rb

@@ -2,9 +2,7 @@ require 'spec_helper'
 
 describe FbGraph::Connections::Threads, '#threads' do
   it 'should return threads as FbGraph::Thread' do
-    mock_graph :get, 'me/threads', 'users/threads/me_private', :params => {
-      :access_token => 'access_token'
-    } do
+    mock_graph :get, 'me/threads', 'users/threads/me_private', :access_token => 'access_token' do
       threads = FbGraph::User.me('access_token').threads
       threads.each do |thread|
         thread.should be_instance_of(FbGraph::Thread)

data/spec/fb_graph/connections/videos_spec.rb

@@ -2,9 +2,7 @@ require 'spec_helper'
 
 describe FbGraph::Connections::Videos, '#videos' do
   it 'should return videos as FbGraph::Video' do
-    mock_graph :get, 'kirk/videos', 'users/videos/kirk_private', :params => {
-      :access_token => 'access_token'
-    } do
+    mock_graph :get, 'kirk/videos', 'users/videos/kirk_private', :access_token => 'access_token' do
       videos = FbGraph::User.new('kirk', :access_token => 'access_token').videos
       videos.each do |video|
         video.should be_instance_of(FbGraph::Video)

data/spec/fb_graph/node_spec.rb

@@ -1,51 +1,54 @@
 require 'spec_helper'
 
-describe FbGraph::Node, '.new' do
+describe FbGraph::Node do
 
-  it 'should setup endpoint' do
-    FbGraph::Node.new('matake').endpoint.should == File.join(FbGraph::ROOT_URL, 'matake')
-  end
+  describe '.new' do
+    it 'should setup endpoint' do
+      FbGraph::Node.new('matake').endpoint.should == File.join(FbGraph::ROOT_URL, 'matake')
+    end
 
-  it 'should support access_token option' do
-    FbGraph::Node.new('matake', :access_token => 'access_token').access_token.should == 'access_token'
+    it 'should support access_token option' do
+      FbGraph::Node.new('matake', :access_token => 'access_token').access_token.should == 'access_token'
+    end
   end
 
-end
+  describe '#build_params' do
+    it 'should make all values to JSON or String' do
+      client = Rack::OAuth2::Client.new(:identifier => 'client_id', :secret => 'client_secret')
+      node = FbGraph::Node.new('identifier')
+      params = node.send :build_params, {:hash => {:a => :b}, :array => [:a, :b], :integer => 123}
+      params[:hash].should == '{"a":"b"}'
+      params[:array].should == '["a","b"]'
+      params[:integer].should == '123'
+    end
 
-describe FbGraph::Node, '#stringfy_params' do
-  it 'should make all values to JSON' do
-    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 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 :build_params, {}
+      params[:oauth_token].should == 'token'
+    end
 
-  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'
+    it 'should support OAuth2::AccessToken as options[:access_token]' do
+      client = Rack::OAuth2::Client.new(:identifier => 'client_id', :secret => 'client_secret')
+      node = FbGraph::Node.new('identifier')
+      params = node.send :build_params, {:access_token => Rack::OAuth2::AccessToken::Legacy.new(:access_token => 'token')}
+      params[:oauth_token].should == 'token'
+    end
   end
 
-  it 'should support OAuth2::AccessToken as options[:access_token]' do
-    client = Rack::OAuth2::Client.new(:identifier => 'client_id', :secret => 'client_secret')
-    node = FbGraph::Node.new('identifier')
-    params = node.send :stringfy_params, {:access_token => Rack::OAuth2::AccessToken::Legacy.new(:access_token => 'token')}
-    params[:access_token].should == 'token'
-  end
 end
 
 describe FbGraph::Node, '#handle_response' do
   it 'should handle null/false response' do
     node = FbGraph::Node.new('identifier')
     null_response = node.send :handle_response do
-      RestClient::Response.create 'null', nil, nil
+      HTTP::Message.new_response 'null'
     end
     null_response.should be_nil
     lambda do
       node.send :handle_response do
-        RestClient::Response.create 'false', nil, nil
+        HTTP::Message.new_response 'false'
       end
     end.should raise_error(
       FbGraph::NotFound,

data/spec/fb_graph/post_spec.rb

@@ -119,9 +119,7 @@ describe FbGraph::Post, '#fetch' do
 
   context 'when access_token given' do
     it 'shold get all attributes and comments' do
-      mock_graph :get, 'platform', 'posts/platform_private', :params => {
-        :access_token => 'access_token'
-      } do
+      mock_graph :get, 'platform', 'posts/platform_private', :access_token => 'access_token' do
         post = FbGraph::Post.fetch('platform', :access_token => 'access_token')
         post.identifier.should == '19292868552_118464504835613'
         post.from.should == FbGraph::Page.new(
@@ -173,9 +171,7 @@ describe FbGraph::Post, '#to' do
 
   context 'when include Group' do
     let :post do
-      mock_graph :get, 'to_group', 'posts/to_group', :params => {
-        :access_token => 'access_token'
-      } do
+      mock_graph :get, 'to_group', 'posts/to_group', :access_token => 'access_token' do
         FbGraph::Post.fetch('to_group', :access_token => 'access_token')
       end
     end

data/spec/fb_graph/query/core_spec.rb

@@ -10,16 +10,6 @@ describe FbGraph::Query do
       query.query.should == raw_query
       query.access_token.should == 'access_token'
     end
-
-    it 'should setup proper endpoint' do
-      endpoint = query.send :build_endpoint
-      params = {
-        :query => raw_query,
-        :format => :json,
-        :access_token => 'access_token'
-      }
-      endpoint.should == "#{FbGraph::Query::ENDPOINT}?#{params.to_query}"
-    end
   end
 
   describe '.fetch' do

data/spec/fb_graph/test_user_spec.rb

@@ -28,8 +28,8 @@ describe FbGraph::TestUser, '.friend!' do
   end
 
   it 'should POST twice' do
-    mock_graph :post, '111/friends/222', 'true' do
-      mock_graph :post, '222/friends/111', 'true' do
+    mock_graph :post, '111/friends/222', 'true', :access_token => 'token1' do
+      mock_graph :post, '222/friends/111', 'true', :access_token => 'token2' do
         @u1.friend! @u2
       end
     end
@@ -39,12 +39,12 @@ end
 
 describe FbGraph::TestUser, '.destroy' do
   before do
-    @user = FbGraph::TestUser.new(111, :access_token => 'token1')
+    @user = FbGraph::TestUser.new(111, :access_token => 'access_token')
   end
 
   it 'should DELETE /user_id' do
-    lambda do
+    mock_graph :delete, '111', 'true', :access_token => 'access_token' do
       @user.destroy
-    end.should request_to('111?access_token=token1', :delete)
+    end
   end
 end

data/spec/fb_graph/user_spec.rb

@@ -46,9 +46,7 @@ describe FbGraph::User, '.fetch' do
 
     context 'when access_token given' do
       it 'should get current user profile' do
-        mock_graph :get, 'me', 'users/me_private', :params => {
-          :access_token => 'access_token'
-        } do
+        mock_graph :get, 'me', 'users/me_private', :access_token => 'access_token' do
           user = FbGraph::User.me('access_token').fetch
           user.interested_in.should       == ['female']
           user.meeting_for.should         == ['Friendship', 'Networking']
@@ -81,9 +79,7 @@ describe FbGraph::User, '.fetch' do
 
   context 'when access_token given' do
     it 'should get public + private profile' do
-      mock_graph :get, 'arjun', 'users/arjun_private', :params => {
-        :access_token => 'access_token'
-      } do
+      mock_graph :get, 'arjun', 'users/arjun_private', :access_token => 'access_token' do
         user = FbGraph::User.fetch('arjun', :access_token => 'access_token')
 
         # public