fb_graph2 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d528a57c6a1d1e118bbe59cf75db11d833aeecb
-  data.tar.gz: 228de293b5fd4060274d3bcdf1571befd5b14b80
+  metadata.gz: 7000a466f8c2cf12f0fca401eb5fdd1651745392
+  data.tar.gz: 4cc82ba45ae78798767f6f2191e5d9496d790442
 SHA512:
-  metadata.gz: be86b435cffbc372cc7bef1dc88ca93c8e453d04056cce7ee04511cddad54b307e52fbd05b043e6733baa747e02aa70d742f0a37a3671a4e3aadd340ecfd03b9
-  data.tar.gz: 90e6bbfa860cc9ce11f0c1cf04926e01733553ecff8cb23009d6b541ab4115290df89568de57526da8326a59e634d5bcc1d8fad11954fdbea3a876a00ae68927
+  metadata.gz: bd8d385375e635ee8655d78e60dcfb1f1722765f4296b110a7257d6180ffde0a87ae5bd43c445738524885e84e38f16068c76ad707ab1b21088960d5063bec34
+  data.tar.gz: a942c1adad9ecf5b3c29713e61a43805fa82d59060609e6a42aa7d878b302af5423a924ddd105cf8b137ad9e7175af1464e281b79d4e6f2681003e0596b93f2b

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/fb_graph2/auth.rb

@@ -27,7 +27,7 @@ module FbGraph2
         client_auth_method: :body
       )
     rescue Rack::OAuth2::Client::Error => e
-      raise Exception.detect_from_status(e.status).new(e.message)
+      raise Exception.detect(e.status, e.response)
     end
   end
 end

data/lib/fb_graph2/collection.rb

@@ -1,6 +1,6 @@
 module FbGraph2
   class Collection < Array
-    attr_accessor :before, :after, :next, :previous, :order, :total_count
+    attr_accessor :before, :after, :next, :previous, :order, :total_count, :summary
 
     def initialize(collection = [])
       collection = normalize collection
@@ -34,8 +34,7 @@ module FbGraph2
     end
 
     def summarize(summary)
-      # NOTE: notifications edge returns "summary" as a blank Array.
-      summary = Hash(summary)
+      self.summary     = summary
       self.order       = summary.try(:[], :order)
       self.total_count = summary.try(:[], :total_count)
     end

