fb_graph 1.6.7 → 1.6.8

data/VERSION

@@ -1 +1 @@
-1.6.7
+1.6.8

data/fb_graph.gemspec

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

data/lib/fb_graph/node.rb

@@ -107,20 +107,26 @@ module FbGraph
         when Array
           _response_.map!(&:with_indifferent_access)
         when Hash
-          _response_ = _response_.with_indifferent_access
-          if _response_[:error]
-            case _response_[:error][:type]
-            when /OAuth/
-              raise Unauthorized.new(_response_[:error][:message])
-            else
-              raise BadRequest.new("#{_response_[:error][:type]} :: #{_response_[:error][:message]}")
-            end
-          else
-            _response_
-          end
+          _response_.with_indifferent_access
         end
       end
     rescue RestClient::Exception => e
+      handle_restclient_error(e)
+    end
+
+    def handle_restclient_error(e)
+      _response_ = JSON.parse(e.http_body).with_indifferent_access
+      if _response_[:error]
+        case _response_[:error][:type]
+        when /OAuth/
+          raise Unauthorized.new(_response_[:error][:message])
+        else
+          raise BadRequest.new("#{_response_[:error][:type]} :: #{_response_[:error][:message]}")
+        end
+      else
+        raise Exception.new(e.http_code, e.message, e.http_body)
+      end
+    rescue JSON::ParserError
       raise Exception.new(e.http_code, e.message, e.http_body)
     end
   end

data/spec/fake_json/users/friends/arjun_private.json

@@ -1,6 +1,6 @@
 {
    "error": {
-      "type": "Exception",
+      "type": "OAuthException",
       "message": "(#604) Can't lookup all friends of 7901103; can only lookup for the logged in user (579612276) or for pairs of users"
    }
 }

data/spec/fb_graph/checkin_spec.rb

@@ -16,7 +16,7 @@ end
 
 describe FbGraph::Checkin, '.search' do
   before do
-    fake_json(:get, 'search?type=checkin', 'checkins/search_public')
+    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
 

data/spec/fb_graph/connections/accounts_spec.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), '../../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')
+      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

data/spec/fb_graph/connections/activities_spec.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), '../../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')
+      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
 

data/spec/fb_graph/connections/albums_spec.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), '../../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')
+      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
 

data/spec/fb_graph/connections/books_spec.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), '../../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')
+      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
 

data/spec/fb_graph/connections/checkins_spec.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), '../../spec_helper')
 describe FbGraph::Connections::Checkins, '#checkins' do
   context 'when included by FbGraph::User' do
     before do
-      fake_json(:get, 'mattt/checkins', 'users/checkins/mattt_public')
+      fake_json(:get, 'mattt/checkins', 'users/checkins/mattt_public', :status => [401, 'Unauthorized'])
       fake_json(:get, 'mattt/checkins?access_token=access_token', 'users/checkins/mattt_private')
     end
 
@@ -55,7 +55,7 @@ describe FbGraph::Connections::Checkins, '#checkins' do
 
   context 'when included by FbGraph::Page' do
     before do
-      fake_json(:get, 'gowalla/checkins', 'pages/checkins/gowalla_public')
+      fake_json(:get, 'gowalla/checkins', 'pages/checkins/gowalla_public', :status => [401, 'Unauthorized'])
       fake_json(:get, 'gowalla/checkins?access_token=access_token', 'pages/checkins/gowalla_private')
     end
 

data/spec/fb_graph/connections/events_spec.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), '../../spec_helper')
 describe FbGraph::Connections::Events, '#events' do
   context 'when included by FbGraph::User' do
     before do
-      fake_json(:get, 'matake/events', 'users/events/matake_public')
+      fake_json(:get, 'matake/events', 'users/events/matake_public', :status => [401, 'Unauthorized'])
       fake_json(:get, 'matake/events?access_token=access_token', 'users/events/matake_private')
     end
 

data/spec/fb_graph/connections/friends_spec.rb

@@ -3,25 +3,25 @@ require File.join(File.dirname(__FILE__), '../../spec_helper')
 describe FbGraph::Connections::Friends, '#friends' do
   context 'when included by FbGraph::User' do
     before do
-      fake_json(:get, 'me/friends', 'users/friends/me_public')
+      fake_json(:get, 'me/friends', 'users/friends/me_public', :status => [401, 'Unauthorized'])
       fake_json(:get, 'me/friends?access_token=access_token', 'users/friends/me_private')
-      fake_json(:get, 'arjun/friends', 'users/friends/arjun_public')
-      fake_json(:get, 'arjun/friends?access_token=access_token', 'users/friends/arjun_private')
+      fake_json(:get, 'arjun/friends', 'users/friends/arjun_public', :status => [401, 'Unauthorized'])
+      fake_json(:get, 'arjun/friends?access_token=access_token', 'users/friends/arjun_private', :status => [401, 'Unauthorized'])
     end
 
     context 'when no access_token given' do
-      it 'should raise FbGraph::Exception' do
+      it 'should raise FbGraph::Unauthorized' do
         lambda do
           FbGraph::User.new('arjun').friends
-        end.should raise_exception(FbGraph::Exception)
+        end.should raise_exception(FbGraph::Unauthorized)
       end
     end
 
     context 'when identifier is not me' do
-      it 'should raise FbGraph::Exception' do
+      it 'should raise FbGraph::Unauthorized' do
         lambda do
           FbGraph::User.new('arjun', :access_token => 'access_token').friends
-        end.should raise_exception(FbGraph::Exception)
+        end.should raise_exception(FbGraph::Unauthorized)
       end
     end
 

data/spec/fb_graph/connections/groups_spec.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), '../../spec_helper')
 describe FbGraph::Connections::Groups, '#groups' do
   context 'when included by FbGraph::User' do
     before do
-      fake_json(:get, 'matake/groups', 'users/groups/matake_public')
+      fake_json(:get, 'matake/groups', 'users/groups/matake_public', :status => [401, 'Unauthorized'])
       fake_json(:get, 'matake/groups?access_token=access_token', 'users/groups/matake_private')
     end
 

data/spec/fb_graph/connections/home_spec.rb

@@ -3,10 +3,10 @@ require File.join(File.dirname(__FILE__), '../../spec_helper')
 describe FbGraph::Connections::Home, '#home' do
   context 'when included by FbGraph::User' do
     before do
-      fake_json(:get, 'me/home', 'users/home/me_public')
+      fake_json(:get, 'me/home', 'users/home/me_public', :status => [401, 'Unauthorized'])
       fake_json(:get, 'me/home?access_token=access_token', 'users/home/me_private')
-      fake_json(:get, 'arjun/home', 'users/home/arjun_public')
-      fake_json(:get, 'arjun/home?access_token=access_token', 'users/home/arjun_private')
+      fake_json(:get, 'arjun/home', 'users/home/arjun_public', :status => [400, 'BadRequest'])
+      fake_json(:get, 'arjun/home?access_token=access_token', 'users/home/arjun_private', :status => [400, 'BadRequest'])
     end
 
     context 'when no access_token given' do

data/spec/fb_graph/connections/insights_spec.rb

@@ -4,7 +4,7 @@ describe FbGraph::Connections::Insights, '#insights' do
 
   context 'when included by FbGraph::Page' do
     before do
-      fake_json(:get, 'FbGraph/insights', 'pages/insights/FbGraph_public')
+      fake_json(:get, 'FbGraph/insights', 'pages/insights/FbGraph_public', :status => [401, 'Unauthorized'])
       fake_json(:get, 'FbGraph/insights?access_token=access_token', 'pages/insights/FbGraph_private')
     end
 

data/spec/fb_graph/connections/likes_spec.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), '../../spec_helper')
 describe FbGraph::Connections::Likes, '#likes' do
   context 'when included by FbGraph::User' do
     before do
-      fake_json(:get, 'arjun/likes', 'users/likes/arjun_public')
+      fake_json(:get, 'arjun/likes', 'users/likes/arjun_public', :status => [401, 'Unauthorized'])
       fake_json(:get, 'arjun/likes?access_token=access_token', 'users/likes/arjun_private')
     end
 

data/spec/fb_graph/connections/statuses_spec.rb

@@ -4,7 +4,7 @@ describe FbGraph::Connections::Statuses, '#statuses' do
 
   context 'when included by FbGraph::User' do
     before do
-      fake_json(:get, 'arjun/statuses', 'users/statuses/arjun_public')
+      fake_json(:get, 'arjun/statuses', 'users/statuses/arjun_public', :status => [401, 'Unauthorized'])
       fake_json(:get, 'arjun/statuses?access_token=access_token', 'users/statuses/arjun_private')
     end
 
@@ -38,7 +38,7 @@ describe FbGraph::Connections::Statuses, '#statuses' do
 
   context 'when included by FbGraph::Page' do
     before do
-      fake_json(:get, 'platform/statuses', 'pages/statuses/platform_public')
+      fake_json(:get, 'platform/statuses', 'pages/statuses/platform_public', :status => [401, 'Unauthorized'])
       fake_json(:get, 'platform/statuses?access_token=access_token', 'pages/statuses/platform_private')
     end
 

data/spec/fb_graph/user_spec.rb

@@ -33,7 +33,7 @@ end
 
 describe FbGraph::User, '.fetch' do
   before do
-    fake_json(:get, 'me', 'users/me_public')
+    fake_json(:get, 'me', 'users/me_public', :status => [401, 'Unauthorized'])
     fake_json(:get, 'me?access_token=access_token', 'users/me_private')
     fake_json(:get, 'arjun', 'users/arjun_public')
     fake_json(:get, 'arjun?access_token=access_token', 'users/arjun_private')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fb_graph
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 31
   prerelease: 
   segments: 
   - 1
   - 6
-  - 7
-  version: 1.6.7
+  - 8
+  version: 1.6.8
 platform: ruby
 authors: 
 - nov matake