fb_graph 2.5.5 → 2.5.6

data/.gitignore

@@ -22,3 +22,4 @@ rdoc
 pkg
 
 ## PROJECT::SPECIFIC
+.rbenv-version

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fb_graph (2.5.3)
+    fb_graph (2.5.6)
       httpclient (>= 2.2.0.2)
       json
       rack-oauth2 (>= 0.14.4)
@@ -28,7 +28,7 @@ GEM
       multi_json (~> 1.0)
     addressable (2.3.2)
     attr_required (0.0.5)
-    builder (3.0.3)
+    builder (3.0.4)
     configatron (2.9.1)
       yamler (>= 0.1.0)
     cover_me (1.2.0)
@@ -54,7 +54,7 @@ GEM
       i18n
       multi_json (>= 1.3.6)
       rack (>= 1.1)
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
     rake (0.9.2.2)
     rspec (2.11.0)
@@ -64,14 +64,14 @@ GEM
     rspec-core (2.11.1)
     rspec-expectations (2.11.3)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.2)
+    rspec-mocks (2.11.3)
     sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     tilt (1.3.3)
-    tzinfo (0.3.33)
-    webmock (1.8.10)
+    tzinfo (0.3.34)
+    webmock (1.8.11)
       addressable (>= 2.2.7)
       crack (>= 0.1.7)
     yamler (0.1.0)

data/VERSION

@@ -1 +1 @@
-2.5.5
+2.5.6

data/lib/fb_graph/album.rb

@@ -42,11 +42,17 @@ module FbGraph
       cache_collection attributes, :comments
     end
 
-    def picture_with_access_token(size = nil)
-      raise Unauthorized.new('Album picture connection requires an access token') unless self.access_token
-      _endpoint_ = URI.parse picture_without_access_token(size)
-      _endpoint_.query = [_endpoint_.query, {:access_token => self.access_token.to_s}.to_query].compact.join('&')
-      _endpoint_.to_s
+    def picture_with_access_token(options_or_size = {})
+      response = picture_without_access_token options_or_size
+      if response.is_a?(FbGraph::Picture)
+        response
+      else
+        _endpoint_ = URI.parse response
+        if self.access_token
+          _endpoint_.query = [_endpoint_.query, {:access_token => self.access_token.to_s}.to_query].compact.join('&')
+        end
+        _endpoint_.to_s
+      end
     end
     alias_method_chain :picture, :access_token
   end

data/lib/fb_graph/connections/picture.rb

@@ -1,12 +1,32 @@
 module FbGraph
   module Connections
     module Picture
-      def picture(size = nil)
-        _endpoint_ = "#{self.endpoint}/picture"
-        if size
-          _endpoint_ += "?type=#{size}"
+      # User can specify size in two ways: 
+      # 1. By type: square | small | normal | large
+      # 2. By width and height, so facebook return the _closest_
+      #    match to the size you specified, if only one parameter
+      #    is set, then facebook will return square image
+      # See: https://developers.facebook.com/docs/reference/api/user/
+      def picture(options_or_size = {})
+        options = if options_or_size.is_a?(String) || options_or_size.is_a?(Symbol)
+          {:type => options_or_size}
+        else
+          options_or_size
+        end
+        _endpoint_ = ["#{self.endpoint}/picture", options.to_query].delete_if(&:blank?).join('?')
+
+        if options[:redirect] == false
+          response = get options.merge(
+            :connection => :picture,
+
+            # NOTE: can be removed when addressable 2.3.3+ released with this fix
+            # https://github.com/sporkmonger/addressable/commit/421a88fed1d2f14426f15158f3712ab563581327
+            :redirect => 'false'
+          )
+          FbGraph::Picture.new response[:data]
+        else
+          _endpoint_
         end
-        _endpoint_
       end
     end
   end

data/lib/fb_graph/node.rb

@@ -113,7 +113,6 @@ module FbGraph
           # ref) http://blog.livedoor.jp/idea_and_players/archives/5184702.html
           value.tempfile
         else
-          puts value.class
           value.to_json
         end
       end

data/lib/fb_graph/picture.rb

@@ -0,0 +1,12 @@
+module FbGraph
+  class Picture
+    include Comparison
+
+    attr_accessor :is_silhouette, :url
+
+    def initialize(attributes = {})
+      @is_silhouette = attributes[:is_silhouette]
+      @url = attributes[:url]
+    end
+  end
+end

data/lib/fb_graph.rb

@@ -69,6 +69,7 @@ require 'fb_graph/searchable'
 require 'fb_graph/action'
 require 'fb_graph/education'
 require 'fb_graph/location'
+require 'fb_graph/picture'
 require 'fb_graph/poke'
 require 'fb_graph/privacy'
 require 'fb_graph/role'

