fb_graph2 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 431d6cb04562b1022f10b4040fea986b10e4404b
-  data.tar.gz: d18110c880b7db29ccfe344d75a489bfa341c10b
+  metadata.gz: 5dff2abb98ac745ab5794798b2464f545f264310
+  data.tar.gz: c1e1bf71b981067e42a5b199c982404126456c74
 SHA512:
-  metadata.gz: cf83c95e279e359db21b00f997dc97bc9f179b17d6cd221053e12898edfaa709dfd13ae90d7887a2ee59005a58e02f118bec5741c8cb148965818e6e15da892e
-  data.tar.gz: 383aca0fff54f11d75ba24f10f289d2bc92ff379b509a7bf47793e8e9c06be0b8ea91ec9a445dbe66676009d867370c66feb7c5678d1bcfee7186e3622a9723f
+  metadata.gz: 3ea181a68ed183e4845afe6919bb095551242bb1553e8511c75a73cf7e397a71c10efe341f77ee3e81c2e935dde246eba17184ea84360a6e731e0afbaadbe128
+  data.tar.gz: 13a8b6b2050e946d42af1c58a523e3f6cf49abb83a89b302e2493eecc2d0e02ea6bbaf5ba2a3cc3b904775efa0a3f751c4181cc602a6292b5c842c989a5c9084

data/VERSION

@@ -1 +1 @@
-0.7.4
+0.7.5

data/lib/fb_graph2.rb

@@ -2,6 +2,7 @@ require 'active_support'
 require 'active_support/core_ext'
 require 'active_support/concern'
 require 'rack/oauth2'
+require 'patch/rack/oauth2/util'
 
 module FbGraph2
   mattr_accessor :root_url, :api_version, :gem_version, :logger, :debugging, :_http_config_, :object_classes

data/lib/fb_graph2/auth/signed_request.rb

@@ -27,6 +27,7 @@ module FbGraph2
 
       def instantiate(client)
         if payload[:code].present?
+          client.redirect_uri ||= ''
           client.authorization_code = payload[:code]
           self.access_token = client.access_token!
         else

data/lib/fb_graph2/edge/permissions.rb

@@ -7,6 +7,10 @@ module FbGraph2
           Struct::Permission.new permission
         end
       end
+
+      def revoke!(permission = nil, params = {})
+        destroy params, edge: :permissions, edge_scope: permission
+      end
     end
   end
 end

data/lib/fb_graph2/edge/picture.rb

@@ -1,10 +1,21 @@
 module FbGraph2
   class Edge
     module Picture
+      def assign(attributes)
+        super
+        if attributes.include? :picture
+          @_cached_picture = attributes[:picture]
+        end
+      end
+
       def picture(*args)
         params = args.extract_options!
         params[:type] = args.first if args.first
-        picture = self.get params.merge(redirect: false), edge: :picture
+        picture = if @_cached_picture.present? && params.blank?
+          @_cached_picture
+        else
+          self.get params.merge(redirect: false), edge: :picture
+        end
         Struct::Picture.new picture[:data]
       end
     end

data/lib/fb_graph2/struct/permission.rb

@@ -4,6 +4,14 @@ module FbGraph2
       register_attributes(
         raw: [:permission, :status]
       )
+
+      def as_identifier
+        permission
+      end
+
+      def revokable?
+        !['public_profile'].include? permission
+      end
     end
   end
 end

data/lib/fb_graph2/util.rb

@@ -5,6 +5,8 @@ module FbGraph2
     def as_identifier(object)
       if object.respond_to? :id
         object.id
+      elsif object.respond_to? :as_identifier
+        object.as_identifier
       else
         object
       end

data/lib/patch/rack/oauth2/util.rb

@@ -0,0 +1,14 @@
+# NOTE: Authorization code given via FB JS SDK needs blank string as redirect_uri
+module Rack::OAuth2::Util
+  class << self
+    def compact_hash_with_blank_redirect_uri(hash)
+      original_redirect_uri = hash[:redirect_uri]
+      result = compact_hash_without_blank_redirect_uri hash
+      if original_redirect_uri
+        result[:redirect_uri] ||= original_redirect_uri
+      end
+      result
+    end
+    alias_method_chain :compact_hash, :blank_redirect_uri
+  end
+end

data/spec/fb_graph2/edge/picture_spec.rb

@@ -4,6 +4,7 @@ describe FbGraph2::Edge::Picture do
   context 'included in User' do
     describe '#picture' do
       let(:me) { FbGraph2::User.me('token') }
+
       it do
         mock_graph :get, 'me/picture', 'user/picture', access_token: 'token', params: {
           redirect: false
@@ -11,6 +12,35 @@ describe FbGraph2::Edge::Picture do
           me.picture
         end.should be_instance_of FbGraph2::Struct::Picture
       end
+
+      context 'when cached' do
+        let(:me_with_picture) do
+          mock_graph :get, 'me', 'user/with_picture', access_token: 'token', params: {
+            fields: 'picture'
+          } do
+            me.fetch fields: 'picture'
+          end
+        end
+
+        context 'with option params' do
+          it 'should not use cache' do
+            mock_graph :get, '579612276/picture', 'user/picture', access_token: 'token', params: {
+              redirect: false,
+              type: 'square'
+            } do
+              me_with_picture.picture :square
+            end
+          end
+        end
+
+        context 'without option params' do
+          it 'should use cache' do
+            expect do
+              me_with_picture.picture
+            end.not_to request_to '579612276/picture'
+          end
+        end
+      end
     end
   end
 end

data/spec/fb_graph2/util_spec.rb

@@ -15,5 +15,13 @@ describe FbGraph2::Util do
         FbGraph2::Util.as_identifier('object_id').should == 'object_id'
       end
     end
+
+    context 'when FbGraph2::Struct::Permission given' do
+      it do
+        FbGraph2::Util.as_identifier(
+          FbGraph2::Struct::Permission.new(permission: 'permission_name', granted: true)
+        ).should == 'permission_name'
+      end
+    end
   end
 end

data/spec/mock_json/user/with_picture.json

@@ -0,0 +1,9 @@
+{
+  "picture": {
+    "data": {
+      "is_silhouette": false,
+      "url": "https://scontent.xx.fbcdn.net/hprofile-xaf1/v/l/t1.0-1/c47.47.587.587/s50x50/480315_10151515065267277_840234863_n.jpg?oh=6935fc39f4807b6f30c741d721ce766e&oe=56639F81"
+    }
+  },
+  "id": "579612276"
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fb_graph2
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors:
 - nov matake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-21 00:00:00.000000000 Z
+date: 2015-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -319,6 +319,7 @@ files:
 - lib/fb_graph2/user.rb
 - lib/fb_graph2/util.rb
 - lib/fb_graph2/video.rb
+- lib/patch/rack/oauth2/util.rb
 - spec/fb_graph2/app_link_host_spec.rb
 - spec/fb_graph2/app_spec.rb
 - spec/fb_graph2/auth_spec.rb
@@ -469,6 +470,7 @@ files:
 - spec/mock_json/user/taggable_friends.json
 - spec/mock_json/user/television.json
 - spec/mock_json/user/videos.json
+- spec/mock_json/user/with_picture.json
 - spec/spec_helper.rb
 - spec/spec_helper/mock_graph.rb
 homepage: https://github.com/nov/fb_graph2
@@ -491,7 +493,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Facebook Graph API v2.x Wrapper in Ruby