fb_graph 0.2.2 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

data/fb_graph.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fb_graph}
-  s.version = "0.2.2"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["nov matake"]

data/lib/fb_graph/connections/activities.rb

@@ -4,7 +4,9 @@ module FbGraph
       def activities(options = {})
         activities = FbGraph::Collection.new(get(options.merge(:connection => 'activities')))
         activities.map! do |activity|
-          FbGraph::Page.new(activity.delete(:id), activity)
+          FbGraph::Page.new(activity.delete(:id), activity.merge(
+            :access_token => options[:access_token] || self.access_token
+          ))
         end
       end
     end

data/lib/fb_graph/connections/albums.rb

@@ -4,13 +4,17 @@ module FbGraph
       def albums(options = {})
         albums = FbGraph::Collection.new(get(options.merge(:connection => 'albums')))
         albums.map! do |album|
-          Album.new(album.delete(:id), album)
+          Album.new(album.delete(:id), album.merge(
+            :access_token => options[:access_token] || self.access_token
+          ))
         end
       end
 
       def album!(options = {})
         album = post(options.merge(:connection => 'albums'))
-        Album.new(album.delete(:id), options.merge(album))
+        Album.new(album.delete(:id), options.merge(album).merge(
+          :access_token => options[:access_token] || self.access_token
+        ))
       end
     end
   end

data/lib/fb_graph/connections/attending.rb

@@ -4,7 +4,9 @@ module FbGraph
       def attending(options = {})
         members = FbGraph::Collection.new(get(options.merge(:connection => 'attending')))
         members.map! do |member|
-          User.new(member.delete(:id), member)
+          User.new(member.delete(:id), member.merge(
+            :access_token => options[:access_token] || self.access_token
+          ))
         end
       end
 

data/lib/fb_graph/connections/books.rb

@@ -4,7 +4,9 @@ module FbGraph
       def books(options = {})
         books = FbGraph::Collection.new(get(options.merge(:connection => 'books')))
         books.map! do |book|
-          Page.new(book.delete(:id), book)
+          Page.new(book.delete(:id), book.merge(
+            :access_token => options[:access_token] || self.access_token
+          ))
         end
       end
     end

data/lib/fb_graph/connections/comments.rb

@@ -11,13 +11,17 @@ module FbGraph
           FbGraph::Collection.new(get(options.merge(:connection => 'comments')))
         end
         comments.map! do |comment|
-          Comment.new(comment.delete(:id), comment)
+          Comment.new(comment.delete(:id), comment.merge(
+            :access_token => options[:access_token] || self.access_token
+          ))
         end
       end
 
       def comment!(options = {})
         comment = post(options.merge(:connection => 'comments'))
-        Comment.new(comment.delete(:id), options.merge(comment))
+        Comment.new(comment.delete(:id), options.merge(comment).merge(
+          :access_token => options[:access_token] || self.access_token
+        ))
       end
 
       # NOTE:

data/lib/fb_graph/connections/declined.rb

@@ -4,7 +4,9 @@ module FbGraph
       def declined(options = {})
         members = FbGraph::Collection.new(get(options.merge(:connection => 'declined')))
         members.map! do |member|
-          User.new(member.delete(:id), member)
+          User.new(member.delete(:id), member.merge(
+            :access_token => options[:access_token] || self.access_token
+          ))
         end
       end
 

data/lib/fb_graph/connections/events.rb

@@ -4,13 +4,17 @@ module FbGraph
       def events(options = {})
         events = FbGraph::Collection.new(get(options.merge(:connection => 'events')))
         events.map! do |event|
-          Event.new(event.delete(:id), event)
+          Event.new(event.delete(:id), event.merge(
+            :access_token => options[:access_token] || self.access_token
+          ))
         end
       end
 
       def event!(options = {})
         event = post(options.merge(:connection => 'events'))
-        Event.new(event.delete(:id), options.merge(event))
+        Event.new(event.delete(:id), options.merge(event).merge(
+          :access_token => options[:access_token] || self.access_token
+        ))
       end
     end
   end

data/lib/fb_graph/connections/feed.rb

@@ -4,13 +4,17 @@ module FbGraph
       def feed(options = {})
         posts = FbGraph::Collection.new(get(options.merge(:connection => 'feed')))
         posts.map! do |post|
-          Post.new(post.delete(:id), post)
+          Post.new(post.delete(:id), post.merge(
+            :access_token => options[:access_token] || self.access_token
+          ))
         end
       end
 
       def feed!(options = {})
         post = post(options.merge(:connection => 'feed'))
