google-api-client 0.4.4 → 0.4.5

data/lib/google/api_client/result.rb

@@ -53,6 +53,28 @@ module Google
         content_type[/^([^;]*);?.*$/, 1].strip.downcase
       end
       
+      def error?
+        return self.response.status >= 400
+      end
+
+      def success?
+        return !self.error?
+      end
+      
+      def error_message
+        if self.data?
+          if self.data.respond_to?(:error) &&
+             self.data.error.respond_to?(:message)
+            # You're going to get a terrible error message if the response isn't
+            # parsed successfully as an error.
+            return self.data.error.message
+          elsif self.data['error'] && self.data['error']['message']
+            return self.data['error']['message']
+          end
+        end
+        return self.body
+      end
+      
       def data?
         self.media_type == 'application/json'
       end

data/lib/google/api_client/version.rb

@@ -22,7 +22,7 @@ if !defined?(::Google::APIClient::VERSION)
       module VERSION
         MAJOR = 0
         MINOR = 4
-        TINY  = 4
+        TINY  = 5
 
         STRING = [MAJOR, MINOR, TINY].join('.')
       end

data/spec/google/api_client/batch_spec.rb

@@ -18,22 +18,26 @@ require 'google/api_client'
 require 'google/api_client/version'
 
 describe Google::APIClient::BatchRequest do
-  before do
-    @client = Google::APIClient.new
+  CLIENT ||= Google::APIClient.new
+
+  after do
+    # Reset client to not-quite-pristine state
+    CLIENT.key = nil
+    CLIENT.user_ip = nil
   end
 
   it 'should raise an error if making an empty batch request' do
     batch = Google::APIClient::BatchRequest.new
 
     (lambda do
-      @client.execute(batch)
+      CLIENT.execute(batch)
     end).should raise_error(Google::APIClient::BatchError)
   end
 
   describe 'with the discovery API' do
     before do
-      @client.authorization = nil
-      @discovery = @client.discovered_api('discovery', 'v1')
+      CLIENT.authorization = nil
+      @discovery = CLIENT.discovered_api('discovery', 'v1')
     end
 
     describe 'with two valid requests' do
@@ -69,7 +73,7 @@ describe Google::APIClient::BatchRequest do
         batch.add(@call1, ids[0])
         batch.add(@call2, ids[1])
 
-        @client.execute(batch)
+        CLIENT.execute(batch)
         block_called.should == 2
       end
 
@@ -86,7 +90,7 @@ describe Google::APIClient::BatchRequest do
           result.status.should == 200
         end
 
-        @client.execute(batch)
+        CLIENT.execute(batch)
         call1_returned.should == true
         call2_returned.should == true
       end
@@ -139,7 +143,7 @@ describe Google::APIClient::BatchRequest do
         batch.add(@call1, ids[0])
         batch.add(@call2, ids[1])
 
-        @client.execute(batch)
+        CLIENT.execute(batch)
         block_called.should == 2
       end
 
@@ -157,7 +161,7 @@ describe Google::APIClient::BatchRequest do
           result.status.should < 500
         end
 
-        @client.execute(batch)
+        CLIENT.execute(batch)
         call1_returned.should == true
         call2_returned.should == true
       end
@@ -166,8 +170,8 @@ describe Google::APIClient::BatchRequest do
 
   describe 'with the calendar API' do
     before do
-      @client.authorization = nil
-      @calendar = @client.discovered_api('calendar', 'v3')
+      CLIENT.authorization = nil
+      @calendar = CLIENT.discovered_api('calendar', 'v3')
     end
 
     describe 'with two valid requests' do
@@ -207,14 +211,14 @@ describe Google::APIClient::BatchRequest do
         @call1 = {
           :api_method => @calendar.events.insert,
           :parameters => {'calendarId' => 'myemail@mydomain.tld'},
-          :body => JSON.dump(event1),
+          :body => MultiJson.dump(event1),
           :headers => {'Content-Type' => 'application/json'}
         }
 
         @call2 = {
           :api_method => @calendar.events.insert,
           :parameters => {'calendarId' => 'myemail@mydomain.tld'},
-          :body => JSON.dump(event2),
+          :body => MultiJson.dump(event2),
           :headers => {'Content-Type' => 'application/json'}
         }
       end

