fb_graph 0.0.2 → 0.0.3

data/README.rdoc

@@ -1,6 +1,30 @@
-= fb_graph
+= FbGraph
 
-Description goes here.
+A Ruby wrapper for Facebook Graph API.
+This is a work in progress.
+
+== Examples
+
+# Basic Objects
+user = FbGraph::User.fetch('matake')
+user.name    # => 'Nov Matake'
+user.picture # => 'https://graph.facebook.com/matake/picture'
+
+page = FbGraph::Page.fetch('smartfmteam')
+page.name     # => 'smart.fm'
+page.picture  # => 'https://graph.facebook.com/smart.fm/picture'
+
+:
+:
+
+# Connections
+likes = user.likes # => Array of FbGraph::Like
+likes.next         # => {:limit => 25, :until => '...'}
+likes.previous     # => {:limit => 25, :since => '...'}
+
+# Pagination
+user.likes(likes.next)     # => Array of FbGraph::Like
+user.likes(likes.previous) # => Array of FbGraph::Like
 
 == Note on Patches/Pull Requests
  

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/fb_graph.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fb_graph}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["nov matake"]
-  s.date = %q{2010-04-26}
+  s.date = %q{2010-04-27}
   s.description = %q{Facebook Graph API library for Ruby}
   s.email = %q{nov@matake.jp}
   s.extra_rdoc_files = [
@@ -26,13 +26,14 @@ Gem::Specification.new do |s|
      "fb_graph.gemspec",
      "lib/fb_graph.rb",
      "lib/fb_graph/album.rb",
+     "lib/fb_graph/collection.rb",
      "lib/fb_graph/comment.rb",
+     "lib/fb_graph/comparison.rb",
      "lib/fb_graph/connections.rb",
      "lib/fb_graph/connections/activities.rb",
      "lib/fb_graph/connections/albums.rb",
      "lib/fb_graph/connections/attending.rb",
      "lib/fb_graph/connections/books.rb",
-     "lib/fb_graph/connections/collection.rb",
      "lib/fb_graph/connections/comments.rb",
      "lib/fb_graph/connections/declined.rb",
      "lib/fb_graph/connections/events.rb",
@@ -66,7 +67,9 @@ Gem::Specification.new do |s|
      "lib/fb_graph/photo.rb",
      "lib/fb_graph/post.rb",
      "lib/fb_graph/status.rb",
+     "lib/fb_graph/tag.rb",
      "lib/fb_graph/user.rb",
+     "lib/fb_graph/venue.rb",
      "lib/fb_graph/video.rb",
      "spec/fake_json/pages/platform_private.json",
      "spec/fake_json/pages/platform_public.json",
@@ -74,17 +77,25 @@ Gem::Specification.new do |s|
      "spec/fake_json/pages/statuses/platform_public.json",
      "spec/fake_json/users/activities/arjun_private.json",
      "spec/fake_json/users/activities/arjun_public.json",
+     "spec/fake_json/users/albums/matake_private.json",
+     "spec/fake_json/users/albums/matake_public.json",
      "spec/fake_json/users/arjun_private.json",
      "spec/fake_json/users/arjun_public.json",
+     "spec/fake_json/users/events/matake_private.json",
+     "spec/fake_json/users/events/matake_public.json",
      "spec/fake_json/users/feed/arjun_private.json",
      "spec/fake_json/users/feed/arjun_public.json",
      "spec/fake_json/users/friends/arjun_private.json",
      "spec/fake_json/users/friends/arjun_public.json",
      "spec/fake_json/users/friends/me_private.json",
      "spec/fake_json/users/friends/me_public.json",
+     "spec/fake_json/users/groups/matake_private.json",
+     "spec/fake_json/users/groups/matake_public.json",
      "spec/fake_json/users/home/arjun_private.json",
      "spec/fake_json/users/home/arjun_public.json",
      "spec/fake_json/users/home/me_private.json",
+     "spec/fake_json/users/home/me_private_next.json",
+     "spec/fake_json/users/home/me_private_previous.json",
      "spec/fake_json/users/home/me_public.json",
      "spec/fake_json/users/likes/arjun_private.json",
      "spec/fake_json/users/likes/arjun_public.json",
@@ -94,19 +105,31 @@ Gem::Specification.new do |s|
      "spec/fake_json/users/statuses/arjun_public.json",
      "spec/fake_json/users/tagged/arjun_private.json",
      "spec/fake_json/users/tagged/arjun_public.json",
+     "spec/fb_graph/album_spec.rb",
+     "spec/fb_graph/collection_spec.rb",
      "spec/fb_graph/connections/activities_spec.rb",
-     "spec/fb_graph/connections/collection_spec.rb",
+     "spec/fb_graph/connections/albums_spec.rb",
+     "spec/fb_graph/connections/events_spec.rb",
      "spec/fb_graph/connections/feed_spec.rb",
      "spec/fb_graph/connections/friends_spec.rb",
+     "spec/fb_graph/connections/groups_spec.rb",
      "spec/fb_graph/connections/home_spec.rb",
      "spec/fb_graph/connections/likes_spec.rb",
      "spec/fb_graph/connections/picture_spec.rb",
      "spec/fb_graph/connections/posts_spec.rb",
      "spec/fb_graph/connections/statuses_spec.rb",
      "spec/fb_graph/connections/tagged_spec.rb",
+     "spec/fb_graph/event_spec.rb",
+     "spec/fb_graph/group_spec.rb",
+     "spec/fb_graph/link_spec.rb",
      "spec/fb_graph/node_spec.rb",
+     "spec/fb_graph/note_spec.rb",
      "spec/fb_graph/page_spec.rb",
+     "spec/fb_graph/photo_spec.rb",
+     "spec/fb_graph/post_spec.rb",
+     "spec/fb_graph/status_spec.rb",
      "spec/fb_graph/user_spec.rb",
+     "spec/fb_graph/video_spec.rb",
      "spec/fb_graph_spec.rb",
      "spec/helpers/fake_json_helper.rb",
      "spec/spec.opts",
@@ -118,19 +141,31 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{Facebook Graph API library for Ruby}
   s.test_files = [
-    "spec/fb_graph/connections/activities_spec.rb",
-     "spec/fb_graph/connections/collection_spec.rb",
+    "spec/fb_graph/album_spec.rb",
+     "spec/fb_graph/collection_spec.rb",
+     "spec/fb_graph/connections/activities_spec.rb",
+     "spec/fb_graph/connections/albums_spec.rb",
+     "spec/fb_graph/connections/events_spec.rb",
      "spec/fb_graph/connections/feed_spec.rb",
      "spec/fb_graph/connections/friends_spec.rb",
+     "spec/fb_graph/connections/groups_spec.rb",
      "spec/fb_graph/connections/home_spec.rb",
      "spec/fb_graph/connections/likes_spec.rb",
      "spec/fb_graph/connections/picture_spec.rb",
      "spec/fb_graph/connections/posts_spec.rb",
      "spec/fb_graph/connections/statuses_spec.rb",
      "spec/fb_graph/connections/tagged_spec.rb",
+     "spec/fb_graph/event_spec.rb",
+     "spec/fb_graph/group_spec.rb",
+     "spec/fb_graph/link_spec.rb",
      "spec/fb_graph/node_spec.rb",
+     "spec/fb_graph/note_spec.rb",
      "spec/fb_graph/page_spec.rb",
+     "spec/fb_graph/photo_spec.rb",
+     "spec/fb_graph/post_spec.rb",
+     "spec/fb_graph/status_spec.rb",
      "spec/fb_graph/user_spec.rb",
+     "spec/fb_graph/video_spec.rb",
      "spec/fb_graph_spec.rb",
      "spec/helpers/fake_json_helper.rb",
      "spec/spec_helper.rb"

data/lib/fb_graph/album.rb

@@ -1,5 +1,5 @@
 module FbGraph
-  class Photo < Node
+  class Album < Node
     include Connections::Photos
     include Connections::Comments
 

data/lib/fb_graph/collection.rb

@@ -0,0 +1,32 @@
+module FbGraph
+  class Collection < Array
+    attr_reader :previous, :next
+
+    def initialize(collection)
+      result = replace(collection[:data])
+      @previous, @next = {}, {}
+      if (paging = collection[:paging])
+        if paging[:previous]
+          @previous = fetch_params(paging[:previous])
+        end
+        if paging[:next]
+          @next = fetch_params(paging[:next])
+        end
+      end
+    end
+
+    private
+
+    def fetch_params(url)
+      query = URI.parse(url).query
+      params = {}
+      query.split('&').each do |q|
+        key, value = q.split('=')
+        params[key] = URI.unescape(value)
+      end
+      params.delete_if do |k, v|
+        k == 'token'
+      end
+    end
+  end
+end

data/lib/fb_graph/comparison.rb

@@ -0,0 +1,9 @@
+module FbGraph
+  module Comparison
+    def ==(other)
+      instance_variables.all? do |key|
+        instance_variable_get(key) == other.instance_variable_get(key)
+      end
+    end
+  end
+end

data/lib/fb_graph/connections/activities.rb

@@ -2,7 +2,7 @@ module FbGraph
   module Connections
     module Activities
       def activities(options = {})
-        activities = Collection.new(get(options.merge(:connection => 'activities')))
+        activities = FbGraph::Collection.new(get(options.merge(:connection => 'activities')))
         activities.map! do |activity|
           Page.new(activity.delete(:id), activity)
         end

data/lib/fb_graph/connections/albums.rb

@@ -2,7 +2,7 @@ module FbGraph
   module Connections
     module Albums
       def albums(options = {})
-        albums = Collection.new(get(options.merge(:connection => 'albums')))
+        albums = FbGraph::Collection.new(get(options.merge(:connection => 'albums')))
         albums.map! do |album|
           Album.new(album.delete(:id), album)
         end

data/lib/fb_graph/connections/attending.rb

@@ -2,7 +2,7 @@ module FbGraph
   module Connections
     module Attending
       def attending(options = {})
-        members = Collection.new(get(options.merge(:connection => 'attending')))
+        members = FbGraph::Collection.new(get(options.merge(:connection => 'attending')))
         members.map! do |member|
           if member[:category]
             Page.new(member.delete(:id), member)

data/lib/fb_graph/connections/books.rb

@@ -2,7 +2,7 @@ module FbGraph
   module Connections
     module Books
       def books(options = {})
-        books = Collection.new(get(options.merge(:connection => 'books')))
+        books = FbGraph::Collection.new(get(options.merge(:connection => 'books')))
         books.map! do |book|
           Page.new(book.delete(:id), book)
         end

data/lib/fb_graph/connections/comments.rb

@@ -2,7 +2,7 @@ module FbGraph
   module Connections
     module Comments
       def comments(options = {})
-        comments = Collection.new(get(options.merge(:connection => 'comment')))
+        comments = FbGraph::Collection.new(get(options.merge(:connection => 'comment')))
         comments.map! do |comment|
           Comment.new(comment.delete(:id), comment)
         end

data/lib/fb_graph/connections/declined.rb

@@ -2,7 +2,7 @@ module FbGraph
   module Connections
     module Declined
       def declined(options = {})
-        members = Collection.new(get(options.merge(:connection => 'declined')))
+        members = FbGraph::Collection.new(get(options.merge(:connection => 'declined')))
         members.map! do |member|
           if member[:category]
             Page.new(member.delete(:id), member)

data/lib/fb_graph/connections/events.rb

@@ -2,7 +2,7 @@ module FbGraph
   module Connections
     module Events
       def events(options = {})
-        events = Collection.new(get(options.merge(:connection => 'events')))
+        events = FbGraph::Collection.new(get(options.merge(:connection => 'events')))
         events.map! do |event|
           Event.new(event.delete(:id), event)
         end

data/lib/fb_graph/connections/feed.rb

@@ -2,7 +2,7 @@ module FbGraph
   module Connections
     module Feed
       def feed(options = {})
-        posts = Collection.new(get(options.merge(:connection => 'feed')))
+        posts = FbGraph::Collection.new(get(options.merge(:connection => 'feed')))
         posts.map! do |post|
           Post.new(post.delete(:id), post)
         end

data/lib/fb_graph/connections/friends.rb

@@ -2,7 +2,7 @@ module FbGraph
   module Connections
     module Friends
       def friends(options = {})
-        users = Collection.new(get(options.merge(:connection => 'friends')))
+        users = FbGraph::Collection.new(get(options.merge(:connection => 'friends')))
         users.map! do |user|
           User.new(user.delete(:id), user)
         end

data/lib/fb_graph/connections/groups.rb

@@ -2,7 +2,7 @@ module FbGraph
   module Connections
     module Groups
       def groups(options = {})
-        groups = Collection.new(get(options.merge(:connection => 'groups')))
+        groups = FbGraph::Collection.new(get(options.merge(:connection => 'groups')))
         groups.map! do |group|
           Group.new(group.delete(:id), group)
         end

data/lib/fb_graph/connections/home.rb

@@ -2,7 +2,7 @@ module FbGraph
   module Connections
     module Home
       def home(options = {})
-        posts = Collection.new(get(options.merge(:connection => 'home')))
+        posts = FbGraph::Collection.new(get(options.merge(:connection => 'home')))
         posts.map! do |post|
           Post.new(post.delete(:id), post)
         end

data/lib/fb_graph/connections/interests.rb

@@ -2,7 +2,7 @@ module FbGraph
   module Connections
     module Interests
       def interests(options = {})
-        interests = Collection.new(get(options.merge(:connection => 'interests')))
+        interests = FbGraph::Collection.new(get(options.merge(:connection => 'interests')))
         interests.map! do |interest|
           Page.new(interest.delete(:id), interest)
         end

data/lib/fb_graph/connections/invited.rb

@@ -2,7 +2,7 @@ module FbGraph
   module Connections
     module Invited
       def invited(options = {})
-        members = Collection.new(get(options.merge(:connection => 'invited')))
+        members = FbGraph::Collection.new(get(options.merge(:connection => 'invited')))
         members.map! do |member|
           if member[:category]
             Page.new(member.delete(:id), member)

data/lib/fb_graph/connections/likes.rb

@@ -2,7 +2,7 @@ module FbGraph
   module Connections
     module Likes
       def likes(options = {})
-        likes = Collection.new(get(options.merge(:connection => 'likes')))
+        likes = FbGraph::Collection.new(get(options.merge(:connection => 'likes')))
         likes.map! do |like|
           Page.new(like.delete(:id), like)
         end

data/lib/fb_graph/connections/links.rb

@@ -2,7 +2,7 @@ module FbGraph
   module Connections
     module Links
       def links(options = {})
-        links = Collection.new(get(options.merge(:connection => 'links')))
+        links = FbGraph::Collection.new(get(options.merge(:connection => 'links')))
         links.map! do |link|
           Link.new(link.delete(:id), link)
         end

data/lib/fb_graph/connections/maybe.rb

@@ -2,7 +2,7 @@ module FbGraph
   module Connections
     module Maybe
       def maybe(options = {})
-        members = Collection.new(get(options.merge(:connection => 'maybe')))
+        members = FbGraph::Collection.new(get(options.merge(:connection => 'maybe')))
         members.map! do |member|
           if member[:category]
             Page.new(member.delete(:id), member)

data/lib/fb_graph/connections/members.rb

@@ -2,7 +2,7 @@ module FbGraph
   module Connections
     module Members
       def members(options = {})
-        members = Collection.new(get(options.merge(:connection => 'members')))
+        members = FbGraph::Collection.new(get(options.merge(:connection => 'members')))
         member.map! do |member|
           if member[:category]
             Page.new(member.delete(:id), member)

data/lib/fb_graph/connections/movies.rb

@@ -2,7 +2,7 @@ module FbGraph
   module Connections
     module Movies
       def movies(options = {})
-        movies = Collection.new(get(options.merge(:connection => 'movies')))
+        movies = FbGraph::Collection.new(get(options.merge(:connection => 'movies')))
         movies.map! do |movie|
           Page.new(movie.delete(:id), movie)
         end

data/lib/fb_graph/connections/music.rb

@@ -2,7 +2,7 @@ module FbGraph
   module Connections
     module Music
       def music(options = {})
-        music = Collection.new(get(options.merge(:connection => 'music')))
+        music = FbGraph::Collection.new(get(options.merge(:connection => 'music')))
         music.map! do |_music_|
           Page.new(_music_.delete(:id), _music_)
         end

data/lib/fb_graph/connections/noreply.rb

@@ -2,7 +2,7 @@ module FbGraph
   module Connections
     module Noreply
       def noreply(options = {})
-        members = Collection.new(get(options.merge(:connection => 'noreply')))
+        members = FbGraph::Collection.new(get(options.merge(:connection => 'noreply')))
         members.map! do |member|
           if member[:category]
             Page.new(member.delete(:id), member)

data/lib/fb_graph/connections/notes.rb

@@ -2,7 +2,7 @@ module FbGraph
   module Connections
     module Notes
       def notes(options = {})
-        notes = Collection.new(get(options.merge(:connection => 'notes')))
+        notes = FbGraph::Collection.new(get(options.merge(:connection => 'notes')))
         notes.map! do |note|
           Note.new(note.delete(:id), note)
         end

data/lib/fb_graph/connections/photos.rb

@@ -2,7 +2,7 @@ module FbGraph
   module Connections
     module Photos
       def photos(options = {})
-        photos = Collection.new(get(options.merge(:connection => 'photos')))
+        photos = FbGraph::Collection.new(get(options.merge(:connection => 'photos')))
         photos.map! do |photo|
           Photo.new(photo.delete(:id), photo)
         end

data/lib/fb_graph/connections/posts.rb

@@ -2,7 +2,7 @@ module FbGraph
   module Connections
     module Posts
       def posts(options = {})
-        posts = Collection.new(get(options.merge(:connection => 'posts')))
+        posts = FbGraph::Collection.new(get(options.merge(:connection => 'posts')))
         posts.map! do |post|
           Post.new(post.delete(:id), post)
         end

data/lib/fb_graph/connections/statuses.rb

@@ -2,7 +2,7 @@ module FbGraph
   module Connections
     module Statuses
       def statuses(options = {})
-        statuses = Collection.new(get(options.merge(:connection => 'statuses')))
+        statuses = FbGraph::Collection.new(get(options.merge(:connection => 'statuses')))
         statuses.map! do |status|
           Status.new(status.delete(:id), status)
         end

data/lib/fb_graph/connections/tagged.rb

@@ -2,7 +2,7 @@ module FbGraph
   module Connections
     module Tagged
       def tagged(options = {})
-        posts = Collection.new(get(options.merge(:connection => 'tagged')))
+        posts = FbGraph::Collection.new(get(options.merge(:connection => 'tagged')))
         posts.map! do |post|
           Post.new(post.delete(:id), post)
         end

data/lib/fb_graph/connections/television.rb

@@ -2,7 +2,7 @@ module FbGraph
   module Connections
     module Television
       def television(options = {})
-        television = Collection.new(get(options.merge(:connection => 'television')))
+        television = FbGraph::Collection.new(get(options.merge(:connection => 'television')))
         television.map! do |_television_|
           Page.new(_television_.delete(:id), _television_)
         end

data/lib/fb_graph/connections/videos.rb

@@ -2,7 +2,7 @@ module FbGraph
   module Connections
     module Videos
       def videos(options = {})
-        videos = Collection.new(get(options.merge(:connection => 'videos')))
+        videos = FbGraph::Collection.new(get(options.merge(:connection => 'videos')))
         videos.map! do |video|
           Video.new(video.delete(:id), video)
         end

data/lib/fb_graph/event.rb

@@ -20,7 +20,9 @@ module FbGraph
       @start_time   = options[:start_time]
       @end_time     = options[:end_time]
       @location     = options[:location]
-      @venue        = options[:venue]
+      if options[:venue]
+        @venue = FbGraph::Venue.new(options[:venue])
+      end
       @privacy      = options[:privacy]
       @updated_time = options[:updated_time]
     end

data/lib/fb_graph/group.rb

@@ -4,7 +4,7 @@ module FbGraph
     include Connections::Members
     include Connections::Picture
 
-    attr_accessor :owner, :name, :description, :link, :venue, :longitude, :privacy, :updated_time
+    attr_accessor :owner, :name, :description, :link, :venue, :privacy, :updated_time
 
     def initialize(identifier, options = {})
       super
@@ -14,8 +14,9 @@ module FbGraph
       @name         = options[:name]
       @description  = options[:description]
       @link         = options[:link]
-      @venue        = options[:venue]
-      @longitude    = options[:longitude]
+      if options[:venue]
+        @venue = FbGraph::Venue.new(options[:venue])
+      end
       @privacy      = options[:privacy]
       @updated_time = options[:updated_time]
     end

data/lib/fb_graph/link.rb

@@ -1,5 +1,5 @@
 module FbGraph
-  class Page < Node
+  class Link < Node
     include Connections::Comments
 
     attr_accessor :from, :link, :message, :updated_time

data/lib/fb_graph/node.rb

@@ -1,17 +1,13 @@
 module FbGraph
   class Node
-    attr_accessor :identifier, :endpoint, :access_token
+    include FbGraph::Comparison
 
-    def ==(other)
-      instance_variables.all? do |key|
-        instance_variable_get(key) == other.instance_variable_get(key)
-      end
-    end
+    attr_accessor :identifier, :endpoint, :token
 
     def initialize(identifier, options = {})
-      @identifier   = identifier
-      @endpoint     = File.join(FbGraph::ROOT_URL, identifier)
-      @access_token = options[:access_token]
+      @identifier = identifier
+      @endpoint   = File.join(FbGraph::ROOT_URL, identifier)
+      @token      = options[:token]
     end
 
     def self.fetch(identifier, options = {})
@@ -34,7 +30,7 @@ module FbGraph
       else
         self.endpoint
       end
-      options[:access_token] ||= self.access_token
+      options[:token] ||= self.token
       _options_ = options.reject do |k, v|
         v.blank?
       end

data/lib/fb_graph/photo.rb

@@ -4,16 +4,6 @@ module FbGraph
 
     attr_accessor :from, :tags, :name, :picture, :source, :height, :width, :link, :created_time, :updated_time
 
-    class Tag
-      attr_accessor :user, :x, :y, :created_time
-      def initialize(identifier, options = {})
-        @x = options.delete(:x)
-        @y = options.delete(:y)
-        @created_time = options.delete(:created_time)
-        @user = User.new(identifier, options)
-      end
-    end
-
     def initialize(identifier, options = {})
       super
       if (from = options[:from])
@@ -25,8 +15,8 @@ module FbGraph
       end
       @tags = []
       if options[:tags]
-        options[:tags][:data].each do |tag|
-          FbGraph::Tag.new(tag.delete(:id), tag) 
+        FbGraph::Collection.new(options[:tags]).each do |tag|
+          @tags << FbGraph::Tag.new(tag.delete(:id), tag) 
         end
       end
       @name         = options[:name]

data/lib/fb_graph/post.rb

@@ -15,7 +15,7 @@ module FbGraph
       end
       @to = []
       if options[:to]
-        options[:to][:data].each do |to|
+        FbGraph::Collection.new(options[:to]).each do |to|
           @to << if to[:category]
             FbGraph::Page.new(to.delete(:id), to) 
           else

data/lib/fb_graph/tag.rb

@@ -0,0 +1,14 @@
+module FbGraph
+  class Tag
+    include FbGraph::Comparison
+
+    attr_accessor :user, :x, :y, :created_time
+
+    def initialize(identifier, options = {})
+      @x = options.delete(:x)
+      @y = options.delete(:y)
+      @created_time = options.delete(:created_time)
+      @user = User.new(identifier, options)
+    end
+  end
+end

data/lib/fb_graph/user.rb

@@ -43,8 +43,8 @@ module FbGraph
       @website    = options[:website]
     end
 
-    def self.me(access_token)
-      new('me', :access_token => access_token)
+    def self.me(token)
+      new('me', :token => token)
     end
 
   end