fb_graph 2.7.13 → 2.7.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 489cd8d4924f39bc8f9b12b22dca02cf4c2c98e4
-  data.tar.gz: 82b991866315bd5b8a328ea2626845d8acfdc39c
+  metadata.gz: 750927031ebf79366752c4d160d4325df2494864
+  data.tar.gz: 2856aaea697629e81c13d335614ddfab5fd02bc9
 SHA512:
-  metadata.gz: fb07775401d98bc9e862f62f61c70cd5045ae797da52a08b3ae783ed6e4bd352ff3d2b39a8d731d2c1c695565449f9ddd6333b2f263de09249ad7ec0399cb767
-  data.tar.gz: d2e6d6ab8d413053382b3a3a57db1026d8cb7eb5289e9980a89ac46d31a47faa7f2cf0ab262c5acc453f7136685a2873ba9e90e6055335d00cf96ae730d0af32
+  metadata.gz: 38a2f8f43c5821fa9e2bb7de372e1dbf736a4adf4f88ec102ff512278c390c11bb37691d58a902780ae44758c8568fab478050a402a39b9047eeac5495248dba
+  data.tar.gz: fe7f26f2efd98cb43b924e4e3bddf810fc0c733e17c5a3b7bd2e76b923dffa3ada434e702325275291b1d4d9381a012cef45c74331d15aeb5b53ab70ecc7f953

data/VERSION

@@ -1 +1 @@
-2.7.13
+2.7.14

data/fb_graph.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "multi_json", ">= 1.3"
   s.add_development_dependency "rake", ">= 0.8"
   s.add_development_dependency "simplecov"
-  s.add_development_dependency "rspec", ">= 2"
-  s.add_development_dependency "fb_graph-mock", ">= 1.0.2"
+  s.add_development_dependency "rspec", "< 2.99"
+  s.add_development_dependency "fb_graph-mock", ">= 1.0.3"
   s.add_development_dependency "actionpack", ">= 3.0.6"
 end

data/lib/fb_graph.rb

@@ -9,7 +9,27 @@ module FbGraph
   VERSION = ::File.read(
     ::File.join(::File.dirname(__FILE__), '../VERSION')
   ).delete("\n\r")
-  ROOT_URL = "https://graph.facebook.com"
+  ROOT_URL = 'https://graph.facebook.com'
+
+  def self.v1!
+    @v2 = false
+  end
+  def self.v2!
+    @v2 = true
+  end
+  def self.v1?
+    !v2?
+  end
+  def self.v2?
+    !!@v2
+  end
+  def self.root_url
+    if self.v2?
+      File.join(ROOT_URL, 'v2.0')
+    else
+      ROOT_URL
+    end
+  end
 
   def self.logger
     @@logger

data/lib/fb_graph/auth.rb