data/spec/google/api_client/discovery_spec.rb

@@ -17,20 +17,24 @@
 
 require 'spec_helper'
 
-gem 'faraday', '~> 0.7.0'
+gem 'faraday', '~> 0.8.1'
 require 'faraday'
 require 'faraday/utils'
 require 'multi_json'
 
-gem 'signet', '~> 0.3.0'
+gem 'signet', '~> 0.4.0'
 require 'signet/oauth_1/client'
 
 require 'google/api_client'
 require 'google/api_client/version'
 
 describe Google::APIClient do
-  before do
-    @client = Google::APIClient.new
+  CLIENT ||= Google::APIClient.new
+
+  after do
+    # Reset client to not-quite-pristine state
+    CLIENT.key = nil
+    CLIENT.user_ip = nil
   end
 
   it 'should raise a type error for bogus authorization' do
@@ -41,199 +45,203 @@ describe Google::APIClient do
 
   it 'should not be able to retrieve the discovery document for a bogus API' do
     (lambda do
-      @client.discovery_document('bogus')
+      CLIENT.discovery_document('bogus')
     end).should raise_error(Google::APIClient::TransmissionError)
     (lambda do
-      @client.discovered_api('bogus')
+      CLIENT.discovered_api('bogus')
     end).should raise_error(Google::APIClient::TransmissionError)
   end
 
   it 'should raise an error for bogus services' do
     (lambda do
-      @client.discovered_api(42)
+      CLIENT.discovered_api(42)
     end).should raise_error(TypeError)
   end
 
   it 'should raise an error for bogus services' do
     (lambda do
-      @client.preferred_version(42)
+      CLIENT.preferred_version(42)
     end).should raise_error(TypeError)
   end
 
   it 'should raise an error for bogus methods' do
     (lambda do
-      @client.generate_request(42)
+      CLIENT.generate_request(42)
     end).should raise_error(TypeError)
   end
 
   it 'should not return a preferred version for bogus service names' do
-    @client.preferred_version('bogus').should == nil
+    CLIENT.preferred_version('bogus').should == nil
   end
 
   describe 'with the prediction API' do
     before do
-      @client.authorization = nil
+      CLIENT.authorization = nil
       # The prediction API no longer exposes a v1, so we have to be
       # careful about looking up the wrong API version.
-      @prediction = @client.discovered_api('prediction', 'v1.2')
+      @prediction = CLIENT.discovered_api('prediction', 'v1.2')
     end
 
     it 'should correctly determine the discovery URI' do
-      @client.discovery_uri('prediction').should ===
+      CLIENT.discovery_uri('prediction').should ===
         'https://www.googleapis.com/discovery/v1/apis/prediction/v1/rest'
     end
 
     it 'should correctly determine the discovery URI if :user_ip is set' do