-        Post.new(post.delete(:id), options.merge(post))
+        Post.new(post.delete(:id), options.merge(post).merge(
+          :access_token => options[:access_token] || self.access_token
+        ))
       end
     end
   end

data/lib/fb_graph/connections/friends.rb

@@ -4,7 +4,9 @@ module FbGraph
       def friends(options = {})
         users = FbGraph::Collection.new(get(options.merge(:connection => 'friends')))
         users.map! do |user|
-          User.new(user.delete(:id), user)
+          User.new(user.delete(:id), user.merge(
+            :access_token => options[:access_token] || self.access_token
+          ))
         end
       end
     end

data/lib/fb_graph/connections/groups.rb

@@ -4,7 +4,9 @@ module FbGraph
       def groups(options = {})
         groups = FbGraph::Collection.new(get(options.merge(:connection => 'groups')))
         groups.map! do |group|
-          Group.new(group.delete(:id), group)
+          Group.new(group.delete(:id), group.merge(
+            :access_token => options[:access_token] || self.access_token
+          ))
         end
       end
     end

data/lib/fb_graph/connections/home.rb

@@ -4,7 +4,9 @@ module FbGraph
       def home(options = {})
         posts = FbGraph::Collection.new(get(options.merge(:connection => 'home')))
         posts.map! do |post|
-          Post.new(post.delete(:id), post)
+          Post.new(post.delete(:id), post.merge(
+            :access_token => options[:access_token] || self.access_token
+          ))
         end
       end
     end

data/lib/fb_graph/connections/interests.rb

@@ -4,7 +4,9 @@ module FbGraph
       def interests(options = {})
         interests = FbGraph::Collection.new(get(options.merge(:connection => 'interests')))
         interests.map! do |interest|
-          Page.new(interest.delete(:id), interest)
+          Page.new(interest.delete(:id), interest.merge(
+            :access_token => options[:access_token] || self.access_token
+          ))
         end
       end
     end

data/lib/fb_graph/connections/invited.rb

@@ -4,7 +4,9 @@ module FbGraph
       def invited(options = {})
         members = FbGraph::Collection.new(get(options.merge(:connection => 'invited')))
         members.map! do |member|
-          User.new(member.delete(:id), member)
+          User.new(member.delete(:id), member.merge(
+            :access_token => options[:access_token] || self.access_token
+          ))
         end
       end
     end

data/lib/fb_graph/connections/likes.rb

@@ -4,7 +4,9 @@ module FbGraph
       def likes(options = {})
         likes = FbGraph::Collection.new(get(options.merge(:connection => 'likes')))
         likes.map! do |like|
-          Page.new(like.delete(:id), like)
+          Page.new(like.delete(:id), like.merge(
+            :access_token => options[:access_token] || self.access_token
+          ))
         end
       end
 

data/lib/fb_graph/connections/links.rb

@@ -4,13 +4,17 @@ module FbGraph
       def links(options = {})
         links = FbGraph::Collection.new(get(options.merge(:connection => 'links')))
         links.map! do |link|
-          Link.new(link.delete(:id), link)
+          Link.new(link.delete(:id), link.merge(
+            :access_token => options[:access_token] || self.access_token
+          ))
         end
       end
 
       def link!(options = {})
         link = post(options.merge(:connection => 'links'))
-        Link.new(link.delete(:id), options.merge(link))
+        Link.new(link.delete(:id), options.merge(link).merge(
+          :access_token => options[:access_token] || self.access_token
+        ))
       end
     end
   end

data/lib/fb_graph/connections/maybe.rb

@@ -4,7 +4,9 @@ module FbGraph
       def maybe(options = {})
         members = FbGraph::Collection.new(get(options.merge(:connection => 'maybe')))
         members.map! do |member|
-          User.new(member.delete(:id), member)
+          User.new(member.delete(:id), member.merge(
+            :access_token => options[:access_token] || self.access_token
+          ))
         end
       end
 

data/lib/fb_graph/connections/members.rb

@@ -4,7 +4,9 @@ module FbGraph
       def members(options = {})
         members = FbGraph::Collection.new(get(options.merge(:connection => 'members')))
         members.map! do |member|
-          User.new(member.delete(:id), member)
+          User.new(member.delete(:id), member.merge(
+            :access_token => options[:access_token] || self.access_token
+          ))
         end
       end
     end

data/lib/fb_graph/connections/movies.rb

@@ -4,7 +4,9 @@ module FbGraph
       def movies(options = {})
         movies = FbGraph::Collection.new(get(options.merge(:connection => 'movies')))
         movies.map! do |movie|
-          Page.new(movie.delete(:id), movie)
+          Page.new(movie.delete(:id), movie.merge(
+            :access_token => options[:access_token] || self.access_token
+          ))
         end
       end
     end

data/lib/fb_graph/connections/music.rb

@@ -4,7 +4,9 @@ module FbGraph
       def music(options = {})
         music = FbGraph::Collection.new(get(options.merge(:connection => 'music')))
         music.map! do |_music_|
-          Page.new(_music_.delete(:id), _music_)
+          Page.new(_music_.delete(:id), _music_.merge(
+            :access_token => options[:access_token] || self.access_token
+          ))
         end
       end
     end

data/lib/fb_graph/connections/noreply.rb

@@ -4,7 +4,9 @@ module FbGraph
       def noreply(options = {})
         members = FbGraph::Collection.new(get(options.merge(:connection => 'noreply')))
         members.map! do |member|
-          User.new(member.delete(:id), member)
+          User.new(member.delete(:id), member.merge(
+            :access_token => options[:access_token] || self.access_token
+          ))
         end
       end
     end

data/lib/fb_graph/connections/notes.rb

@@ -4,13 +4,17 @@ module FbGraph
       def notes(options = {})
         notes = FbGraph::Collection.new(get(options.merge(:connection => 'notes')))
         notes.map! do |note|
-          Note.new(note.delete(:id), note)
+          Note.new(note.delete(:id), note.merge(
+            :access_token => options[:access_token] || self.access_token
+          ))
         end
       end
 
       def note!(options = {})
         note = post(options.merge(:connection => 'notes'))
-        Note.new(note.delete(:id), options.merge(note))
+        Note.new(note.delete(:id), options.merge(note).merge(
+          :access_token => options[:access_token] || self.access_token
+        ))
       end
     end
   end

data/lib/fb_graph/connections/photos.rb

@@ -4,13 +4,17 @@ module FbGraph
       def photos(options = {})
         photos = FbGraph::Collection.new(get(options.merge(:connection => 'photos')))
         photos.map! do |photo|
-          Photo.new(photo.delete(:id), photo)
+          Photo.new(photo.delete(:id), photo.merge(
+            :access_token => options[:access_token] || self.access_token
+          ))
         end
       end
 
       def photo!(options = {})
         photo = post(options.merge(:connection => 'photos'))
-        Photo.new(photo.delete(:id), options.merge(photo))
+        Photo.new(photo.delete(:id), options.merge(photo).merge(
+          :access_token => options[:access_token] || self.access_token
+        ))
       end
     end
   end

data/lib/fb_graph/connections/posts.rb

@@ -4,7 +4,9 @@ module FbGraph
       def posts(options = {})
         posts = FbGraph::Collection.new(get(options.merge(:connection => 'posts')))
         posts.map! do |post|
-          Post.new(post.delete(:id), post)
+          Post.new(post.delete(:id), post.merge(
+            :access_token => options[:access_token] || self.access_token
+          ))
         end
       end
     end

data/lib/fb_graph/connections/statuses.rb

@@ -4,7 +4,9 @@ module FbGraph
       def statuses(options = {})
         statuses = FbGraph::Collection.new(get(options.merge(:connection => 'statuses')))
         statuses.map! do |status|
-          Status.new(status.delete(:id), status)
+          Status.new(status.delete(:id), status.merge(
+            :access_token => options[:access_token] || self.access_token
+          ))
         end
       end
     end

data/lib/fb_graph/connections/tagged.rb

@@ -4,7 +4,9 @@ module FbGraph
       def tagged(options = {})
         posts = FbGraph::Collection.new(get(options.merge(:connection => 'tagged')))
         posts.map! do |post|
-          Post.new(post.delete(:id), post)
+          Post.new(post.delete(:id), post.merge(
+            :access_token => options[:access_token] || self.access_token
+          ))
         end
       end
     end

data/lib/fb_graph/connections/television.rb

@@ -4,7 +4,9 @@ module FbGraph
       def television(options = {})
         television = FbGraph::Collection.new(get(options.merge(:connection => 'television')))
         television.map! do |_television_|
-          Page.new(_television_.delete(:id), _television_)
+          Page.new(_television_.delete(:id), _television_.merge(
+            :access_token => options[:access_token] || self.access_token
+          ))
         end
       end
     end