@@ -8,7 +8,7 @@ module FbGraph
       @client = Rack::OAuth2::Client.new(
         :identifier             => client_id,
         :secret                 => client_secret,
-        :host                   => URI.parse(ROOT_URL).host,
+        :host                   => URI.parse(FbGraph.root_url).host,
         :authorization_endpoint => '/oauth/authorize',
         :token_endpoint         => '/oauth/access_token',
         :redirect_uri           => options[:redirect_uri]

data/lib/fb_graph/connections/permissions.rb

@@ -2,10 +2,17 @@ module FbGraph
   module Connections
     module Permissions
       def permissions(options = {})
-        self.connection(:permissions, options).first.try(:inject, []) do |arr, (key, value)|
-          arr << key.to_sym if value.to_i == 1
-          arr
-        end || []
+        if FbGraph.v2?
+          self.connection(:permissions, options).try(:inject, []) do |arr, entry|
+            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
       end
 
       def revoke!(permission = nil, options = {})

data/lib/fb_graph/node.rb

@@ -8,7 +8,7 @@ module FbGraph
 
     def initialize(identifier, attributes = {})
       @identifier         = identifier
-      @endpoint           = File.join(ROOT_URL, identifier.to_s)
+      @endpoint           = File.join(FbGraph.root_url, identifier.to_s)
       @access_token       = attributes[:access_token]
       @raw_attributes     = attributes
       @cached_collections = {}

data/spec/fb_graph/album_spec.rb

@@ -69,14 +69,14 @@ describe FbGraph::Album do
 
     context 'when access token is given' do
       before { album.access_token = 'access_token' }
-      it { should == File.join(FbGraph::ROOT_URL, '12345/picture?access_token=access_token') }
+      it { should == File.join(FbGraph.root_url, '12345/picture?access_token=access_token') }
       it 'should support size' do
-        album.picture(:small).should == File.join(FbGraph::ROOT_URL, '12345/picture?type=small&access_token=access_token')
+        album.picture(:small).should == File.join(FbGraph.root_url, '12345/picture?type=small&access_token=access_token')
       end
     end
 
     context 'when no access token' do
-      it { should == File.join(FbGraph::ROOT_URL, '12345/picture') }
+      it { should == File.join(FbGraph.root_url, '12345/picture') }
     end
 
     context 'when no redirect' do

data/spec/fb_graph/connections/permissions_spec.rb

@@ -2,23 +2,65 @@ require 'spec_helper'
 
 describe FbGraph::Connections::Permissions do
   describe '#permissions' do
-    let :permissions do
-      mock_graph :get, 'me/permissions', 'users/permissions/me_private', :access_token => 'access_token' do
-        FbGraph::User.me('access_token').permissions
+
+    context 'v1 API' do
+      let :permissions do
+        mock_graph :get, 'me/permissions', 'users/permissions/me_private', :access_token => 'access_token' do
+          FbGraph::User.me('access_token').permissions
+        end
+      end
+
+      it 'should be an Array of Symbol' do
+        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 Symbol' do
-      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, '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_graph :get, 'me/permissions', 'users/permissions/blank', :access_token => 'access_token' do
+    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
+
+      before(:each) do
+        FbGraph.v2!
+      end
+
+      after(:each) do
+        FbGraph.v1!
+      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
+        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 == []
         end

data/spec/fb_graph/connections/picture_spec.rb

@@ -4,30 +4,30 @@ describe FbGraph::Connections::Picture do
   describe '#picture' do
     context 'when included by FbGraph::User' do
       it 'should return image url' do
-        FbGraph::User.new('matake').picture.should == File.join(FbGraph::ROOT_URL, 'matake/picture')
+        FbGraph::User.new('matake').picture.should == File.join(FbGraph.root_url, 'matake/picture')
       end
 
       it 'should support size option' do
         [:square, :small, :normal, :large].each do |size|
-          FbGraph::User.new('matake').picture(size).should == File.join(FbGraph::ROOT_URL, "matake/picture?type=#{size}")
-          FbGraph::User.new('matake').picture(:type => size).should == File.join(FbGraph::ROOT_URL, "matake/picture?type=#{size}")
+          FbGraph::User.new('matake').picture(size).should == File.join(FbGraph.root_url, "matake/picture?type=#{size}")
+          FbGraph::User.new('matake').picture(:type => size).should == File.join(FbGraph.root_url, "matake/picture?type=#{size}")
         end
       end
 
       it 'should support width option' do
-        FbGraph::User.new('matake').picture(:width => 13).should == File.join(FbGraph::ROOT_URL, "matake/picture?width=13")
+        FbGraph::User.new('matake').picture(:width => 13).should == File.join(FbGraph.root_url, "matake/picture?width=13")
       end
 
       it 'should support height option' do
-        FbGraph::User.new('matake').picture(:height => 37).should == File.join(FbGraph::ROOT_URL, "matake/picture?height=37")
+        FbGraph::User.new('matake').picture(:height => 37).should == File.join(FbGraph.root_url, "matake/picture?height=37")
       end
 
       it 'should support width and height options at the same time' do
         # Because we can't be sure of order of arguments and order by itself doesn't matter
         FbGraph::User.new('matake').picture(:width => 13, :height => 37).should satisfy { |uri|
           [
-            File.join(FbGraph::ROOT_URL, "matake/picture?width=13&height=37"),
-            File.join(FbGraph::ROOT_URL, "matake/picture?height=37&width=13")
+            File.join(FbGraph.root_url, "matake/picture?width=13&height=37"),
+            File.join(FbGraph.root_url, "matake/picture?height=37&width=13")
           ].include? uri
         }
       end
@@ -46,29 +46,29 @@ describe FbGraph::Connections::Picture do
 
     context 'when included by FbGraph::Page' do
       it 'should return image url' do
-        FbGraph::Page.new('platform').picture.should == File.join(FbGraph::ROOT_URL, 'platform/picture')
+        FbGraph::Page.new('platform').picture.should == File.join(FbGraph.root_url, 'platform/picture')
       end
 
       it 'should support size option' do
         [:square, :small, :normal, :large].each do |size|
-          FbGraph::Page.new('platform').picture(size).should == File.join(FbGraph::ROOT_URL, "platform/picture?type=#{size}")
-          FbGraph::Page.new('platform').picture(:type => size).should == File.join(FbGraph::ROOT_URL, "platform/picture?type=#{size}")
+          FbGraph::Page.new('platform').picture(size).should == File.join(FbGraph.root_url, "platform/picture?type=#{size}")
+          FbGraph::Page.new('platform').picture(:type => size).should == File.join(FbGraph.root_url, "platform/picture?type=#{size}")
         end
       end
 
       it 'should support width option' do
-        FbGraph::Page.new('platform').picture(:width => 13).should == File.join(FbGraph::ROOT_URL, "platform/picture?width=13")
+        FbGraph::Page.new('platform').picture(:width => 13).should == File.join(FbGraph.root_url, "platform/picture?width=13")
       end
 
       it 'should support height option' do
-        FbGraph::Page.new('platform').picture(:height => 37).should == File.join(FbGraph::ROOT_URL, "platform/picture?height=37")
+        FbGraph::Page.new('platform').picture(:height => 37).should == File.join(FbGraph.root_url, "platform/picture?height=37")
       end
 
       it 'should support width and height options at the same time' do
         FbGraph::Page.new('platform').picture(:width => 13, :height => 37).should satisfy { |uri|
           [
-            File.join(FbGraph::ROOT_URL, "platform/picture?width=13&height=37"),
-            File.join(FbGraph::ROOT_URL, "platform/picture?height=37&width=13")
+            File.join(FbGraph.root_url, "platform/picture?width=13&height=37"),
+            File.join(FbGraph.root_url, "platform/picture?height=37&width=13")
           ].include? uri
         }
       end

data/spec/fb_graph/node_spec.rb

@@ -4,7 +4,7 @@ describe FbGraph::Node do
 
   describe '.new' do
     it 'should setup endpoint' do
-      FbGraph::Node.new('matake').endpoint.should == File.join(FbGraph::ROOT_URL, 'matake')
+      FbGraph::Node.new('matake').endpoint.should == File.join(FbGraph.root_url, 'matake')
     end
 
     it 'should support access_token option' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fb_graph
 version: !ruby/object:Gem::Version
-  version: 2.7.13
+  version: 2.7.14
 platform: ruby
 authors:
 - nov matake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-17 00:00:00.000000000 Z
+date: 2014-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -98,30 +98,30 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '2.99'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '2.99'
 - !ruby/object:Gem::Dependency
   name: fb_graph-mock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement