fb_graph 1.8.5 → 1.8.6

data/Gemfile.lock

@@ -1,21 +1,21 @@
 PATH
   remote: .
   specs:
-    fb_graph (1.8.4)
+    fb_graph (1.8.6)
       httpclient (>= 2.2.0.2)
       rack-oauth2 (>= 0.8.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.0.8)
+    activesupport (3.0.9)
     addressable (2.2.6)
     attr_required (0.0.3)
     crack (0.1.8)
     diff-lcs (1.1.2)
     httpclient (2.2.1)
     i18n (0.6.0)
-    json (1.5.1)
+    json (1.5.2)
     rack (1.3.0)
     rack-oauth2 (0.8.1)
       activesupport (>= 2.3)

data/VERSION

@@ -1 +1 @@
-1.8.5
+1.8.6

data/lib/fb_graph/application.rb

@@ -33,5 +33,11 @@ module FbGraph
       self.access_token = auth.client.access_token!
     end
 
+    def access_token_with_auto_fetch
+      access_token_without_auto_fetch ||
+      self.secret && get_access_token
+    end
+    alias_method_chain :access_token, :auto_fetch
+
   end
 end

data/lib/fb_graph/connections/insights.rb

@@ -3,7 +3,6 @@ module FbGraph
     module Insights
       def insights(options = {})
         options[:access_token] ||= self.access_token
-        options[:access_token] ||= get_access_token(options[:secret]) if respond_to?(:get_access_token)
         insights = self.connection(:insights, options.merge(:connection_scope => connection_scope(options)))
         insights.map! do |insight|
           Insight.new(insight[:id], insight.merge(:access_token => options[:access_token]))

data/lib/fb_graph/connections/payments.rb

@@ -3,7 +3,6 @@ module FbGraph
     module Payments
       def payments(options = {})
         options[:access_token] ||= self.access_token
-        options[:access_token] ||= get_access_token(options[:secret]) if respond_to?(:get_access_token)
         orders = self.connection(:payments, options)
         orders.map! do |order|
           orders[:access_token] ||= options[:access_token] || self.access_token

data/lib/fb_graph/connections/subscriptions.rb

@@ -7,7 +7,7 @@ module FbGraph
       #   app.subscriptions
       #   => Array of FbGraph::Subscriptions
       def subscriptions(options = {})
-        options[:access_token] ||= self.access_token || get_access_token(options[:secret])
+        options[:access_token] ||= self.access_token
         subscriptions = self.connection(:subscriptions, options)
         subscriptions.map! do |subscription|
           Subscription.new(subscription.merge(:access_token => options[:access_token]))
@@ -29,7 +29,7 @@ module FbGraph
       #   )
       #   => Array of FbGraph::Subscriptions
       def subscribe!(options = {})
-        options[:access_token] ||= self.access_token || get_access_token(options[:secret])
+        options[:access_token] ||= self.access_token
         post(options.merge(:connection => :subscriptions))
       end
 
@@ -45,7 +45,7 @@ module FbGraph
       #   )
       #   => Array of FbGraph::Subscriptions
       def unsubscribe!(options = {})
-        options[:access_token] ||= self.access_token || get_access_token(options[:secret])
+        options[:access_token] ||= self.access_token
         destroy(options.merge(:connection => :subscriptions))
       end
     end

data/lib/fb_graph/connections/test_users.rb

@@ -2,7 +2,7 @@ module FbGraph
   module Connections
     module TestUsers
       def test_users(options = {})
-        options[:access_token] ||= self.access_token || get_access_token(options[:secret])
+        options[:access_token] ||= self.access_token
         test_users = self.connection(:accounts, options.merge(:connection_scope => 'test-users'))
         test_users.map! do |test_user|
           TestUser.new(test_user[:id], test_user)
@@ -10,7 +10,7 @@ module FbGraph
       end
 
       def test_user!(options = {})
-        options[:access_token] ||= self.access_token || get_access_token(options[:secret])
+        options[:access_token] ||= self.access_token
         test_user = post(options.merge(:connection => :accounts, :connection_scope => 'test-users'))
         TestUser.new(test_user[:id], test_user)
       end

data/lib/fb_graph/connections/videos.rb

@@ -9,6 +9,13 @@ module FbGraph
           ))
         end
       end
+
+      def video!(options = {})
+        video = post(options.merge(:connection => :videos))
+        Video.new(video[:id], options.merge(video).merge(
+          :access_token => options[:access_token] || self.access_token
+        ))
+      end
     end
   end
 end

data/lib/fb_graph/group.rb

@@ -3,6 +3,7 @@ module FbGraph
     include Connections::Feed
     include Connections::Members
     include Connections::Picture
+    include Connections::Videos
     extend Searchable
 
     attr_accessor :owner, :name, :description, :link, :icon, :venue, :privacy, :version, :updated_time

data/spec/fb_graph/application_spec.rb

@@ -1,33 +1,64 @@
 require 'spec_helper'
 
