google-api-client 0.4.7 → 0.5.0

data/spec/google/api_client/media_spec.rb

@@ -71,68 +71,56 @@ describe Google::APIClient::ResumableUpload do
     @file = File.expand_path('files/sample.txt', fixtures_path)
     @media = Google::APIClient::UploadIO.new(@file, 'text/plain')
     @uploader = Google::APIClient::ResumableUpload.new(
-      mock_result(308),
-      @media,
-      'https://www.googleapis.com/upload/drive/v1/files/12345')
+      :media => @media,
+      :api_method => @drive.files.insert,
+      :uri => 'https://www.googleapis.com/upload/drive/v1/files/12345')
   end
 
   it 'should consider 20x status as complete' do
-    api_client = stub('api', :execute => mock_result(200))
-    @uploader.send_chunk(api_client)
+    request = @uploader.to_http_request
+    @uploader.process_http_response(mock_result(200))
     @uploader.complete?.should == true
   end
 
   it 'should consider 30x status as incomplete' do
-    api_client = stub('api', :execute => mock_result(308))
-    @uploader.send_chunk(api_client)
+    request = @uploader.to_http_request
+    @uploader.process_http_response(mock_result(308))
     @uploader.complete?.should == false
     @uploader.expired?.should == false
   end
 
   it 'should consider 40x status as fatal' do
-    api_client = stub('api', :execute => mock_result(404))
-    @uploader.send_chunk(api_client)
+    request = @uploader.to_http_request
+    @uploader.process_http_response(mock_result(404))
     @uploader.expired?.should == true
   end
 
   it 'should detect changes to location' do
-    api_client = stub('api', :execute => mock_result(308, 'location' => 'https://www.googleapis.com/upload/drive/v1/files/abcdef'))
-    @uploader.send_chunk(api_client)
-    @uploader.location.should == 'https://www.googleapis.com/upload/drive/v1/files/abcdef'
+    request = @uploader.to_http_request
+    @uploader.process_http_response(mock_result(308, 'location' => 'https://www.googleapis.com/upload/drive/v1/files/abcdef'))
+    @uploader.uri.to_s.should == 'https://www.googleapis.com/upload/drive/v1/files/abcdef'
   end
 
-  it 'should resume from the saved range reported by the server' do
-    api_client = mock('api')
-    api_client.should_receive(:execute).and_return(mock_result(308, 'range' => '0-99'))
-    api_client.should_receive(:execute).with(
-      hash_including(:headers => hash_including(
-        "Content-Range" => "bytes 100-299/#{@media.length}",
-        "Content-Length" => "200"
-      ))).and_return(mock_result(308))
-
+  it 'should resume from the saved range reported by the server' do    
     @uploader.chunk_size = 200
-    @uploader.send_chunk(api_client) # Send bytes 0-199, only 0-99 saved
-    @uploader.send_chunk(api_client) # Send bytes 100-299
+    @uploader.to_http_request # Send bytes 0-199, only 0-99 saved
+    @uploader.process_http_response(mock_result(308, 'range' => '0-99'))
+    method, url, headers, body = @uploader.to_http_request # Send bytes 100-299
+    headers['Content-Range'].should == "bytes 100-299/#{@media.length}"
+    headers['Content-length'].should == "200"
   end
 
   it 'should resync the offset after 5xx errors' do
-    api_client = mock('api')
-    api_client.should_receive(:execute).and_return(mock_result(500))
-    api_client.should_receive(:execute).with(
-      hash_including(:headers => hash_including(
-        "Content-Range" => "bytes */#{@media.length}",
-        "Content-Length" => "0"
-      ))).and_return(mock_result(308, 'range' => '0-99'))
-    api_client.should_receive(:execute).with(
-      hash_including(:headers => hash_including(
-        "Content-Range" => "bytes 100-299/#{@media.length}",
-        "Content-Length" => "200"
-      ))).and_return(mock_result(308))
-
     @uploader.chunk_size = 200
-    @uploader.send_chunk(api_client) # 500, invalidate
-    @uploader.send_chunk(api_client) # Just resyncs, doesn't actually upload
-    @uploader.send_chunk(api_client) # Send next chunk at correct range
+    @uploader.to_http_request
+    @uploader.process_http_response(mock_result(500)) # Invalidates range
+    method, url, headers, body = @uploader.to_http_request # Resync
+    headers['Content-Range'].should == "bytes */#{@media.length}"
+    headers['Content-length'].should == "0"
+    @uploader.process_http_response(mock_result(308, 'range' => '0-99'))
+    method, url, headers, body = @uploader.to_http_request # Send next chunk at correct range
+    headers['Content-Range'].should == "bytes 100-299/#{@media.length}"
+    headers['Content-length'].should == "200"
   end
 
   def mock_result(status, headers = {})

data/spec/google/api_client/result_spec.rb

@@ -32,7 +32,7 @@ describe Google::APIClient::Result do
           'maxResults' => 20
         }
       })
-      @request = @reference.to_request
+      @request = @reference.to_http_request
 
       # Response stub
       @response = stub("response")
@@ -61,12 +61,12 @@ describe Google::APIClient::Result do
             "nextLink": "https://www.googleapis.com/plus/v1/people/foo/activities/public?maxResults=20&pageToken=NEXT%2BPAGE%2BTOKEN",
             "title": "Plus Public Activity Feed for ",
             "updated": "2012-04-23T00:00:00.000Z",
-            "id": "tag:google.com,2010:/plus/people/foo/activities/public",
+            "id": "123456790",
             "items": []
           }
           END_OF_STRING
         )
-        @result = Google::APIClient::Result.new(@reference, @request, @response)
+        @result = Google::APIClient::Result.new(@reference, @response)
       end
 
       it 'should indicate a successful response' do
@@ -78,10 +78,11 @@ describe Google::APIClient::Result do
       end
 
       it 'should escape the next page token when calling next_page' do
+        pending("This is caused by Faraday's encoding of query parameters.")
         reference = @result.next_page
         Hash[reference.parameters].should include('pageToken')
         Hash[reference.parameters]['pageToken'].should == 'NEXT+PAGE+TOKEN'
-        url = reference.to_request.to_env(Faraday.default_connection)[:url]
+        url = reference.to_env(Faraday.default_connection)[:url]
         url.to_s.should include('pageToken=NEXT%2BPAGE%2BTOKEN')
       end
 
@@ -102,8 +103,7 @@ describe Google::APIClient::Result do
             'https://www.googleapis.com/plus/v1/people/foo/activities/public?' +
             'maxResults=20&pageToken=NEXT%2BPAGE%2BTOKEN'
         @result.data.title.should == 'Plus Public Activity Feed for '
-        @result.data.id.should ==
-            'tag:google.com,2010:/plus/people/foo/activities/public'
+        @result.data.id.should == "123456790"
         @result.data.items.should be_empty
       end
     end
@@ -118,12 +118,12 @@ describe Google::APIClient::Result do
             "selfLink": "https://www.googleapis.com/plus/v1/people/foo/activities/public?",
             "title": "Plus Public Activity Feed for ",
             "updated": "2012-04-23T00:00:00.000Z",
-            "id": "tag:google.com,2010:/plus/people/foo/activities/public",
+            "id": "123456790",
             "items": []
           }
           END_OF_STRING
         )
-        @result = Google::APIClient::Result.new(@reference, @request, @response)
+        @result = Google::APIClient::Result.new(@reference, @response)
       end
 
       it 'should not return a next page token' do
@@ -143,8 +143,7 @@ describe Google::APIClient::Result do
         @result.data.selfLink.should ==
             'https://www.googleapis.com/plus/v1/people/foo/activities/public?'
         @result.data.title.should == 'Plus Public Activity Feed for '
-        @result.data.id.should ==
-            'tag:google.com,2010:/plus/people/foo/activities/public'
+        @result.data.id.should == "123456790"
         @result.data.items.should be_empty
       end
     end
@@ -169,7 +168,7 @@ describe Google::APIClient::Result do
          END_OF_STRING
         )
         @response.stub(:status).and_return(400)
-        @result = Google::APIClient::Result.new(@reference, @request, @response)
+        @result = Google::APIClient::Result.new(@reference, @response)
       end
       
       it 'should return error status correctly' do
@@ -179,7 +178,27 @@ describe Google::APIClient::Result do
       it 'should return the correct error message' do
         @result.error_message.should == 'Parse Error'
       end
+    end
+    
+    describe 'with 204 No Content response' do
+      before do
+        @response.stub(:body).and_return('')
+        @response.stub(:status).and_return(204)
+        @response.stub(:headers).and_return({})
+        @result = Google::APIClient::Result.new(@reference, @response)
+      end
 
+      it 'should indicate no data is available' do
+        @result.data?.should be_false
+      end
+      
+      it 'should return nil for data' do
+        @result.data.should == nil
+      end
+      
+      it 'should return nil for media_type' do
+        @result.media_type.should == nil
+      end
     end
   end
 end

data/spec/google/api_client/service_account_spec.rb

@@ -17,6 +17,7 @@ require 'spec_helper'
 require 'google/api_client'
 
 describe Google::APIClient::JWTAsserter do
+  include ConnectionHelpers
 
   before do
     @key = OpenSSL::PKey::RSA.new 2048
@@ -33,7 +34,7 @@ describe Google::APIClient::JWTAsserter do
   end
 
   it 'should send valid access token request' do
-    stubs = Faraday::Adapter::Test::Stubs.new do |stub|
+    conn = stub_connection do |stub|
       stub.post('/o/oauth2/token') do |env|
         params = Addressable::URI.form_unencode(env[:body])
         JWT.decode(params.assoc("assertion").last, @key.public_key)
@@ -45,14 +46,45 @@ describe Google::APIClient::JWTAsserter do
         }']
       end
     end
-    connection = Faraday.new(:url => 'https://accounts.google.com') do |builder|
-      builder.adapter(:test, stubs)
-    end
-
     asserter = Google::APIClient::JWTAsserter.new('client1', 'scope1 scope2', @key)
-    auth = asserter.authorize(nil, { :connection => connection})
+    auth = asserter.authorize(nil, { :connection => conn })
     auth.should_not == nil?
     auth.access_token.should == "1/abcdef1234567890"
+    conn.verify
   end
+  
+  it 'should be refreshable' do
+    conn = stub_connection do |stub|
+      stub.post('/o/oauth2/token') do |env|
+        params = Addressable::URI.form_unencode(env[:body])
+        JWT.decode(params.assoc("assertion").last, @key.public_key)
+        params.assoc("grant_type").should == ['grant_type','urn:ietf:params:oauth:grant-type:jwt-bearer']
+        [200, {}, '{
+          "access_token" : "1/abcdef1234567890",
+          "token_type" : "Bearer",
+          "expires_in" : 3600
+        }']
+      end
+      stub.post('/o/oauth2/token') do |env|
+        params = Addressable::URI.form_unencode(env[:body])
+        JWT.decode(params.assoc("assertion").last, @key.public_key)
+        params.assoc("grant_type").should == ['grant_type','urn:ietf:params:oauth:grant-type:jwt-bearer']
+        [200, {}, '{
+          "access_token" : "1/0987654321fedcba",
+          "token_type" : "Bearer",
+          "expires_in" : 3600
+        }']
+      end
+    end
+    asserter = Google::APIClient::JWTAsserter.new('client1', 'scope1 scope2', @key)
+    auth = asserter.authorize(nil, { :connection => conn })
+    auth.should_not == nil?
+    auth.access_token.should == "1/abcdef1234567890"
+    
+    auth.fetch_access_token!(:connection => conn)
+    auth.access_token.should == "1/0987654321fedcba"
+    
+    conn.verify
+  end    
 end
 

data/spec/google/api_client_spec.rb

@@ -14,17 +14,15 @@
 
 require 'spec_helper'
 
-gem 'faraday', '~> 0.8.1'
 require 'faraday'
 require 'faraday/utils'
-
-gem 'signet', '~> 0.4.0'
 require 'signet/oauth_1/client'
-
 require 'google/api_client'
 require 'google/api_client/version'
 
 shared_examples_for 'configurable user agent' do
+  include ConnectionHelpers
+  
   it 'should allow the user agent to be modified' do
     client.user_agent = 'Custom User Agent/1.2.3'
     client.user_agent.should == 'Custom User Agent/1.2.3'
@@ -38,18 +36,14 @@ shared_examples_for 'configurable user agent' do
   it 'should not allow the user agent to be used with bogus values' do
     (lambda do
       client.user_agent = 42
-      client.transmit(
-        ['GET', 'http://www.google.com/', [], []]
-      )
+      client.execute(:uri=>'http://www.google.com/')
     end).should raise_error(TypeError)
   end
 
   it 'should transmit a User-Agent header when sending requests' do
     client.user_agent = 'Custom User Agent/1.2.3'
-    request = Faraday::Request.new(:get) do |req|
-      req.url('http://www.google.com/')
-    end
-    stubs = Faraday::Adapter::Test::Stubs.new do |stub|
+
+    conn = stub_connection do |stub|
       stub.get('/') do |env|
         headers = env[:request_headers]
         headers.should have_key('User-Agent')
@@ -57,15 +51,14 @@ shared_examples_for 'configurable user agent' do
         [200, {}, ['']]
       end
     end
-    connection = Faraday.new(:url => 'https://www.google.com') do |builder|
-      builder.adapter(:test, stubs)
-    end
-    client.transmit(:request => request, :connection => connection)
-    stubs.verify_stubbed_calls
+    client.execute(:uri=>'http://www.google.com/', :connection => conn)
+    conn.verify
   end
 end
 
 describe Google::APIClient do
+  include ConnectionHelpers
+
   let(:client) { Google::APIClient.new }
 
   it 'should make its version number available' do
@@ -76,11 +69,18 @@ describe Google::APIClient do
     Signet::OAuth2::Client.should === client.authorization
   end
 
-  it_should_behave_like 'configurable user agent'
-
+  describe 'configure for no authentication' do
+    before do
+      client.authorization = nil
+    end
+    it_should_behave_like 'configurable user agent'
+  end
+    
   describe 'configured for OAuth 1' do
     before do
       client.authorization = :oauth_1
+      client.authorization.token_credential_key = 'abc'
+      client.authorization.token_credential_secret = '123'
     end
 
     it 'should use the default OAuth1 client configuration' do
@@ -101,6 +101,7 @@ describe Google::APIClient do
   describe 'configured for OAuth 2' do
     before do
       client.authorization = :oauth_2
+      client.authorization.access_token = '12345'
     end
 
     # TODO
@@ -109,31 +110,46 @@ describe Google::APIClient do
   
   describe 'when executing requests' do
     before do
+      @prediction = client.discovered_api('prediction', 'v1.2')
       client.authorization = :oauth_2
-      @connection = Faraday.new(:url => 'https://www.googleapis.com') do |builder|
-        stubs = Faraday::Adapter::Test::Stubs.new do |stub|
-          stub.get('/test') do |env|
-            env[:request_headers]['Authorization'].should == 'Bearer 12345'
-          end
+      @connection = stub_connection do |stub|
+        stub.post('/prediction/v1.2/training?data=12345') do |env|
+          env[:request_headers]['Authorization'].should == 'Bearer 12345'
         end
-        builder.adapter(:test, stubs)
       end
     end
-     
+
+    after do
+      @connection.verify
+    end
+    
     it 'should use default authorization' do
       client.authorization.access_token = "12345"
-      client.execute(:http_method => :get, 
-                      :uri => 'https://www.googleapis.com/test',
-                      :connection => @connection)
+      client.execute(  
+        :api_method => @prediction.training.insert,
+        :parameters => {'data' => '12345'},
+        :connection => @connection
+      )
     end
 
     it 'should use request scoped authorization when provided' do
       client.authorization.access_token = "abcdef"
       new_auth = Signet::OAuth2::Client.new(:access_token => '12345')
-      client.execute(:http_method => :get, 
-                      :uri => 'https://www.googleapis.com/test',
-                      :connection => @connection,
-                      :authorization => new_auth)
+      client.execute(  
+        :api_method => @prediction.training.insert,
+        :parameters => {'data' => '12345'},
+        :authorization => new_auth,
+        :connection => @connection
+      )
     end
+    
+    it 'should accept options in array style execute' do
+       client.authorization.access_token = "abcdef"
+       new_auth = Signet::OAuth2::Client.new(:access_token => '12345')
+       client.execute(  
+         @prediction.training.insert, {'data' => '12345'}, '', {},
+         { :authorization => new_auth, :connection => @connection }         
+       )
+     end
   end  
 end

data/spec/spec_helper.rb

@@ -2,6 +2,52 @@ $LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
 $LOAD_PATH.uniq!
 
 require 'rspec'
+require 'faraday'
+
+module Faraday
+  class Connection
+    def verify
+      if app.kind_of?(Faraday::Adapter::Test)
+        app.stubs.verify_stubbed_calls
+      else
+        raise TypeError, "Expected test adapter"
+      end
+    end
+  end
+end
+
+module ConnectionHelpers
+  def stub_connection(&block)
+    stubs = Faraday::Adapter::Test::Stubs.new do |stub|
+      block.call(stub)
+    end
+    connection = Faraday.new do |builder|
+      builder.adapter(:test, stubs)
+    end
+  end
+end
+
+module JSONMatchers
+  class EqualsJson
+    def initialize(expected)
+      @expected = JSON.parse(expected)
+    end
+    def matches?(target)
+      @target = JSON.parse(target)
+      @target.eql?(@expected)
+    end
+    def failure_message
+      "expected #{@target.inspect} to be #{@expected}"
+    end
+    def negative_failure_message
+      "expected #{@target.inspect} not to be #{@expected}"
+    end
+  end
+  
+  def be_json(expected)
+    EqualsJson.new(expected)
+  end
+end
 
 RSpec.configure do |config|
 end