fb_graph 1.2.2 → 1.2.3

data/lib/fb_graph/project.rb

@@ -0,0 +1,31 @@
+module FbGraph
+  class Project < Page
+    attr_accessor :with, :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
+          Date.new(year)
+        else
+          Date.new(year, month)
+        end
+      end
+      if attributes[:end_date]
+        year, month = attributes[:end_date].split('-').collect(&:to_i)
+        @end_date = if month == 0
+          Date.new(year)
+        else
+          Date.new(year, month)
+        end
+      end
+    end
+  end
+end

data/lib/fb_graph/query.rb

@@ -23,6 +23,9 @@ module FbGraph
         :access_token => self.access_token,
         :format => :json
       )
+      params.delete_if do |k, v|
+        v.blank?
+      end
       ENDPOINT + "?#{params.to_query}"
     end
 

data/lib/fb_graph/test_user.rb

@@ -38,11 +38,11 @@ module FbGraph
         :connection => :friends,
         :connection_scope => test_user.identifier
       )
-      post(
+      test_user.send :post, {
         :access_token => test_user.access_token,
         :connection => :friends,
         :connection_scope => self.identifier
-      )
+      }
     end
   end
 end

data/lib/fb_graph/work.rb

@@ -2,7 +2,7 @@ module FbGraph
   class Work
     include Comparison
 
-    attr_accessor :employer, :location, :position, :start_date, :end_date
+    attr_accessor :employer, :location, :position, :projects, :start_date, :end_date
 
     def initialize(attributes = {})
       if (employer = attributes[:employer])
@@ -14,6 +14,12 @@ module FbGraph
       if (position = attributes[:position])
         @position = Page.new(position.delete(:id), position)
       end
+      @projects = []
+      if attributes[:projects]
+        attributes[:projects].each do |project|
+          @projects << Project.new(project.delete(:id), project)
+        end
+      end
       if attributes[:start_date] && attributes[:start_date] != '0000-00'
         year, month = attributes[:start_date].split('-').collect(&:to_i)
         @start_date = if month == 0

data/lib/fb_graph.rb

@@ -68,6 +68,7 @@ require 'fb_graph/page'
 require 'fb_graph/photo'
 require 'fb_graph/place'
 require 'fb_graph/post'
+require 'fb_graph/project'
 require 'fb_graph/status'
 require 'fb_graph/subscription'
 require 'fb_graph/tag'

data/spec/fake_json/query/user/with_invalid_token.json

@@ -0,0 +1 @@
+{"error_code":190,"error_msg":"Invalid OAuth 2.0 Access Token","request_args":[{"key":"method","value":"fql.query"},{"key":"access_token","value":"token"},{"key":"format","value":"json"},{"key":"query","value":"SELECT uid FROM user WHERE uid = me()"}]}

data/spec/fake_json/query/user/with_valid_token.json

@@ -0,0 +1 @@
+[{"uid":579612276}]

data/spec/fake_json/query/user/without_token.json

@@ -0,0 +1 @@
+{}

data/spec/fake_json/true.json

@@ -0,0 +1 @@
+true

data/spec/fake_json/users/me_private.json

@@ -4,112 +4,147 @@
    "first_name": "Nov",
    "last_name": "Matake",
    "link": "http://www.facebook.com/matake",
-   "about": "I'm a Ruby on Rails Developer on smart.fm",
    "birthday": "12/13/1981",
    "hometown": {
-      "id": 112359252112966,
+      "id": "112359252112966",
       "name": "Hirakata, Osaka"
    },
    "location": {
-      "id": 108449982512946,
+      "id": "108449982512946",
       "name": "Kawasaki, Kanagawa"
    },
