fb_graph 2.0.0.alpha → 2.0.0.beta

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fb_graph (1.9.5)
+    fb_graph (2.0.0.beta)
       httpclient (>= 2.2.0.2)
       rack-oauth2 (>= 0.8.0)
 
@@ -9,9 +9,9 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionpack (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
+    actionpack (3.0.10)
+      activemodel (= 3.0.10)
+      activesupport (= 3.0.10)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.5.0)
@@ -19,11 +19,11 @@ GEM
       rack-mount (~> 0.6.14)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.9)
-      activesupport (= 3.0.9)
+    activemodel (3.0.10)
+      activesupport (= 3.0.10)
       builder (~> 2.1.2)
       i18n (~> 0.5.0)
-    activesupport (3.0.9)
+    activesupport (3.0.10)
     addressable (2.2.6)
     attr_required (0.0.3)
     bouncy-castle-java (1.5.0146.1)
@@ -37,11 +37,10 @@ GEM
     jruby-openssl (0.7.4)
       bouncy-castle-java
     json (1.5.3)
-    json (1.5.3-java)
     rack (1.2.3)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
-    rack-oauth2 (0.8.7)
+    rack-oauth2 (0.9.2)
       activesupport (>= 2.3)
       attr_required (>= 0.0.3)
       httpclient (>= 2.2.0.2)
@@ -62,7 +61,7 @@ GEM
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
     tzinfo (0.3.29)
-    webmock (1.6.4)
+    webmock (1.7.4)
       addressable (> 2.2.5, ~> 2.2)
       crack (>= 0.1.7)
 

data/README.rdoc

@@ -8,11 +8,10 @@ A full-stack Facebook Graph API wrapper in Ruby.
 
 == Resources
 
-* View RDoc on RDoc.info (http://rdoc.info/github/nov/fb_graph)
-* View Source on GitHub (http://github.com/nov/fb_graph)
-* Report Issues on GitHub (http://github.com/nov/fb_graph/issues)
-* Q&A on Google Groups (https://groups.google.com/group/fb_graph)
-* Facebook Page (http://www.facebook.com/pages/FbGraph/117513961602338)
+* View Source on GitHub (https://github.com/nov/fb_graph)
+* Report Issues on GitHub (https://github.com/nov/fb_graph/issues)
+* Subscribe Update Info (https://www.facebook.com/FbGraph)
+* Q&A on Google Groups (http://groups.google.com/group/fb_graph)
 
 == Examples
 
@@ -113,7 +112,7 @@ https://github.com/nov/fb_graph/wiki
   me.feed!(
     :message => 'Updating via FbGraph',
     :picture => 'https://graph.facebook.com/matake/picture',
-    :link => 'http://github.com/nov/fb_graph',
+    :link => 'https://github.com/nov/fb_graph',
     :name => 'FbGraph',
     :description => 'A Ruby wrapper for Facebook Graph API'
   )
@@ -142,7 +141,7 @@ https://github.com/nov/fb_graph/wiki
 
   me = FbGraph::User.me(ACCESS_TOKEN)
   link = me.link!(
-    :link => 'http://github.com/nov/fb_graph',
+    :link => 'https://github.com/nov/fb_graph',
     :message => 'A Ruby wrapper for Facebook Graph API.'
   )
 
@@ -202,7 +201,7 @@ https://github.com/nov/fb_graph/wiki
 
 Both Facebook JavaScript SDK and normal OAuth2 flow is supported.
 Below I show simple sample code.
-You can also see http://github.com/nov/fb_graph_sample for more details Rails3 sample application.
+You can also see https://github.com/nov/fb_graph_sample for more details Rails3 sample application.
 
 ==== JavaScript SDK
 

data/VERSION

@@ -1 +1 @@
-2.0.0.alpha
+2.0.0.beta

data/lib/fb_graph/connections/blocked.rb

@@ -0,0 +1,33 @@
+module FbGraph
+  module Connections
+    module Blocked
+      def blocked(options = {})
+        blocked = self.connection :blocked, options
+        blocked.map! do |user|
+          User.new(user[:id], user.merge(
+            :access_token => options[:access_token] || self.access_token
+          ))
+        end
+      end
+
+      def blocked?(user, options = {})
+        blocked = self.connection :blocked, options.merge(:connection_scope => user.identifier)
+        blocked.present?
+      end
+
+      def block!(*users)
+        options = users.extract_options!
+        blocked = post options.merge(:connection => :blocked, :uid => Array(users).collect(&:identifier).join(','))
+        blocked.delete_if do |user_id, succeeded|
+          !succeeded
+        end.keys.map! do |user_id|
+          User.new(user_id, :access_token => options[:access_token] || self.access_token)
+        end
+      end
+
+      def unblock!(user, options = {})
+        delete options.merge(:connection => :blocked, :connection_scope => user.identifier)
+      end
+    end
+  end
+end

data/lib/fb_graph/connections/likes.rb

@@ -19,6 +19,11 @@ module FbGraph
         end
       end
 
+      def like?(page, options = {})
+        like = self.connection :likes, options.merge(:connection_scope => page.identifier)
+        like.present?
+      end
+
       # NOTE: likes! is defined in fb_graph/connections/comments.rb
     end
   end

data/lib/fb_graph/page.rb

@@ -1,6 +1,7 @@
 module FbGraph
   class Page < Node
     include Connections::Albums
+    include Connections::Blocked
     include Connections::Checkins
     include Connections::Events
     include Connections::Feed

data/spec/fb_graph/connections/blocked_spec.rb

@@ -0,0 +1,56 @@
+require 'spec_helper'
+
+describe FbGraph::Connections::Blocked do
+  let(:page) { FbGraph::Page.new(117513961602338, :access_token => 'access_token') }
+  let(:user) { FbGraph::User.new(579612276) }
+
+  describe '#blocked' do
+    it 'should return blocked users as FbGraph::User' do
+      mock_graph :get, '117513961602338/blocked', 'pages/blocked/index', :access_token => 'access_token' do
+        users = page.blocked
+        users.each do |user|
+          user.should be_a FbGraph::User
+        end
+      end
+    end
+  end
+
+  describe '#blocked?' do
+    context 'when blocked' do
+      it 'should retrun true' do
+        mock_graph :get, '117513961602338/blocked/579612276', 'pages/blocked/show_blocked', :access_token => 'access_token' do
+          page.blocked?(user).should be_true
+        end
+      end
+    end
+
+    context 'otherwise' do
+      it 'should retrun false' do
+        mock_graph :get, '117513961602338/blocked/579612276', 'pages/blocked/show_non_blocked', :access_token => 'access_token' do
+          page.blocked?(user).should be_false
+        end
+      end
+    end
+  end
+
+  describe '#block!' do
+    it 'should return blocked users as FbGraph::User' do
+      mock_graph :post, '117513961602338/blocked', 'pages/blocked/create', :access_token => 'access_token', :params => {
+        :uid => '579612276'
+      } do
+        blocked = page.block! user
+        blocked.each do |user|
+          user.should be_a FbGraph::User
+        end
+      end
+    end
+  end
+
+  describe '#unblock!' do
+    it 'should return true' do
+      mock_graph :delete, '117513961602338/blocked/579612276', 'true', :access_token => 'access_token' do
+        page.unblock!(user).should be_true
+      end
+    end
+  end
+end

data/spec/fb_graph/connections/likes_spec.rb

@@ -1,71 +1,95 @@
 # -*- coding: utf-8 -*-
 require 'spec_helper'
 
-describe FbGraph::Connections::Likes, '#likes' do
-  context 'when included by FbGraph::User' do
-    context 'when no access_token given' do
-      it 'should raise FbGraph::Unauthorized' do
-        mock_graph :get, 'arjun/likes', 'users/likes/arjun_public', :status => [401, 'Unauthorized'] do
-          lambda do
-            FbGraph::User.new('arjun').likes
-          end.should raise_exception(FbGraph::Unauthorized)
+describe FbGraph::Connections::Likes do
+  describe '#likes' do
+    context 'when included by FbGraph::User' do
+      context 'when no access_token given' do
+        it 'should raise FbGraph::Unauthorized' do
+          mock_graph :get, 'arjun/likes', 'users/likes/arjun_public', :status => [401, 'Unauthorized'] do
+            lambda do
+              FbGraph::User.new('arjun').likes
+            end.should raise_exception(FbGraph::Unauthorized)
+          end
         end
       end
-    end
 
-    context 'when access_token is given' do
-      it 'should return liked pages as FbGraph::Page' do
-        mock_graph :get, 'arjun/likes', 'users/likes/arjun_private', :access_token => 'access_token' do
-          likes = FbGraph::User.new('arjun', :access_token => 'access_token').likes
-          likes.first.should == FbGraph::Page.new(
-            '378209722137',
-            :access_token => 'access_token',
-            :name => 'Doing Things at the Last Minute',
-            :category => '活動'
-          )
-          likes.each do |like|
-            like.should be_instance_of(FbGraph::Page)
+      context 'when access_token is given' do
+        it 'should return liked pages as FbGraph::Page' do
+          mock_graph :get, 'arjun/likes', 'users/likes/arjun_private', :access_token => 'access_token' do
+            likes = FbGraph::User.new('arjun', :access_token => 'access_token').likes
+            likes.first.should == FbGraph::Page.new(
+              '378209722137',
+              :access_token => 'access_token',
+              :name => 'Doing Things at the Last Minute',
+              :category => '活動'
+            )
+            likes.each do |like|
+              like.should be_instance_of(FbGraph::Page)
+            end
           end
         end
       end
     end
-  end
 
-  context 'when included by FbGraph::Status' do
-    context 'when cached collection exists' do
-      before do
-        mock_graph :get, 'with_likes', 'statuses/with_likes', :access_token => 'access_token' do
-          @status = FbGraph::Status.new('with_likes').fetch(:access_token => 'access_token')
+    context 'when included by FbGraph::Status' do
+      context 'when cached collection exists' do
+        before do
+          mock_graph :get, 'with_likes', 'statuses/with_likes', :access_token => 'access_token' do
+            @status = FbGraph::Status.new('with_likes').fetch(:access_token => 'access_token')
+          end
         end
-      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 == []
+        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 request_to('115838235152172/likes?access_token=access_token&no_cache=true')
+            lambda do
+              @status.likes(:limit => 10)
+            end.should request_to('115838235152172/likes?access_token=access_token&limit=10')
+          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
+
+  describe '#like?' do
+    let(:user)     { FbGraph::User.new(579612276, :access_token => 'access_token') }
+    let(:fb_graph) { FbGraph::Page.new(117513961602338) }
+    let(:poken)    { FbGraph::Page.new(1234567890) }
 
-      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 request_to('115838235152172/likes?access_token=access_token&no_cache=true')
-          lambda do
-            @status.likes(:limit => 10)
-          end.should request_to('115838235152172/likes?access_token=access_token&limit=10')
+    context 'when liked' do
+      it 'should retrun true' do
+        mock_graph :get, '579612276/likes/117513961602338', 'users/likes/fb_graph', :access_token => 'access_token' do
+          user.like?(fb_graph).should be_true
         end
+      end
+    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
+    context 'otherwise' do
+      it 'should retrun true' do
+        mock_graph :get, '579612276/likes/1234567890', 'users/likes/poken', :access_token => 'access_token' do
+          user.like?(poken).should be_false
         end
       end
     end

data/spec/mock_json/pages/blocked/create.json

@@ -0,0 +1 @@
+{"579612276":true}

data/spec/mock_json/pages/blocked/index.json

@@ -0,0 +1,10 @@
+{
+    "data": [{
+        "name": "Jr Nov",
+        "id": "1575327134"
+    },
+    {
+        "name": "Nov Matake",
+        "id": "579612276"
+    }]
+}

data/spec/mock_json/pages/blocked/show_blocked.json

@@ -0,0 +1,6 @@
+{
+    "data": [{
+        "name": "Nov Matake",
+        "id": "579612276"
+    }]
+}

data/spec/mock_json/pages/blocked/show_non_blocked.json

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

data/spec/mock_json/users/likes/fb_graph.json

@@ -0,0 +1 @@
+{"data":[{"name":"FbGraph", "category":"Software", "id":"117513961602338", "created_time":"2010-04-30T06:48:21+0000"}]}

data/spec/mock_json/users/likes/poken.json

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: fb_graph
 version: !ruby/object:Gem::Version 
-  hash: -1851332194
+  hash: 31098209
   prerelease: 6
   segments: 
   - 2
   - 0
   - 0
-  - alpha
-  version: 2.0.0.alpha
+  - beta
+  version: 2.0.0.beta
 platform: ruby
 authors: 
 - nov matake
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-10 00:00:00 Z
+date: 2011-08-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: httpclient
@@ -168,6 +168,7 @@ files:
 - lib/fb_graph/connections/albums.rb
 - lib/fb_graph/connections/app_requests.rb
 - lib/fb_graph/connections/attending.rb
+- lib/fb_graph/connections/blocked.rb
 - lib/fb_graph/connections/books.rb
 - lib/fb_graph/connections/checkins.rb
 - lib/fb_graph/connections/comments.rb
@@ -269,6 +270,7 @@ files:
 - spec/fb_graph/connections/albums_spec.rb
 - spec/fb_graph/connections/app_requests_spec.rb
 - spec/fb_graph/connections/attending_spec.rb
+- spec/fb_graph/connections/blocked_spec.rb
 - spec/fb_graph/connections/books_spec.rb
 - spec/fb_graph/connections/checkins_spec.rb
 - spec/fb_graph/connections/comments_spec.rb
@@ -377,6 +379,10 @@ files:
 - spec/mock_json/events/noreply/smartday_private.json
 - spec/mock_json/groups/docs/private.json
 - spec/mock_json/groups/members/emacs_private.json
+- spec/mock_json/pages/blocked/create.json
+- spec/mock_json/pages/blocked/index.json
+- spec/mock_json/pages/blocked/show_blocked.json
+- spec/mock_json/pages/blocked/show_non_blocked.json
 - spec/mock_json/pages/categories/local_business.json
 - spec/mock_json/pages/categories/movie.json
 - spec/mock_json/pages/categories/music.json
@@ -467,6 +473,8 @@ files:
 - spec/mock_json/users/interests/matake_private.json
 - spec/mock_json/users/likes/arjun_private.json
 - spec/mock_json/users/likes/arjun_public.json
+- spec/mock_json/users/likes/fb_graph.json
+- spec/mock_json/users/likes/poken.json
 - spec/mock_json/users/links/matake_private.json
 - spec/mock_json/users/links/post_with_valid_access_token.json
 - spec/mock_json/users/me_private.json
@@ -539,6 +547,7 @@ test_files:
 - spec/fb_graph/connections/albums_spec.rb
 - spec/fb_graph/connections/app_requests_spec.rb
 - spec/fb_graph/connections/attending_spec.rb
+- spec/fb_graph/connections/blocked_spec.rb
 - spec/fb_graph/connections/books_spec.rb
 - spec/fb_graph/connections/checkins_spec.rb
 - spec/fb_graph/connections/comments_spec.rb
@@ -647,6 +656,10 @@ test_files:
 - spec/mock_json/events/noreply/smartday_private.json
 - spec/mock_json/groups/docs/private.json
 - spec/mock_json/groups/members/emacs_private.json
+- spec/mock_json/pages/blocked/create.json
+- spec/mock_json/pages/blocked/index.json
+- spec/mock_json/pages/blocked/show_blocked.json
+- spec/mock_json/pages/blocked/show_non_blocked.json
 - spec/mock_json/pages/categories/local_business.json
 - spec/mock_json/pages/categories/movie.json
 - spec/mock_json/pages/categories/music.json
@@ -737,6 +750,8 @@ test_files:
 - spec/mock_json/users/interests/matake_private.json
 - spec/mock_json/users/likes/arjun_private.json
 - spec/mock_json/users/likes/arjun_public.json
+- spec/mock_json/users/likes/fb_graph.json
+- spec/mock_json/users/likes/poken.json
 - spec/mock_json/users/links/matake_private.json
 - spec/mock_json/users/links/post_with_valid_access_token.json
 - spec/mock_json/users/me_private.json