fb_graph 2.1.11 → 2.1.12

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fb_graph (2.1.10)
+    fb_graph (2.1.11)
       httpclient (>= 2.2.0.2)
       rack-oauth2 (>= 0.9.4)
 

data/VERSION

@@ -1 +1 @@
-2.1.11
+2.1.12

data/lib/fb_graph/checkin.rb

@@ -1,5 +1,7 @@
 module FbGraph
   class Checkin < Node
+    include Connections::Comments
+    include Connections::Likes
     extend Searchable
 
     attr_accessor :from, :tags, :place, :message, :application, :created_time

data/lib/fb_graph/connections/comments.rb

@@ -20,17 +20,6 @@ module FbGraph
           :access_token => options[:access_token] || self.access_token
         ))
       end
-
-      # NOTE:
-      # the context of getting likes is User, but the context of posting like is not user.
-      # posting like is always in same context with comment!
-      def like!(options = {})
-        post(options.merge(:connection => :likes))
-      end
-
-      def unlike!(options = {})
-        destroy(options.merge(:connection => :likes))
-      end
     end
   end
 end

data/lib/fb_graph/connections/likes.rb

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

data/lib/fb_graph/connections/user_likes.rb

@@ -0,0 +1,19 @@
+module FbGraph
+  module Connections
+    module UserLikes
+      def likes(options = {})
+        likes = self.connection(:likes, options)
+        likes.map! do |like|
+          Page.new(like[:id], like.merge!(
+            :access_token => options[:access_token] || self.access_token
+          ))
+        end
+      end
+
+      def like?(page, options = {})
+        like = self.connection :likes, options.merge(:connection_scope => page.identifier)
+        like.present?
+      end
+    end
+  end
+end

data/lib/fb_graph/user.rb

@@ -18,7 +18,6 @@ module FbGraph
     include Connections::Home
     include Connections::Inbox
     include Connections::Interests
-    include Connections::Likes
     include Connections::Links
     include Connections::Movies
     include Connections::Music
@@ -35,6 +34,7 @@ module FbGraph
     include Connections::Television
     include Connections::Threads
     include Connections::UserAchievements
+    include Connections::UserLikes
     include Connections::Videos
     extend Searchable
 

data/spec/fb_graph/connections/comments_spec.rb

@@ -60,44 +60,4 @@ describe FbGraph::Connections::Comments, '#comment!' do
       end
     end
   end
-end
-
-describe FbGraph::Connections::Comments, '#like!' do
-  context 'when included by FbGraph::Post' do
-    context 'when no access_token given' do
-      it 'should raise FbGraph::Exception' do
-        mock_graph :post, '12345/likes', 'posts/likes/post_without_access_token', :status => [500, 'Internal Server Error'] do
-          lambda do
-            FbGraph::Post.new('12345').like!
-          end.should raise_exception(FbGraph::Exception)
-        end
-      end
-    end
-
-    context 'when invalid access_token is given' do
-      it 'should raise FbGraph::Exception' do
-        mock_graph :post, '12345/likes', 'posts/likes/post_with_invalid_access_token', :status => [500, 'Internal Server Error'] do
-          lambda do
-            FbGraph::Post.new('12345', :access_token => 'invalid').like!
-          end.should raise_exception(FbGraph::Exception)
-        end
-      end
-    end
-
-    context 'when valid access_token is given' do
-      it 'should return true' do
-        mock_graph :post, '12345/likes', 'posts/likes/post_with_valid_access_token' do
-          FbGraph::Post.new('12345', :access_token => 'valid').like!.should be_true
-        end
-      end
-    end
-  end
-end
-
-describe FbGraph::Connections::Comments, '#unlike!' do
-  it 'should DELETE /:object_id/likes' do
-    mock_graph :delete, '12345/likes', 'true', :access_token => 'valid' do
-      FbGraph::Post.new('12345', :access_token => 'valid').unlike!
-    end
-  end
 end

data/spec/fb_graph/connections/likes_spec.rb

@@ -3,35 +3,6 @@ require 'spec_helper'
 
 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
-
-      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
-
     context 'when included by FbGraph::Status' do
       context 'when cached collection exists' do
         before do
@@ -73,25 +44,43 @@ describe FbGraph::Connections::Likes do
     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) }
+  describe '#like!' do
+    context 'when included by FbGraph::Post' do
+      context 'when no access_token given' do
+        it 'should raise FbGraph::Exception' do
+          mock_graph :post, '12345/likes', 'posts/likes/post_without_access_token', :status => [500, 'Internal Server Error'] do
+            lambda do
+              FbGraph::Post.new('12345').like!
+            end.should raise_exception(FbGraph::Exception)
+          end
+        end
+      end
 
-    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
+      context 'when invalid access_token is given' do
+        it 'should raise FbGraph::Exception' do
+          mock_graph :post, '12345/likes', 'posts/likes/post_with_invalid_access_token', :status => [500, 'Internal Server Error'] do
+            lambda do
+              FbGraph::Post.new('12345', :access_token => 'invalid').like!
+            end.should raise_exception(FbGraph::Exception)
+          end
         end
       end
-    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
+      context 'when valid access_token is given' do
+        it 'should return true' do
+          mock_graph :post, '12345/likes', 'posts/likes/post_with_valid_access_token' do
+            FbGraph::Post.new('12345', :access_token => 'valid').like!.should be_true
+          end
         end
       end
     end
   end
+
+  describe '#unlike!' do
+    it 'should DELETE /:object_id/likes' do
+      mock_graph :delete, '12345/likes', 'true', :access_token => 'valid' do
+        FbGraph::Post.new('12345', :access_token => 'valid').unlike!
+      end
+    end
+  end
 end

data/spec/fb_graph/connections/user_likes_spec.rb

@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+require 'spec_helper'
+
+describe FbGraph::Connections::Likes do
+  describe '#likes' 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
+
+    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
+
+  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 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 '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
+  end
+end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: fb_graph
 version: !ruby/object:Gem::Version 
-  hash: 29
   prerelease: 
-  segments: 
-  - 2
-  - 1
-  - 11
-  version: 2.1.11
+  version: 2.1.12
 platform: ruby
 authors: 
 - nov matake
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-24 00:00:00 Z
+date: 2011-10-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: httpclient
@@ -25,12 +20,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 123
-        segments: 
-        - 2
-        - 2
-        - 0
-        - 2
         version: 2.2.0.2
   type: :runtime
   version_requirements: *id001
@@ -42,11 +31,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 51
-        segments: 
-        - 0
-        - 9
-        - 4
         version: 0.9.4
   type: :runtime
   version_requirements: *id002
@@ -58,10 +42,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 8
         version: "0.8"
   type: :development
   version_requirements: *id003
@@ -73,10 +53,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 9
         version: "0.9"
   type: :development
   version_requirements: *id004
@@ -88,9 +64,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
         version: "2"
   type: :development
   version_requirements: *id005
@@ -102,11 +75,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 6
-        - 2
         version: 1.6.2
   type: :development
   version_requirements: *id006
@@ -118,11 +86,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 3
-        - 0
-        - 6
         version: 3.0.6
   type: :development
   version_requirements: *id007
@@ -239,6 +202,7 @@ files:
 - lib/fb_graph/connections/test_users.rb
 - lib/fb_graph/connections/threads.rb
 - lib/fb_graph/connections/user_achievements.rb
+- lib/fb_graph/connections/user_likes.rb
 - lib/fb_graph/connections/videos.rb
 - lib/fb_graph/debugger.rb
 - lib/fb_graph/doc.rb
@@ -368,6 +332,7 @@ files:
 - spec/fb_graph/connections/test_users_spec.rb
 - spec/fb_graph/connections/threads_spec.rb
 - spec/fb_graph/connections/user_achievements_spec.rb
+- spec/fb_graph/connections/user_likes_spec.rb
 - spec/fb_graph/connections/videos_spec.rb
 - spec/fb_graph/debugger_spec.rb
 - spec/fb_graph/doc_spec.rb
@@ -591,23 +556,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A full-stack Facebook Graph API wrapper in Ruby.
@@ -695,6 +654,7 @@ test_files:
 - spec/fb_graph/connections/test_users_spec.rb
 - spec/fb_graph/connections/threads_spec.rb
 - spec/fb_graph/connections/user_achievements_spec.rb
+- spec/fb_graph/connections/user_likes_spec.rb
 - spec/fb_graph/connections/videos_spec.rb
 - spec/fb_graph/debugger_spec.rb
 - spec/fb_graph/doc_spec.rb