fb_graph 1.8.1 → 1.8.2

data/Gemfile.lock

@@ -1,36 +1,31 @@
 PATH
   remote: .
   specs:
-    fb_graph (1.8.0)
+    fb_graph (1.8.1)
       httpclient (>= 2.2.0.2)
-      rack-oauth2 (>= 0.6.9)
+      rack-oauth2 (>= 0.8.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
     activesupport (3.0.7)
-    addressable (2.2.5)
+    addressable (2.2.6)
     attr_required (0.0.3)
     crack (0.1.8)
     diff-lcs (1.1.2)
     httpclient (2.2.0.2)
     i18n (0.5.0)
     json (1.5.1)
-    mime-types (1.16)
     rack (1.2.2)
-    rack-oauth2 (0.6.9)
+    rack-oauth2 (0.8.0)
       activesupport (>= 2.3)
       attr_required (>= 0.0.3)
+      httpclient (>= 2.2.0.2)
       i18n
       json (>= 1.4.3)
       rack (>= 1.1)
-      restclient_with_cert
     rake (0.8.7)
     rcov (0.9.9)
-    rest-client (1.6.1)
-      mime-types (>= 1.16)
-    restclient_with_cert (0.0.7)
-      rest-client (>= 1.6)
     rspec (2.5.0)
       rspec-core (~> 2.5.0)
       rspec-expectations (~> 2.5.0)
@@ -39,8 +34,8 @@ GEM
     rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.5.0)
-    webmock (1.6.2)
-      addressable (>= 2.2.2)
+    webmock (1.6.4)
+      addressable (> 2.2.5, ~> 2.2)
       crack (>= 0.1.7)
 
 PLATFORMS
@@ -48,7 +43,7 @@ PLATFORMS
 
 DEPENDENCIES
   fb_graph!
-  rake (>= 0.8)
+  rake (< 0.9, >= 0.8)
   rcov (>= 0.9)
-  rspec (>= 2)
+  rspec (< 2.6, >= 2)
   webmock (>= 1.6.2)

data/VERSION

@@ -1 +1 @@
-1.8.1
+1.8.2

data/fb_graph.gemspec

@@ -13,9 +13,9 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.add_runtime_dependency "httpclient", ">= 2.2.0.2"
-  s.add_runtime_dependency "rack-oauth2", ">= 0.6.9"
-  s.add_development_dependency "rake", ">= 0.8"
+  s.add_runtime_dependency "rack-oauth2", ">= 0.8.0"
+  s.add_development_dependency "rake", ">= 0.8", "< 0.9"
   s.add_development_dependency "rcov", ">= 0.9"
-  s.add_development_dependency "rspec", ">= 2"
+  s.add_development_dependency "rspec", ">= 2", "< 2.6"
   s.add_development_dependency "webmock", ">= 1.6.2"
 end

data/lib/fb_graph/checkin.rb

@@ -11,8 +11,15 @@ module FbGraph
       end
       @tags = []
       if (tags = attributes[:tags])
-        Collection.new(tags).each do |user|
-          @tags << User.new(user[:id], user)
+        case tags
+        when Hash
+          Collection.new(tags).each do |user|
+            @tags << User.new(user[:id], user)
+          end
+        when String, Array
+          Array(tags).each do |user_id|
+            @tags << User.new(user_id)
+          end
         end
       end
       if (place = attributes[:place])

data/lib/fb_graph/connections/insights.rb

@@ -16,7 +16,7 @@ module FbGraph
         if metrics = options.delete(:metrics)
           File.join([metrics, options.delete(:period)].compact.collect(&:to_s))
         else
-          nil
+          options[:connection_scope]
         end
       end
     end

data/spec/fb_graph/connections/checkins_spec.rb

@@ -1,121 +1,153 @@
 require 'spec_helper'
 