-      @client.user_ip = '127.0.0.1'
-      request = @client.generate_request(
+      CLIENT.user_ip = '127.0.0.1'
+      request = CLIENT.generate_request(
         :http_method => 'GET',
-        :uri => @client.discovery_uri('prediction', 'v1.2'),
+        :uri => CLIENT.discovery_uri('prediction', 'v1.2'),
         :authenticated => false
       )
-      request.to_env(Faraday.default_connection)[:url].should === (
+      request.to_env(Faraday.default_connection)[:url].to_s.should === (
         'https://www.googleapis.com/discovery/v1/apis/prediction/v1.2/rest' +
         '?userIp=127.0.0.1'
       )
     end
 
     it 'should correctly determine the discovery URI if :key is set' do
-      @client.key = 'qwerty'
-      request = @client.generate_request(
+      CLIENT.key = 'qwerty'
+      request = CLIENT.generate_request(
         :http_method => 'GET',
-        :uri => @client.discovery_uri('prediction', 'v1.2'),
+        :uri => CLIENT.discovery_uri('prediction', 'v1.2'),
         :authenticated => false
       )
-      request.to_env(Faraday.default_connection)[:url].should === (
+      request.to_env(Faraday.default_connection)[:url].to_s.should === (
         'https://www.googleapis.com/discovery/v1/apis/prediction/v1.2/rest' +
         '?key=qwerty'
       )
     end
 
     it 'should correctly determine the discovery URI if both are set' do
-      @client.key = 'qwerty'
-      @client.user_ip = '127.0.0.1'
-      request = @client.generate_request(
+      CLIENT.key = 'qwerty'
+      CLIENT.user_ip = '127.0.0.1'
+      request = CLIENT.generate_request(
         :http_method => 'GET',
-        :uri => @client.discovery_uri('prediction', 'v1.2'),
+        :uri => CLIENT.discovery_uri('prediction', 'v1.2'),
         :authenticated => false
       )
-      request.to_env(Faraday.default_connection)[:url].query_values.should == {
+      Addressable::URI.parse(
+        request.to_env(Faraday.default_connection)[:url]
+      ).query_values.should == {
         'key' => 'qwerty',
         'userIp' => '127.0.0.1'
       }
     end
 
     it 'should correctly generate API objects' do
-      @client.discovered_api('prediction', 'v1.2').name.should == 'prediction'
-      @client.discovered_api('prediction', 'v1.2').version.should == 'v1.2'
-      @client.discovered_api(:prediction, 'v1.2').name.should == 'prediction'
-      @client.discovered_api(:prediction, 'v1.2').version.should == 'v1.2'
+      CLIENT.discovered_api('prediction', 'v1.2').name.should == 'prediction'
+      CLIENT.discovered_api('prediction', 'v1.2').version.should == 'v1.2'
+      CLIENT.discovered_api(:prediction, 'v1.2').name.should == 'prediction'
+      CLIENT.discovered_api(:prediction, 'v1.2').version.should == 'v1.2'
     end
 
     it 'should discover methods' do
-      @client.discovered_method(
+      CLIENT.discovered_method(
         'prediction.training.insert', 'prediction', 'v1.2'
       ).name.should == 'insert'
-      @client.discovered_method(
+      CLIENT.discovered_method(
         :'prediction.training.insert', :prediction, 'v1.2'
       ).name.should == 'insert'
-      @client.discovered_method(
+      CLIENT.discovered_method(
         'prediction.training.delete', 'prediction', 'v1.2'
       ).name.should == 'delete'
     end
 
     it 'should define the origin API in discovered methods' do
-      @client.discovered_method(
+      CLIENT.discovered_method(
         'prediction.training.insert', 'prediction', 'v1.2'
       ).api.name.should == 'prediction'
     end
 
     it 'should not find methods that are not in the discovery document' do
-      @client.discovered_method(
+      CLIENT.discovered_method(
         'prediction.bogus', 'prediction', 'v1.2'
       ).should == nil
     end
 
     it 'should raise an error for bogus methods' do
       (lambda do
-        @client.discovered_method(42, 'prediction', 'v1.2')
+        CLIENT.discovered_method(42, 'prediction', 'v1.2')
       end).should raise_error(TypeError)
     end
 
     it 'should raise an error for bogus methods' do
       (lambda do
-        @client.generate_request(@client.discovered_api('prediction', 'v1.2'))
+        CLIENT.generate_request(CLIENT.discovered_api('prediction', 'v1.2'))
       end).should raise_error(TypeError)
     end
 
     it 'should correctly determine the preferred version' do
-      @client.preferred_version('prediction').version.should_not == 'v1'
-      @client.preferred_version(:prediction).version.should_not == 'v1'
+      CLIENT.preferred_version('prediction').version.should_not == 'v1'
+      CLIENT.preferred_version(:prediction).version.should_not == 'v1'
     end
 
     it 'should return a batch path' do
-      @client.discovered_api('prediction', 'v1.2').batch_path.should_not be_nil
+      CLIENT.discovered_api('prediction', 'v1.2').batch_path.should_not be_nil
     end
 
     it 'should generate valid requests' do
-      request = @client.generate_request(
+      request = CLIENT.generate_request(
         :api_method => @prediction.training.insert,
-        :parameters => {'data' => '12345', }
+        :parameters => {'data' => '12345'}
       )
       request.method.should == :post
-      request.to_env(Faraday.default_connection)[:url].should ===
+      request.to_env(Faraday.default_connection)[:url].to_s.should ===
         'https://www.googleapis.com/prediction/v1.2/training?data=12345'
       request.headers.should be_empty
       request.body.should == ''
     end
 
     it 'should generate valid requests when repeated parameters are passed' do
-      request = @client.generate_request(
+      request = CLIENT.generate_request(
         :api_method => @prediction.training.insert,
-        :parameters => [['data', '1'],['data','2']]
+        :parameters => [['data', '1'], ['data','2']]
       )
       request.method.should == :post
-      request.to_env(Faraday.default_connection)[:url].should ===
+      request.to_env(Faraday.default_connection)[:url].to_s.should ===
         'https://www.googleapis.com/prediction/v1.2/training?data=1&data=2'
     end
 
     it 'should generate requests against the correct URIs' do
-      request = @client.generate_request(
+      request = CLIENT.generate_request(
         :api_method => @prediction.training.insert,
         :parameters => {'data' => '12345'}
       )
-      request.to_env(Faraday.default_connection)[:url].should ===
+      request.to_env(Faraday.default_connection)[:url].to_s.should ===
         'https://www.googleapis.com/prediction/v1.2/training?data=12345'
     end
 
     it 'should generate requests against the correct URIs' do
-      request = @client.generate_request(
+      request = CLIENT.generate_request(
         :api_method => @prediction.training.insert,
         :parameters => {'data' => '12345'}
       )
-      request.to_env(Faraday.default_connection)[:url].should ===
+      request.to_env(Faraday.default_connection)[:url].to_s.should ===
         'https://www.googleapis.com/prediction/v1.2/training?data=12345'
     end
 
     it 'should allow modification to the base URIs for testing purposes' do
-      prediction = @client.discovered_api('prediction', 'v1.2')
-      prediction.method_base =
-        'https://testing-domain.googleapis.com/prediction/v1.2/'
-      request = @client.generate_request(
-        :api_method => prediction.training.insert,
+      # Using a new client instance here to avoid caching rebased discovery doc
+      prediction_rebase =
+        Google::APIClient.new.discovered_api('prediction', 'v1.2')
+      prediction_rebase.method_base =
+        'https://testing-domain.example.com/prediction/v1.2/'
+      request = CLIENT.generate_request(
+        :api_method => prediction_rebase.training.insert,
         :parameters => {'data' => '123'}
       )
-      request.to_env(Faraday.default_connection)[:url].should === (
-        'https://testing-domain.googleapis.com/' +
+      request.to_env(Faraday.default_connection)[:url].to_s.should === (
+        'https://testing-domain.example.com/' +
         'prediction/v1.2/training?data=123'
       )
     end
 
     it 'should generate OAuth 1 requests' do
-      @client.authorization = :oauth_1
-      @client.authorization.token_credential_key = '12345'
-      @client.authorization.token_credential_secret = '12345'
-      request = @client.generate_request(
+      CLIENT.authorization = :oauth_1
+      CLIENT.authorization.token_credential_key = '12345'
+      CLIENT.authorization.token_credential_secret = '12345'
+      request = CLIENT.generate_request(
         :api_method => @prediction.training.insert,
         :parameters => {'data' => '12345'}
       )
@@ -242,9 +250,9 @@ describe Google::APIClient do
     end
 
     it 'should generate OAuth 2 requests' do
-      @client.authorization = :oauth_2
-      @client.authorization.access_token = '12345'
-      request = @client.generate_request(
+      CLIENT.authorization = :oauth_2
+      CLIENT.authorization.access_token = '12345'
+      request = CLIENT.generate_request(
         :api_method => @prediction.training.insert,
         :parameters => {'data' => '12345'}
       )
@@ -253,10 +261,10 @@ describe Google::APIClient do
     end
 
     it 'should not be able to execute improperly authorized requests' do
-      @client.authorization = :oauth_1
-      @client.authorization.token_credential_key = '12345'
-      @client.authorization.token_credential_secret = '12345'
-      result = @client.execute(
+      CLIENT.authorization = :oauth_1
+      CLIENT.authorization.token_credential_key = '12345'
+      CLIENT.authorization.token_credential_secret = '12345'
+      result = CLIENT.execute(
         @prediction.training.insert,
         {'data' => '12345'}
       )
@@ -264,9 +272,9 @@ describe Google::APIClient do
     end
 
     it 'should not be able to execute improperly authorized requests' do
-      @client.authorization = :oauth_2
-      @client.authorization.access_token = '12345'
-      result = @client.execute(
+      CLIENT.authorization = :oauth_2
+      CLIENT.authorization.access_token = '12345'
+      result = CLIENT.execute(
         @prediction.training.insert,
         {'data' => '12345'}
       )
@@ -275,10 +283,10 @@ describe Google::APIClient do
 
     it 'should not be able to execute improperly authorized requests' do
       (lambda do
-        @client.authorization = :oauth_1
-        @client.authorization.token_credential_key = '12345'
-        @client.authorization.token_credential_secret = '12345'
-        result = @client.execute!(
+        CLIENT.authorization = :oauth_1
+        CLIENT.authorization.token_credential_key = '12345'
+        CLIENT.authorization.token_credential_secret = '12345'
+        result = CLIENT.execute!(
           @prediction.training.insert,
           {'data' => '12345'}
         )
@@ -287,9 +295,9 @@ describe Google::APIClient do
 
     it 'should not be able to execute improperly authorized requests' do
       (lambda do
-        @client.authorization = :oauth_2
-        @client.authorization.access_token = '12345'
-        result = @client.execute!(
+        CLIENT.authorization = :oauth_2
+        CLIENT.authorization.access_token = '12345'
+        result = CLIENT.execute!(
           @prediction.training.insert,
           {'data' => '12345'}
         )
@@ -297,9 +305,9 @@ describe Google::APIClient do
     end
 
     it 'should correctly handle unnamed parameters' do
-      @client.authorization = :oauth_2
-      @client.authorization.access_token = '12345'
-      result = @client.execute(
+      CLIENT.authorization = :oauth_2
+      CLIENT.authorization.access_token = '12345'
+      result = CLIENT.execute(
         @prediction.training.insert,
         {},
         MultiJson.dump({"id" => "bucket/object"}),
@@ -311,48 +319,48 @@ describe Google::APIClient do
 
   describe 'with the plus API' do
     before do
-      @client.authorization = nil
-      @plus = @client.discovered_api('plus')
+      CLIENT.authorization = nil
+      @plus = CLIENT.discovered_api('plus')
     end
 
     it 'should correctly determine the discovery URI' do
-      @client.discovery_uri('plus').should ===
+      CLIENT.discovery_uri('plus').should ===
         'https://www.googleapis.com/discovery/v1/apis/plus/v1/rest'
     end
 
     it 'should find APIs that are in the discovery document' do
-      @client.discovered_api('plus').name.should == 'plus'
-      @client.discovered_api('plus').version.should == 'v1'
-      @client.discovered_api(:plus).name.should == 'plus'
-      @client.discovered_api(:plus).version.should == 'v1'
+      CLIENT.discovered_api('plus').name.should == 'plus'
+      CLIENT.discovered_api('plus').version.should == 'v1'
+      CLIENT.discovered_api(:plus).name.should == 'plus'
+      CLIENT.discovered_api(:plus).version.should == 'v1'
     end
 
     it 'should find methods that are in the discovery document' do
       # TODO(bobaman) Fix this when the RPC names are correct
-      @client.discovered_method(
+      CLIENT.discovered_method(
         'plus.activities.list', 'plus'
       ).name.should == 'list'
     end
 
     it 'should define the origin API in discovered methods' do
-      @client.discovered_method(
+      CLIENT.discovered_method(
         'plus.activities.list', 'plus'
       ).api.name.should == 'plus'
     end
 
     it 'should not find methods that are not in the discovery document' do
-      @client.discovered_method('plus.bogus', 'plus').should == nil
+      CLIENT.discovered_method('plus.bogus', 'plus').should == nil
     end
 
     it 'should generate requests against the correct URIs' do
-      request = @client.generate_request(
+      request = CLIENT.generate_request(
         :api_method => @plus.activities.list,
         :parameters => {
           'userId' => '107807692475771887386', 'collection' => 'public'
         },
         :authenticated => false
       )
-      request.to_env(Faraday.default_connection)[:url].should === (
+      request.to_env(Faraday.default_connection)[:url].to_s.should === (
         'https://www.googleapis.com/plus/v1/' +
         'people/107807692475771887386/activities/public'
       )
@@ -360,7 +368,7 @@ describe Google::APIClient do
 
     it 'should correctly validate parameters' do
       (lambda do
-        @client.generate_request(
+        CLIENT.generate_request(
           :api_method => @plus.activities.list,
           :parameters => {'alt' => 'json'},
           :authenticated => false
@@ -370,7 +378,7 @@ describe Google::APIClient do
 
     it 'should correctly validate parameters' do
       (lambda do
-        @client.generate_request(
+        CLIENT.generate_request(
           :api_method => @plus.activities.list,
           :parameters => {
             'userId' => '107807692475771887386', 'collection' => 'bogus'
@@ -383,60 +391,60 @@ describe Google::APIClient do
 
   describe 'with the latitude API' do
     before do
-      @client.authorization = nil
-      @latitude = @client.discovered_api('latitude')
+      CLIENT.authorization = nil
+      @latitude = CLIENT.discovered_api('latitude')
     end
 
     it 'should correctly determine the discovery URI' do
-      @client.discovery_uri('latitude').should ===
+      CLIENT.discovery_uri('latitude').should ===
         'https://www.googleapis.com/discovery/v1/apis/latitude/v1/rest'
     end
 
     it 'should find APIs that are in the discovery document' do
-      @client.discovered_api('latitude').name.should == 'latitude'
-      @client.discovered_api('latitude').version.should == 'v1'
+      CLIENT.discovered_api('latitude').name.should == 'latitude'
+      CLIENT.discovered_api('latitude').version.should == 'v1'
     end
 
     it 'should return a batch path' do
-      @client.discovered_api('latitude').batch_path.should_not be_nil
+      CLIENT.discovered_api('latitude').batch_path.should_not be_nil
     end
 
     it 'should find methods that are in the discovery document' do
-      @client.discovered_method(
+      CLIENT.discovered_method(
         'latitude.currentLocation.get', 'latitude'
       ).name.should == 'get'
     end
 
     it 'should define the origin API in discovered methods' do
-      @client.discovered_method(
+      CLIENT.discovered_method(
         'latitude.currentLocation.get', 'latitude'
       ).api.name.should == 'latitude'
     end
 
     it 'should not find methods that are not in the discovery document' do
-      @client.discovered_method('latitude.bogus', 'latitude').should == nil
+      CLIENT.discovered_method('latitude.bogus', 'latitude').should == nil
     end
 
     it 'should generate requests against the correct URIs' do
-      request = @client.generate_request(
+      request = CLIENT.generate_request(
         :api_method => 'latitude.currentLocation.get',
         :authenticated => false
       )
-      request.to_env(Faraday.default_connection)[:url].should ===
+      request.to_env(Faraday.default_connection)[:url].to_s.should ===
         'https://www.googleapis.com/latitude/v1/currentLocation'
     end
 
     it 'should generate requests against the correct URIs' do
-      request = @client.generate_request(
+      request = CLIENT.generate_request(
         :api_method => @latitude.current_location.get,
         :authenticated => false
       )
-      request.to_env(Faraday.default_connection)[:url].should ===
+      request.to_env(Faraday.default_connection)[:url].to_s.should ===
         'https://www.googleapis.com/latitude/v1/currentLocation'
     end
 
     it 'should not be able to execute requests without authorization' do
-      result = @client.execute(
+      result = CLIENT.execute(
         :api_method => 'latitude.currentLocation.get',
         :authenticated => false
       )
@@ -446,60 +454,60 @@ describe Google::APIClient do
 
   describe 'with the moderator API' do
     before do
-      @client.authorization = nil
-      @moderator = @client.discovered_api('moderator')
+      CLIENT.authorization = nil
+      @moderator = CLIENT.discovered_api('moderator')
     end
 
     it 'should correctly determine the discovery URI' do
-      @client.discovery_uri('moderator').should ===
+      CLIENT.discovery_uri('moderator').should ===
         'https://www.googleapis.com/discovery/v1/apis/moderator/v1/rest'
     end
 
     it 'should find APIs that are in the discovery document' do
-      @client.discovered_api('moderator').name.should == 'moderator'
-      @client.discovered_api('moderator').version.should == 'v1'
+      CLIENT.discovered_api('moderator').name.should == 'moderator'
+      CLIENT.discovered_api('moderator').version.should == 'v1'
     end
 
     it 'should find methods that are in the discovery document' do
-      @client.discovered_method(
+      CLIENT.discovered_method(
         'moderator.profiles.get', 'moderator'
       ).name.should == 'get'
     end
 
     it 'should define the origin API in discovered methods' do
-      @client.discovered_method(
+      CLIENT.discovered_method(
         'moderator.profiles.get', 'moderator'
       ).api.name.should == 'moderator'
     end
 
     it 'should not find methods that are not in the discovery document' do
-      @client.discovered_method('moderator.bogus', 'moderator').should == nil
+      CLIENT.discovered_method('moderator.bogus', 'moderator').should == nil
     end
 
     it 'should return a batch path' do
-      @client.discovered_api('moderator').batch_path.should_not be_nil
+      CLIENT.discovered_api('moderator').batch_path.should_not be_nil
     end
 
     it 'should generate requests against the correct URIs' do
-      request = @client.generate_request(
+      request = CLIENT.generate_request(
         :api_method => 'moderator.profiles.get',
         :authenticated => false
       )
-      request.to_env(Faraday.default_connection)[:url].should ===
+      request.to_env(Faraday.default_connection)[:url].to_s.should ===
         'https://www.googleapis.com/moderator/v1/profiles/@me'
     end
 
     it 'should generate requests against the correct URIs' do
-      request = @client.generate_request(
+      request = CLIENT.generate_request(
         :api_method => @moderator.profiles.get,
         :authenticated => false
       )
-      request.to_env(Faraday.default_connection)[:url].should ===
+      request.to_env(Faraday.default_connection)[:url].to_s.should ===
         'https://www.googleapis.com/moderator/v1/profiles/@me'
     end
 
     it 'should not be able to execute requests without authorization' do
-      result = @client.execute(
+      result = CLIENT.execute(
         'moderator.profiles.get',
         {},
         '',
@@ -512,54 +520,54 @@ describe Google::APIClient do
 
   describe 'with the adsense API' do
     before do
-      @client.authorization = nil
-      @adsense = @client.discovered_api('adsense', 'v1')
+      CLIENT.authorization = nil
+      @adsense = CLIENT.discovered_api('adsense', 'v1')
     end
 
     it 'should correctly determine the discovery URI' do
-      @client.discovery_uri('adsense').should ===
+      CLIENT.discovery_uri('adsense').should ===
         'https://www.googleapis.com/discovery/v1/apis/adsense/v1/rest'
     end
 
     it 'should find APIs that are in the discovery document' do
-      @client.discovered_api('adsense').name.should == 'adsense'
-      @client.discovered_api('adsense').version.should == 'v1'
+      CLIENT.discovered_api('adsense').name.should == 'adsense'
+      CLIENT.discovered_api('adsense').version.should == 'v1'
     end
 
     it 'should return a batch path' do
-      @client.discovered_api('adsense').batch_path.should_not be_nil
+      CLIENT.discovered_api('adsense').batch_path.should_not be_nil
     end
 
     it 'should find methods that are in the discovery document' do
-      @client.discovered_method(
+      CLIENT.discovered_method(
         'adsense.reports.generate', 'adsense'
       ).name.should == 'generate'
     end
 
     it 'should not find methods that are not in the discovery document' do
-      @client.discovered_method('adsense.bogus', 'adsense').should == nil
+      CLIENT.discovered_method('adsense.bogus', 'adsense').should == nil
     end
 
     it 'should generate requests against the correct URIs' do
-      request = @client.generate_request(
+      request = CLIENT.generate_request(
         :api_method => 'adsense.adclients.list',
         :authenticated => false
       )
-      request.to_env(Faraday.default_connection)[:url].should ===
+      request.to_env(Faraday.default_connection)[:url].to_s.should ===
         'https://www.googleapis.com/adsense/v1/adclients'
     end
 
     it 'should generate requests against the correct URIs' do
-      request = @client.generate_request(
+      request = CLIENT.generate_request(
         :api_method => @adsense.adclients.list,
         :authenticated => false
       )
-      request.to_env(Faraday.default_connection)[:url].should ===
+      request.to_env(Faraday.default_connection)[:url].to_s.should ===
         'https://www.googleapis.com/adsense/v1/adclients'
     end
 
     it 'should not be able to execute requests without authorization' do
-      result = @client.execute(
+      result = CLIENT.execute(
         :api_method => 'adsense.adclients.list',
         :authenticated => false
       )
@@ -568,7 +576,7 @@ describe Google::APIClient do
 
     it 'should fail when validating missing required parameters' do
       (lambda do
-        @client.generate_request(
+        CLIENT.generate_request(
           :api_method => @adsense.reports.generate,
           :authenticated => false
         )
@@ -577,7 +585,7 @@ describe Google::APIClient do
 
     it 'should succeed when validating parameters in a correct call' do
       (lambda do
-        @client.generate_request(
+        CLIENT.generate_request(
           :api_method => @adsense.reports.generate,
           :parameters => {
             'startDate' => '2000-01-01',
@@ -592,7 +600,7 @@ describe Google::APIClient do
 
     it 'should fail when validating parameters with invalid values' do
       (lambda do
-        @client.generate_request(
+        CLIENT.generate_request(
           :api_method => @adsense.reports.generate,
           :parameters => {
             'startDate' => '2000-01-01',
@@ -607,7 +615,7 @@ describe Google::APIClient do
 
     it 'should succeed when validating repeated parameters in a correct call' do
       (lambda do
-        @client.generate_request(
+        CLIENT.generate_request(
           :api_method => @adsense.reports.generate,
           :parameters => {
             'startDate' => '2000-01-01',
@@ -622,7 +630,7 @@ describe Google::APIClient do
 
     it 'should fail when validating incorrect repeated parameters' do
       (lambda do
-        @client.generate_request(
+        CLIENT.generate_request(
           :api_method => @adsense.reports.generate,
           :parameters => {
             'startDate' => '2000-01-01',
@@ -635,25 +643,25 @@ describe Google::APIClient do
       end).should raise_error(ArgumentError)
     end
   end
-  
+
   describe 'with the Drive API' do
     before do
-      @client.authorization = nil
-      @drive = @client.discovered_api('drive', 'v1')
+      CLIENT.authorization = nil
+      @drive = CLIENT.discovered_api('drive', 'v1')
     end
-    
+
     it 'should include media upload info methods' do
       @drive.files.insert.media_upload.should_not == nil
     end
-    
+
     it 'should include accepted media types' do
       @drive.files.insert.media_upload.accepted_types.should_not be_empty
     end
-    
+
     it 'should have an upload path' do
       @drive.files.insert.media_upload.uri_template.should_not == nil
     end
-    
+
     it 'should have a max file size' do
       @drive.files.insert.media_upload.max_size.should_not == nil
     end