-describe FbGraph::Application, '.new' do
-  it 'should setup all supported attributes' do
-    attributes = {
-      :id          => '12345',
-      :name        => 'FbGraph',
-      :description => 'Owsome Facebook Graph Wrapper',
-      :category    => 'Programming',
-      :link        => 'http://github.com/nov/fb_graph',
-      :secret      => 'sec sec'
-    }
-    app = FbGraph::Application.new(attributes.delete(:id), attributes)
-    app.identifier.should  == '12345'
-    app.name.should        == 'FbGraph'
-    app.description.should == 'Owsome Facebook Graph Wrapper'
-    app.category.should    == 'Programming'
-    app.link.should        == 'http://github.com/nov/fb_graph'
-    app.secret.should      == 'sec sec'
+describe FbGraph::Application do
+  let(:app) { FbGraph::Application.new('client_id') }
+
+  describe '.new' do
+    it 'should setup all supported attributes' do
+      attributes = {
+        :id          => '12345',
+        :name        => 'FbGraph',
+        :description => 'Owsome Facebook Graph Wrapper',
+        :category    => 'Programming',
+        :link        => 'http://github.com/nov/fb_graph',
+        :secret      => 'sec sec'
+      }
+      app = FbGraph::Application.new(attributes.delete(:id), attributes)
+      app.identifier.should  == '12345'
+      app.name.should        == 'FbGraph'
+      app.description.should == 'Owsome Facebook Graph Wrapper'
+      app.category.should    == 'Programming'
+      app.link.should        == 'http://github.com/nov/fb_graph'
+      app.secret.should      == 'sec sec'
+    end
   end
-end
 
-describe FbGraph::Application, '.get_access_token' do
-  let(:app) { FbGraph::Application.new('client_id', :secret => 'client_secret') }
-  it 'should return Rack::OAuth2::AccessToken::Legacy' do
-    mock_graph :post, 'oauth/access_token', 'token_response' do
-      app.access_token.should be_nil
-      app.get_access_token
-      app.access_token.should be_instance_of(Rack::OAuth2::AccessToken::Legacy)
-      app.access_token.access_token.should == 'token'
+  describe '#get_access_token' do
+    before { app.secret = 'secret' }
+
+    it 'should return Rack::OAuth2::AccessToken::Legacy' do
+      mock_graph :post, 'oauth/access_token', 'token_response' do
+        token = app.get_access_token
+        token.should be_instance_of(Rack::OAuth2::AccessToken::Legacy)
+        token.access_token.should == 'token'
+      end
+    end
+  end
+
+  describe '#access_token' do
+    context 'when access token already exists' do
+      before { app.access_token = "token" }
+      it 'should not fetch new token' do
+        app.should_not_receive(:get_access_token)
+        app.access_token
+      end
+    end
+
+    context 'otherwise' do
+      context 'when secret exists' do
+        before { app.secret = 'secret' }
+        it 'should fetch new token' do
+          app.should_receive(:get_access_token)
+          app.access_token
+        end
+      end
+
+      context 'otherwise' do
+        it 'should not fetch new token' do
+          app.should_not_receive(:get_access_token)
+          app.access_token
+        end
+      end
     end
   end
 end

data/spec/fb_graph/connections/videos_spec.rb

@@ -1,11 +1,26 @@
 require 'spec_helper'
 
-describe FbGraph::Connections::Videos, '#videos' do
-  it 'should return videos as FbGraph::Video' do
-    mock_graph :get, 'kirk/videos', 'users/videos/kirk_private', :access_token => 'access_token' do
-      videos = FbGraph::User.new('kirk', :access_token => 'access_token').videos
-      videos.each do |video|
-        video.should be_instance_of(FbGraph::Video)
+describe FbGraph::Connections::Videos do
+  describe '#videos' do
+    it 'should return videos as FbGraph::Video' do
+      mock_graph :get, 'kirk/videos', 'users/videos/kirk_private', :access_token => 'access_token' do
+        videos = FbGraph::User.new('kirk', :access_token => 'access_token').videos
+        videos.each do |video|
+          video.should be_instance_of(FbGraph::Video)
+        end
+      end
+    end
+  end
+
+  describe '#video!' do
+    it 'should return generated photo' do
+      mock_graph :post, 'me/videos', 'users/videos/posted' do
+        me = FbGraph::User.me('access_token')
+        video = me.video!(
+          :source => Tempfile.new('movie_file')
+        )
+        video.should be_a FbGraph::Video
+        video.identifier.should == '10150241488822277'
       end
     end
   end

data/spec/mock_json/users/videos/posted.json

@@ -0,0 +1 @@
+{"id":"10150241488822277"}

metadata

@@ -2,7 +2,7 @@
 name: fb_graph
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.8.5
+  version: 1.8.6
 platform: ruby
 authors: 
 - nov matake
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-14 00:00:00 Z
+date: 2011-06-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: httpclient
@@ -403,6 +403,7 @@ files:
 - spec/mock_json/users/tagged/arjun_public.json
 - spec/mock_json/users/television/matake_private.json
 - spec/mock_json/users/videos/kirk_private.json
+- spec/mock_json/users/videos/posted.json
 - spec/spec_helper.rb
 homepage: http://github.com/nov/fb_graph
 licenses: []
@@ -642,4 +643,5 @@ test_files:
 - spec/mock_json/users/tagged/arjun_public.json
 - spec/mock_json/users/television/matake_private.json
 - spec/mock_json/users/videos/kirk_private.json
+- spec/mock_json/users/videos/posted.json
 - spec/spec_helper.rb