data/spec/fb_graph2/{application_spec.rb → app_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe FbGraph2::User do
+describe FbGraph2::App do
   describe '.app' do
     let(:klass) { FbGraph2::App }
 

data/spec/fb_graph2/auth_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe FbGraph2::Auth do
+  describe '.app' do
+    subject { instance }
+    let(:instance) { FbGraph2::Auth.new 'client_id', 'client_secret' }
+
+    it { should be_a Rack::OAuth2::Client }
+
+    describe 'fb_exchange_token grant' do
+      it do
+        instance.fb_exchange_token = 'short_lived_access_token'
+        access_token = mock_graph :post, 'oauth/access_token', 'token_response', params: {
+          grant_type: 'fb_exchange_token',
+          fb_exchange_token: 'short_lived_access_token',
+          client_id: 'client_id',
+          client_secret: 'client_secret'
+        }, disable_api_versioning: true do
+          instance.access_token!
+        end
+        access_token.should be_instance_of Rack::OAuth2::AccessToken::Legacy
+      end
+    end
+
+    context 'when error occured' do
+      it do
+        expect do
+          mock_graph :post, 'oauth/access_token', 'error/400/191', status: [400, 'Bad Request'], disable_api_versioning: true do
+            instance.authorization_code = 'auth_code'
+            instance.access_token!
+          end
+        end.to raise_error(FbGraph2::Exception) do |e|
+          e.message.should == 'Missing redirect_uri parameter.'
+        end
+      end
+    end
+  end
+end

data/spec/fb_graph2/node_spec.rb

@@ -22,7 +22,7 @@ describe FbGraph2::Node do
         it 'should use api_version globally' do
           expect do
             instance.fetch
-          end.to request_to 'v2.x/identifier', :get, api_version_in_path: true
+          end.to request_to 'v2.x/identifier', :get, disable_api_versioning: true
         end
       end
 
@@ -30,7 +30,7 @@ describe FbGraph2::Node do
         it 'should use api_version globally' do
           expect do
             instance.edge :foo
-          end.to request_to 'v2.x/identifier/foo', :get, api_version_in_path: true
+          end.to request_to 'v2.x/identifier/foo', :get, disable_api_versioning: true
         end
       end
     end
@@ -40,7 +40,7 @@ describe FbGraph2::Node do
         it 'should use api_version locally' do
           expect do
             instance.fetch nil, api_version: 'v2.y'
-          end.to request_to 'v2.y/identifier', :get, api_version_in_path: true
+          end.to request_to 'v2.y/identifier', :get, disable_api_versioning: true
           FbGraph2.api_version.should == @original
         end
       end
@@ -49,7 +49,7 @@ describe FbGraph2::Node do
         it 'should use api_version locally' do
           expect do
             instance.edge :foo, {}, api_version: 'v2.y'
-          end.to request_to 'v2.y/identifier/foo', :get, api_version_in_path: true
+          end.to request_to 'v2.y/identifier/foo', :get, disable_api_versioning: true
           FbGraph2.api_version.should == @original
         end
       end

data/spec/fb_graph2/page_spec.rb

@@ -0,0 +1,61 @@
+require 'spec_helper'
+
+describe FbGraph2::Page do
+  context 'with optional fields' do
+    subject { page }
+    let(:page) do
+      attributes = mock_json 'page/with_optional_fields'
+      FbGraph2::Page.new attributes[:id], attributes
+    end
+
+    describe '#context' do
+      subject { page.context }
+      it { should be_instance_of FbGraph2::Struct::Context::PageContext }
+
+      describe 'friends_who_like' do
+        subject { page.context.friends_who_like }
+        it { should be_instance_of FbGraph2::Collection }
+        it { should be_blank }
+        its(:total_count) { should == 14 }
+        its(:summary) { should include :social_sentence }
+      end
+    end
+
+    describe '#parking' do
+      subject { page.parking }
+      [:street, :lot, :valet].each do |key|
+        its(key) { should == false }
+      end
+    end
+
+    describe '#restaurant_services' do
+      subject { page.restaurant_services }
+      [:kids, :delivery, :catering, :waiter, :outdoor, :takeout].each do |key|
+        its(key) { should == false }
+      end
+      [:groups, :reserve, :walkins].each do |key|
+        its(key) { should == true }
+      end
+    end
+
+    describe '#restaurant_specialties' do
+      subject { page.restaurant_specialties }
+      [:coffee, :drinks, :breakfast, :lunch].each do |key|
+        its(key) { should == false }
+      end
+      [:dinner].each do |key|
+        its(key) { should == true }
+      end
+    end
+
+    describe '#payment_options' do
+      subject { page.payment_options }
+      [:cash_only, :discover].each do |key|
+        its(key) { should == false }
+      end
+      [:amex, :mastercard, :visa].each do |key|
+        its(key) { should == true }
+      end
+    end
+  end
+end

data/spec/mock_json/error/400/191.json

@@ -0,0 +1,7 @@
+{
+  "error": {
+    "message": "Missing redirect_uri parameter.",
+    "type": "OAuthException",
+    "code": 191
+  }
+}

data/spec/mock_json/page/blocked.json

@@ -1,11 +1,9 @@
 {
-  "data": [
-    {
-      "name": "Jr Nov",
-      "id": "1575327134"
-    }
-  ],
+  "data": [{
+    "name": "Jr Nov",
+    "id": "1575327134"
+  }],
   "paging": {
     "next": "https://graph.facebook.com/v2.0/117513961602338/blocked?limit=5000&offset=5000&__after_id=enc_AewU3hSo5zqbS5KA0i0lJYmPrLn57SMSo645aYB7BTPg1PSawPvlM9mRI_3Y_dcpeDI"
   }
-}
+}

data/spec/mock_json/page/with_optional_fields.json

@@ -0,0 +1,42 @@
+{
+  "context": {
+    "friends_who_like": {
+      "data": [],
+      "summary": {
+        "social_sentence": "14 of your friends like this.",
+        "total_count": 14
+      }
+    }
+  },
+  "parking": {
+    "lot": 0,
+    "street": 0,
+    "valet": 0
+  },
+  "restaurant_services": {
+    "delivery": 0,
+    "catering": 0,
+    "groups": 1,
+    "kids": 0,
+    "outdoor": 0,
+    "reserve": 1,
+    "takeout": 0,
+    "waiter": 0,
+    "walkins": 1
+  },
+  "restaurant_specialties": {
+    "breakfast": 0,
+    "coffee": 0,
+    "dinner": 1,
+    "drinks": 0,
+    "lunch": 0
+  },
+  "payment_options": {
+    "amex": 1,
+    "cash_only": 0,
+    "discover": 0,
+    "mastercard": 1,
+    "visa": 1
+  },
+  "id": "139296106095829"
+}

data/spec/mock_json/token_response.json

@@ -0,0 +1 @@
+access_token=access_token&expires=5183975

data/spec/mock_json/user/notifications.json

@@ -1,111 +1,45 @@
 {
   "data": [{
-    "id": "notif_579612276_360745635",
+    "id": "notif_579612276_373456430",
     "from": {
-      "id": "10203663293120616",
-      "name": "Tatsuya Kurosaka"
+      "id": "583017165143721",
+      "name": "Akira  Otaishi"
     },
     "to": {
       "id": "579612276",
       "name": "Nov Matake"
     },
-    "created_time": "2014-06-03T03:20:28+0000",
-    "updated_time": "2014-06-03T03:54:10+0000",
-    "title": "Tatsuya Kurosaka posted in クロサカさんの仕事部屋.",
-    "link": "http://www.facebook.com/groups/597190250369020/632381620183216/",
+    "created_time": "2014-08-27T18:48:07+0000",
+    "updated_time": "2014-08-27T18:48:07+0000",
+    "title": "Akira  Otaishi invited you to his event あんしんかんcafe vol.4 ～ネット選挙をめぐるビジネス＆セキュリティ～.",
+    "link": "http://www.facebook.com/events/339815099528481/",
     "application": {
-      "name": "Groups",
-      "id": "2361831622"
-    },
-    "unread": 1,
-    "object": {
-      "name": "クロサカさんの仕事部屋",
-      "id": "597190250369020"
-    }
-  }, {
-    "id": "notif_579612276_360668511",
-    "from": {
-      "id": "824378870925480",
-      "name": "ちゃちゃき まさゆき"
-    },
-    "to": {
-      "id": "579612276",
-      "name": "Nov Matake"
-    },
-    "created_time": "2014-06-02T14:57:39+0000",
-    "updated_time": "2014-06-02T14:57:39+0000",
-    "title": "ちゃちゃき まさゆき posted in DevLOVE Park: \"こんにちは。..\"",
-    "link": "http://www.facebook.com/groups/devlovepark/763062600400231/",
-    "application": {
-      "name": "Groups",
-      "id": "2361831622"
+      "name": "Events",
+      "id": "141157392619610"
     },
     "unread": 1
   }, {
-    "id": "notif_579612276_360654609",
+    "id": "notif_579612276_373364015",
     "from": {
-      "id": "689134294485152",
-      "name": "Shunya Iriki"
+      "id": "631020523647805",
+      "name": "Shota Kawaminami"
     },
     "to": {
       "id": "579612276",
       "name": "Nov Matake"
     },
-    "created_time": "2014-06-02T12:46:26+0000",
-    "updated_time": "2014-06-02T12:46:26+0000",
-    "title": "Shunya Iriki shared your link.",
-    "link": "http://www.facebook.com/shunya.iriki/posts/695439827187932",
+    "created_time": "2014-08-27T05:28:07+0000",
+    "updated_time": "2014-08-27T05:28:07+0000",
+    "title": "Shota Kawaminami shared your link.",
+    "link": "http://www.facebook.com/shota.kawaminami/posts/700333850049805",
     "application": {
       "name": "Links",
       "id": "2309869772"
     },
-    "unread": 1,
-    "object": {
-      "id": "689134294485152_695439827187932",
-      "from": {
-        "id": "689134294485152",
-        "name": "Shunya Iriki"
-      },
-      "story": "Shunya Iriki shared a link.",
-      "story_tags": {
-        "0": [{
-          "id": "689134294485152",
-          "name": "Shunya Iriki",
-          "offset": 0,
-          "length": 12,
-          "type": "user"
-        }]
-      },
-      "picture": "https://fbexternal-a.akamaihd.net/safe_image.php?d=AQCtEdPdezKIoUxo&w=154&h=154&url=http%3A%2F%2Fi.yimg.jp%2Fi%2Fdocs%2Frelease%2Ffbicon.jpg",
-      "link": "http://docs.yahoo.co.jp/docs/info/terms/chapter1.html#cf2nd",
-      "name": "ヤフー株式会社 - サービス利用規約 第1編 基本ガイドライン",
-      "caption": "docs.yahoo.co.jp",
-      "description": "Yahoo! JAPANのサービス利用規約、第1編 基本ガイドラインは当社のサービスをご利用になるすべての方に共通して適用されます。",
-      "icon": "https://fbstatic-a.akamaihd.net/rsrc.php/v2/yD/r/aS8ecmYRys0.gif",
-      "actions": [{
-        "name": "Comment",
-        "link": "https://www.facebook.com/100001657627507/posts/695439827187932"
-      }, {
-        "name": "Like",
-        "link": "https://www.facebook.com/100001657627507/posts/695439827187932"
-      }],
-      "privacy": {
-        "value": ""
-      },
-      "type": "link",
-      "status_type": "shared_story",
-      "application": {
-        "name": "Facebook for iPhone",
-        "namespace": "fbiphone",
-        "id": "6628568379"
-      },
-      "created_time": "2014-06-02T12:46:26+0000",
-      "updated_time": "2014-06-02T12:46:26+0000"
-    }
+    "unread": 1
   }],
   "paging": {
-    "previous": "https://graph.facebook.com/v2.0/579612276/notifications?limit=5000&since=1401765628&__paging_token=enc_Aeym53-nXWoBenYHHSSltWVXrHRbkZ5EGNZqVaacQApfA_a2VF0iAvQcjVx-jwo_UTLcO4e3kI7LJdGCggqD2OBS",
-    "next": "https://graph.facebook.com/v2.0/579612276/notifications?limit=5000&until=1401236040&__paging_token=enc_AexWonNPHkycgkJiATXUJ_5MzIfU8dVfjvWB0MxLEXkSEAByVh8rT8gqpKb29rj5O2TpyohRzt0iyg-Tcu6U7ImO"
-  },
-  "summary": []
+    "previous": "https://graph.facebook.com/v2.1/579612276/notifications?limit=5000&since=1409272999&__paging_token=enc_Aewp7NBZ5fIN12MTyeJziuFNDceCydTGsvVqg-hwrjPZBCnWi-W_fjsS1bNaXkZ9K-tS8wFhFQw4pOajivn20h3c",
+    "next": "https://graph.facebook.com/v2.1/579612276/notifications?limit=5000&until=1408919679&__paging_token=enc_Aey6fAeKsVGCSCKsplC0g1FGjchGgmGajndTVwb-tzE0q7A8nT6C_1iVdwBRzXWdt3zKHh3yOjq6caxNtsTrD58s"
+  }
 }

