fb_graph 2.4.10 → 2.4.11

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fb_graph (2.4.8)
+    fb_graph (2.4.10)
       httpclient (>= 2.2.0.2)
       rack-oauth2 (>= 0.14.4)
       tzinfo
@@ -28,7 +28,7 @@ GEM
     addressable (2.2.7)
     attr_required (0.0.5)
     builder (3.0.0)
-    configatron (2.9.0)
+    configatron (2.9.1)
       yamler (>= 0.1.0)
     cover_me (1.2.0)
       configatron
@@ -42,7 +42,7 @@ GEM
     i18n (0.6.0)
     journey (1.0.3)
     json (1.6.6)
-    multi_json (1.2.0)
+    multi_json (1.3.2)
     rack (1.4.1)
     rack-cache (1.2)
       rack (>= 0.4)
@@ -61,7 +61,7 @@ GEM
       rspec-expectations (~> 2.9.0)
       rspec-mocks (~> 2.9.0)
     rspec-core (2.9.0)
-    rspec-expectations (2.9.0)
+    rspec-expectations (2.9.1)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.9.0)
     sprockets (2.1.2)
@@ -69,8 +69,8 @@ GEM
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     tilt (1.3.3)
-    tzinfo (0.3.32)
-    webmock (1.8.5)
+    tzinfo (0.3.33)
+    webmock (1.8.6)
       addressable (>= 2.2.7)
       crack (>= 0.1.7)
     yamler (0.1.0)

data/README.rdoc

@@ -231,7 +231,7 @@ See more here: http://developers.facebook.com/docs/authentication/fb_sig/
 
   # in callback
   client.authorization_code = params[:code]
-  access_token = client.access_token!  # => Rack::OAuth2::AccessToken
+  access_token = client.access_token! :client_auth_body # => Rack::OAuth2::AccessToken
   FbGraph::User.me(access_token).fetch # => FbGraph::User
 
 ==== Session Key Exchange

data/VERSION

@@ -1 +1 @@
-2.4.10
+2.4.11

data/lib/fb_graph/auth.rb

@@ -56,7 +56,7 @@ module FbGraph
       self.access_token = client.access_token! :client_auth_body
       self
     rescue Rack::OAuth2::Client::Error => e
-      raise Exception.new(e.status, e.message)
+      Exception.handle_rack_oauth2_error e
     end
 
     private
@@ -69,7 +69,7 @@ module FbGraph
       self.user = User.new(data[:user_id], :access_token => access_token)
       self
     rescue Rack::OAuth2::Client::Error => e
-      raise Exception.new(e.status, e.message)
+      Exception.handle_rack_oauth2_error e
     end
 
     def build_access_token(data)

data/lib/fb_graph/exception.rb

@@ -66,6 +66,18 @@ module FbGraph
       end
     end
 
+    def self.handle_rack_oauth2_error(e)
+      exception = case e.status
+      when 400
+        BadRequest.new(e.message)
+      when 401
+        Unauthorized.new(e.message)
+      else
+        Exception.new(e.status, e.message)
+      end
+      raise exception
+    end
+
     def initialize(code, message, body = '')
       @code = code
       if body.present?

data/spec/fb_graph/auth_spec.rb

@@ -106,11 +106,33 @@ describe FbGraph::Auth do
     end
 
     context 'when Rack::OAuth2::Client::Error occurred' do