data/spec/fb_graph/album_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe FbGraph::Album do
-
   describe '.new' do
     it 'should setup all supported attributes' do
       attributes = {
@@ -66,21 +65,29 @@ describe FbGraph::Album do
 
   describe '#picture' do
     let(:album) { FbGraph::Album.new('12345') }
-    subject { album }
+    subject { album.picture }
 
     context 'when access token is given' do
       before { album.access_token = 'access_token' }
-      its(:picture) { 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')
       end
     end
 
-    context 'otherwise' do
-      it do
-        expect { album.picture }.to raise_error(FbGraph::Unauthorized)
+    context 'when no access token' do
+      it { should == File.join(FbGraph::ROOT_URL, '12345/picture') }
+    end
+
+    context 'when no redirect' do
+      before { album.access_token = 'access_token' }
+      it 'should return FbGraph::Picture' do
+        mock_graph :get, '12345/picture', 'albums/picture/success', :access_token => 'access_token', :params => {
+          :redirect => 'false'
+        } do
+          album.picture(:redirect => false).should be_instance_of FbGraph::Picture
+        end
       end
     end
   end
-
 end

data/spec/fb_graph/connections/picture_spec.rb

@@ -1,15 +1,44 @@
 require 'spec_helper'
 
 describe FbGraph::Connections::Picture, '#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')
     end
 
     it 'should support size option' do
-      [:square, :large].each do |size|
+      [: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}")
+      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")
+    end
+
+    it 'should support height option' do
+      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")
+        ].include? uri
+      }
+    end
+
+    context 'when no-redirect' do
+      it 'should return Picture object' do
+        mock_graph :get, 'matake/picture', 'users/picture/success', :params => {
+          :redirect => 'false'
+        } do
+          picture = FbGraph::User.new('matake').picture(:redirect => false)
+          picture.should be_instance_of FbGraph::Picture
+        end
       end
     end
   end
@@ -20,10 +49,27 @@ describe FbGraph::Connections::Picture, '#picture' do
     end
 
     it 'should support size option' do
-      [:square, :large].each do |size|
+      [: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}")
       end
     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")
+    end
+
+    it 'should support height option' do
+      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")
+        ].include? uri
+      }
+    end    
+  end
 end

data/spec/mock_json/albums/picture/success.json

@@ -0,0 +1,5 @@
+{
+  "data": {
+    "url": "http://static.ak.fbcdn.net/rsrc.php/v1/yC/r/gtEJuZGrBLG.jpg"
+  }
+}

data/spec/mock_json/users/picture/success.json

@@ -0,0 +1,6 @@
+{
+  "data": {
+    "url": "http://profile.ak.fbcdn.net/hprofile-ak-snc6/260832_579612276_1894390292_q.jpg",
+    "is_silhouette": false
+  }
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fb_graph
 version: !ruby/object:Gem::Version
-  version: 2.5.5
+  version: 2.5.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-16 00:00:00.000000000 Z
+date: 2012-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -312,6 +312,7 @@ files:
 - lib/fb_graph/page.rb
 - lib/fb_graph/page/category_attributes.rb
 - lib/fb_graph/photo.rb
+- lib/fb_graph/picture.rb
 - lib/fb_graph/place.rb
 - lib/fb_graph/poke.rb
 - lib/fb_graph/post.rb
@@ -521,6 +522,7 @@ files:
 - spec/mock_json/ad_keywords/buffy_search.json
 - spec/mock_json/albums/photos/matake_private.json
 - spec/mock_json/albums/photos/post_with_valid_access_token.json
+- spec/mock_json/albums/picture/success.json
 - spec/mock_json/app_token_response.json
 - spec/mock_json/applications/accounts/private.json
 - spec/mock_json/applications/achievements/sample.json
@@ -687,6 +689,7 @@ files:
 - spec/mock_json/users/notifications/all.json
 - spec/mock_json/users/outbox/me_private.json
 - spec/mock_json/users/permissions/me_private.json
+- spec/mock_json/users/picture/success.json
 - spec/mock_json/users/pokes/sample.json
 - spec/mock_json/users/posts/arjun_private.json
 - spec/mock_json/users/posts/arjun_public.json
@@ -720,12 +723,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 77075375696592851
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 77075375696592851
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -909,6 +918,7 @@ test_files:
 - spec/mock_json/ad_keywords/buffy_search.json
 - spec/mock_json/albums/photos/matake_private.json
 - spec/mock_json/albums/photos/post_with_valid_access_token.json
+- spec/mock_json/albums/picture/success.json
 - spec/mock_json/app_token_response.json
 - spec/mock_json/applications/accounts/private.json
 - spec/mock_json/applications/achievements/sample.json
@@ -1075,6 +1085,7 @@ test_files:
 - spec/mock_json/users/notifications/all.json
 - spec/mock_json/users/outbox/me_private.json
 - spec/mock_json/users/permissions/me_private.json
+- spec/mock_json/users/picture/success.json
 - spec/mock_json/users/pokes/sample.json
 - spec/mock_json/users/posts/arjun_private.json
 - spec/mock_json/users/posts/arjun_public.json