fb_graph 1.1.6 → 1.1.7

data/lib/fb_graph/connections/comments.rb

@@ -3,10 +3,7 @@ module FbGraph
     module Comments
       def comments(options = {})
         comments = if @_comments_ && options.blank?
-          # Note:
-          # "comments" is a connection, but included in fetched object
-          # this improves performance when rendering the stream with comments
-          @_comments_
+          self.connection(:comments, options.merge(:cached_collection => @_comments_))
         else
           self.connection(:comments, options)
         end

data/lib/fb_graph/connections/likes.rb

@@ -3,10 +3,7 @@ module FbGraph
     module Likes
       def likes(options = {})
         likes = if @_likes_ && options.blank?
-          # Note:
-          # "likes" is a connection, but included in fetched object
-          # this improves performance when rendering the stream with likes
-          @_likes_
+          self.connection(:likes, options.merge(:cached_collection => @_likes_))
         else
           self.connection(:likes, options)
         end

data/lib/fb_graph/node.rb

@@ -21,7 +21,7 @@ module FbGraph
     end
 
     def connection(connection, options = {})
-      collection = FbGraph::Collection.new(get(options.merge(:connection => connection)))
+      collection = options[:cached_collection] || FbGraph::Collection.new(get(options.merge(:connection => connection)))
       Connection.new(self, connection, options.merge(:collection => collection))
     end
 

data/spec/fake_json/statuses/with_likes.json

@@ -0,0 +1,17 @@
+{
+   "id": "115838235152172",
+   "from": {
+      "name": "Nov Matake",
+      "id": "579612276"
+   },
+   "message": "\u3053\u306eUI\u3067\u3082\u30b9\u30c6\u30fc\u30bf\u30b9\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8\u3059\u308b\u30e6\u30fc\u30b6\u30fc\u304c\u591a\u3044Facebook\u3063\u3066\u3001\u3042\u308b\u610f\u5473\u3059\u3054\u3044\u306a\u3002",
+   "updated_time": "2010-12-21T14:43:12+0000",
+   "likes": {
+      "data": [
+         {
+            "id": "604578140",
+            "name": "K Hiromi"
+         }
+      ]
+   }
+}

data/spec/fb_graph/checkin_spec.rb

@@ -5,7 +5,7 @@ describe FbGraph::Checkin, '.new' do
 end
 
 describe FbGraph::Checkin, '.search' do
-  before(:all) do
+  before do
     fake_json(:get, 'search?type=checkin', 'checkins/search_public')
     fake_json(:get, 'search?type=checkin&access_token=access_token', 'checkins/search_private')
   end

data/spec/fb_graph/collection_spec.rb

@@ -1,7 +1,7 @@
 require File.join(File.dirname(__FILE__), '../spec_helper')
 
 describe FbGraph::Collection, '.new' do
-  before(:all) do
+  before do
     fake_json(:get, 'platform/statuses?access_token=access_token', 'pages/statuses/platform_private')
   end
 

data/spec/fb_graph/connection_spec.rb

@@ -1,7 +1,7 @@
 require File.join(File.dirname(__FILE__), '../spec_helper')
 
 describe FbGraph::Connection, '.new' do
-  before(:all) do
+  before do
     fake_json(:get, 'platform/statuses?access_token=access_token', 'pages/statuses/platform_private')
   end
 
@@ -16,7 +16,7 @@ describe FbGraph::Connection, '.new' do
 end
 
 describe FbGraph::Connection do
-  before(:all) do
+  before do
     fake_json(:get, 'me/home?access_token=access_token', 'users/home/me_private')
     fake_json(:get, 'me/home?limit=25&since=2010-04-27T13%3A06%3A14%2B0000&access_token=access_token', 'users/home/me_private_previous')
     fake_json(:get, 'me/home?limit=25&access_token=access_token&until=2010-04-27T11%3A07%3A48%2B0000', 'users/home/me_private_next')
@@ -34,5 +34,4 @@ describe FbGraph::Connection do
     next_posts.first.created_time.should == Time.parse('2010-04-27T11:06:29+0000')
     next_posts.last.created_time.should  == Time.parse('2010-04-27T09:44:28+0000')
   end
-
 end