-      it 'should raise FbGraph::Exception' do
-        mock_graph :post, 'oauth/access_token', 'blank', :status => [401, 'Unauthorized'] do
-          lambda do
-            auth.from_cookie(cookie)
-          end.should raise_exception FbGraph::Exception
+      context 'when BadRequest' do
+        it 'should raise FbGraph::BadRequest' do
+          mock_graph :post, 'oauth/access_token', 'blank', :status => [400, 'BadRequest'] do
+            lambda do
+              auth.from_cookie(cookie)
+            end.should raise_exception FbGraph::BadRequest
+          end
+        end
+      end
+
+      context 'when Unauthorized' do
+        it 'should raise FbGraph::Unauthorized' do
+          mock_graph :post, 'oauth/access_token', 'blank', :status => [401, 'Unauthorized'] do
+            lambda do
+              auth.from_cookie(cookie)
+            end.should raise_exception FbGraph::Unauthorized
+          end
+        end
+      end
+
+      context 'otherwise' do
+        it 'should raise FbGraph::Exception' do
+          mock_graph :post, 'oauth/access_token', 'blank', :status => [403, 'Forbidden'] do
+            lambda do
+              auth.from_cookie(cookie)
+            end.should raise_exception FbGraph::Exception
+          end
         end
       end
     end
@@ -166,11 +188,42 @@ describe FbGraph::Auth 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
+
+    context 'when Rack::OAuth2::Client::Error occurred' do
+      context 'when BadRequest' do
+        it 'should raise FbGraph::BadRequest' do
+          mock_graph :post, 'oauth/access_token', 'blank', :status => [400, 'BadRequest'] do
+            lambda do
+              auth.exchange_token! 'old_token'
+            end.should raise_exception FbGraph::BadRequest
+          end
+        end
+      end
+
+      context 'when Unauthorized' do
+        it 'should raise FbGraph::Unauthorized' do
+          mock_graph :post, 'oauth/access_token', 'blank', :status => [401, 'Unauthorized'] do
+            lambda do
+              auth.exchange_token! 'old_token'
+            end.should raise_exception FbGraph::Unauthorized
+          end
+        end
+      end
+
+      context 'otherwise' do
+        it 'should raise FbGraph::Exception' do
+          mock_graph :post, 'oauth/access_token', 'blank', :status => [403, 'Forbidden'] do
+            lambda do
+              auth.exchange_token! 'old_token'
+            end.should raise_exception FbGraph::Exception
+          end
+        end
+      end
+    end
   end
 end
 

metadata

@@ -1,155 +1,112 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: fb_graph
-version: !ruby/object:Gem::Version 
-  hash: 11
+version: !ruby/object:Gem::Version
+  version: 2.4.11
   prerelease: 
-  segments: 
-  - 2
-  - 4
-  - 10
-  version: 2.4.10
 platform: ruby
-authors: 
+authors:
 - nov matake
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-04-10 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: httpclient
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70120463031880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 123
-        segments: 
-        - 2
-        - 2
-        - 0
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.2.0.2
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rack-oauth2
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70120463031880
+- !ruby/object:Gem::Dependency
+  name: rack-oauth2
+  requirement: &70120458748700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 47
-        segments: 
-        - 0
-        - 14
-        - 4
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.14.4
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: tzinfo
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70120458748700
+- !ruby/object:Gem::Dependency
+  name: tzinfo
+  requirement: &70120458748320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70120458748320
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70120458747780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 8
-        version: "0.8"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.8'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rcov
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70120458747780
+- !ruby/object:Gem::Dependency
+  name: cover_me
+  requirement: &70120458747260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 9
-        version: "0.9"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.0
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70120458747260
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70120458746800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        version: "2"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: webmock
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70120458746800
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: &70120458746340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 6
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.6.2
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: actionpack
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *70120458746340
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: &70120458745880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 3
-        - 0
-        - 6
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.6
   type: :development
-  version_requirements: *id008
+  prerelease: false
+  version_requirements: *70120458745880
 description: A full-stack Facebook Graph API wrapper in Ruby.
 email: nov@matake.jp
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
 - .document
 - .gitignore
 - .rspec
@@ -665,38 +622,30 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/nov/fb_graph
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: A full-stack Facebook Graph API wrapper in Ruby.
-test_files: 
+test_files:
 - spec/fb_graph/achievement_spec.rb
 - spec/fb_graph/ad_account_spec.rb
 - spec/fb_graph/ad_campaign_spec.rb