fb_graph 1.7.4 → 1.7.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fb_graph (1.7.3)
+    fb_graph (1.7.4)
       rack-oauth2 (>= 0.6.5)
 
 GEM
@@ -16,7 +16,7 @@ GEM
     json (1.5.1)
     mime-types (1.16)
     rack (1.2.2)
-    rack-oauth2 (0.6.6)
+    rack-oauth2 (0.6.9)
       activesupport (>= 2.3)
       attr_required (>= 0.0.3)
       i18n

data/VERSION

@@ -1 +1 @@
-1.7.4
+1.7.5

data/lib/fb_graph/album.rb

@@ -3,6 +3,7 @@ module FbGraph
     include Connections::Photos
     include Connections::Comments
     include Connections::Likes
+    include Connections::Picture
 
     attr_accessor :from, :name, :description, :location, :link, :privacy, :count, :created_time, :updated_time, :type
 
@@ -38,5 +39,13 @@ module FbGraph
       # cached connection
       @_comments_ = Collection.new(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
+    end
+    alias_method_chain :picture, :access_token
   end
 end

data/lib/fb_graph/connections/picture.rb

@@ -4,10 +4,9 @@ module FbGraph
       def picture(size = nil)
         _endpoint_ = "#{self.endpoint}/picture"
         if size
-          "#{_endpoint_}?type=#{size}"
-        else
-          _endpoint_
+          _endpoint_ += "?type=#{size}"
         end
+        _endpoint_
       end
     end
   end

data/spec/fb_graph/album_spec.rb

@@ -1,63 +1,84 @@
 require 'spec_helper'
 
-describe FbGraph::Album, '.new' do
+describe FbGraph::Album do
 
-  it 'should setup all supported attributes' do
-    attributes = {
-      :id => '12345',
-      :from => {
-        :id => '23456',
-        :name => 'nov matake'
-      },
-      :name => 'album 1',
-      :description => 'an album for fb_graph test',
-      :location => 'Tokyo, Japan',
-      :link => 'http://www.facebook.com/album/12345',
-      :count => 10,
-      :type => 'normal',
-      :created_time => '2009-12-29T15:24:50+0000',
-      :updated_time => '2010-01-02T15:37:41+0000',
-      :comments => {
-        :data => [{
-          :id => '909694472945_418735',
-          :from => {
-            :id => '520739622',
-            :name => 'Alison Marie Weber',
-          },
-          :message => 'Love all the pix!',
-          :created_time => '2009-08-15T14:57:36+0000'
-        }]
+  describe '.new' do
+    it 'should setup all supported attributes' do
+      attributes = {
+        :id => '12345',
+        :from => {
+          :id => '23456',
+          :name => 'nov matake'
+        },
+        :name => 'album 1',
+        :description => 'an album for fb_graph test',
+        :location => 'Tokyo, Japan',
+        :link => 'http://www.facebook.com/album/12345',
+        :count => 10,
+        :type => 'normal',
+        :created_time => '2009-12-29T15:24:50+0000',
+        :updated_time => '2010-01-02T15:37:41+0000',
+        :comments => {
+          :data => [{
+            :id => '909694472945_418735',
+            :from => {
+              :id => '520739622',
+              :name => 'Alison Marie Weber',
+            },
+            :message => 'Love all the pix!',
+            :created_time => '2009-08-15T14:57:36+0000'
+          }]
+        }
       }
-    }
-    album = FbGraph::Album.new(attributes.delete(:id), attributes)
-    album.identifier.should     == '12345'
-    album.from.should           == FbGraph::User.new('23456', :name => 'nov matake')
-    album.name.should           == 'album 1'
-    album.description.should    == 'an album for fb_graph test'
-    album.location.should       == 'Tokyo, Japan'
-    album.link.should           == 'http://www.facebook.com/album/12345'
-    album.count.should          == 10
-    album.type.should           == 'normal'
-    album.created_time.should   == Time.parse('2009-12-29T15:24:50+0000')
-    album.updated_time.should   == Time.parse('2010-01-02T15:37:41+0000')
-    album.comments.should       == [FbGraph::Comment.new(
-      '909694472945_418735',
-      :from => {
-        :id => '520739622',
-        :name => 'Alison Marie Weber',
-      },
-      :message => 'Love all the pix!',
-      :created_time => '2009-08-15T14:57:36+0000'
-    )]
+      album = FbGraph::Album.new(attributes.delete(:id), attributes)
+      album.identifier.should     == '12345'
+      album.from.should           == FbGraph::User.new('23456', :name => 'nov matake')
+      album.name.should           == 'album 1'
+      album.description.should    == 'an album for fb_graph test'
+      album.location.should       == 'Tokyo, Japan'
+      album.link.should           == 'http://www.facebook.com/album/12345'
+      album.count.should          == 10
+      album.type.should           == 'normal'
+      album.created_time.should   == Time.parse('2009-12-29T15:24:50+0000')
+      album.updated_time.should   == Time.parse('2010-01-02T15:37:41+0000')
+      album.comments.should       == [FbGraph::Comment.new(
+        '909694472945_418735',
+        :from => {
+          :id => '520739622',
+          :name => 'Alison Marie Weber',
+        },
+        :message => 'Love all the pix!',
+        :created_time => '2009-08-15T14:57:36+0000'
+      )]
+    end
+
+    it 'should support page as from' do
+      page_album = FbGraph::Album.new('12345', :from => {
+        :id => '23456',
+        :name => 'Smart.fm',
+        :category => 'Web Site'
+      })
+      page_album.from.should == FbGraph::Page.new('23456', :name => 'Smart.fm', :category => 'Web Site')
+    end
   end
 
-  it 'should support page as from' do
-    page_album = FbGraph::Album.new('12345', :from => {
-      :id => '23456',
-      :name => 'Smart.fm',
-      :category => 'Web Site'
-    })
-    page_album.from.should == FbGraph::Page.new('23456', :name => 'Smart.fm', :category => 'Web Site')
+  describe '#picture' do
+    let(:album) { FbGraph::Album.new('12345') }
+    subject { album }
+
+    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 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 }.should raise_error(FbGraph::Unauthorized)
+      end
+    end
   end
 
 end

metadata

@@ -2,7 +2,7 @@
 name: fb_graph
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.7.4
+  version: 1.7.5
 platform: ruby
 authors: 
 - nov matake
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-09 00:00:00 Z
+date: 2011-05-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack-oauth2