data/lib/fb_graph/connections/videos.rb

@@ -4,7 +4,9 @@ module FbGraph
       def videos(options = {})
         videos = FbGraph::Collection.new(get(options.merge(:connection => 'videos')))
         videos.map! do |video|
-          Video.new(video.delete(:id), video)
+          Video.new(video.delete(:id), video.merge(
+            :access_token => options[:access_token] || self.access_token
+          ))
         end
       end
     end

data/spec/fb_graph/connections/activities_spec.rb

@@ -20,6 +20,7 @@ context 'when included by FbGraph::User' do
         activities = FbGraph::User.new('arjun', :access_token => 'access_token').activities
         activities.first.should == FbGraph::Page.new(
           '378209722137',
+          :access_token => 'access_token',
           :name => 'Doing Things at the Last Minute',
           :category => '活動'
         )

data/spec/fb_graph/connections/albums_spec.rb

@@ -20,6 +20,7 @@ context 'when included by FbGraph::User' do
         albums = FbGraph::User.new('matake', :access_token => 'access_token').albums
         albums.first.should == FbGraph::Album.new(
           '19351532276',
+          :access_token => 'access_token',
           :from => {
             :id => '579612276',
             :name => 'Nov Matake'
@@ -48,6 +49,7 @@ context 'when included by FbGraph::User' do
         :message => 'test test test'
       )
       album.identifier.should == 401096332276
+      album.access_token.should == 'valid'
       album.name.should == 'FbGraph test'
       album.description.should == 'test test test'
     end

data/spec/fb_graph/connections/books_spec.rb

@@ -20,6 +20,7 @@ describe FbGraph::Connections::Books, '#books' do
         books = FbGraph::User.new('matake', :access_token => 'access_token').books
         books.first.should == FbGraph::Page.new(
           '102253616477130',
+          :access_token => 'access_token',
           :name => 'Momo Michael Ende',
           :category => 'Unknown'
         )

data/spec/fb_graph/connections/comments_spec.rb

@@ -39,7 +39,9 @@ context 'when included by FbGraph::Post' do
       it 'should return generated comment' do
         comment = FbGraph::Post.new('12345', :access_token => 'valid').comment!(:message => 'hello')
         comment.identifier.should == '117513961602338_119401698085884_535271'
+        comment.access_token.should == 'valid'
         comment.message.should == 'hello'
+        comment.access_token.should == 'valid'
       end
     end
   end

data/spec/fb_graph/connections/events_spec.rb

@@ -20,6 +20,7 @@ context 'when included by FbGraph::User' do
         events = FbGraph::User.new('matake', :access_token => 'access_token').events
         events.first.should == FbGraph::Event.new(
           '116600818359630',
+          :access_token => 'access_token',
           :name => 'The Loyal We @ Rainy Day Bookstore and Cafe',
           :start_time => '2010-04-29T01:30:00+0000',
           :end_time => '2010-04-29T04:30:00+0000',
@@ -45,6 +46,7 @@ context 'when included by FbGraph::User' do
         :end_time   => Time.utc(2010, 5, 11, 12, 0, 0).to_i
       )
       event.name.should == 'FbGraph test event'
+      event.access_token.should == 'valid'
       event.start_time.should == Time.utc(2010, 5, 11, 10, 0, 0)
       event.end_time.should == Time.utc(2010, 5, 11, 12, 0, 0)
     end

data/spec/fb_graph/connections/feed_spec.rb

@@ -32,6 +32,32 @@ context 'when included by FbGraph::User' do
         end
       end
     end
+
+    context 'when access_token is given' do
+      it 'should return posts on the user\'s wall as FbGraph::Post' do
+        posts = FbGraph::User.new('arjun').feed(:access_token => 'access_token')
+        posts.first.should == FbGraph::Post.new(
+          '7901103_121392141207495',
+          :access_token => 'access_token',
+          :from => {
+            :id => '7901103',
+            :name => 'Arjun Banker'
+          },
+          :picture => 'http://external.ak.fbcdn.net/safe_image.php?d=d2cc5beedaa401ba54eccc9014647285&w=130&h=130&url=http%3A%2F%2Fimages.ted.com%2Fimages%2Fted%2F269_389x292.jpg',
+          :link => 'http://www.ted.com/talks/wade_davis_on_endangered_cultures.html',
+          :name => 'Wade Davis on endangered cultures | Video on TED.com',
+          :caption => 'www.ted.com',
+          :description => 'TED Talks With stunning photos and stories, National Geographic Explorer Wade Davis celebrates the extraordinary diversity of the world\'s indigenous cultures, which are disappearing from the planet at an alarming rate.',
+          :icon => 'http://static.ak.fbcdn.net/rsrc.php/z9XZ8/hash/976ulj6z.gif',
+          :created_time => '2010-04-25T04:05:32+0000',
+          :updated_time => '2010-04-25T04:05:32+0000',
+          :likes => 1
+        )
+        posts.each do |post|
+          post.should be_instance_of(FbGraph::Post)
+        end
+      end
+    end
   end
 
   describe FbGraph::Connections::Feed, '#feed!' do
@@ -68,6 +94,7 @@ context 'when included by FbGraph::User' do
         post = FbGraph::User.new('matake', :access_token => 'valid').feed!(:message => 'hello')
         post.identifier.should == '579612276_401071652276'
         post.message.should == 'hello'
+        post.access_token.should == 'valid'
       end
     end
   end

data/spec/fb_graph/connections/friends_spec.rb

@@ -38,6 +38,7 @@ describe FbGraph::Connections::Friends, '#friends' do
         users = FbGraph::User.new('me', :access_token => 'access_token').friends
         users.first.should == FbGraph::User.new(
           '6401',
+          :access_token => 'access_token',
           :name => 'Kirk McMurray'
         )
         users.each do |user|

data/spec/fb_graph/connections/groups_spec.rb

@@ -20,6 +20,7 @@ describe FbGraph::Connections::Groups, '#groups' do
         groups = FbGraph::User.new('matake', :access_token => 'access_token').groups
         groups.first.should == FbGraph::Group.new(
           '115286585902',
+          :access_token => 'access_token',
           :name => 'iPhone 3G S'
         )
         groups.each do |group|

data/spec/fb_graph/connections/home_spec.rb

@@ -38,6 +38,7 @@ describe FbGraph::Connections::Home, '#home' do
         posts = FbGraph::User.new('me', :access_token => 'access_token').home
         posts.first.should == FbGraph::Post.new(
           '634033380_112599768777073',
+          :access_token => 'access_token',
           :from => {
             :id => '634033380',
             :name => 'nishikokura hironobu'

data/spec/fb_graph/connections/likes_spec.rb

@@ -20,6 +20,7 @@ context 'when included by FbGraph::User' do
         likes = FbGraph::User.new('arjun', :access_token => 'access_token').likes
         likes.first.should == FbGraph::Page.new(
           '378209722137',
+          :access_token => 'access_token',
           :name => 'Doing Things at the Last Minute',
           :category => '活動'
         )

data/spec/fb_graph/connections/links_spec.rb

@@ -27,6 +27,7 @@ context 'when included by FbGraph::User' do
       link.identifier.should == 120765121284251
       link.link.should == 'http://github.com/nov/fb_graph'
       link.message.should == 'A Ruby wrapper for Facebook Graph API.'
+      link.access_token.should == 'valid'
     end
   end
 end

data/spec/fb_graph/connections/notes_spec.rb

@@ -26,6 +26,7 @@ context 'when included by FbGraph::Page' do
       note.identifier.should == 396664845100
       note.subject.should == 'test'
       note.message.should == 'hello'
+      note.access_token.should == 'valid'
     end
   end
 end

data/spec/fb_graph/connections/photos_spec.rb

@@ -25,5 +25,6 @@ describe FbGraph::Connections::Photos, '#photo!' do
     )
     photo.identifier.should == 401111132276
     photo.name.should == 'Hello, where is photo?'
+    photo.access_token.should == 'valid'
   end
 end

data/spec/fb_graph/connections/statuses_spec.rb

@@ -21,6 +21,7 @@ describe FbGraph::Connections::Statuses, '#statuses' do
         statuses = FbGraph::User.new('arjun', :access_token => 'access_token').statuses
         statuses.first.should == FbGraph::Status.new(
           '113559395341627',
+          :access_token => 'access_token',
           :from => {
             :id => '7901103',
             :name => 'Arjun Banker'
@@ -54,6 +55,7 @@ describe FbGraph::Connections::Statuses, '#statuses' do
         statuses = FbGraph::Page.new('platform', :access_token => 'access_token').statuses
         statuses.first.should == FbGraph::Status.new(
           '111081598927600',
+          :access_token => 'access_token',
           :from => {
             :id => '19292868552',
             :name => 'Facebook Platform',

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 2
-  version: 0.2.2
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - nov matake