data/spec/spec_helper/mock_graph.rb

@@ -14,7 +14,7 @@ module MockGraph
       response = yield
       a_request(
         method,
-        endpoint_for(path)
+        endpoint_for(path, options)
       ).with(
         request_for(method, options)
       ).should have_been_made.once
@@ -40,7 +40,7 @@ module MockGraph
   private
 
   def endpoint_for(path, options = {})
-    api_version = unless options[:api_version_in_path]
+    api_version = unless options[:disable_api_versioning]
       options[:api_version] || FbGraph2.api_version
     end
     File.join FbGraph2.root_url, api_version.to_s, path

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fb_graph2
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - nov matake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-20 00:00:00.000000000 Z
+date: 2014-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -283,7 +283,8 @@ files:
 - lib/fb_graph2/user.rb
 - lib/fb_graph2/util.rb
 - lib/fb_graph2/video.rb
-- spec/fb_graph2/application_spec.rb
+- spec/fb_graph2/app_spec.rb
+- spec/fb_graph2/auth_spec.rb
 - spec/fb_graph2/collection_spec.rb
 - spec/fb_graph2/edge/accounts_spec.rb
 - spec/fb_graph2/edge/achievements_spec.rb
@@ -324,6 +325,7 @@ files:
 - spec/fb_graph2/edge_spec.rb
 - spec/fb_graph2/node_spec.rb
 - spec/fb_graph2/node_subclass_spec.rb
+- spec/fb_graph2/page_spec.rb
 - spec/fb_graph2/request_filter/authenticator_spec.rb
 - spec/fb_graph2/request_filter/debugger_spec.rb
 - spec/fb_graph2/user_spec.rb
@@ -333,6 +335,7 @@ files:
 - spec/mock_json/app/subscriptions.json
 - spec/mock_json/app/test_users.json
 - spec/mock_json/blank_collection.json
+- spec/mock_json/error/400/191.json
 - spec/mock_json/error/400/2500.json
 - spec/mock_json/error/invalid_format.json
 - spec/mock_json/page/admins.json
@@ -340,6 +343,7 @@ files:
 - spec/mock_json/page/blocked.json
 - spec/mock_json/page/milestones.json
 - spec/mock_json/page/promotable_posts.json
+- spec/mock_json/page/with_optional_fields.json
 - spec/mock_json/post/comments.json
 - spec/mock_json/post/comments_with_summary.json
 - spec/mock_json/post/liked_and_commented.json
@@ -347,6 +351,7 @@ files:
 - spec/mock_json/post/shared_posts.json
 - spec/mock_json/success_true.json
 - spec/mock_json/success_with_id.json
+- spec/mock_json/token_response.json
 - spec/mock_json/true.json
 - spec/mock_json/user/accounts.json
 - spec/mock_json/user/achievements.json