data/spec/fb_graph/connections/accounts_spec.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), '../../spec_helper')
 
 describe FbGraph::Connections::Accounts, '#accounts' do
   context 'when included by FbGraph::User' do
-    before(:all) do
+    before do
       fake_json(:get, 'matake/accounts', 'users/accounts/matake_public')
       fake_json(:get, 'matake/accounts?access_token=access_token', 'users/accounts/matake_private')
       fake_json(:get, 'matake/accounts?access_token=access_token_with_manage_pages_permission', 'users/accounts/matake_private_with_manage_pages_permission')

data/spec/fb_graph/connections/activities_spec.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), '../../spec_helper')
 
 describe FbGraph::Connections::Activities, '#activities' do
   context 'when included by FbGraph::User' do
-    before(:all) do
+    before do
       fake_json(:get, 'arjun/activities', 'users/activities/arjun_public')
       fake_json(:get, 'arjun/activities?access_token=access_token', 'users/activities/arjun_private')
     end

data/spec/fb_graph/connections/albums_spec.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), '../../spec_helper')
 
 describe FbGraph::Connections::Albums, '#albums' do
   context 'when included by FbGraph::User' do
-    before(:all) do
+    before do
       fake_json(:get, 'matake/albums', 'users/albums/matake_public')
       fake_json(:get, 'matake/albums?access_token=access_token', 'users/albums/matake_private')
     end

data/spec/fb_graph/connections/attending_spec.rb

@@ -1,7 +1,7 @@
 require File.join(File.dirname(__FILE__), '../../spec_helper')
 
 describe FbGraph::Connections::Attending, '#attending' do
-  before(:all) do
+  before do
     fake_json(:get, 'smartday/attending?access_token=access_token', 'events/attending/smartday_private')
   end
 

data/spec/fb_graph/connections/books_spec.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), '../../spec_helper')
 
 describe FbGraph::Connections::Books, '#books' do
   context 'when included by FbGraph::User' do
-    before(:all) do
+    before do
       fake_json(:get, 'matake/books', 'users/books/matake_public')
       fake_json(:get, 'matake/books?access_token=access_token', 'users/books/matake_private')
     end

data/spec/fb_graph/connections/checkins_spec.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), '../../spec_helper')
 
 describe FbGraph::Connections::Checkins, '#checkins' do
   context 'when included by FbGraph::User' do
-    before(:all) do
+    before do
       fake_json(:get, 'mattt/checkins', 'users/checkins/mattt_public')
       fake_json(:get, 'mattt/checkins?access_token=access_token', 'users/checkins/mattt_private')
     end
@@ -54,7 +54,7 @@ describe FbGraph::Connections::Checkins, '#checkins' do
   end
 
   context 'when included by FbGraph::Page' do
-    before(:all) do
+    before do
       fake_json(:get, 'gowalla/checkins', 'pages/checkins/gowalla_public')
       fake_json(:get, 'gowalla/checkins?access_token=access_token', 'pages/checkins/gowalla_private')
     end

data/spec/fb_graph/connections/declined_spec.rb

@@ -1,7 +1,7 @@
 require File.join(File.dirname(__FILE__), '../../spec_helper')
 
 describe FbGraph::Connections::Declined, '#declined' do
-  before(:all) do
+  before do
     fake_json(:get, 'smartday/declined?access_token=access_token', 'events/declined/smartday_private')
   end
 

data/spec/fb_graph/connections/events_spec.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), '../../spec_helper')
 
 describe FbGraph::Connections::Events, '#events' do
   context 'when included by FbGraph::User' do
-    before(:all) do
+    before do
       fake_json(:get, 'matake/events', 'users/events/matake_public')
       fake_json(:get, 'matake/events?access_token=access_token', 'users/events/matake_private')
     end

data/spec/fb_graph/connections/feed_spec.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), '../../spec_helper')
 
 describe FbGraph::Connections::Feed, '#feed' do
   context 'when included by FbGraph::User' do
-    before(:all) do
+    before do
       fake_json(:get, 'arjun/feed', 'users/feed/arjun_public')
       fake_json(:get, 'arjun/feed?access_token=access_token', 'users/feed/arjun_private')
     end

data/spec/fb_graph/connections/friend_lists_spec.rb

@@ -1,7 +1,7 @@
 require File.join(File.dirname(__FILE__), '../../spec_helper')
 
 describe FbGraph::Connections::FriendLists, '#friend_lists' do
-  before(:all) do
+  before do
     fake_json(:get, 'matake/friendlists?access_token=access_token', 'users/friend_lists/matake')
   end
 

data/spec/fb_graph/connections/friends_spec.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), '../../spec_helper')
 
 describe FbGraph::Connections::Friends, '#friends' do
   context 'when included by FbGraph::User' do
-    before(:all) do
+    before do
       fake_json(:get, 'me/friends', 'users/friends/me_public')
       fake_json(:get, 'me/friends?access_token=access_token', 'users/friends/me_private')
       fake_json(:get, 'arjun/friends', 'users/friends/arjun_public')

data/spec/fb_graph/connections/groups_spec.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), '../../spec_helper')
 
 describe FbGraph::Connections::Groups, '#groups' do
   context 'when included by FbGraph::User' do
-    before(:all) do
+    before do
       fake_json(:get, 'matake/groups', 'users/groups/matake_public')
       fake_json(:get, 'matake/groups?access_token=access_token', 'users/groups/matake_private')
     end

data/spec/fb_graph/connections/home_spec.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), '../../spec_helper')
 
 describe FbGraph::Connections::Home, '#home' do
   context 'when included by FbGraph::User' do
-    before(:all) do
+    before do
       fake_json(:get, 'me/home', 'users/home/me_public')
       fake_json(:get, 'me/home?access_token=access_token', 'users/home/me_private')
       fake_json(:get, 'arjun/home', 'users/home/arjun_public')

data/spec/fb_graph/connections/insights_spec.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), '../../spec_helper')
 describe FbGraph::Connections::Insights, '#insights' do
 
   context 'when included by FbGraph::Page' do
-    before(:all) do
+    before do
       fake_json(:get, 'FbGraph/insights', 'pages/insights/FbGraph_public')
       fake_json(:get, 'FbGraph/insights?access_token=access_token', 'pages/insights/FbGraph_private')
     end
@@ -38,7 +38,7 @@ describe FbGraph::Connections::Insights, '#insights' do
     end
 
     context 'when metrics is given' do
-      before(:all) do
+      before do
         fake_json(:get, 'FbGraph/insights/page_like_adds?access_token=access_token', 'pages/insights/page_like_adds/FbGraph_private')
         fake_json(:get, 'FbGraph/insights/page_like_adds/day?access_token=access_token', 'pages/insights/page_like_adds/day/FbGraph_private')
       end

data/spec/fb_graph/connections/interests_spec.rb

@@ -1,7 +1,7 @@
 require File.join(File.dirname(__FILE__), '../../spec_helper')
 
 describe FbGraph::Connections::Interests, '#interests' do
-  before(:all) do
+  before do
     fake_json(:get, 'matake/interests?access_token=access_token', 'users/interests/matake_private')
   end
 

data/spec/fb_graph/connections/invited_spec.rb

@@ -1,7 +1,7 @@
 require File.join(File.dirname(__FILE__), '../../spec_helper')
 
 describe FbGraph::Connections::Invited, '#invited' do
-  before(:all) do
+  before do
     fake_json(:get, 'smartday/invited?access_token=access_token', 'events/invited/smartday_private')
   end
 

data/spec/fb_graph/connections/likes_spec.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), '../../spec_helper')
 
 describe FbGraph::Connections::Likes, '#likes' do
   context 'when included by FbGraph::User' do
-    before(:all) do
+    before do
       fake_json(:get, 'arjun/likes', 'users/likes/arjun_public')
       fake_json(:get, 'arjun/likes?access_token=access_token', 'users/likes/arjun_private')
     end
@@ -30,4 +30,43 @@ describe FbGraph::Connections::Likes, '#likes' do
       end
     end
   end
+
+  context 'when included by FbGraph::Status' do
+    context 'when cached collection exists' do
+      before do
+        fake_json(:get, 'with_likes?access_token=access_token', 'statuses/with_likes')
+        @status = FbGraph::Status.new('with_likes').fetch(:access_token => 'access_token')
+      end
+
+      context 'when no options given' do
+        it 'should not access to Graph API' do
+          @status.likes.should == [FbGraph::User.new(
+            '604578140',
+            :access_token => 'access_token',
+            :name => 'K Hiromi'
+          )]
+          @status.likes.next.should == []
+          @status.likes.previous.should == []
+        end
+      end
+
+      context 'when any options given' do
+        it 'should access to Graph API' do
+          lambda do
+            @status.likes(:no_cache => true) # :no_cache has no meaning, just putting some value as options
+          end.should raise_error(FakeWeb::NetConnectNotAllowedError)
+          lambda do
+            @status.likes(:limit => 10)
+          end.should raise_error(FakeWeb::NetConnectNotAllowedError)
+        end
+
+        context 'when next/previous are obviously blank' do
+          it 'should not access to Graph API' do
+            @status.likes.next(:no_cache => true).should == []
+            @status.likes.previous(:no_cache => true).should == []
+          end
+        end
+      end
+    end
+  end
 end

data/spec/fb_graph/connections/links_spec.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), '../../spec_helper')
 
 describe FbGraph::Connections::Links, '#links' do
   context 'when included by FbGraph::User' do
-    before(:all) do
+    before do
       fake_json(:get, 'matake/links?access_token=access_token', 'users/links/matake_private')
     end
 

data/spec/fb_graph/connections/maybe_spec.rb

@@ -1,7 +1,7 @@
 require File.join(File.dirname(__FILE__), '../../spec_helper')
 
 describe FbGraph::Connections::Maybe, '#maybe' do
-  before(:all) do
+  before do
     fake_json(:get, 'smartday/maybe?access_token=access_token', 'events/maybe/smartday_private')
   end
 

data/spec/fb_graph/connections/members_spec.rb

@@ -1,7 +1,7 @@
 require File.join(File.dirname(__FILE__), '../../spec_helper')
 
 describe FbGraph::Connections::Friends, '#friends' do
-  before(:all) do
+  before do
     fake_json(:get, 'emacs/members?access_token=access_token', 'groups/members/emacs_private')
   end
 

data/spec/fb_graph/connections/movies_spec.rb

@@ -1,7 +1,7 @@
 require File.join(File.dirname(__FILE__), '../../spec_helper')
 
 describe FbGraph::Connections::Movies, '#movies' do
-  before(:all) do
+  before do
     fake_json(:get, 'matake/movies?access_token=access_token', 'users/movies/matake_private')
   end
 

data/spec/fb_graph/connections/music_spec.rb

@@ -1,7 +1,7 @@
 require File.join(File.dirname(__FILE__), '../../spec_helper')
 
 describe FbGraph::Connections::Music, '#music' do
-  before(:all) do
+  before do
     fake_json(:get, 'matake/music?access_token=access_token', 'users/music/matake_private')
   end
 

data/spec/fb_graph/connections/noreply_spec.rb

@@ -1,7 +1,7 @@
 require File.join(File.dirname(__FILE__), '../../spec_helper')
 
 describe FbGraph::Connections::Noreply, '#noreply' do
-  before(:all) do
+  before do
     fake_json(:get, 'smartday/noreply?access_token=access_token', 'events/noreply/smartday_private')
   end
 

data/spec/fb_graph/connections/notes_spec.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), '../../spec_helper')
 
 describe FbGraph::Connections::Notes, '#notes' do
   context 'when included by FbGraph::User' do
-    before(:all) do
+    before do
       fake_json(:get, 'matake/notes?access_token=access_token', 'users/notes/matake_private')
     end
 

data/spec/fb_graph/connections/photos_spec.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), '../../spec_helper')
 
 describe FbGraph::Connections::Photos, '#photos' do
   context 'when included by FbGraph::Album' do
-    before(:all) do
+    before do
       fake_json(:get, '12345/photos?access_token=access_token', 'albums/photos/matake_private')
     end
 

data/spec/fb_graph/connections/posts_spec.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), '../../spec_helper')
 
 describe FbGraph::Connections::Posts, '#posts' do
   context 'when included by FbGraph::User' do
-    before(:all) do
+    before do
       fake_json(:get, 'arjun/posts', 'users/posts/arjun_public')
       fake_json(:get, 'arjun/posts?access_token=access_token', 'users/posts/arjun_private')
     end

data/spec/fb_graph/connections/statuses_spec.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), '../../spec_helper')
 describe FbGraph::Connections::Statuses, '#statuses' do
 
   context 'when included by FbGraph::User' do
-    before(:all) do
+    before do
       fake_json(:get, 'arjun/statuses', 'users/statuses/arjun_public')
       fake_json(:get, 'arjun/statuses?access_token=access_token', 'users/statuses/arjun_private')
     end
@@ -37,7 +37,7 @@ describe FbGraph::Connections::Statuses, '#statuses' do
   end
 
   context 'when included by FbGraph::Page' do
-    before(:all) do
+    before do
       fake_json(:get, 'platform/statuses', 'pages/statuses/platform_public')
       fake_json(:get, 'platform/statuses?access_token=access_token', 'pages/statuses/platform_private')
     end

data/spec/fb_graph/connections/subscriptions_spec.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), '../../spec_helper')
 
 describe FbGraph::Connections::Subscriptions, '#subscriptions' do
   context 'when included by FbGraph::Application' do
-    before(:all) do
+    before do
       fake_json(:get, 'fb_graph/subscriptions?access_token=access_token', 'applications/subscriptions/fb_graph_private')
     end
 

data/spec/fb_graph/connections/tagged_spec.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), '../../spec_helper')
 
 describe FbGraph::Connections::Tagged, '#tagged' do
   context 'when included by FbGraph::User' do
-    before(:all) do
+    before do
       fake_json(:get, 'arjun/tagged', 'users/tagged/arjun_public')
       fake_json(:get, 'arjun/tagged?access_token=access_token', 'users/tagged/arjun_private')
     end

data/spec/fb_graph/connections/television_spec.rb

@@ -1,7 +1,7 @@
 require File.join(File.dirname(__FILE__), '../../spec_helper')
 
 describe FbGraph::Connections::Television, '#television' do
-  before(:all) do
+  before do
     fake_json(:get, 'matake/television?access_token=access_token', 'users/television/matake_private')
   end
 

data/spec/fb_graph/connections/videos_spec.rb

@@ -1,7 +1,7 @@
 require File.join(File.dirname(__FILE__), '../../spec_helper')
 
 describe FbGraph::Connections::Videos, '#videos' do
-  before(:all) do
+  before do
     fake_json(:get, 'kirk/videos?access_token=access_token', 'users/videos/kirk_private')
   end
 

data/spec/fb_graph/page_spec.rb

@@ -44,7 +44,7 @@ describe FbGraph::Page, '.new' do
 end
 
 describe FbGraph::Page, '.fetch' do
-  before(:all) do
+  before do
     fake_json(:get, 'platform', 'pages/platform_public')
     fake_json(:get, 'platform?access_token=access_token', 'pages/platform_private')
   end

data/spec/fb_graph/post_spec.rb

@@ -27,7 +27,7 @@ end
 describe FbGraph::Post, '#fetch' do
 
   context 'when no access_token given' do
-    before(:all) do
+    before do
       fake_json(:get, 'platform', 'posts/platform_public')
     end
 
@@ -48,7 +48,7 @@ describe FbGraph::Post, '#fetch' do
   end
 
   context 'when access_token given' do
-    before(:all) do
+    before do
       fake_json(:get, 'platform?access_token=access_token', 'posts/platform_private')
     end
 

data/spec/fb_graph/user_spec.rb

@@ -20,7 +20,7 @@ describe FbGraph::User, '.me' do
 end
 
 describe FbGraph::User, '.fetch' do
-  before(:all) do
+  before 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')

data/spec/spec_helper.rb

@@ -8,11 +8,4 @@ require 'fb_graph'
 require 'fakeweb'
 require 'helpers/fake_json_helper'
 include FakeJsonHelper
-FakeWeb.allow_net_connect = false
-
-
-Spec::Runner.configure do |config|
-  config.before(:all) do
-    
-  end
-end
+FakeWeb.allow_net_connect = false

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fb_graph
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 1
   - 1
-  - 6
-  version: 1.1.6
+  - 7
+  version: 1.1.7
 platform: ruby
 authors: 
 - nov matake
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-22 00:00:00 +09:00
+date: 2010-12-23 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -133,6 +133,7 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
+- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -237,6 +238,7 @@ 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/statuses/with_likes.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
@@ -356,8 +358,8 @@ homepage: http://github.com/nov/fb_graph
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement