fb_graph 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/fb_graph.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fb_graph}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["nov matake"]
-  s.date = %q{2010-05-21}
+  s.date = %q{2010-06-06}
   s.description = %q{A Ruby wrapper for Facebook Graph API}
   s.email = %q{nov@matake.jp}
   s.extra_rdoc_files = [

data/lib/fb_graph.rb

@@ -5,8 +5,7 @@ require 'restclient'
 # NOTE:
 # For some reason, ActiveSupport 3.0.0 doesn'tj load whole code.
 # Load needed extention directly for now.
-require 'active_support/core_ext/object'
-require 'active_support/core_ext/hash'
+require 'active_support/core_ext'
 
 module FbGraph
   ROOT_URL = "https://graph.facebook.com"

data/lib/fb_graph/node.rb

@@ -86,10 +86,8 @@ module FbGraph
         _response_ = JSON.parse(response.body).with_indifferent_access
         if _response_[:error]
           case _response_[:error][:type]
-          when 'OAuthAccessTokenException'
+          when 'OAuthAccessTokenException', 'QueryParseException'
             raise FbGraph::Unauthorized.new(401, _response_[:error][:message])
-          when 'QueryParseException'
-            raise FbGraph::NotFound.new(404, _response_[:error][:message])
           else
             raise FbGraph::Exception.new(400, "#{_response_[:error][:type]} :: #{_response_[:error][:message]}")
           end

data/lib/fb_graph/user.rb

@@ -27,16 +27,15 @@ module FbGraph
     # include Connections::Outbox
     # include Connections::Updates
 
-    attr_accessor :name, :last_name, :first_name, :link, :about, :birthday, :work, :education, :email, :website
+    attr_accessor :first_name, :last_name, :name, :link, :about, :birthday, :work, :education, :email, :website, :hometown, :location, :gender, :interested_in, :meeting_for, :relationship_status, :religion, :political, :verified, :significant_other, :timezone, :updated_time
 
     def initialize(identifier, options = {})
       super
-      @name       = options[:name]
-      @last_name  = options[:last_name]
       @first_name = options[:first_name]
+      @last_name  = options[:last_name]
+      @name       = options[:name]
       @link       = options[:link]
       @about      = options[:about]
-      @email      = options[:email]
       if options[:birthday]
         month, day, year = options[:birthday].split('/').collect(&:to_i)
         year ||= 0
@@ -54,7 +53,26 @@ module FbGraph
           @education << FbGraph::Education.new(education)
         end
       end
+      @email   = options[:email]
       @website = options[:website].to_s.split("\n")
+      if (hometown = options[:hometown])
+        @hometown = FbGraph::Page.new(hometown.delete(:id), hometown)
+      end
+      if (location = options[:location])
+        @location = FbGraph::Page.new(location.delete(:id), location)
+      end
+      @gender              = options[:gender]
+      @interested_in       = Array(options[:interested_in])
+      @meeting_for         = Array(options[:meeting_for])
+      @relationship_status = options[:relationship_status]
+      @religion            = options[:religion]
+      @political           = options[:political]
+      @verified            = options[:verified]
+      @significant_other   = options[:significant_other] # What's this??
+      @timezone            = options[:timezone]
+      if options[:updated_time]
+        @updated_time = Time.parse(options[:updated_time]).utc
+      end
     end
 
     def self.me(access_token)

data/spec/fake_json/users/arjun_private.json

@@ -4,8 +4,16 @@
    "first_name": "Arjun",
    "last_name": "Banker",
    "link": "http://www.facebook.com/Arjun",
-   "about": "squish squash\npip pop\nfizz bang",
+   "about": "daydrea",
    "birthday": "04/15/1984",
+   "hometown": {
+      "id": 109533479072558,
+      "name": "Minnetonka, Minnesota"
+   },
+   "location": {
+      "id": 114952118516947,
+      "name": "San Francisco, California"
+   },
    "work": [
       {
          "employer": {
@@ -87,13 +95,15 @@
          ]
       }
    ],
+   "gender": "male",
    "interested_in": [
-      "\\u5973\\u6027"
+      "female"
    ],
    "meeting_for": [
-      "\\u53cb\\u60c5"
+      "Friendship"
    ],
+   "relationship_status": "In a Relationship",
    "religion": "zorp",
-   "timezone": -7,
-   "updated_time": "2010-04-22T18:23:22+0000"
+   "political": "Liberal",
+   "updated_time": "2010-05-29T04:29:23+0000"
 }

data/spec/fake_json/users/arjun_public.json

@@ -3,5 +3,10 @@
    "name": "Arjun Banker",
    "first_name": "Arjun",
    "last_name": "Banker",
-   "link": "http://www.facebook.com/Arjun"
+   "link": "http://www.facebook.com/Arjun",
+   "location": {
+      "id": 114952118516947,
+      "name": "San Francisco, California"
+   },
+   "gender": "male"
 }

data/spec/fake_json/users/me_private.json

@@ -6,18 +6,123 @@
    "link": "http://www.facebook.com/matake",
    "about": "I'm a Ruby on Rails Developer on smart.fm",
    "birthday": "12/13/1981",
+   "hometown": {
+      "id": 112359252112966,
+      "name": "Hirakata, Osaka"
+   },
+   "location": {
+      "id": 108449982512946,
+      "name": "Kawasaki, Kanagawa"
+   },
+   "work": [
+      {
+         "employer": {
+            "id": 105612642807396,
+            "name": "Cerego Japan Inc."
+         },
+         "location": {
+            "id": 114600441890814,
+            "name": "Shibuya"
+         },
+         "position": {
+            "id": 112075768810308,
+            "name": "Web Engineer"
+         },
+         "start_date": "2008-00",
+         "end_date": "0000-00"
+      },
+      {
+         "employer": {
+            "id": 107722015925937,
+            "name": "Drecom Co., Ltd."
+         },
+         "location": {
+            "id": 111736052177472,
+            "name": "Tokyo, Tokyo"
+         },
+         "position": {
+            "id": 111091815582753,
+            "name": "Web Engineer"
+         },
+         "start_date": "2007-04",
+         "end_date": "2008-09"
+      }
+   ],
+   "education": [
+      {
+         "school": {
+            "id": 110149592341159,
+            "name": "\u540c\u5fd7\u793e\u5927\u5b66"
+         },
+         "degree": {
+            "id": 110616875633830,
+            "name": "Master of Engineering"
+         },
+         "year": {
+            "id": 104926492884272,
+            "name": "2007"
+         },
+         "concentration": [
+            {
+               "id": 112303688789448,
+               "name": "Engineering"
+            },
+            {
+               "id": 102358546472290,
+               "name": "Intelligent Information"
+            },
+            {
+               "id": 108311762535367,
+               "name": "Intelligent Systems Design Laboratory"
+            }
+         ]
+      },
+      {
+         "school": {
+            "id": 110149592341159,
+            "name": "\u540c\u5fd7\u793e\u5927\u5b66"
+         },
+         "year": {
+            "id": 117078804987252,
+            "name": "2004"
+         },
+         "concentration": [
+            {
+               "id": 108311762535367,
+               "name": "Intelligent Systems Design Laboratory"
+            },
+            {
+               "id": 120973077930419,
+               "name": "Engineering"
+            },
+            {
+               "id": 114592028573050,
+               "name": "Intelligent Information"
+            }
+         ]
+      },
+      {
+         "school": {
+            "id": 114666815212021,
+            "name": "Doshisha H.S."
+         },
+         "year": {
+            "id": 125827317431375,
+            "name": "2000"
+         }
+      }
+   ],
+   "gender": "male",
    "interested_in": [
-      "\u5973\u6027"
+      "female"
    ],
    "meeting_for": [
-      "\u53cb\u60c5",
-      "\u30c7\u30fc\u30c8",
-      "\u604b\u611b",
-      "\u60c5\u5831\u4ea4\u63db"
+      "Friendship",
+      "Networking"
    ],
-   "relationship_status": "\u65e2\u5a5a",
-   "website": "http://matake.jp\nhttp://blog.matake.jp\nhttp://railspress.matake.jp",
+   "relationship_status": "Married",
+   "website": "http://matake.jp",
    "timezone": 9,
    "verified": true,
-   "updated_time": "2009-10-01T06:57:02+0000"
+   "updated_time": "2010-05-20T06:50:04+0000"
 }

data/spec/fb_graph/connections/friends_spec.rb

@@ -26,10 +26,10 @@ describe FbGraph::Connections::Friends, '#friends' do
     end
 
     context 'when identifier is me and no access_token is given' do