+   "bio": "I'm a Ruby on Rails Developer on smart.fm",
+   "quotes": "\u6c42\u3081\u306a\u3055\u3044\u3002\u305d\u3046\u3059\u308c\u3070\u3001\u4e0e\u3048\u3089\u308c\u308b\u3002\r\n\u63a2\u3057\u306a\u3055\u3044\u3002\u305d\u3046\u3059\u308c\u3070\u3001\u898b\u3064\u304b\u308b\u3002\r\n\u9580\u3092\u305f\u305f\u304d\u306a\u3055\u3044\u3002\u305d\u3046\u3059\u308c\u3070\u3001\u958b\u304b\u308c\u308b\u3002\r\n\u3060\u308c\u3067\u3082\u3001\u6c42\u3081\u308b\u8005\u306f\u53d7\u3051\u3001\u63a2\u3059\u8005\u306f\u898b\u3064\u3051\u3001\u9580\u3092\u305f\u305f\u304f\u8005\u306b\u306f\u958b\u304b\u308c\u308b\u3002\r\n\r\n\u3042\u306a\u305f\u304c\u305f\u306e\u3060\u308c\u304c\u3001\u30d1\u30f3\u3092\u6b32\u3057\u304c\u308b\u81ea\u5206\u306e\u5b50\u4f9b\u306b\u3001\u77f3\u3092\u4e0e\u3048\u308b\u3060\u308d\u3046\u304b\u3002\u9b5a\u3092\u6b32\u3057\u304c\u308b\u306e\u306b\u3001\u86c7\u3092\u4e0e\u3048\u308b\u3060\u308d\u3046\u304b\u3002\r\n\r\n\u3053\u306e\u3088\u3046\u306b\u3001\u3042\u306a\u305f\u304c\u305f\u306f\u60aa\u3044\u8005\u3067\u3042\u308a\u306a\u304c\u3089\u3082\u3001\u81ea\u5206\u306e\u5b50\u4f9b\u306b\u826f\u3044\u7269\u3092\u4e0e\u3048\u308b\u3053\u3068\u3092\u77e5\u3063\u3066\u3044\u308b\u3002\u307e\u3057\u3066\u3001\u3042\u306a\u305f\u304c\u305f\u306e\u5929\u306e\u7236\u306f\u3001\u6c42\u3081\u308b\u8005\u306b\u826f\u3044\u7269\u3092\u304f\u3060\u3055\u308b\u306b\u3061\u304c\u3044\u306a\u3044\u3002\r\n\r\n\u3060\u304b\u3089\u3001\u4eba\u306b\u3057\u3066\u3082\u3089\u3044\u305f\u3044\u3068\u601d\u3046\u3053\u3068\u306f\u4f55\u3067\u3082\u3001\u3042\u306a\u305f\u304c\u305f\u3082\u4eba\u306b\u3057\u306a\u3055\u3044\u3002\r\n\r\n\u3053\u308c\u3053\u305d\u3001\u5f8b\u6cd5\u3068\u9810\u8a00\u8005\u3067\u3042\u308b\u3002",
    "work": [
       {
          "employer": {
-            "id": 105612642807396,
-            "name": "Cerego Japan Inc."
+            "id": "168674439825608",
+            "name": "Cerego Japan"
          },
          "location": {
-            "id": 114600441890814,
-            "name": "Shibuya"
+            "id": "112261372122567",
+            "name": "Shibuya, Tokyo"
          },
          "position": {
-            "id": 112075768810308,
-            "name": "Web Engineer"
+            "id": "116439701737440",
+            "name": "Rails Developer"
          },
-         "start_date": "2008-00",
-         "end_date": "0000-00"
+         "start_date": "2008-10",
+         "end_date": "0000-00",
+         "projects": [
+            {
+               "id": "139390256117606",
+               "name": "Smart.fm",
+               "start_date": "2009-03"
+            },
+            {
+               "id": "166213200088679",
+               "name": "iKnow!",
+               "start_date": "2008-10",
+               "end_date": "2009-02"
+            }
+         ]
       },
       {
          "employer": {
-            "id": 107722015925937,
-            "name": "Drecom Co., Ltd."
-         },
-         "location": {
-            "id": 111736052177472,
-            "name": "Tokyo, Tokyo"
+            "id": "110398398982373",
+            "name": "\u30c9\u30ea\u30b3\u30e0"
          },
          "position": {
-            "id": 111091815582753,
-            "name": "Web Engineer"
+            "id": "114582978558535",
+            "name": "Web-developer"
          },
-         "start_date": "2007-04",
-         "end_date": "2008-09"
+         "start_date": "2006-01",
+         "end_date": "2008-09",
+         "projects": [
+            {
+               "id": "184246058253896",
+               "name": "Drecom Blog",
+               "with": [
+                  {
+                     "id": "1064067203",
+                     "name": "Takanori Ishikawa"
+                  }
+               ],
+               "start_date": "2008-04",
+               "end_date": "2008-09"
+            },
+            {
+               "id": "180894985272562",
+               "name": "Resumy",
+               "with": [
+                  {
+                     "id": "1064067203",
+                     "name": "Takanori Ishikawa"
+                  }
+               ],
+               "start_date": "2008-01",
+               "end_date": "2008-05"
+            },
+            {
+               "id": "129047983826039",
+               "name": "Drecom Wanted",
+               "with": [
+                  {
+                     "id": "581259565",
+                     "name": "Hiroumi Mitani"
+                  }
+               ],
+               "start_date": "2006-04",
+               "end_date": "2007-12"
+            }
+         ]
       }
    ],
    "education": [
       {
          "school": {
-            "id": 110149592341159,
-            "name": "\u540c\u5fd7\u793e\u5927\u5b66"
-         },
-         "degree": {
-            "id": 110616875633830,
-            "name": "Master of Engineering"
+            "id": "109239532428621",
+            "name": "Doshisha University"
          },
          "year": {
-            "id": 104926492884272,
-            "name": "2007"
+            "id": "141016309258708",
+            "name": "2004"
          },
          "concentration": [
             {
-               "id": 112303688789448,
-               "name": "Engineering"
-            },
-            {
-               "id": 102358546472290,
-               "name": "Intelligent Information"
-            },
-            {
-               "id": 108311762535367,
-               "name": "Intelligent Systems Design Laboratory"
+               "id": "123326981016954",
+               "name": "engineering"
             }
-         ]
+         ],
+         "type": "College"
       },
       {
          "school": {
-            "id": 110149592341159,
-            "name": "\u540c\u5fd7\u793e\u5927\u5b66"
+            "id": "109239532428621",
+            "name": "Doshisha University"
+         },
+         "degree": {
+            "id": "114462511951178",
+            "name": "Engineering"
          },
          "year": {
-            "id": 117078804987252,
-            "name": "2004"
+            "id": "122604561117941",
+            "name": "2007"
          },
          "concentration": [
             {
-               "id": 108311762535367,
-               "name": "Intelligent Systems Design Laboratory"
-            },
-            {
-               "id": 120973077930419,
-               "name": "Engineering"
-            },
-            {
-               "id": 114592028573050,
-               "name": "Intelligent Information"
+               "id": "123326981016954",
+               "name": "engineering"
             }
-         ]
+         ],
+         "type": "Graduate School"
       },
       {
          "school": {
-            "id": 114666815212021,
-            "name": "Doshisha H.S."
+            "id": "108125045896334",
+            "name": "Doshisha High School"
          },
          "year": {
-            "id": 125827317431375,
+            "id": "125324724167172",
             "name": "2000"
-         }
+         },
+         "type": "High School"
       }
    ],
    "gender": "male",
@@ -123,6 +158,17 @@
    "relationship_status": "Married",
    "website": "http://matake.jp",
    "timezone": 9,
+   "locale": "en_US",
+   "languages": [
+      {
+         "id": "109549852396760",
+         "name": "Japanese"
+      },
+      {
+         "id": "106059522759137",
+         "name": "English"
+      }
+   ],
    "verified": true,
-   "updated_time": "2010-05-20T06:50:04+0000"
+   "updated_time": "2010-12-11T08:33:47+0000"
 }

data/spec/fb_graph/project_spec.rb

@@ -0,0 +1,34 @@
+require File.join(File.dirname(__FILE__), '../spec_helper')
+
+describe FbGraph::Project, '.new' do
+
+  it 'should setup all supported attributes' do
+    attributes = {
+      :id   => 184246058253896,
+      :name => "Drecom Blog",
+      :with => [{
+        :id   => 1064067203,
+        :name => "Takanori Ishikawa"
+      }],
+      :start_date => "2008-04",
+      :end_date   => "2008-09"
+    }
+    project = FbGraph::Project.new(attributes.delete(:id), attributes)
+    project.with.should == [FbGraph::User.new(1064067203, :name => "Takanori Ishikawa")]
+    project.start_date.should == Date.new(2008, 4)
+    project.end_date.should   == Date.new(2008, 9)
+  end
+
+  it 'should treat 2008-00 style date' do
+    attributes = {
+      :id   => 184246058253896,
+      :name => "Drecom Blog",
+      :start_date => "2008-00",
+      :end_date   => "2009-00"
+    }
+    project = FbGraph::Project.new(attributes.delete(:id), attributes)
+    project.start_date.should == Date.new(2008)
+    project.end_date.should   == Date.new(2009)
+  end
+
+end

data/spec/fb_graph/query/core_spec.rb

@@ -0,0 +1,68 @@
+require File.join(File.dirname(__FILE__), '../../spec_helper')
+
+describe FbGraph::Query, '.new' do
+
+  before do
+    @raw_query = 'SELECT uid FROM user WHERE uid = me()'
+    @query = FbGraph::Query.new(@raw_query, 'access_token')
+  end
+
+  it 'should setup query and access_token' do
+    @query.query.should == @raw_query
+    @query.access_token.should == 'access_token'
+  end
+
+  it 'should setup proper endpoint' do
+    endpoint = @query.send :build_endpoint
+    params = {
+      :query => @raw_query,
+      :format => :json,
+      :access_token => 'access_token'
+    }
+    endpoint.should == "#{FbGraph::Query::ENDPOINT}?#{params.to_query}"
+  end
+
+end
+
+describe FbGraph::Query, '.fetch' do
+
+  before do
+    @raw_query = 'SELECT uid FROM user WHERE uid = me()'
+    @query = FbGraph::Query.new(@raw_query)
+  end
+
+  context 'when no access token given' do
+    before do
+      fake_fql_json @raw_query, 'query/user/without_token'
+    end
+
+    it 'should return blank Hash' do
+      response = @query.fetch
+      response.should == {}
+    end
+  end
+
+  context 'when invalid access token given' do
+    before do
+      fake_fql_json @raw_query, 'query/user/with_invalid_token', :access_token => 'invalid'
+    end
+
+    it 'should raise exception' do
+      lambda do
+        @query.fetch('invalid')
+      end.should raise_error(FbGraph::Exception)
+    end
+  end
+
+  context 'when valid access token given' do
+    before do
+      fake_fql_json @raw_query, 'query/user/with_valid_token', :access_token => 'valid'
+    end
+
+    it 'should return an Array of Hash' do
+      response = @query.fetch('valid')
+      response.should == [{'uid' => 579612276}]
+    end
+  end
+
+end

data/spec/fb_graph/test_user_spec.rb

@@ -0,0 +1,44 @@
+require File.join(File.dirname(__FILE__), '../spec_helper')
+
+describe FbGraph::TestUser, '.new' do
+
+  it 'should setup all supported attributes' do
+    attributes = {
+      :id => 12345,
+      :access_token => 'access_token',
+      :login_url => 'https://www.facebook.com/login/test-user/12345'
+    }
+    test_user = FbGraph::TestUser.new(attributes.delete(:id), attributes)
+    test_user.login_url.should == 'https://www.facebook.com/login/test-user/12345'
+  end
+
+end
+
+describe FbGraph::TestUser, '.friend!' do
+
+  before do
+    @u1 = FbGraph::TestUser.new(111, :access_token => 'token1')
+    @u2 = FbGraph::TestUser.new(222, :access_token => 'token2')
+  end
+
+  it 'should POST twice' do
+    lambda do
+      @u1.friend! @u2
+    end.should raise_error(
+      FakeWeb::NetConnectNotAllowedError,
+      "Real HTTP connections are disabled. Unregistered request: POST https://graph.facebook.com/111/friends/222"
+    )
+    fake_json(:post, '111/friends/222', 'true')
+    lambda do
+      @u1.friend! @u2
+    end.should raise_error(
+      FakeWeb::NetConnectNotAllowedError,
+      "Real HTTP connections are disabled. Unregistered request: POST https://graph.facebook.com/222/friends/111"
+    )
+    fake_json(:post, '222/friends/111', 'true')
+    lambda do
+      @u1.friend! @u2
+    end.should_not raise_error(FakeWeb::NetConnectNotAllowedError)
+  end
+
+end

data/spec/fb_graph/work_spec.rb

@@ -16,6 +16,16 @@ describe FbGraph::Work, '.new' do
         :id => 111091815582753,
         :name => "Web Engineer"
       },
+      :projects => [{
+        :id   => 184246058253896,
+        :name => "Drecom Blog",
+        :with => [{
+          :id   => 1064067203,
+          :name => "Takanori Ishikawa"
+        }],
+        :start_date => "2008-04",
+        :end_date   => "2008-09"
+      }],
       :start_date => "2007-04",
       :end_date   => "2008-09"
     }
@@ -32,6 +42,16 @@ describe FbGraph::Work, '.new' do
       111091815582753,
       :name => "Web Engineer"
     )
+    work.projects.should == [FbGraph::Project.new(
+      184246058253896,
+      :name => "Drecom Blog",
+      :with => [{
+        :id   => 1064067203,
+        :name => "Takanori Ishikawa"
+      }],
+      :start_date => "2008-04",
+      :end_date   => "2008-09"
+    )]
     work.start_date.should == Date.new(2007, 4)
     work.end_date.should   == Date.new(2008, 9)
   end

data/spec/helpers/fake_json_helper.rb

@@ -1,4 +1,5 @@
 module FakeJsonHelper
+
   def fake_json(method, path, file_path, options = {})
     FakeWeb.register_uri(
       method,
@@ -8,4 +9,21 @@ module FakeJsonHelper
       )
     )
   end
+
+  def fake_fql_json(query, file_path, options = {})
+    params = {
+      :query => query,
+      :access_token => options[:access_token],
+      :format => :json
+    }
+    params.delete_if do |k, v|
+      v.blank?
+    end
+    FakeWeb.register_uri(
+      :get,
+      FbGraph::Query::ENDPOINT + '?' + params.to_query,
+      :body => File.read(File.join(File.dirname(__FILE__), '../fake_json', "#{file_path}.json"))
+    )
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fb_graph
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 1
   - 2
-  - 2
-  version: 1.2.2
+  - 3
+  version: 1.2.3
 platform: ruby
 authors: 
 - nov matake
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-24 00:00:00 +09:00
+date: 2010-12-25 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -133,7 +133,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -198,6 +197,7 @@ files:
 - lib/fb_graph/photo.rb
 - lib/fb_graph/place.rb
 - lib/fb_graph/post.rb
+- lib/fb_graph/project.rb
 - lib/fb_graph/query.rb
 - lib/fb_graph/searchable.rb
 - lib/fb_graph/searchable/result.rb
@@ -242,7 +242,11 @@ files:
 - spec/fake_json/posts/likes/post_without_access_token.json
 - spec/fake_json/posts/platform_private.json
 - spec/fake_json/posts/platform_public.json
+- spec/fake_json/query/user/with_invalid_token.json
+- spec/fake_json/query/user/with_valid_token.json
+- spec/fake_json/query/user/without_token.json
 - spec/fake_json/statuses/with_likes.json
+- spec/fake_json/true.json
 - spec/fake_json/users/accounts/matake_private.json
 - spec/fake_json/users/accounts/matake_private_with_manage_pages_permission.json
 - spec/fake_json/users/accounts/matake_public.json
@@ -347,9 +351,12 @@ files:
 - spec/fb_graph/page_spec.rb
 - spec/fb_graph/photo_spec.rb
 - spec/fb_graph/post_spec.rb
+- spec/fb_graph/project_spec.rb
+- spec/fb_graph/query/core_spec.rb
 - spec/fb_graph/status_spec.rb
 - spec/fb_graph/subscription_spec.rb
 - spec/fb_graph/tag_spec.rb
+- spec/fb_graph/test_user_spec.rb
 - spec/fb_graph/user_spec.rb
 - spec/fb_graph/venue_spec.rb
 - spec/fb_graph/video_spec.rb
@@ -362,8 +369,8 @@ homepage: http://github.com/nov/fb_graph
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -443,9 +450,12 @@ test_files:
 - spec/fb_graph/page_spec.rb
 - spec/fb_graph/photo_spec.rb
 - spec/fb_graph/post_spec.rb
+- spec/fb_graph/project_spec.rb
+- spec/fb_graph/query/core_spec.rb
 - spec/fb_graph/status_spec.rb
 - spec/fb_graph/subscription_spec.rb
 - spec/fb_graph/tag_spec.rb
+- spec/fb_graph/test_user_spec.rb
 - spec/fb_graph/user_spec.rb
 - spec/fb_graph/venue_spec.rb
 - spec/fb_graph/video_spec.rb

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC