fb_graph 1.3.1 → 1.3.2

data/VERSION

@@ -1 +1 @@
-1.3.1
+1.3.2

data/fb_graph.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fb_graph}
-  s.version = "1.3.1"
+  s.version = "1.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["nov matake"]
@@ -49,6 +49,7 @@ Gem::Specification.new do |s|
     "lib/fb_graph/connections/feed.rb",
     "lib/fb_graph/connections/friend_lists.rb",
     "lib/fb_graph/connections/friends.rb",
+    "lib/fb_graph/connections/games.rb",
     "lib/fb_graph/connections/groups.rb",
     "lib/fb_graph/connections/home.rb",
     "lib/fb_graph/connections/insights.rb",
@@ -171,6 +172,7 @@ Gem::Specification.new do |s|
     "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/games/matake_private.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",
@@ -217,6 +219,7 @@ Gem::Specification.new do |s|
     "spec/fb_graph/connections/feed_spec.rb",
     "spec/fb_graph/connections/friend_lists_spec.rb",
     "spec/fb_graph/connections/friends_spec.rb",
+    "spec/fb_graph/connections/games_spec.rb",
     "spec/fb_graph/connections/groups_spec.rb",
     "spec/fb_graph/connections/home_spec.rb",
     "spec/fb_graph/connections/insights_spec.rb",
@@ -251,6 +254,7 @@ Gem::Specification.new do |s|
     "spec/fb_graph/note_spec.rb",
     "spec/fb_graph/page_spec.rb",
     "spec/fb_graph/photo_spec.rb",
+    "spec/fb_graph/place_spec.rb",
     "spec/fb_graph/post_spec.rb",
     "spec/fb_graph/privacy_spec.rb",
     "spec/fb_graph/project_spec.rb",
@@ -295,6 +299,7 @@ Gem::Specification.new do |s|
     "spec/fb_graph/connections/feed_spec.rb",
     "spec/fb_graph/connections/friend_lists_spec.rb",
     "spec/fb_graph/connections/friends_spec.rb",
+    "spec/fb_graph/connections/games_spec.rb",
     "spec/fb_graph/connections/groups_spec.rb",
     "spec/fb_graph/connections/home_spec.rb",
     "spec/fb_graph/connections/insights_spec.rb",
@@ -329,6 +334,7 @@ Gem::Specification.new do |s|
     "spec/fb_graph/note_spec.rb",
     "spec/fb_graph/page_spec.rb",
     "spec/fb_graph/photo_spec.rb",
+    "spec/fb_graph/place_spec.rb",
     "spec/fb_graph/post_spec.rb",
     "spec/fb_graph/privacy_spec.rb",
     "spec/fb_graph/project_spec.rb",

data/lib/fb_graph/connections/games.rb

@@ -0,0 +1,14 @@
+module FbGraph
+  module Connections
+    module Games
+      def games(options = {})
+        games = self.connection(:games, options)
+        games.map! do |game|
+          Page.new(game.delete(:id), game.merge(
+            :access_token => options[:access_token] || self.access_token
+          ))
+        end
+      end
+    end
+  end
+end

data/lib/fb_graph/education.rb

@@ -2,7 +2,7 @@ module FbGraph
   class Education
     include Comparison
 
-    attr_accessor :school, :degree, :year, :concentration
+    attr_accessor :school, :degree, :year, :concentration, :classes, :type
 
     def initialize(attributes = {})
       if (school = attributes[:school])
@@ -20,6 +20,13 @@ module FbGraph
           @concentration << Page.new(concentration.delete(:id), concentration)
         end
       end
+      @classes = []
+      if attributes[:classes]
+        attributes[:classes].each do |klass|
+          @classes << Page.new(klass.delete(:id), klass)
+        end
+      end
+      @type = attributes[:type]
     end
   end
 end

data/lib/fb_graph/page.rb

@@ -16,7 +16,7 @@ module FbGraph
     include Connections::Videos
     extend Searchable
 
-    attr_accessor :name, :username, :link, :category, :founded, :is_community_page, :company_overview, :general_info, :mission, :products, :release_date, :fan_count, :location, :website, :like_count, :checkin_count
+    attr_accessor :name, :username, :link, :category, :founded, :is_community_page, :company_overview, :general_info, :mission, :products, :release_date, :fan_count, :location, :website, :like_count, :checkin_count, :with, :created_time
 
     def initialize(identifier, attributes = {})
       super
@@ -44,6 +44,15 @@ module FbGraph
       @website = attributes[:website]
       @like_count = attributes[:likes]
       @checkin_count = attributes[:checkins]
+      @with = []
+      if attributes[:with]
+        attributes[:with].each do |user|
+          @with << User.new(user.delete(:id), user)
+        end
+      end
+      if attributes[:created_time]
+        @created_time = Time.parse(attributes[:created_time]).utc
+      end
     end
   end
 end

data/lib/fb_graph/project.rb

@@ -1,15 +1,9 @@
 module FbGraph
   class Project < Page
-    attr_accessor :with, :start_date, :end_date
+    attr_accessor :start_date, :end_date
 
     def initialize(identifier, attributes = {})
       super
-      @with = []
-      if attributes[:with]
-        attributes[:with].each do |user|
-          @with << User.new(user.delete(:id), user)
-        end
-      end
       if attributes[:start_date]
         year, month = attributes[:start_date].split('-').collect(&:to_i)
         @start_date = if month == 0

data/lib/fb_graph/user.rb

@@ -9,6 +9,7 @@ module FbGraph
     include Connections::Feed
     include Connections::FriendLists
     include Connections::Friends
+    include Connections::Games
     include Connections::Groups
     include Connections::Home
     include Connections::Interests
@@ -32,7 +33,7 @@ module FbGraph
     # ++
     extend Searchable
 
-    attr_accessor :first_name, :last_name, :name, :link, :about, :birthday, :work, :education, :email, :website, :hometown, :location, :bio, :quotes, :gender, :interested_in, :meeting_for, :relationship_status, :religion, :political, :verified, :significant_other, :timezone, :updated_time
+    attr_accessor :first_name, :last_name, :name, :link, :about, :birthday, :work, :education, :email, :website, :hometown, :location, :bio, :quotes, :gender, :interested_in, :meeting_for, :relationship_status, :religion, :political, :verified, :significant_other, :timezone, :updated_time, :sports, :favorite_teams, :favorite_athletes, :inspirational_people, :locale, :languages, :third_party_id
 
     def initialize(identifier, attributes = {})
       super
@@ -66,6 +67,30 @@ module FbGraph
       if (location = attributes[:location])
         @location = Page.new(location.delete(:id), location)
       end
+      @sports = []
+      if (sports = attributes[:sports])
+        sports.each do |sport|
+          @sports << Page.new(sport.delete(:id), sport)
+        end
+      end
+      @favorite_teams = []
+      if attributes[:favorite_teams]
+        attributes[:favorite_teams].each do |favorite_team|
+          @favorite_teams << Page.new(favorite_team.delete(:id), favorite_team)
+        end
+      end
+      @favorite_athletes = []
+      if attributes[:favorite_athletes]
+        attributes[:favorite_athletes].each do |favorite_athlete|
+          @favorite_athletes << Page.new(favorite_athlete.delete(:id), favorite_athlete)
+        end
+      end
+      @inspirational_people = []
+      if attributes[:inspirational_people]
+        attributes[:inspirational_people].each do |inspirational_person|
+          @inspirational_people << Page.new(inspirational_person.delete(:id), inspirational_person)
+        end
+      end
       @bio                 = attributes[:bio]
       @quotes              = attributes[:quotes]
       @gender              = attributes[:gender]
@@ -75,8 +100,18 @@ module FbGraph
       @religion            = attributes[:religion]
       @political           = attributes[:political]
       @verified            = attributes[:verified]