-      it 'should raise FbGraph::NotFound' do
+      it 'should raise FbGraph::Unauthorized' do
         lambda do
           FbGraph::User.new('me').friends
-        end.should raise_exception(FbGraph::NotFound)
+        end.should raise_exception(FbGraph::Unauthorized)
       end
     end
 

data/spec/fb_graph/connections/home_spec.rb

@@ -26,10 +26,10 @@ describe FbGraph::Connections::Home, '#home' do
     end
 
     context 'when identifier is me and no access_token is given' do
-      it 'should raise FbGraph::NotFound' do
+      it 'should raise FbGraph::Unauthorized' do
         lambda do
           FbGraph::User.new('me').home
-        end.should raise_exception(FbGraph::NotFound)
+        end.should raise_exception(FbGraph::Unauthorized)
       end
     end
 

data/spec/fb_graph/tag_spec.rb

@@ -15,7 +15,6 @@ describe FbGraph::Tag, '.new' do
     tag.x.should == 32.5
     tag.y.should == 27.7778
     tag.created_time.should == Time.parse("2010-04-22T08:24:26+0000")
-    
   end
 
 end

data/spec/fb_graph/user_spec.rb

@@ -17,10 +17,38 @@ end
 
 describe FbGraph::User, '.fetch' do
   before(:all) do
+    fake_json(:get, 'me', 'users/me_public')
+    fake_json(:get, 'me?access_token=access_token', 'users/me_private')
     fake_json(:get, 'arjun', 'users/arjun_public')
     fake_json(:get, 'arjun?access_token=access_token', 'users/arjun_private')
   end
 
+  context 'with me context' do
+
+    context 'when no access_token given' do
+      it 'should raise FbGraph::Unauthorized' do
+        lambda do
+          FbGraph::User.fetch('me')
+        end.should raise_exception(FbGraph::Unauthorized)
+      end
+    end
+
+    context 'when access_token given' do
+      it 'should get current user profile' do
+        user = FbGraph::User.me('access_token').fetch
+        user.interested_in.should       == ['female']
+        user.meeting_for.should         == ['Friendship', 'Networking']
+        user.relationship_status.should == 'Married'
+        user.website.should             == ['http://matake.jp']
+        user.religion.should            be_nil
+        user.political.should           be_nil
+        user.timezone.should            == 9
+        user.verified.should            be_true
+      end
+    end
+
+  end
+
   context 'when no access_token given' do
     it 'should get only public profile' do
       user = FbGraph::User.fetch('arjun')
@@ -29,6 +57,8 @@ describe FbGraph::User, '.fetch' do
       user.last_name.should  == 'Banker'
       user.identifier.should == '7901103'
       user.link.should       == 'http://www.facebook.com/Arjun'
+      user.location.should   == FbGraph::Page.new(114952118516947, :name => 'San Francisco, California')
+      user.gender.should     == 'male'
     end
   end
 
@@ -42,9 +72,11 @@ describe FbGraph::User, '.fetch' do
       user.last_name.should  == 'Banker'
       user.identifier.should == '7901103'
       user.link.should       == 'http://www.facebook.com/Arjun'
+      user.location.should   == FbGraph::Page.new(114952118516947, :name => 'San Francisco, California')
+      user.gender.should     == 'male'
 
       # private
-      user.about.should    == "squish squash\npip pop\nfizz bang"
+      user.about.should    == 'daydrea'
       user.birthday.should == Date.parse('04/15/1984')
       user.work.should     == [
         FbGraph::Work.new({
@@ -85,8 +117,19 @@ describe FbGraph::User, '.fetch' do
           ]
         })
       ]
-      user.email.should   == nil
-      user.website.should == []
+      user.email.should               == nil
+      user.website.should             == []
+      user.hometown.should            == FbGraph::Page.new(109533479072558, :name => 'Minnetonka, Minnesota')
+      user.interested_in.should       == ['female']
+      user.meeting_for.should         == ['Friendship']
+      user.relationship_status.should == 'In a Relationship'
+      user.religion.should            == 'zorp'
+      user.political.should           == 'Liberal'
+      user.verified.should            be_nil
+      # What's this?
+      # user.significant_other
+      user.timezone.should            be_nil
+      user.updated_time.should        == Time.parse('2010-05-29T04:29:23+0000')
     end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - nov matake
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-21 00:00:00 +09:00
+date: 2010-06-06 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency