fb_graph 2.7.14 → 2.7.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 750927031ebf79366752c4d160d4325df2494864
-  data.tar.gz: 2856aaea697629e81c13d335614ddfab5fd02bc9
+  metadata.gz: 368ca9c527e97ab552c51958ff0614ea86dd0d8b
+  data.tar.gz: 5ff8b37a4ea646ccb4a912848ba0cf7e782fee28
 SHA512:
-  metadata.gz: 38a2f8f43c5821fa9e2bb7de372e1dbf736a4adf4f88ec102ff512278c390c11bb37691d58a902780ae44758c8568fab478050a402a39b9047eeac5495248dba
-  data.tar.gz: fe7f26f2efd98cb43b924e4e3bddf810fc0c733e17c5a3b7bd2e76b923dffa3ada434e702325275291b1d4d9381a012cef45c74331d15aeb5b53ab70ecc7f953
+  metadata.gz: 6ad52e162c283b9e57293a7d351fcd6e5ff8af8896cae381bc3e55674221fda4607d5c7a349b53f61765c2284647e7a8cba091c64c37aea5b72cf0ef7be560e0
+  data.tar.gz: eda16eacf3f3aeac3dc05e038a45e26e6517c6eb5c31bf1fa19f7d313a9f978b641f4eeb391a75fe2f1bcbda56fe672e48de83f1f37c8c1d4795db688ca837bc

data/README.rdoc

@@ -15,6 +15,13 @@ A full-stack Facebook Graph API wrapper in Ruby.
 * Subscribe Update Info (https://www.facebook.com/FbGraph)
 * Q&A on Google Groups (http://groups.google.com/group/fb_graph)
 
+== Graph API v2.0
+
+FbGraph is basically developed for v1.0, and could be buggy for v2.0.
+
+Along with adding v2 support to this gem, I also started to develop fb_graph2 as Graph API v2.0 client library.
+https://github.com/nov/fb_graph2
+
 == Examples
 
 Now FbGraph supports all objects listed here: http://developers.facebook.com/docs/reference/api/

data/VERSION

@@ -1 +1 @@
-2.7.14
+2.7.15

data/lib/fb_graph/connections/permissions.rb

@@ -2,17 +2,18 @@ module FbGraph
   module Connections
     module Permissions
       def permissions(options = {})
-        if FbGraph.v2?
-          self.connection(:permissions, options).try(:inject, []) do |arr, entry|
+        self.connection(:permissions, options).try(:inject, []) do |arr, entry|
+          if entry.include? :status
+            # v2.0
             arr << entry[:permission].to_sym if entry[:status] == 'granted'
-            arr
-          end || []
-        else
-          self.connection(:permissions, options).first.try(:inject, []) do |arr, (key, value)|
-            arr << key.to_sym if value.to_i == 1
-            arr
-          end || []
-        end
+          else
+            # v1.0
+            entry.each do |key, value|
+              arr << key.to_sym if value.to_i == 1
+            end
+          end
+          arr
+        end || []
       end
 
       def revoke!(permission = nil, options = {})

data/lib/fb_graph/node.rb

@@ -90,7 +90,11 @@ module FbGraph
     alias_method :cache_collection, :cache_collections
 
     def build_endpoint(params = {})
-      File.join([self.endpoint, params.delete(:connection), params.delete(:connection_scope)].compact.collect(&:to_s))
+      _endpoint_ = URI.parse self.endpoint
+      if api_version = params.delete(:api_version)
+        _endpoint_.path = File.join('/', api_version, _endpoint_.path)
+      end
+      File.join([_endpoint_.to_s, params.delete(:connection), params.delete(:connection_scope)].compact.collect(&:to_s))
     end
 
     def build_params(params)

data/spec/fb_graph/connections/permissions_spec.rb

@@ -29,40 +29,46 @@ describe FbGraph::Connections::Permissions do
     end
 
     context 'v2 API' do
-      def mock_v2_graph(response)
-        stub_request(
-          :get,
-          File.join(FbGraph::ROOT_URL, 'v2.0', 'me', 'permissions')
-        ).with(
-          request_for(:get, { :params => { :access_token => 'access_token' } })
-        ).to_return(
-          { body: response }
-        )
-      end
+      context 'using global config' do
+        before(:each) do
+          FbGraph.v2!
+        end
 
-      before(:each) do
-        FbGraph.v2!
-      end
+        after(:each) do
+          FbGraph.v1!
+        end
 
-      after(:each) do
-        FbGraph.v1!
-      end
+        it 'should be an Array of Hash' do
+          mock_graph :get, 'v2.0/me/permissions', 'users/permissions/v2', :access_token => 'access_token' do
+            permissions = FbGraph::User.me('access_token').permissions
+            permissions.should be_instance_of Array
+            permissions.should_not be_blank
+            permissions.each do |permission|
+              permission.should be_instance_of Symbol
+            end
+          end
+        end
 
-      it 'should be an Array of Hash' do
-        mock_v2_graph("{\"data\":[{\"permission\":\"installed\",\"status\":\"granted\"},{\"permission\": \"public_profile\",\"status\": \"granted\"}]}")
-        permissions = FbGraph::User.me('access_token').permissions
-        permissions.should be_instance_of Array
-        permissions.should_not be_blank
-        permissions.each do |permission|
-          permission.should be_instance_of Symbol
+        context 'when blank' do
+          it 'should return blank array' do
+            mock_graph :get, 'v2.0/me/permissions', 'users/permissions/blank', :access_token => 'access_token' do
+              permissions = FbGraph::User.me('access_token').permissions
+              permissions.should == []
+            end
+          end
         end
       end
 
-      context 'when blank' do
-        it 'should return blank array' do
-          mock_v2_graph("{\"data\":[]}")
-          permissions = FbGraph::User.me('access_token').permissions
-          permissions.should == []
+      context 'using local config' do
+        it 'should be an Array of Hash' do
+          mock_graph :get, 'v2.0/me/permissions', 'users/permissions/v2', :access_token => 'access_token' do
+            permissions = FbGraph::User.me('access_token').permissions(:api_version => 'v2.0')
+            permissions.should be_instance_of Array
+            permissions.should_not be_blank
+            permissions.each do |permission|
+              permission.should be_instance_of Symbol
+            end
+          end
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fb_graph
 version: !ruby/object:Gem::Version
-  version: 2.7.14
+  version: 2.7.15
 platform: ruby
 authors:
 - nov matake