-      @significant_other   = attributes[:significant_other] # What's this??
+      if (significant_other = attributes[:significant_other])
+        @significant_other = User.new(significant_other.delete(:id), significant_other)
+      end
       @timezone            = attributes[:timezone]
+      @locale              = attributes[:locale]
+      @third_party_id      = attributes[:third_party_id]
+      @languages = []
+      if attributes[:languages]
+        attributes[:languages].each do |language|
+          @languages << Page.new(language.delete(:id), language)
+        end
+      end
       if attributes[:updated_time]
         @updated_time = Time.parse(attributes[:updated_time]).utc
       end

data/spec/fake_json/users/games/matake_private.json

@@ -0,0 +1,10 @@
+{
+   "data": [
+      {
+         "name": "FarmVille Cows",
+         "category": "Game",
+         "id": "101392683235776",
+         "created_time": "2011-01-05T13:37:40+0000"
+      }
+   ]
+}

data/spec/fake_json/users/me_private.json

@@ -30,7 +30,6 @@
             "name": "Rails Developer"
          },
          "start_date": "2008-10",
-         "end_date": "0000-00",
          "projects": [
             {
                "id": "139390256117606",
@@ -54,6 +53,16 @@
             "id": "114582978558535",
             "name": "Web-developer"
          },
+         "with": [
+            {
+               "id": "1064067203",
+               "name": "Takanori Ishikawa"
+            },
+            {
+               "id": "1641626585",
+               "name": "Shoichi Imamura"
+            }
+         ],
          "start_date": "2006-01",
          "end_date": "2008-09",
          "projects": [
@@ -66,7 +75,7 @@
                      "name": "Takanori Ishikawa"
                   }
                ],
-               "start_date": "2008-04",
+               "start_date": "2008-00",
                "end_date": "2008-09"
             },
             {
@@ -96,6 +105,40 @@
          ]
       }
    ],
+   "sports": [
+      {
+         "id": "114967135183020",
+         "name": "Billiards"
+      },
+      {
+         "id": "104085636293671",
+         "name": "Darts"
+      },
+      {
+         "id": "111124835576428",
+         "name": "Rugby"
+      }
+   ],
+   "favorite_teams": [
+      {
+         "id": "112498808761105",
+         "name": "Bologna F.C. 1909"
+      },
+      {
+         "id": "103968596307357",
+         "name": "Gamba Osaka"
+      }
+   ],
+   "favorite_athletes": [
+      {
+         "id": "112766865404959",
+         "name": "Giuseppe Signori"
+      }
+   ],
+   "inspirational_people": [{
+      "id": "1234567890",
+      "name": "Someone"
+    }],
    "education": [
       {
          "school": {
@@ -144,7 +187,19 @@
             "id": "125324724167172",
             "name": "2000"
          },
-         "type": "High School"
+         "type": "High School",
+         "classes": [
+            {
+               "id": "182887815062869",
+               "name": "class '99",
+               "with": [
+                  {
+                     "id": "1268300987",
+                     "name": "Yuko Shimabata"
+                  }
+               ]
+            }
+         ]
       }
    ],
    "gender": "male",
@@ -155,6 +210,10 @@
       "Friendship",
       "Networking"
    ],
+   "significant_other": {
+      "id": "1234567890",
+      "name": "Satomi Matake"
+    },
    "relationship_status": "Married",
    "website": "http://matake.jp",
    "timezone": 9,
@@ -170,5 +229,5 @@
       }
    ],
    "verified": true,
-   "updated_time": "2010-12-11T08:33:47+0000"
+   "updated_time": "2011-01-05T13:44:17+0000"
 }

data/spec/fb_graph/checkin_spec.rb

@@ -1,6 +1,11 @@
 require File.join(File.dirname(__FILE__), '../spec_helper')
 
 describe FbGraph::Checkin, '.new' do
