fb_graph 2.2.5 → 2.2.6

data/Gemfile.lock

@@ -1,34 +1,33 @@
 PATH
   remote: .
   specs:
-    fb_graph (2.2.3)
+    fb_graph (2.2.5)
       httpclient (>= 2.2.0.2)
       rack-oauth2 (>= 0.9.4)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionpack (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
+    actionpack (3.2.0)
+      activemodel (= 3.2.0)
+      activesupport (= 3.2.0)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.5)
+      journey (~> 1.0.0)
+      rack (~> 1.4.0)
       rack-cache (~> 1.1)
-      rack-mount (~> 0.8.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.0.3)
-    activemodel (3.1.3)
-      activesupport (= 3.1.3)
+      sprockets (~> 2.1.2)
+    activemodel (3.2.0)
+      activesupport (= 3.2.0)
       builder (~> 3.0.0)
+    activesupport (3.2.0)
       i18n (~> 0.6)
-    activesupport (3.1.3)
       multi_json (~> 1.0)
     addressable (2.2.6)
     attr_required (0.0.3)
     builder (3.0.0)
-    configatron (2.8.4)
+    configatron (2.9.0)
       yamler (>= 0.1.0)
     cover_me (1.2.0)
       configatron
@@ -38,15 +37,14 @@ GEM
     erubis (2.7.0)
     hashie (1.2.0)
     hike (1.2.1)
-    httpclient (2.2.3)
+    httpclient (2.2.4)
     i18n (0.6.0)
-    json (1.6.1)
-    multi_json (1.0.3)
-    rack (1.3.5)
+    journey (1.0.0)
+    json (1.6.5)
+    multi_json (1.0.4)
+    rack (1.4.0)
     rack-cache (1.1)
       rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
     rack-oauth2 (0.11.0)
       activesupport (>= 2.3)
       attr_required (>= 0.0.3)
@@ -57,20 +55,20 @@ GEM
     rack-test (0.6.1)
       rack (>= 1.0)
     rake (0.9.2.2)
-    rspec (2.7.0)
-      rspec-core (~> 2.7.0)
-      rspec-expectations (~> 2.7.0)
-      rspec-mocks (~> 2.7.0)
-    rspec-core (2.7.1)
-    rspec-expectations (2.7.0)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.7.0)
-    sprockets (2.0.3)
+    rspec-mocks (2.8.0)
+    sprockets (2.1.2)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     tilt (1.3.3)
-    webmock (1.7.8)
+    webmock (1.7.10)
       addressable (~> 2.2, > 2.2.5)
       crack (>= 0.1.7)
     yamler (0.1.0)

data/VERSION

@@ -1 +1 @@
-2.2.5
+2.2.6

data/lib/fb_graph/exception.rb

@@ -7,6 +7,18 @@ module FbGraph
       /invalid_request/ => "InvalidRequest"
     }
 
+    ERROR_EXCEPTION_MATCHERS = {
+      /Could\snot\ssave\screative/          => "CreativeNotSaved",
+      /QueryLockTimeoutException/           => "QueryLockTimeout",
+      /Could\snot\screate\stargeting\sspec/ => "TargetingSpecNotSaved",
+      /Could\snot\sfetch\sadgroups/         => "AdgroupFetchFailure",
+      /Failed\sto\sopen\sprocess/           => "OpenProcessFailure",
+      /Could\snot\scommit\stransaction/     => "TransactionCommitFailure",
+      /QueryErrorException/                 => "QueryError",
+      /QueryConnectionException/            => "QueryConnection",
+      /QueryDuplicateKeyException/          => "QueryDuplicateKey"
+    }
+
     def self.handle_httpclient_error(response, headers)
       return nil unless response[:error]
 
@@ -31,7 +43,15 @@ module FbGraph
       when /OAuth/
         raise Unauthorized.new("#{response[:error][:type]} :: #{response[:error][:message]}")
       else
-        raise BadRequest.new("#{response[:error][:type]} :: #{response[:error][:message]}")
+        exception_class = nil
+        ERROR_EXCEPTION_MATCHERS.keys.each do |matcher|
+          exception_class = FbGraph::const_get(ERROR_EXCEPTION_MATCHERS[matcher]) if matcher =~ response[:error][:message]
+        end
+        if exception_class
+          raise exception_class.new("#{response[:error][:type]} :: #{response[:error][:message]}")
+        else
+          raise BadRequest.new("#{response[:error][:type]} :: #{response[:error][:message]}")
+        end
       end
     end
 
@@ -65,9 +85,33 @@ module FbGraph
     end
   end
 
+  class InternalServerError < Exception
+    def initialize(message, body = '')
+      super 500, message, body
+    end
+  end
+
   class InvalidToken < Unauthorized; end
 
   class InvalidSession < InvalidToken; end
 
   class InvalidRequest < BadRequest; end
+
+  class CreativeNotSaved < InternalServerError; end
+
+  class QueryLockTimeout < InternalServerError; end
+
+  class TargetingSpecNotSaved < InternalServerError; end
+
+  class AdgroupFetchFailure < InternalServerError; end
+
+  class OpenProcessFailure < InternalServerError; end
+
+  class TransactionCommitFailure < InternalServerError; end
+
+  class QueryError < InternalServerError; end
+
+  class QueryConnection < InternalServerError; end
+
+  class QueryDuplicateKey < InternalServerError; end
 end

data/lib/fb_graph/user.rb

@@ -43,10 +43,10 @@ module FbGraph
     include OpenGraph::UserContext
     extend Searchable
 
-    attr_accessor :name, :first_name, :middle_name, :last_name, :gender, :locale, :languages, :link, :username, :third_party_id, :timezone, :updated_time, :verified, :about, :bio, :birthday, :education, :email, :hometown, :interested_in, :location, :political, :favorite_teams, :quotes, :relationship_status, :religion, :significant_other, :video_upload_limits, :website, :work
+    attr_accessor :name, :first_name, :middle_name, :last_name, :gender, :locale, :languages, :link, :username, :third_party_id, :timezone, :updated_time, :verified, :about, :bio, :birthday, :education, :email, :hometown, :interested_in, :location, :political, :favorite_teams, :quotes, :relationship, :relationship_status, :religion, :significant_other, :video_upload_limits, :website, :work
 
     # NOTE: below are non-documented
-    attr_accessor :sports,  :favorite_athletes, :inspirational_people, :address, :mobile_phone
+    attr_accessor :sports,  :favorite_athletes, :inspirational_people, :address, :mobile_phone, :installed
 
     def initialize(identifier, attributes = {})
       super
@@ -104,6 +104,8 @@ module FbGraph
       if (significant_other = attributes[:significant_other])
         @significant_other = User.new(significant_other[:id], significant_other)
       end
+      # If this user was build from the family connection, set the relationship type
+      @relationship = attributes[:relationship]
       # NOTE: couldn't find "video_upload_limits" in the response..
       #  @video_upload_limits = ??
       @website = attributes[:website]
@@ -137,6 +139,7 @@ module FbGraph
         @address = Venue.new(attributes[:address])
       end
       @mobile_phone = attributes[:mobile_phone]
+      @installed = attributes[:installed]
     end
 
     def self.me(access_token)

data/spec/fb_graph/exception_spec.rb

@@ -135,9 +135,146 @@ describe FbGraph::Exception, ".handle_httpclient_error" do
         }
       end
 
-      it "should raise a BadRequst exception" do
+      it "should raise a BadRequest exception" do
         lambda {FbGraph::Exception.handle_httpclient_error(parsed_response, {})}.should raise_exception(FbGraph::BadRequest)
       end
+
+      context "with an Ads API Exception" do
+        context "of Could not save creative" do
+          let(:parsed_response) do
+            {
+              :error => {
+                :message => 'Could not save creative',
+                :type => "Exception"
+              }
+            }
+          end
+
+          it "should raise a CreativeNotSaved exception" do
+            lambda {FbGraph::Exception.handle_httpclient_error(parsed_response, {})}.should raise_exception(FbGraph::CreativeNotSaved)
+          end
+        end
+
+        context "of QueryLockTimeout" do
+          let(:parsed_response) do
+            {
+              :error => {
+                :message => 'QueryLockTimeoutException',
+                :type => "Exception"
+              }
+            }
+          end
+
+          it "should raise a QueryLockTimeout exception" do
+            lambda {FbGraph::Exception.handle_httpclient_error(parsed_response, {})}.should raise_exception(FbGraph::QueryLockTimeout)
+          end
+        end
+
+        context "of Could not create targeting spec" do
+          let(:parsed_response) do
+            {
+              :error => {
+                :message => 'Could not create targeting spec',
+                :type => "Exception"
+              }
+            }
+          end
+
+          it "should raise a TargetingSpecNotSaved exception" do
+            lambda {FbGraph::Exception.handle_httpclient_error(parsed_response, {})}.should raise_exception(FbGraph::TargetingSpecNotSaved)
+          end
+        end
+
+        context "of Could not fetch adgroups" do
+          let(:parsed_response) do
+            {
+              :error => {
+                :message => 'Could not fetch adgroups',
+                :type => "Exception"
+              }
+            }
+          end
+
+          it "should raise a AdgroupFetchFailure exception" do
+            lambda {FbGraph::Exception.handle_httpclient_error(parsed_response, {})}.should raise_exception(FbGraph::AdgroupFetchFailure)
+          end
+        end
+
+        context "of Failed to open process" do
+          let(:parsed_response) do
+            {
+              :error => {
+                :message => 'Failed to open process',
+                :type => "Exception"
+              }
+            }
+          end
+
+          it "should raise a OpenProcessFailure exception" do
+            lambda {FbGraph::Exception.handle_httpclient_error(parsed_response, {})}.should raise_exception(FbGraph::OpenProcessFailure)
+          end
+        end
+
+        context "of Could not commit transaction" do
+          let(:parsed_response) do
+            {
+              :error => {
+                :message => 'Could not commit transaction',
+                :type => "Exception"
+              }
+            }
+          end
+
+          it "should raise a TransactionCommitFailure exception" do
+            lambda {FbGraph::Exception.handle_httpclient_error(parsed_response, {})}.should raise_exception(FbGraph::TransactionCommitFailure)
+          end
+        end
+
+        context "of QueryErrorException" do
+          let(:parsed_response) do
+            {
+              :error => {
+                :message => 'DB Error: QueryErrorException',
+                :type => "Exception"
+              }
+            }
+          end
+
+          it "should raise a QueryError exception" do
+            lambda {FbGraph::Exception.handle_httpclient_error(parsed_response, {})}.should raise_exception(FbGraph::QueryError)
+          end
+        end
+
+        context "of QueryConnectionException" do
+          let(:parsed_response) do
+            {
+              :error => {
+                :message => 'QueryConnectionException',
+                :type => "Exception"
+              }
+            }
+          end
+
+          it "should raise a QueryConnection exception" do
+            lambda {FbGraph::Exception.handle_httpclient_error(parsed_response, {})}.should raise_exception(FbGraph::QueryConnection)
+          end
+        end
+
+        context "of QueryDuplicateKeyException" do
+          let(:parsed_response) do
+            {
+              :error => {
+                :message => 'QueryDuplicateKeyException',
+                :type => "Exception"
+              }
+            }
+          end
+
+          it "should raise a QueryDuplicateKey exception" do
+            lambda {FbGraph::Exception.handle_httpclient_error(parsed_response, {})}.should raise_exception(FbGraph::QueryDuplicateKey)
+          end
+        end
+      end
     end
   end
 end

data/spec/fb_graph/user_spec.rb

@@ -9,11 +9,13 @@ describe FbGraph::User, '.new' do
         :state => "Kanagawa",
         :country => "Japan"
       },
-      :mobile_phone => '810000000000'
+      :mobile_phone => '810000000000',
+      :installed => true
     }
     user = FbGraph::User.new(attributes.delete(:id), attributes)
     user.address.should == FbGraph::Venue.new(attributes[:address])
     user.mobile_phone.should == '810000000000'
+    user.installed.should be_true
   end
 
   it 'should support year-hidden birthday' do

data/spec/mock_json/applications/fbgraphsample.json

@@ -4,7 +4,6 @@
     "category": "Games",
     "subcategory": "Virtual World",
     "link": "http:\/\/www.facebook.com\/apps\/application.php?id=134145643294322",
-    "canvas_name": "fbgraphsample",
     "namespace": "fbgraphsample",
     "icon_url": "http:\/\/static.ak.fbcdn.net\/rsrc.php\/v1\/yT\/r\/4QVMqOjUhcd.gif",
     "logo_url": "http:\/\/static.ak.fbcdn.net\/rsrc.php\/v1\/yq\/r\/IobSBNz4FuT.gif",

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

@@ -7,7 +7,6 @@
         "score": 10,
         "application": {
             "name": "gem sample",
-            "canvas_name": "fbgraphsample",
             "namespace": "fbgraphsample",
             "id": "134145643294322"
         }

metadata

@@ -1,141 +1,101 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: fb_graph
-version: !ruby/object:Gem::Version 
-  hash: 13
+version: !ruby/object:Gem::Version
+  version: 2.2.6
   prerelease: 
-  segments: 
-  - 2
-  - 2
-  - 5
-  version: 2.2.5
 platform: ruby
-authors: 
+authors:
 - nov matake
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-05 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-01-23 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: httpclient
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70181080284940 !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: *70181080284940
+- !ruby/object:Gem::Dependency
+  name: rack-oauth2
+  requirement: &70181080283820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 51
-        segments: 
-        - 0
-        - 9
-        - 4
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.9.4
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70181080283820
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70181080283240 !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: *id003
-- !ruby/object:Gem::Dependency 
-  name: rcov
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70181080283240
+- !ruby/object:Gem::Dependency
+  name: cover_me
+  requirement: &70181080282560 !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: *id004
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70181080282560
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70181080281640 !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: *id005
-- !ruby/object:Gem::Dependency 
-  name: webmock
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70181080281640
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: &70181080280640 !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: *id006
-- !ruby/object:Gem::Dependency 
-  name: actionpack
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70181080280640
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: &70181080279640 !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: *id007
+  prerelease: false
+  version_requirements: *70181080279640
 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
@@ -628,38 +588,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.6
+rubygems_version: 1.8.12
 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