google-api-client 0.4.4 → 0.4.5

data/spec/google/api_client/media_spec.rb

@@ -25,22 +25,22 @@ describe Google::APIClient::UploadIO do
       media = Google::APIClient::UploadIO.new('doesnotexist', 'text/plain')
     end).should raise_error
   end
-  
+
   describe 'with a file' do
     before do
       @file = File.expand_path('files/sample.txt', fixtures_path)
       @media = Google::APIClient::UploadIO.new(@file, 'text/plain')
     end
-    
+
     it 'should report the correct file length' do
       @media.length.should == File.size(@file)
     end
-    
+
     it 'should have a mime type' do
       @media.content_type.should == 'text/plain'
     end
   end
-  
+
   describe 'with StringIO' do
     before do
       @content = "hello world"
@@ -50,7 +50,7 @@ describe Google::APIClient::UploadIO do
     it 'should report the correct file length' do
       @media.length.should == @content.length
     end
-    
+
     it 'should have a mime type' do
       @media.content_type.should == 'text/plain'
     end
@@ -58,9 +58,16 @@ describe Google::APIClient::UploadIO do
 end
 
 describe Google::APIClient::ResumableUpload do
+  CLIENT ||= Google::APIClient.new
+
+  after do
+    # Reset client to not-quite-pristine state
+    CLIENT.key = nil
+    CLIENT.user_ip = nil
+  end
+
   before do
-    @client = Google::APIClient.new
-    @drive = @client.discovered_api('drive', 'v1')
+    @drive = CLIENT.discovered_api('drive', 'v1')
     @file = File.expand_path('files/sample.txt', fixtures_path)
     @media = Google::APIClient::UploadIO.new(@file, 'text/plain')
     @uploader = Google::APIClient::ResumableUpload.new(
@@ -68,7 +75,7 @@ describe Google::APIClient::ResumableUpload do
       @media,
       '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)
@@ -93,8 +100,8 @@ describe Google::APIClient::ResumableUpload do
     @uploader.send_chunk(api_client)
     @uploader.location.should == 'https://www.googleapis.com/upload/drive/v1/files/abcdef'
   end
-  
-  it 'should resume from the saved range reported by the server' do 
+
+  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(
@@ -107,7 +114,7 @@ describe Google::APIClient::ResumableUpload do
     @uploader.send_chunk(api_client) # Send bytes 0-199, only 0-99 saved
     @uploader.send_chunk(api_client) # Send bytes 100-299
   end
-  
+
   it 'should resync the offset after 5xx errors' do
     api_client = mock('api')
     api_client.should_receive(:execute).and_return(mock_result(500))
@@ -132,5 +139,5 @@ describe Google::APIClient::ResumableUpload do
     reference = Google::APIClient::Reference.new(:api_method => @drive.files.insert)
     stub('result', :status => status, :headers => headers, :reference => reference)
   end
-  
+
 end

data/spec/google/api_client/result_spec.rb

@@ -18,14 +18,12 @@ require 'google/api_client'
 require 'google/api_client/version'
 
 describe Google::APIClient::Result do
-  before do
-    @client = Google::APIClient.new
-  end
+  CLIENT ||= Google::APIClient.new
 
   describe 'with the plus API' do
     before do
-      @client.authorization = nil
-      @plus = @client.discovered_api('plus', 'v1')
+      CLIENT.authorization = nil
+      @plus = CLIENT.discovered_api('plus', 'v1')
       @reference = Google::APIClient::Reference.new({
         :api_method => @plus.activities.list,
         :parameters => {
@@ -71,16 +69,20 @@ describe Google::APIClient::Result do
         @result = Google::APIClient::Result.new(@reference, @request, @response)
       end
 
+      it 'should indicate a successful response' do
+        @result.error?.should be_false
+      end
+
       it 'should return the correct next page token' do
         @result.next_page_token.should == 'NEXT+PAGE+TOKEN'
       end
 
       it 'should escape the next page token when calling next_page' do
         reference = @result.next_page
-        reference.parameters.should include('pageToken')
-        reference.parameters['pageToken'].should == 'NEXT+PAGE+TOKEN'
-        path = reference.to_request.path.to_s
-        path.should include 'pageToken=NEXT%2BPAGE%2BTOKEN'
+        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.to_s.should include('pageToken=NEXT%2BPAGE%2BTOKEN')
       end
 
       it 'should return content type correctly' do
@@ -146,5 +148,38 @@ describe Google::APIClient::Result do
         @result.data.items.should be_empty
       end
     end
+    
+    describe 'with JSON error response' do
+      before do
+        @response.stub(:body).and_return(
+         <<-END_OF_STRING
+         {
+          "error": {
+           "errors": [
+            {
+             "domain": "global",
+             "reason": "parseError",
+             "message": "Parse Error"
+            }
+           ],
+           "code": 400,
+           "message": "Parse Error"
+          }
+         }
+         END_OF_STRING
+        )
+        @response.stub(:status).and_return(400)
+        @result = Google::APIClient::Result.new(@reference, @request, @response)
+      end
+      
+      it 'should return error status correctly' do
+        @result.error?.should be_true
+      end
+
+      it 'should return the correct error message' do
+        @result.error_message.should == 'Parse Error'
+      end
+
+    end
   end
 end

data/spec/google/api_client/service_account_spec.rb

@@ -17,21 +17,21 @@ require 'spec_helper'
 require 'google/api_client'
 
 describe Google::APIClient::JWTAsserter do
-  
+
   before do
     @key = OpenSSL::PKey::RSA.new 2048
   end
-  
+
   it 'should generate valid JWTs' do
     asserter = Google::APIClient::JWTAsserter.new('client1', 'scope1 scope2', @key)
     jwt = asserter.to_jwt
-    jwt.should_not == nil  
-    
+    jwt.should_not == nil
+
     claim = JWT.decode(jwt, @key.public_key, true)
     claim["iss"].should == 'client1'
     claim["scope"].should == 'scope1 scope2'
   end
-  
+
   it 'should send valid access token request' do
     stubs = Faraday::Adapter::Test::Stubs.new do |stub|
       stub.post('/o/oauth2/token') do |env|
@@ -48,7 +48,7 @@ describe Google::APIClient::JWTAsserter do
     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.should_not == nil?

data/spec/google/api_client_spec.rb

@@ -14,11 +14,11 @@
 
 require 'spec_helper'
 
-gem 'faraday', '~> 0.7.0'
+gem 'faraday', '~> 0.8.1'
 require 'faraday'
 require 'faraday/utils'
 
-gem 'signet', '~> 0.3.0'
+gem 'signet', '~> 0.4.0'
 require 'signet/oauth_1/client'
 
 require 'google/api_client'
@@ -26,26 +26,26 @@ require 'google/api_client/version'
 
 shared_examples_for 'configurable user agent' do
   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'
+    client.user_agent = 'Custom User Agent/1.2.3'
+    client.user_agent.should == 'Custom User Agent/1.2.3'
   end
 
   it 'should allow the user agent to be set to nil' do
-    @client.user_agent = nil
-    @client.user_agent.should == nil
+    client.user_agent = nil
+    client.user_agent.should == nil
   end
 
   it 'should not allow the user agent to be used with bogus values' do
     (lambda do
-      @client.user_agent = 42
-      @client.transmit(
+      client.user_agent = 42
+      client.transmit(
         ['GET', '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'
+    client.user_agent = 'Custom User Agent/1.2.3'
     request = Faraday::Request.new(:get) do |req|
       req.url('http://www.google.com/')
     end
@@ -53,48 +53,46 @@ shared_examples_for 'configurable user agent' do
       stub.get('/') do |env|
         headers = env[:request_headers]
         headers.should have_key('User-Agent')
-        headers['User-Agent'].should == @client.user_agent
+        headers['User-Agent'].should == client.user_agent
         [200, {}, ['']]
       end
     end
     connection = Faraday.new(:url => 'https://www.google.com') do |builder|
       builder.adapter(:test, stubs)
     end
-    @client.transmit(:request => request, :connection => connection)
+    client.transmit(:request => request, :connection => connection)
     stubs.verify_stubbed_calls
   end
 end
 
 describe Google::APIClient do
-  before do
-    @client = Google::APIClient.new
-  end
+  let(:client) { Google::APIClient.new }
 
   it 'should make its version number available' do
     Google::APIClient::VERSION::STRING.should be_instance_of(String)
   end
 
   it 'should default to OAuth 2' do
-    Signet::OAuth2::Client.should === @client.authorization
+    Signet::OAuth2::Client.should === client.authorization
   end
 
   it_should_behave_like 'configurable user agent'
 
   describe 'configured for OAuth 1' do
     before do
-      @client.authorization = :oauth_1
+      client.authorization = :oauth_1
     end
 
     it 'should use the default OAuth1 client configuration' do
-      @client.authorization.temporary_credential_uri.to_s.should ==
+      client.authorization.temporary_credential_uri.to_s.should ==
         'https://www.google.com/accounts/OAuthGetRequestToken'
-      @client.authorization.authorization_uri.to_s.should include(
+      client.authorization.authorization_uri.to_s.should include(
         'https://www.google.com/accounts/OAuthAuthorizeToken'
       )
-      @client.authorization.token_credential_uri.to_s.should ==
+      client.authorization.token_credential_uri.to_s.should ==
         'https://www.google.com/accounts/OAuthGetAccessToken'
-      @client.authorization.client_credential_key.should == 'anonymous'
-      @client.authorization.client_credential_secret.should == 'anonymous'
+      client.authorization.client_credential_key.should == 'anonymous'
+      client.authorization.client_credential_secret.should == 'anonymous'
     end
 
     it_should_behave_like 'configurable user agent'
@@ -102,7 +100,7 @@ describe Google::APIClient do
 
   describe 'configured for OAuth 2' do
     before do
-      @client.authorization = :oauth_2
+      client.authorization = :oauth_2
     end
 
     # TODO
@@ -111,7 +109,7 @@ describe Google::APIClient do
   
   describe 'when executing requests' do
     before do
-      @client.authorization = :oauth_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|
@@ -123,16 +121,16 @@ describe Google::APIClient do
     end
      
     it 'should use default authorization' do
-      @client.authorization.access_token = "12345"
-      @client.execute(:http_method => :get, 
+      client.authorization.access_token = "12345"
+      client.execute(:http_method => :get, 
                       :uri => 'https://www.googleapis.com/test',
                       :connection => @connection)
     end
 
     it 'should use request scoped authorization when provided' do
-      @client.authorization.access_token = "abcdef"
+      client.authorization.access_token = "abcdef"
       new_auth = Signet::OAuth2::Client.new(:access_token => '12345')
-      @client.execute(:http_method => :get, 
+      client.execute(:http_method => :get, 
                       :uri => 'https://www.googleapis.com/test',
                       :connection => @connection,
                       :authorization => new_auth)

data/spec/spec_helper.rb

@@ -1,5 +1,7 @@
-spec_dir = File.expand_path("..", __FILE__)
-lib_dir = File.expand_path("../lib", spec_dir)
-
-$LOAD_PATH.unshift(lib_dir)
+$LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
 $LOAD_PATH.uniq!
+
+require 'rspec'
+
+RSpec.configure do |config|
+end

data/tasks/gem.rake

@@ -24,23 +24,20 @@ namespace :gem do
     s.rdoc_options.concat ['--main',  'README.md']
 
     # Dependencies used in the main library
-    s.add_runtime_dependency('signet', '>= 0.3.4')
-    s.add_runtime_dependency('addressable', '>= 2.2.3')
-    s.add_runtime_dependency('autoparse', '>= 0.3.1')
-    s.add_runtime_dependency('faraday', '~> 0.7.0')
-    s.add_runtime_dependency('multi_json', '>= 1.3.0')
-    s.add_runtime_dependency('extlib', '>= 0.9.15')
+    s.add_runtime_dependency('signet', '>= 0.4.1')
+    s.add_runtime_dependency('addressable', '>= 2.3.2')
     s.add_runtime_dependency('uuidtools', '>= 2.1.0')
+    s.add_runtime_dependency('autoparse', '>= 0.3.2')
+    s.add_runtime_dependency('faraday', '~> 0.8.1')
+    s.add_runtime_dependency('multi_json', '>= 1.0.0')
+    s.add_runtime_dependency('extlib', '>= 0.9.15')
 
     # Dependencies used in the CLI
-    s.add_runtime_dependency('launchy', '>= 2.0.0')
+    s.add_runtime_dependency('launchy', '>= 2.1.1')
 
     # Dependencies used in the examples
-    s.add_development_dependency('sinatra', '>= 1.2.0')
-
     s.add_development_dependency('rake', '>= 0.9.0')
-    s.add_development_dependency('rspec', '~> 1.2.9')
-    s.add_development_dependency('rcov', '>= 0.9.9')
+    s.add_development_dependency('rspec', '>= 2.11.0')
 
     s.require_path = 'lib'
 

data/tasks/spec.rake

@@ -1,16 +1,28 @@
-require 'spec/rake/verify_rcov'
 require 'rake/clean'
+require 'rspec/core/rake_task'
 
 CLOBBER.include('coverage', 'specdoc')
 
 namespace :spec do
-  Spec::Rake::SpecTask.new(:rcov) do |t|
-    t.spec_files = FileList['spec/**/*_spec.rb']
-    t.spec_opts = ['--require', 'rubygems', '--color', '--format', 'specdoc']
+  RSpec::Core::RakeTask.new(:all) do |t|
+    t.pattern = FileList['spec/**/*_spec.rb']
+    t.rspec_opts = ['--color', '--format', 'documentation']
+    t.rcov = false
+  end
+
+  desc 'Generate HTML Specdocs for all specs.'
+  RSpec::Core::RakeTask.new(:specdoc) do |t|
+    specdoc_path = File.expand_path('../../specdoc', __FILE__)
+
+    t.rspec_opts = %W( --format html --out #{File.join(specdoc_path, 'index.html')} )
+    t.fail_on_error = false
+  end
+
+  RSpec::Core::RakeTask.new(:rcov) do |t|
     if RCOV_ENABLED
       if `which rcov`.strip == ""
         STDERR.puts(
-          "Please install rcov and ensure that its binary is in the PATH:"
+            "Please install rcov and ensure that its binary is in the PATH:"
         )
         STDERR.puts("sudo gem install rcov")
         exit(1)
@@ -19,51 +31,12 @@ namespace :spec do
     else
       t.rcov = false
     end
-    t.rcov_opts = [
-      '--exclude', 'lib\\/google\\/api_client\\/environment.rb',
-      '--exclude', 'lib\\/compat',
-      '--exclude', 'spec',
-      '--exclude', '\\.rvm\\/gems',
-      '--exclude', '1\\.8\\/gems',
-      '--exclude', '1\\.9\\/gems',
-      '--exclude', '\\.rvm',
-      '--exclude', '\\/Library\\/Ruby',
-    ]
-  end
-
-  Spec::Rake::SpecTask.new(:all) do |t|
-    t.spec_files = FileList['spec/**/*_spec.rb']
-    t.spec_opts = ['--require', 'rubygems', '--color', '--format', 'specdoc']
-    t.rcov = false
-  end
-
-  Spec::Rake::SpecTask.new(:fast) do |t|
-    t.spec_files = FileList['spec/**/*_spec.rb'].exclude(
-      'spec/**/*_slow_spec.rb'
+    t.rcov_opts = %w(
+         --exclude gems/
+         --exclude spec/
+         --exclude lib/google/api_client/environment.rb
+         --exclude lib/compat
     )
-    t.spec_opts = ['--require', 'rubygems', '--color', '--format', 'specdoc']
-    t.rcov = false
-  end
-
-  if RCOV_ENABLED
-    RCov::VerifyTask.new(:verify) do |t|
-      t.threshold = 65.0
-      t.index_html = 'coverage/index.html'
-    end
-
-    task :verify => :rcov
-  end
-
-  desc 'Generate HTML Specdocs for all specs'
-  Spec::Rake::SpecTask.new(:specdoc) do |t|
-    specdoc_path = File.expand_path(
-      File.join(File.dirname(__FILE__), '../specdoc/'))
-    Dir.mkdir(specdoc_path) if !File.exist?(specdoc_path)
-
-    output_file = File.join(specdoc_path, 'index.html')
-    t.spec_files = FileList['spec/**/*_spec.rb']
-    t.spec_opts = ['--format', "\"html:#{output_file}\"", '--diff']
-    t.fail_on_error = false
   end
 
   namespace :rcov do