fb_graph 0.0.7 → 0.0.8

data/fb_graph.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fb_graph}
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["nov matake"]
-  s.date = %q{2010-04-30}
+  s.date = %q{2010-05-10}
   s.description = %q{A Ruby wrapper for Facebook Graph API}
   s.email = %q{nov@matake.jp}
   s.extra_rdoc_files = [
@@ -23,6 +23,8 @@ Gem::Specification.new do |s|
      "README.rdoc",
      "Rakefile",
      "VERSION",
+     "assets/fb_graph.ai",
+     "assets/fb_graph.png",
      "fb_graph.gemspec",
      "lib/fb_graph.rb",
      "lib/fb_graph/album.rb",
@@ -58,6 +60,7 @@ Gem::Specification.new do |s|
      "lib/fb_graph/connections/tagged.rb",
      "lib/fb_graph/connections/television.rb",
      "lib/fb_graph/connections/videos.rb",
+     "lib/fb_graph/education.rb",
      "lib/fb_graph/event.rb",
      "lib/fb_graph/group.rb",
      "lib/fb_graph/link.rb",
@@ -71,16 +74,21 @@ Gem::Specification.new do |s|
      "lib/fb_graph/user.rb",
      "lib/fb_graph/venue.rb",
      "lib/fb_graph/video.rb",
+     "lib/fb_graph/work.rb",
      "spec/fake_json/pages/platform_private.json",
      "spec/fake_json/pages/platform_public.json",
      "spec/fake_json/pages/statuses/platform_private.json",
      "spec/fake_json/pages/statuses/platform_public.json",
+     "spec/fake_json/posts/platform_private.json",
+     "spec/fake_json/posts/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/books/matake_private.json",
+     "spec/fake_json/users/books/matake_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",
@@ -109,8 +117,10 @@ Gem::Specification.new do |s|
      "spec/fake_json/users/tagged/arjun_public.json",
      "spec/fb_graph/album_spec.rb",
      "spec/fb_graph/collection_spec.rb",
+     "spec/fb_graph/comment_spec.rb",
      "spec/fb_graph/connections/activities_spec.rb",
      "spec/fb_graph/connections/albums_spec.rb",
+     "spec/fb_graph/connections/books_spec.rb",
      "spec/fb_graph/connections/events_spec.rb",
      "spec/fb_graph/connections/feed_spec.rb",
      "spec/fb_graph/connections/friends_spec.rb",
@@ -121,6 +131,7 @@ Gem::Specification.new do |s|
      "spec/fb_graph/connections/posts_spec.rb",
      "spec/fb_graph/connections/statuses_spec.rb",
      "spec/fb_graph/connections/tagged_spec.rb",
+     "spec/fb_graph/education_spec.rb",
      "spec/fb_graph/event_spec.rb",
      "spec/fb_graph/group_spec.rb",
      "spec/fb_graph/link_spec.rb",
@@ -130,8 +141,11 @@ Gem::Specification.new do |s|
      "spec/fb_graph/photo_spec.rb",
      "spec/fb_graph/post_spec.rb",
      "spec/fb_graph/status_spec.rb",
+     "spec/fb_graph/tag_spec.rb",
      "spec/fb_graph/user_spec.rb",
+     "spec/fb_graph/venue_spec.rb",
      "spec/fb_graph/video_spec.rb",
+     "spec/fb_graph/work_spec.rb",
      "spec/fb_graph_spec.rb",
      "spec/helpers/fake_json_helper.rb",
      "spec/spec.opts",
@@ -145,8 +159,10 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/fb_graph/album_spec.rb",
      "spec/fb_graph/collection_spec.rb",
+     "spec/fb_graph/comment_spec.rb",
      "spec/fb_graph/connections/activities_spec.rb",
      "spec/fb_graph/connections/albums_spec.rb",
+     "spec/fb_graph/connections/books_spec.rb",
      "spec/fb_graph/connections/events_spec.rb",
      "spec/fb_graph/connections/feed_spec.rb",
      "spec/fb_graph/connections/friends_spec.rb",
@@ -157,6 +173,7 @@ Gem::Specification.new do |s|
      "spec/fb_graph/connections/posts_spec.rb",
      "spec/fb_graph/connections/statuses_spec.rb",
      "spec/fb_graph/connections/tagged_spec.rb",
+     "spec/fb_graph/education_spec.rb",
      "spec/fb_graph/event_spec.rb",
      "spec/fb_graph/group_spec.rb",
      "spec/fb_graph/link_spec.rb",
@@ -166,8 +183,11 @@ Gem::Specification.new do |s|
      "spec/fb_graph/photo_spec.rb",
      "spec/fb_graph/post_spec.rb",
      "spec/fb_graph/status_spec.rb",
+     "spec/fb_graph/tag_spec.rb",
      "spec/fb_graph/user_spec.rb",
+     "spec/fb_graph/venue_spec.rb",
      "spec/fb_graph/video_spec.rb",
+     "spec/fb_graph/work_spec.rb",
      "spec/fb_graph_spec.rb",
      "spec/helpers/fake_json_helper.rb",
      "spec/spec_helper.rb"

data/lib/fb_graph/album.rb

@@ -9,9 +9,9 @@ module FbGraph
       super
       if (from = options[:from])
         @from = if from[:category]
-          FbGraph::Page.new(from.delete(:id), from) 
+          FbGraph::Page.new(from.delete(:id), from)
         else
-          FbGraph::User.new(from.delete(:id), from) 
+          FbGraph::User.new(from.delete(:id), from)
         end
       end
       @name         = options[:name]
@@ -19,8 +19,12 @@ module FbGraph
       @location     = options[:location]
       @link         = options[:link]
       @count        = options[:count]
-      @created_time = options[:created_time]
-      @updated_time = options[:updated_time]
+      if options[:created_time]
+        @created_time = Time.parse(options[:created_time])
+      end
+      if options[:updated_time]
+        @updated_time = Time.parse(options[:updated_time])
+      end
     end
   end
 end

data/lib/fb_graph/collection.rb

@@ -3,6 +3,9 @@ module FbGraph
     attr_reader :previous, :next
 
     def initialize(collection)
+      # allow nil input
+      collection ||= {:data => []}
+
       result = replace(collection[:data])
       @previous, @next = {}, {}
       if (paging = collection[:paging])
@@ -25,7 +28,7 @@ module FbGraph
         params[key] = URI.unescape(value)
       end
       params.delete_if do |k, v|
-        k == 'access_token'
+        !['limit', 'offset', 'until', 'since'].include?(k)
       end
     end
   end

data/lib/fb_graph/comment.rb

@@ -6,13 +6,15 @@ module FbGraph
       super
       if (from = options[:from])
         @from = if from[:category]
-          FbGraph::Page.new(from.delete(:id), from) 
+          FbGraph::Page.new(from.delete(:id), from)
         else
-          FbGraph::User.new(from.delete(:id), from) 
+          FbGraph::User.new(from.delete(:id), from)
         end
       end
-      @message      = options[:message]
-      @created_time = options[:created_time]
+      @message = options[:message]
+      if options[:created_time]
+        @created_time = Time.parse(options[:created_time])
+      end
     end
   end
 end

data/lib/fb_graph/connections/comments.rb

@@ -2,7 +2,14 @@ module FbGraph
   module Connections
     module Comments
       def comments(options = {})
-        comments = FbGraph::Collection.new(get(options.merge(:connection => 'comments')))
+        comments = if options.blank?
+          # Note:
+          # "comments" is a connection, but included in fetched "post" object
+          # this improves performance when rendering the stream with comments
+          @_comments_
+        else
+          FbGraph::Collection.new(get(options.merge(:connection => 'comments')))
+        end
         comments.map! do |comment|
           Comment.new(comment.delete(:id), comment)
         end

data/lib/fb_graph/education.rb

@@ -0,0 +1,25 @@
+module FbGraph
+  class Education
+    include FbGraph::Comparison
+
+    attr_accessor :school, :degree, :year, :concentration
+
+    def initialize(attributes = {})
+      if (school = attributes[:school])
+        @school = FbGraph::Page.new(school.delete(:id), school)
+      end
+      if (degree = attributes[:degree])
+        @degree = FbGraph::Page.new(degree.delete(:id), degree)
+      end
+      if (year = attributes[:year])
+        @year = FbGraph::Page.new(year.delete(:id), year)
+      end
+      @concentration = []
+      if attributes[:concentration]
+        attributes[:concentration].each do |concentration|
+          @concentration << FbGraph::Page.new(concentration.delete(:id), concentration)
+        end
+      end
+    end
+  end
+end

data/lib/fb_graph/event.rb

@@ -17,14 +17,20 @@ module FbGraph
       end
       @name         = options[:name]
       @description  = options[:description]
-      @start_time   = options[:start_time]
-      @end_time     = options[:end_time]
+      if options[:start_time]
+        @start_time = Time.parse(options[:start_time])
+      end
+      if options[:end_time]
+        @end_time = Time.parse(options[:end_time])
+      end
       @location     = options[:location]
+      @privacy      = options[:privacy]
       if options[:venue]
         @venue = FbGraph::Venue.new(options[:venue])
       end
-      @privacy      = options[:privacy]
-      @updated_time = options[:updated_time]
+      if options[:updated_time]
+        @updated_time = Time.parse(options[:updated_time])
+      end
     end
   end
 end

data/lib/fb_graph/group.rb

@@ -14,11 +14,13 @@ module FbGraph
       @name         = options[:name]
       @description  = options[:description]
       @link         = options[:link]
+      @privacy      = options[:privacy]
       if options[:venue]
         @venue = FbGraph::Venue.new(options[:venue])
       end
-      @privacy      = options[:privacy]
-      @updated_time = options[:updated_time]
+      if options[:updated_time]
+        @updated_time = Time.parse(options[:updated_time])
+      end
     end
   end
 end

data/lib/fb_graph/link.rb

@@ -8,14 +8,16 @@ module FbGraph
       super
       if (from = options[:from])
         @from = if from[:category]
-          FbGraph::Page.new(from.delete(:id), from) 
+          FbGraph::Page.new(from.delete(:id), from)
         else
-          FbGraph::User.new(from.delete(:id), from) 
+          FbGraph::User.new(from.delete(:id), from)
         end
       end
       @link         = options[:link]
       @message      = options[:message]
-      @updated_time = options[:updated_time]
+      if options[:updated_time]
+        @updated_time = Time.parse(options[:updated_time])
+      end
     end
   end
 end

data/lib/fb_graph/note.rb

@@ -8,15 +8,19 @@ module FbGraph
       super
       if (from = options[:from])
         @from = if from[:category]
-          FbGraph::Page.new(from.delete(:id), from) 
+          FbGraph::Page.new(from.delete(:id), from)
         else
-          FbGraph::User.new(from.delete(:id), from) 
+          FbGraph::User.new(from.delete(:id), from)
         end
       end
       @subject      = options[:subject]
       @message      = options[:message]
-      @created_time = options[:created_time]
-      @updated_time = options[:updated_time]
+      if options[:created_time]
+        @created_time = Time.parse(options[:created_time])
+      end
+      if options[:updated_time]
+        @updated_time = Time.parse(options[:updated_time])
+      end
     end
   end
 end

data/lib/fb_graph/photo.rb

@@ -8,15 +8,15 @@ module FbGraph
       super
       if (from = options[:from])
         @from = if from[:category]
-          FbGraph::Page.new(from.delete(:id), from) 
+          FbGraph::Page.new(from.delete(:id), from)
         else
-          FbGraph::User.new(from.delete(:id), from) 
+          FbGraph::User.new(from.delete(:id), from)
         end
       end
       @tags = []
       if options[:tags]
         FbGraph::Collection.new(options[:tags]).each do |tag|
-          @tags << FbGraph::Tag.new(tag.delete(:id), tag) 
+          @tags << FbGraph::Tag.new(tag.delete(:id), tag)
         end
       end
       @name         = options[:name]
@@ -25,8 +25,12 @@ module FbGraph
       @height       = options[:height]
       @width        = options[:width]
       @link         = options[:link]
-      @created_time = options[:created_time]
-      @updated_time = options[:updated_time]
+      if options[:created_time]
+        @created_time = Time.parse(options[:created_time])
+      end
+      if options[:updated_time]
+        @updated_time = Time.parse(options[:updated_time])
+      end
     end
   end
 end

data/lib/fb_graph/post.rb

@@ -8,34 +8,41 @@ module FbGraph
       super
       if (from = options[:from])
         @from = if from[:category]
-          FbGraph::Page.new(from.delete(:id), from) 
+          FbGraph::Page.new(from.delete(:id), from)
         else
-          FbGraph::User.new(from.delete(:id), from) 
+          FbGraph::User.new(from.delete(:id), from)
         end
       end
       @to = []
       if options[:to]
         FbGraph::Collection.new(options[:to]).each do |to|
           @to << if to[:category]
-            FbGraph::Page.new(to.delete(:id), to) 
+            FbGraph::Page.new(to.delete(:id), to)
           else
-            FbGraph::User.new(to.delete(:id), to) 
+            FbGraph::User.new(to.delete(:id), to)
           end
         end
       end
-      @message      = options[:message]
-      @picture      = options[:picture]
-      @link         = options[:link]
-      @name         = options[:name]
-      @caption      = options[:caption]
-      @description  = options[:description]
-      @source       = options[:source]
-      @icon         = options[:icon]
-      @attribution  = options[:attribution]
-      @actions      = options[:actions]
-      @likes        = options[:likes]
-      @created_time = options[:created_time]
-      @updated_time = options[:updated_time]
+      @message     = options[:message]
+      @picture     = options[:picture]
+      @link        = options[:link]
+      @name        = options[:name]
+      @caption     = options[:caption]
+      @description = options[:description]
+      @source      = options[:source]
+      @icon        = options[:icon]
+      @attribution = options[:attribution]
+      @actions     = options[:actions]
+      @likes       = options[:likes]
+      if options[:created_time]
+        @created_time = Time.parse(options[:created_time])
+      end
+      if options[:updated_time]
+        @updated_time = Time.parse(options[:updated_time])
+      end
+
+      # cached connection
+      @_comments_ = FbGraph::Collection.new(options[:comments])
     end
   end
 end

data/lib/fb_graph/status.rb

@@ -10,11 +10,13 @@ module FbGraph
         @from = if from[:category]
           FbGraph::Page.new(from.delete(:id), from)
         else
-          FbGraph::User.new(from.delete(:id), from) 
+          FbGraph::User.new(from.delete(:id), from)
         end
       end
-      @message      = options[:message]
-      @updated_time = options[:updated_time]
+      @message = options[:message]
+      if (updated_time = options.delete(:updated_time))
+        @updated_time = Time.parse(updated_time)
+      end
     end
   end
 end

data/lib/fb_graph/tag.rb

@@ -7,7 +7,9 @@ module FbGraph
     def initialize(identifier, options = {})
       @x = options.delete(:x)
       @y = options.delete(:y)
-      @created_time = options.delete(:created_time)
+      if (created_time = options.delete(:created_time))
+        @created_time = Time.parse(created_time)
+      end
       @user = User.new(identifier, options)
     end
   end

data/lib/fb_graph/user.rb

@@ -36,11 +36,23 @@ module FbGraph
       @first_name = options[:first_name]
       @link       = options[:link]
       @about      = options[:about]
-      @birthday   = options[:birthday]
-      @work       = options[:work]
-      @education  = options[:education]
       @email      = options[:email]
-      @website    = options[:website]
+      if options[:birthday]
+        @birthday = Date.parse(options[:birthday])
+      end
+      @work = []
+      if options[:work]
+        options[:work].each do |work|
+          @work << FbGraph::Work.new(work)
+        end
+      end
+      @education = []
+      if options[:education]
+        options[:education].each do |education|
+          @education << FbGraph::Education.new(education)
+        end
+      end
+      @website = options[:website].to_s.split("\n")
     end
 
     def self.me(access_token)

data/lib/fb_graph/video.rb

@@ -8,16 +8,20 @@ module FbGraph
       super
       if (from = options[:from])
         @from = if from[:category]
-          FbGraph::Page.new(from.delete(:id), from) 
+          FbGraph::Page.new(from.delete(:id), from)
         else
-          FbGraph::User.new(from.delete(:id), from) 
+          FbGraph::User.new(from.delete(:id), from)
         end
       end
-      @message      = options[:message]
-      @description  = options[:description]
-      @length       = options[:length]
-      @created_time = options[:created_time]
-      @updated_time = options[:updated_time]
+      @message     = options[:message]
+      @description = options[:description]
+      @length      = options[:length]
+      if options[:created_time]
+        @created_time = Time.parse(options[:created_time])
+      end
+      if options[:updated_time]
+        @updated_time = Time.parse(options[:updated_time])
+      end
     end
   end
 end

data/lib/fb_graph/work.rb

@@ -0,0 +1,25 @@
+module FbGraph
+  class Work
+    include FbGraph::Comparison
+
+    attr_accessor :employer, :location, :position, :start_date, :end_date
+
+    def initialize(attributes = {})
+      if (employer = attributes[:employer])
+        @employer = FbGraph::Page.new(employer.delete(:id), employer)
+      end
+      if (location = attributes[:location])
+        @location = FbGraph::Page.new(location.delete(:id), location)
+      end
+      if (position = attributes[:position])
+        @position = FbGraph::Page.new(position.delete(:id), position)
+      end
+      if attributes[:start_date]
+        @start_date = Date.new(*attributes[:start_date].split('-').collect(&:to_i))
+      end
+      if attributes[:end_date] && attributes[:end_date] != '0000-00'
+        @end_date = Date.new(*attributes[:end_date].split('-').collect(&:to_i))
+      end
+    end
+  end
+end

data/lib/fb_graph.rb

@@ -35,6 +35,7 @@ require 'fb_graph/connections'
 require 'fb_graph/node'
 require 'fb_graph/album'
 require 'fb_graph/comment'
+require 'fb_graph/education'
 require 'fb_graph/event'
 require 'fb_graph/group'
 require 'fb_graph/link'
@@ -47,3 +48,4 @@ require 'fb_graph/tag'
 require 'fb_graph/user'
 require 'fb_graph/venue'
 require 'fb_graph/video'
+require 'fb_graph/work'

data/spec/fake_json/posts/platform_private.json

@@ -0,0 +1,97 @@
+{
+   "id": "19292868552_118464504835613",
+   "from": {
+      "name": "Facebook Platform",
+      "category": "Technology",
+      "id": "19292868552"
+   },
+   "message": "We're getting ready for f8! Check out the latest on the f8 Page, including a video from the first event, when Platform launched :: http://bit.ly/ahHl7j",
+   "created_time": "2010-04-15T17:37:03+0000",
+   "updated_time": "2010-04-22T18:19:13+0000",
+   "likes": 61,
+   "comments": {
+      "data": [
+         {
+            "id": "19292868552_118464504835613_388624",
+            "from": {
+               "name": "Sisi GeLap Qu",
+               "id": "1458135488"
+            },
+            "message": "hadir",
+            "created_time": "2010-04-15T17:37:52+0000"
+         },
+         {
+            "id": "19292868552_118464504835613_390050",
+            "from": {
+               "name": "Goran Kaplovic",
+               "id": "1849687320"
+            },
+            "message": "Platform Fans.. would you like to launch your own facebook integrated FMyLife.com 4 free? check this out: http://facebook.com/Anekdotz",
+            "created_time": "2010-04-15T20:29:35+0000"
+         },
+         {
+            "id": "19292868552_118464504835613_390487",
+            "from": {
+               "name": "Manuela Morales",
+               "id": "1259255079"
+            },
+            "message": "become a fan plz http://www.facebook.com/?sk=messages&tid=1426513385890#!/pages/Juanita-Rojas-Gabriela-Bernal/105811462793768?ref=nf <---please become a fannn \u2665",
+            "created_time": "2010-04-15T21:23:27+0000"
+         },
+         {
+            "id": "19292868552_118464504835613_391357",
+            "from": {
+               "name": "Gotti Hase Lepit",
+               "id": "1151607928"
+            },
+            "message": "http://www.facebook.com/home.php#!/pages/Munchen-Germany/Lepit-Clothing/97683488231?ref=ts",
+            "created_time": "2010-04-15T23:24:01+0000"
+         },
+         {
+            "id": "19292868552_118464504835613_395097",
+            "from": {
+               "name": "Sinem \u00d6zt\u00fcrk",
+               "id": "1648592169"
+            },
+            "message": "yetkililerin dikkatin habibe \u00f6zt\u00fcrk budak adl\u0131 hesab\u0131m anlams\u0131zca kapat\u0131lm\u0131\u015f okadar mail \u00e7ektigime g\u00f6re bir ileriye d\u00f6n\u00fck cevap alamad\u0131m ",
+            "created_time": "2010-04-16T11:01:56+0000"
+         },
+         {
+            "id": "19292868552_118464504835613_395110",
+            "from": {
+               "name": "Sinem \u00d6zt\u00fcrk",
+               "id": "1648592169"
+            },
+            "message": "d\u00fcn bir yaz\u0131 yaz\u0131lm\u0131\u015f kimlik fotokopisini istiyor kay\u0131t ederken bu t\u00fcr bilgi istemmemi\u015fken kapat\u0131ktan sonra neye dayanarak bu bilgiyi isteye biliniyor ",
+            "created_time": "2010-04-16T11:03:27+0000"
+         },
+         {
+            "id": "19292868552_118464504835613_395124",
+            "from": {
+               "name": "Sinem \u00d6zt\u00fcrk",
+               "id": "1648592169"
+            },
+            "message": "face yeklilerinden rica ediyorum bu nas\u0131l bir yer cevap bekliyorum ben sorunum i\u00e7in nereye ba\u015f vurmam gerek adresim ba\u015fkalar\u0131 taraf\u0131ndan kullan\u0131lmad\u0131g\u0131ndan nas\u0131l emin olabilirim benim resmimde vard\u0131 belkide resmimi kullanacak \nl\u00fctfen cevap",
+            "created_time": "2010-04-16T11:06:01+0000"
+         },
+         {
+            "id": "19292868552_118464504835613_429610",
+            "from": {
+               "name": "Mubashir Tanvir Zaver \u0645\u0628\u0634\u0631\u062a\u0646\u0648\u06cc\u0631\u0632\u06cc\u0648\u0631",
+               "id": "1181826641"
+            },
+            "message": ".\nThe \"AMAZING\" Page:\n\nhttp://www.facebook.com/profile.php?id=1181826641&ref=profile#!/pages/AMAZING/10150157765120055?ref=ts",
+            "created_time": "2010-04-20T14:48:57+0000"
+         },
+         {
+            "id": "19292868552_118464504835613_449320",
+            "from": {
+               "name": "Steve Boyer",
+               "id": "17814467"
+            },
+            "message": "These changes are amazing.  Watch out world!  FB is coming!",
+            "created_time": "2010-04-22T18:19:13+0000"
+         }
+      ]
+   }
+}