-describe FbGraph::Connections::Checkins, '#checkins' do
-  context 'when included by FbGraph::User' do
-    context 'when no access_token given' do
-      it 'should raise FbGraph::Unauthorized' do
-        mock_graph :get, 'mattt/checkins', 'users/checkins/mattt_public', :status => [401, 'Unauthorized'] do
-          lambda do
-            FbGraph::User.new('mattt').checkins
-          end.should raise_exception(FbGraph::Unauthorized)
+describe FbGraph::Connections::Checkins do
+  describe '#checkins' do
+    context 'when included by FbGraph::User' do
+      context 'when no access_token given' do
+        it 'should raise FbGraph::Unauthorized' do
+          mock_graph :get, 'mattt/checkins', 'users/checkins/mattt_public', :status => [401, 'Unauthorized'] do
+            lambda do
+              FbGraph::User.new('mattt').checkins
+            end.should raise_exception(FbGraph::Unauthorized)
+          end
         end
       end
-    end
 
-    context 'when access_token is given' do
-      it 'should return checkins as FbGraph::Checkin' do
-        mock_graph :get, 'mattt/checkins', 'users/checkins/mattt_private', :access_token => 'access_token' do
-          checkins = FbGraph::User.new('mattt', :access_token => 'access_token').checkins
-          checkins.first.should == FbGraph::Checkin.new(
-            '696876187499',
-            :access_token => 'access_token',
-            :from => {
-              :id => '12820552',
-              :name => 'Roger Pincombe'
-            },
-            :tags => {
-              :data => [{
-                :id => '4810308',
-                :name => 'Mattt Thompson'
-              }]
-            },
-            :message => 'Checking out Austin, TX',
-            :place => {
-              :id => '120454134658381',
-              :name => 'Gowalla HQ',
-              :location => {
-                :latitude => 30.26876,
-                :longitude => -97.74962
-              }
-            },
-            :application => {
-              :id => '6628568379',
-              :name => 'Facebook for iPhone'
-            },
-            :created_time => '2010-09-08T00:09:25+0000'
-          )
-          checkins.each do |checkin|
-            checkin.should be_instance_of(FbGraph::Checkin)
+      context 'when access_token is given' do
+        it 'should return checkins as FbGraph::Checkin' do
+          mock_graph :get, 'mattt/checkins', 'users/checkins/mattt_private', :access_token => 'access_token' do
+            checkins = FbGraph::User.new('mattt', :access_token => 'access_token').checkins
+            checkins.first.should == FbGraph::Checkin.new(
+              '696876187499',
+              :access_token => 'access_token',
+              :from => {
+                :id => '12820552',
+                :name => 'Roger Pincombe'
+              },
+              :tags => {
+                :data => [{
+                  :id => '4810308',
+                  :name => 'Mattt Thompson'
+                }]
+              },
+              :message => 'Checking out Austin, TX',
+              :place => {
+                :id => '120454134658381',
+                :name => 'Gowalla HQ',
+                :location => {
+                  :latitude => 30.26876,
+                  :longitude => -97.74962
+                }
+              },
+              :application => {
+                :id => '6628568379',
+                :name => 'Facebook for iPhone'
+              },
+              :created_time => '2010-09-08T00:09:25+0000'
+            )
+            checkins.each do |checkin|
+              checkin.should be_instance_of(FbGraph::Checkin)
+            end
           end
         end
       end
     end
-  end
 
-  context 'when included by FbGraph::Page' do
-    context 'when no access_token given' do
-      it 'should raise FbGraph::Unauthorized' do
-        mock_graph :get, 'gowalla/checkins', 'pages/checkins/gowalla_public', :status => [401, 'Unauthorized'] do
-          lambda do
-            FbGraph::Page.new('gowalla').checkins
-          end.should raise_exception(FbGraph::Unauthorized)
+    context 'when included by FbGraph::Page' do
+      context 'when no access_token given' do
+        it 'should raise FbGraph::Unauthorized' do
+          mock_graph :get, 'gowalla/checkins', 'pages/checkins/gowalla_public', :status => [401, 'Unauthorized'] do
+            lambda do
+              FbGraph::Page.new('gowalla').checkins
+            end.should raise_exception(FbGraph::Unauthorized)
+          end
         end
       end
-    end
 
-    context 'when access_token is given' do
-      it 'should return checkins as FbGraph::Checkin' do
-        mock_graph :get, 'gowalla/checkins', 'pages/checkins/gowalla_private', :access_token => 'access_token' do
-          checkins = FbGraph::Page.new('gowalla', :access_token => 'access_token').checkins
-          checkins.first.should == FbGraph::Checkin.new(
-            '696876187499',
-            :access_token => 'access_token',
-            :from => {
-              :id => '12820552',
-              :name => 'Roger Pincombe'
-            },
-            :tags => {
-              :data => [{
-                :id => '4810308',
-                :name => 'Mattt Thompson'
-              }]
-            },
-            :message => 'Checking out Austin, TX',
-            :place => {
-              :id => '120454134658381',
-              :name => 'Gowalla HQ',
-              :location => {
-                :latitude => 30.26876,
-                :longitude => -97.74962
-              }
-            },
-            :application => {
-              :id => '6628568379',
-              :name => 'Facebook for iPhone'
-            },
-            :created_time => '2010-09-08T00:09:25+0000'
-          )
-          checkins.each do |checkin|
-            checkin.should be_instance_of(FbGraph::Checkin)
+      context 'when access_token is given' do
+        it 'should return checkins as FbGraph::Checkin' do
+          mock_graph :get, 'gowalla/checkins', 'pages/checkins/gowalla_private', :access_token => 'access_token' do
+            checkins = FbGraph::Page.new('gowalla', :access_token => 'access_token').checkins
+            checkins.first.should == FbGraph::Checkin.new(
+              '696876187499',
+              :access_token => 'access_token',
+              :from => {
+                :id => '12820552',
+                :name => 'Roger Pincombe'
+              },
+              :tags => {
+                :data => [{
+                  :id => '4810308',
+                  :name => 'Mattt Thompson'
+                }]
+              },
+              :message => 'Checking out Austin, TX',
+              :place => {
+                :id => '120454134658381',
+                :name => 'Gowalla HQ',
+                :location => {
+                  :latitude => 30.26876,
+                  :longitude => -97.74962
+                }
+              },
+              :application => {
+                :id => '6628568379',
+                :name => 'Facebook for iPhone'
+              },
+              :created_time => '2010-09-08T00:09:25+0000'
+            )
+            checkins.each do |checkin|
+              checkin.should be_instance_of(FbGraph::Checkin)
+            end
           end
         end
       end
     end
   end
-end
 
-describe FbGraph::Connections::Checkins, '#checkin!' do
-  it 'should POST :user_id/checkins' do
-    mock_graph :post, 'me/checkins', 'users/checkins/posted' do
-      checkin = FbGraph::User.me('token').checkin!(
-        :place => 'place_id',
-        :coordinates => {
-          :latitude => 30.26876,
-          :longitude => -97.74962
-        }.to_json
-      )
-      checkin.identifier.should == '10150090286117277'
-      checkin.place.should == FbGraph::Place.new('place_id')
+  describe '#checkin!' do
+    it 'should POST :user_id/checkins' do
+      mock_graph :post, 'me/checkins', 'users/checkins/posted' do
+        checkin = FbGraph::User.me('token').checkin!(
+          :place => 'place_id',
+          :coordinates => {
+            :latitude => 30.26876,
+            :longitude => -97.74962
+          }.to_json
+        )
+        checkin.identifier.should == '10150090286117277'
+        checkin.place.should == FbGraph::Place.new('place_id')
+      end
+    end
+
+    context 'when tags are given' do
+      it 'should allow single tag' do
+        mock_graph :post, 'me/checkins', 'users/checkins/posted' do
+          checkin = FbGraph::User.me('token').checkin!(
+            :place => 'place_id',
+            :coordinates => {
+              :latitude => 30.26876,
+              :longitude => -97.74962
+            }.to_json,
+            :tags => 'friend_1'
+          )
+          checkin.tags.should == [FbGraph::User.new('friend_1')]
+        end
+      end
+
+      it 'should allow multiple tags' do
+        mock_graph :post, 'me/checkins', 'users/checkins/posted' do
+          checkin = FbGraph::User.me('token').checkin!(
+            :place => 'place_id',
+            :coordinates => {
+              :latitude => 30.26876,
+              :longitude => -97.74962
+            }.to_json,
+            :tags => ['friend_1', 'friend_2']
+          )
+          checkin.tags.should == [FbGraph::User.new('friend_1'), FbGraph::User.new('friend_2')]
+        end
+      end
     end
   end
 end

data/spec/fb_graph/connections/insights_spec.rb

@@ -1,96 +1,104 @@
 require 'spec_helper'
 
-describe FbGraph::Connections::Insights, '#insights' do
-
-  context 'when included by FbGraph::Page' do
-    context 'when no access_token given' do
-      it 'should raise FbGraph::Unauthorized' do
-        mock_graph :get, 'FbGraph/insights', 'pages/insights/FbGraph_public', :status => [401, 'Unauthorized'] do
-          lambda do
-            FbGraph::Page.new('FbGraph').insights
-          end.should raise_exception(FbGraph::Unauthorized)
+describe FbGraph::Connections::Insights do
+  describe '#insights' do
+    context 'when included by FbGraph::Page' do
+      context 'when no access_token given' do
+        it 'should raise FbGraph::Unauthorized' do
+          mock_graph :get, 'FbGraph/insights', 'pages/insights/FbGraph_public', :status => [401, 'Unauthorized'] do
+            lambda do
+              FbGraph::Page.new('FbGraph').insights
+            end.should raise_exception(FbGraph::Unauthorized)
+          end
         end
       end
-    end
 
-    context 'when access_token is given' do
-      it 'should return insights as FbGraph::Insight' do
-        mock_graph :get, 'FbGraph/insights', 'pages/insights/FbGraph_private', :access_token => 'access_token' do
-          insights = FbGraph::Page.new('FbGraph').insights(:access_token => 'access_token')
-          insights.class.should == FbGraph::Connection
-          insights.first.should == FbGraph::Insight.new(
-            '117513961602338/insights/page_fan_adds_unique/day',
-            :access_token => 'access_token',
-            :name => 'page_fan_adds_unique',
-            :description => 'Daily New Likes of your Page (Unique Users)',
-            :period => 'day',
-            :values => [{
-              :value => 1,
-              :end_time => '2010-11-27T08:00:00+0000'
-            }]
-          )
-          insights.each do |insight|
-            insight.should be_instance_of(FbGraph::Insight)
+      context 'when access_token is given' do
+        it 'should return insights as FbGraph::Insight' do
+          mock_graph :get, 'FbGraph/insights', 'pages/insights/FbGraph_private', :access_token => 'access_token' do
+            insights = FbGraph::Page.new('FbGraph').insights(:access_token => 'access_token')
+            insights.class.should == FbGraph::Connection
+            insights.first.should == FbGraph::Insight.new(
+              '117513961602338/insights/page_fan_adds_unique/day',
+              :access_token => 'access_token',
+              :name => 'page_fan_adds_unique',
+              :description => 'Daily New Likes of your Page (Unique Users)',
+              :period => 'day',
+              :values => [{
+                :value => 1,
+                :end_time => '2010-11-27T08:00:00+0000'
+              }]
+            )
+            insights.each do |insight|
+              insight.should be_instance_of(FbGraph::Insight)
+            end
           end
         end
       end
-    end
 
-    context 'when metrics is given' do
-      it 'should treat metrics as connection scope' do
-        mock_graph :get, 'FbGraph/insights/page_like_adds', 'pages/insights/page_like_adds/FbGraph_private', :access_token => 'access_token' do
-          insights = FbGraph::Page.new('FbGraph').insights(:access_token => 'access_token', :metrics => :page_like_adds)
-          insights.options.should == {
-            :connection_scope => 'page_like_adds',
-            :access_token => 'access_token'
-          }
-          insights.first.should == FbGraph::Insight.new(
-            '117513961602338/insights/page_like_adds/day',
-            :access_token => 'access_token',
-            :name => 'page_like_adds',
-            :description => 'Daily Likes of your Page\'s content (Total Count)',
-            :period => 'day',
-            :values => [{
-              :value => 0,
-              :end_time => '2010-12-09T08:00:00+0000'
-            }, {
-              :value => 0,
-              :end_time => '2010-12-10T08:00:00+0000'
-            }, {
-              :value => 0,
-              :end_time => '2010-12-11T08:00:00+0000'
-            }]
-          )
+      context 'when metrics is given' do
+        it 'should treat metrics as connection scope' do
+          mock_graph :get, 'FbGraph/insights/page_like_adds', 'pages/insights/page_like_adds/FbGraph_private', :access_token => 'access_token' do
+            insights = FbGraph::Page.new('FbGraph').insights(:access_token => 'access_token', :metrics => :page_like_adds)
+            insights.options.should == {
+              :connection_scope => 'page_like_adds',
+              :access_token => 'access_token'
+            }
+            insights.first.should == FbGraph::Insight.new(
+              '117513961602338/insights/page_like_adds/day',
+              :access_token => 'access_token',
+              :name => 'page_like_adds',
+              :description => 'Daily Likes of your Page\'s content (Total Count)',
+              :period => 'day',
+              :values => [{
+                :value => 0,
+                :end_time => '2010-12-09T08:00:00+0000'
+              }, {
+                :value => 0,
+                :end_time => '2010-12-10T08:00:00+0000'
+              }, {
+                :value => 0,
+                :end_time => '2010-12-11T08:00:00+0000'
+              }]
+            )
+          end
         end