+  it 'should accept FbGraph::Place as place' do
+    checkin = FbGraph::Checkin.new(12345, :place => FbGraph::Place.new(123456))
+    checkin.place.should == FbGraph::Place.new(123456)
+  end
+
   it 'should accept String/Integer as place' do
     checkin1 = FbGraph::Checkin.new(12345, :place => 123456)
     checkin2 = FbGraph::Checkin.new(12345, :place => '123456')

data/spec/fb_graph/connections/games_spec.rb

@@ -0,0 +1,22 @@
+require File.join(File.dirname(__FILE__), '../../spec_helper')
+
+describe FbGraph::Connections::Activities, '#activities' do
+  before do
+    fake_json(:get, 'matake/games?access_token=access_token', 'users/games/matake_private')
+  end
+
+  it 'should return games as FbGraph::Page' do
+    games = FbGraph::User.new('matake', :access_token => 'access_token').games
+    games.class.should == FbGraph::Connection
+    games.first.should == FbGraph::Page.new(
+      '101392683235776',
+      :access_token => 'access_token',
+      :name => 'FarmVille Cows',
+      :category => 'Game',
+      :created_time => '2011-01-05T13:37:40+0000'
+    )
+    games.each do |game|
+      game.should be_instance_of(FbGraph::Page)
+    end
+  end
+end

data/spec/fb_graph/place_spec.rb

@@ -0,0 +1,8 @@
+require File.join(File.dirname(__FILE__), '../spec_helper')
+
+describe FbGraph::Place, '.to_json' do
+  it 'should return identifier' do
+    place = FbGraph::Place.new(12345)
+    place.to_json.should == 12345
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fb_graph
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 1
   - 3
-  - 1
-  version: 1.3.1
+  - 2
+  version: 1.3.2
 platform: ruby
 authors: 
 - nov matake
@@ -167,6 +167,7 @@ files:
 - lib/fb_graph/connections/feed.rb
 - lib/fb_graph/connections/friend_lists.rb
 - lib/fb_graph/connections/friends.rb
+- lib/fb_graph/connections/games.rb
 - lib/fb_graph/connections/groups.rb
 - lib/fb_graph/connections/home.rb
 - lib/fb_graph/connections/insights.rb
@@ -289,6 +290,7 @@ files:
 - 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/games/matake_private.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
@@ -335,6 +337,7 @@ files:
 - spec/fb_graph/connections/feed_spec.rb
 - spec/fb_graph/connections/friend_lists_spec.rb
 - spec/fb_graph/connections/friends_spec.rb
+- spec/fb_graph/connections/games_spec.rb
 - spec/fb_graph/connections/groups_spec.rb
 - spec/fb_graph/connections/home_spec.rb
 - spec/fb_graph/connections/insights_spec.rb
@@ -369,6 +372,7 @@ files:
 - spec/fb_graph/note_spec.rb
 - spec/fb_graph/page_spec.rb
 - spec/fb_graph/photo_spec.rb
+- spec/fb_graph/place_spec.rb
 - spec/fb_graph/post_spec.rb
 - spec/fb_graph/privacy_spec.rb
 - spec/fb_graph/project_spec.rb
@@ -442,6 +446,7 @@ test_files:
 - spec/fb_graph/connections/feed_spec.rb
 - spec/fb_graph/connections/friend_lists_spec.rb
 - spec/fb_graph/connections/friends_spec.rb
+- spec/fb_graph/connections/games_spec.rb
 - spec/fb_graph/connections/groups_spec.rb
 - spec/fb_graph/connections/home_spec.rb
 - spec/fb_graph/connections/insights_spec.rb
@@ -476,6 +481,7 @@ test_files:
 - spec/fb_graph/note_spec.rb
 - spec/fb_graph/page_spec.rb
 - spec/fb_graph/photo_spec.rb
+- spec/fb_graph/place_spec.rb
 - spec/fb_graph/post_spec.rb
 - spec/fb_graph/privacy_spec.rb
 - spec/fb_graph/project_spec.rb