-      end
 
-      it 'should support period also' do
-        mock_graph :get, 'FbGraph/insights/page_like_adds/day', 'pages/insights/page_like_adds/day/FbGraph_private', :access_token => 'access_token' do
-          insights = FbGraph::Page.new('FbGraph').insights(:access_token => 'access_token', :metrics => :page_like_adds, :period => :day)
-          insights.options.should == {
-            :connection_scope => 'page_like_adds/day',
-            :access_token => 'access_token'
-          }
-          insights.first.should == FbGraph::Insight.new(
-            '117513961602338/insights/page_like_adds/day',
-            :access_token => 'access_token',
-            :name => 'page_like_adds',
-            :description => 'Daily Likes of your Page\'s content (Total Count)',
-            :period => 'day',
-            :values => [{
-              :value => 1,
-              :end_time => '2010-12-09T08:00:00+0000'
-            }, {
-              :value => 1,
-              :end_time => '2010-12-10T08:00:00+0000'
-            }, {
-              :value => 1,
-              :end_time => '2010-12-11T08:00:00+0000'
-            }]
-          )
+        it 'should support period also' do
+          mock_graph :get, 'FbGraph/insights/page_like_adds/day', 'pages/insights/page_like_adds/day/FbGraph_private', :access_token => 'access_token' do
+            insights = FbGraph::Page.new('FbGraph').insights(:access_token => 'access_token', :metrics => :page_like_adds, :period => :day)
+            insights.options.should == {
+              :connection_scope => 'page_like_adds/day',
+              :access_token => 'access_token'
+            }
+            insights.first.should == FbGraph::Insight.new(
+              '117513961602338/insights/page_like_adds/day',
+              :access_token => 'access_token',
+              :name => 'page_like_adds',
+              :description => 'Daily Likes of your Page\'s content (Total Count)',
+              :period => 'day',
+              :values => [{
+                :value => 1,
+                :end_time => '2010-12-09T08:00:00+0000'
+              }, {
+                :value => 1,
+                :end_time => '2010-12-10T08:00:00+0000'
+              }, {
+                :value => 1,
+                :end_time => '2010-12-11T08:00:00+0000'
+              }]
+            )
+          end
+        end
+
+        it 'should used for pagination' do
+          mock_graph :get, 'FbGraph/insights/page_like_adds/day', 'pages/insights/page_like_adds/day/FbGraph_private', :access_token => 'access_token' do
+            insights = FbGraph::Page.new('FbGraph').insights(:access_token => 'access_token', :metrics => :page_like_adds, :period => :day)
+            expect { insights.next     }.should request_to 'FbGraph/insights/page_like_adds/day?oauth_token=access_token&since=1292065709&until=1292324909'
+            expect { insights.previous }.should request_to 'FbGraph/insights/page_like_adds/day?oauth_token=access_token&since=1291547309&until=1291806509'
+          end
         end
       end
     end
   end
-
 end

metadata

@@ -2,7 +2,7 @@
 name: fb_graph
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.8.1
+  version: 1.8.2
 platform: ruby
 authors: 
 - nov matake
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-16 00:00:00 Z
+date: 2011-05-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: httpclient
@@ -31,7 +31,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.9
+        version: 0.8.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -43,6 +43,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0.8"
+    - - <
+      - !ruby/object:Gem::Version 
+        version: "0.9"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -65,6 +68,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         version: "2"
+    - - <
+      - !ruby/object:Gem::Version 
+        version: "2.6"
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency