google-api-client 0.6.4 → 0.7.0.rc2

data/lib/google/api_client/service_account.rb

@@ -15,3 +15,4 @@
 require 'google/api_client/auth/pkcs12'
 require 'google/api_client/auth/jwt_asserter'
 require 'google/api_client/auth/key_utils'
+require 'google/api_client/auth/compute_service_account'

data/lib/google/api_client/version.rb

@@ -21,9 +21,10 @@ if !defined?(::Google::APIClient::VERSION)
     class APIClient
       module VERSION
         MAJOR = 0
-        MINOR = 6
-        TINY  = 4
-        STRING = [MAJOR, MINOR, TINY].join('.')
+        MINOR = 7
+        TINY  = 0
+        PATCH = 'rc2'
+        STRING = [MAJOR, MINOR, TINY, PATCH].compact.join('.')
       end
     end
   end

data/spec/google/api_client/batch_spec.rb

@@ -234,7 +234,7 @@ describe Google::APIClient::BatchRequest do
       it 'should convert to a correct HTTP request' do
         batch = Google::APIClient::BatchRequest.new { |result| }
         batch.add(@call1, '1').add(@call2, '2')
-        request = batch.to_env(Faraday.default_connection)
+        request = batch.to_env(CLIENT.connection)
         boundary = Google::APIClient::BatchRequest::BATCH_BOUNDARY
         request[:method].to_s.downcase.should == 'post'
         request[:url].to_s.should == 'https://www.googleapis.com/batch'

data/spec/google/api_client/discovery_spec.rb

@@ -18,29 +18,12 @@
 require 'spec_helper'
 
 require 'faraday'
-require 'faraday/utils'
 require 'multi_json'
 require 'compat/multi_json'
 require 'signet/oauth_1/client'
 require 'google/api_client'
 require 'google/api_client/version'
 
-def TestHandler
-  def initialize(&block)
-    @block = block
-  end
-  
-  def call(env)
-    @block.call(env)
-  end
-end
-
-def mock_connection(&block)
-    connection = Faraday.new do |builder|
-      use TestHandler block
-  end
-end
-
 describe Google::APIClient do
   include ConnectionHelpers
   CLIENT = Google::APIClient.new(:application_name => 'API Client Tests') unless defined?(CLIENT)
@@ -231,16 +214,15 @@ describe Google::APIClient do
       conn.verify
     end
 
-    it 'should generate valid requests when repeated parameters are passed' do
-      pending("This is caused by Faraday's encoding of query parameters.")
+    it 'should generate valid requests when multivalued parameters are passed' do
       conn = stub_connection do |stub|
          stub.post('/prediction/v1.2/training?data=1&data=2') do |env|
-           env[:params]['data'].should include('1', '2')
+           env.params['data'].should include('1', '2')
          end
        end
       request = CLIENT.execute(
         :api_method => @prediction.training.insert,
-        :parameters => [['data', '1'], ['data','2']],
+        :parameters => {'data' => ['1', '2']},
         :connection => conn
       )
       conn.verify
@@ -465,92 +447,29 @@ describe Google::APIClient do
             'userId' => '107807692475771887386', 'collection' => 'bogus'
           },
           :authenticated => false
-        ).to_env(Faraday.default_connection)
+        ).to_env(CLIENT.connection)
       end).should raise_error(ArgumentError)
     end
   end
-  
-  describe 'with the latitude API' do
-    before do
-      CLIENT.authorization = nil
-      @latitude = CLIENT.discovered_api('latitude')
-    end
-
-    it 'should correctly determine the discovery URI' do
-      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'
-    end
-
-    it 'should return a batch path' do
-      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(
-        'latitude.currentLocation.get', 'latitude'
-      ).name.should == 'get'
-    end
-
-    it 'should define the origin API in discovered methods' do
-      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
-    end
-
-    it 'should generate requests against the correct URIs' do
-      request = CLIENT.generate_request(
-        :api_method => @latitude.current_location.get,
-        :authenticated => false
-      )
-      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(
-        :api_method => @latitude.current_location.get,
-        :authenticated => false
-      )
-      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(
-        :api_method => @latitude.current_location.get,
-        :authenticated => false
-      )
-      result.response.status.should == 401
-    end
-  end
 
   describe 'with the adsense API' do
     before do
       CLIENT.authorization = nil
-      @adsense = CLIENT.discovered_api('adsense', 'v1')
+      @adsense = CLIENT.discovered_api('adsense', 'v1.3')
     end
 
     it 'should correctly determine the discovery URI' do
-      CLIENT.discovery_uri('adsense').should ===
-        'https://www.googleapis.com/discovery/v1/apis/adsense/v1/rest'
+      CLIENT.discovery_uri('adsense', 'v1.3').to_s.should ===
+        'https://www.googleapis.com/discovery/v1/apis/adsense/v1.3/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', 'v1.3').name.should == 'adsense'
+      CLIENT.discovered_api('adsense', 'v1.3').version.should == 'v1.3'
     end
 
     it 'should return a batch path' do
-      CLIENT.discovered_api('adsense').batch_path.should_not be_nil
+      CLIENT.discovered_api('adsense', 'v1.3').batch_path.should_not be_nil
     end
 
     it 'should find methods that are in the discovery document' do
@@ -565,7 +484,7 @@ describe Google::APIClient do
 
     it 'should generate requests against the correct URIs' do
       conn = stub_connection do |stub|
-        stub.get('/adsense/v1/adclients') do |env|
+        stub.get('/adsense/v1.3/adclients') do |env|
         end
       end
       request = CLIENT.execute(
@@ -595,7 +514,7 @@ describe Google::APIClient do
 
     it 'should succeed when validating parameters in a correct call' do
       conn = stub_connection do |stub|
-        stub.get('/adsense/v1/reports?dimension=DATE&endDate=2010-01-01&metric=PAGE_VIEWS&startDate=2000-01-01') do |env|
+        stub.get('/adsense/v1.3/reports?dimension=DATE&endDate=2010-01-01&metric=PAGE_VIEWS&startDate=2000-01-01') do |env|
         end
       end
       (lambda do
@@ -630,9 +549,8 @@ describe Google::APIClient do
     end
 
     it 'should succeed when validating repeated parameters in a correct call' do
-      pending("This is caused by Faraday's encoding of query parameters.")
       conn = stub_connection do |stub|
-        stub.get('/adsense/v1/reports?dimension=DATE&dimension=PRODUCT_CODE'+
+        stub.get('/adsense/v1.3/reports?dimension=DATE&dimension=PRODUCT_CODE'+
                  '&endDate=2010-01-01&metric=CLICKS&metric=PAGE_VIEWS&'+
                  'startDate=2000-01-01') do |env|
         end
@@ -667,6 +585,29 @@ describe Google::APIClient do
         )
       end).should raise_error(ArgumentError)
     end
+
+    it 'should generate valid requests when multivalued parameters are passed' do
+      conn = stub_connection do |stub|
+         stub.get('/adsense/v1.3/reports?dimension=DATE&dimension=PRODUCT_CODE'+
+                 '&endDate=2010-01-01&metric=CLICKS&metric=PAGE_VIEWS&'+
+                 'startDate=2000-01-01') do |env|
+           env.params['dimension'].should include('DATE', 'PRODUCT_CODE')
+           env.params['metric'].should include('CLICKS', 'PAGE_VIEWS')
+         end
+       end
+      request = CLIENT.execute(
+        :api_method => @adsense.reports.generate,
+          :parameters => {
+            'startDate' => '2000-01-01',
+            'endDate' => '2010-01-01',
+            'dimension' => ['DATE', 'PRODUCT_CODE'],
+            'metric' => ['PAGE_VIEWS', 'CLICKS']
+          },
+          :authenticated => false,
+          :connection => conn
+      )
+      conn.verify
+    end
   end
 
   describe 'with the Drive API' do

data/spec/google/api_client/gzip_spec.rb

@@ -0,0 +1,86 @@
+# Copyright 2012 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'spec_helper'
+
+require 'google/api_client'
+require 'google/api_client/version'
+
+describe Google::APIClient::Gzip do
+
+  def create_connection(&block)
+    Faraday.new do |b|
+      b.response :gzip
+      b.adapter :test do |stub|
+        stub.get '/', &block
+      end
+    end
+  end  
+
+  it 'should ignore non-zipped content' do
+    conn = create_connection do |env|
+      [200, {}, 'Hello world']
+    end
+    result = conn.get('/')
+    result.body.should == "Hello world"
+  end
+
+  it 'should decompress gziped content' do
+    conn = create_connection do |env|
+      [200, { 'Content-Encoding' => 'gzip'}, Base64.decode64('H4sICLVGwlEAA3RtcADzSM3JyVcozy/KSeECANXgObcMAAAA')]
+    end
+    result = conn.get('/')
+    result.body.should == "Hello world\n"
+  end
+  
+  describe 'with API Client' do
+
+    before do
+      @client = Google::APIClient.new(:application_name => 'test')
+      @client.authorization = nil
+    end
+    
+    
+    it 'should send gzip in user agent' do
+      conn = create_connection do |env|
+        agent = env[:request_headers]['User-Agent']
+        agent.should_not be_nil
+        agent.should include 'gzip'
+        [200, {}, 'Hello world']
+      end
+      @client.execute(:uri => 'http://www.example.com/', :connection => conn)
+    end
+
+    it 'should send gzip in accept-encoding' do
+      conn = create_connection do |env|
+        encoding = env[:request_headers]['Accept-Encoding']
+        encoding.should_not be_nil
+        encoding.should include 'gzip'
+        [200, {}, 'Hello world']
+      end
+      @client.execute(:uri => 'http://www.example.com/', :connection => conn)
+    end
+    
+    it 'should not send gzip in accept-encoding if disabled for request' do
+      conn = create_connection do |env|
+        encoding = env[:request_headers]['Accept-Encoding']
+        encoding.should_not include('gzip') unless encoding.nil?
+        [200, {}, 'Hello world']
+      end
+      response = @client.execute(:uri => 'http://www.example.com/', :gzip => false, :connection => conn)
+      puts response.status
+    end
+    
+  end
+end

data/spec/google/api_client/media_spec.rb

@@ -57,6 +57,54 @@ describe Google::APIClient::UploadIO do
   end
 end
 
+describe Google::APIClient::RangedIO do
+  before do
+    @source = StringIO.new("1234567890abcdef")
+    @io = Google::APIClient::RangedIO.new(@source, 1, 5)
+  end
+  
+  it 'should return the correct range when read entirely' do
+    @io.read.should == "23456"
+  end
+  
+  it 'should maintain position' do
+    @io.read(1).should == '2'
+    @io.read(2).should == '34'
+    @io.read(2).should == '56'
+  end
+  
+  it 'should allow rewinds' do
+    @io.read(2).should == '23'
+    @io.rewind()
+    @io.read(2).should == '23'
+  end
+  
+  it 'should allow setting position' do
+    @io.pos = 3
+    @io.read.should == '56'
+  end
+  
+  it 'should not allow position to be set beyond range' do
+    @io.pos = 10
+    @io.read.should == ''
+  end
+  
+  it 'should return empty string when read amount is zero' do
+    @io.read(0).should == ''
+  end
+  
+  it 'should return empty string at EOF if amount is nil' do
+    @io.read
+    @io.read.should == ''
+  end
+  
+  it 'should return nil at EOF if amount is positive int' do
+    @io.read
+    @io.read(1).should == nil
+  end
+    
+end
+
 describe Google::APIClient::ResumableUpload do
   CLIENT = Google::APIClient.new(:application_name => 'API Client Tests') unless defined?(CLIENT)
 
@@ -125,7 +173,7 @@ describe Google::APIClient::ResumableUpload do
 
   def mock_result(status, headers = {})
     reference = Google::APIClient::Reference.new(:api_method => @drive.files.insert)
-    stub('result', :status => status, :headers => headers, :reference => reference)
+    double('result', :status => status, :headers => headers, :reference => reference)
   end
 
 end

data/spec/google/api_client/request_spec.rb

@@ -0,0 +1,30 @@
+# Copyright 2012 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'spec_helper'
+
+require 'google/api_client'
+require 'google/api_client/version'
+
+describe Google::APIClient::Request do
+  CLIENT = Google::APIClient.new(:application_name => 'API Client Tests') unless defined?(CLIENT)
+
+  it 'should normalize parameter names to strings' do
+    request = Google::APIClient::Request.new(:uri => 'https://www.google.com', :parameters => {
+      :a => '1', 'b' => '2'
+    })
+    request.parameters['a'].should == '1'
+    request.parameters['b'].should == '2'
+  end
+end

data/spec/google/api_client/result_spec.rb

@@ -34,8 +34,8 @@ describe Google::APIClient::Result do
       })
       @request = @reference.to_http_request
 
-      # Response stub
-      @response = stub("response")
+      # Response double
+      @response = double("response")
       @response.stub(:status).and_return(200)
       @response.stub(:headers).and_return({
         'etag' => '12345',
@@ -78,11 +78,10 @@ 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_env(Faraday.default_connection)[:url]
+        url = reference.to_env(CLIENT.connection)[:url]
         url.to_s.should include('pageToken=NEXT%2BPAGE%2BTOKEN')
       end
 

data/spec/google/api_client/service_account_spec.rb

@@ -141,3 +141,24 @@ describe Google::APIClient::JWTAsserter do
   end    
 end
 
+describe Google::APIClient::ComputeServiceAccount do
+  include ConnectionHelpers
+
+  it 'should query metadata server' do
+    conn = stub_connection do |stub|
+      stub.get('/computeMetadata/v1beta1/instance/service-accounts/default/token') do |env|
+        env.url.host.should == 'metadata'
+        [200, {}, '{
+          "access_token" : "1/abcdef1234567890",
+          "token_type" : "Bearer",
+          "expires_in" : 3600
+        }']
+      end
+    end
+    service_account = Google::APIClient::ComputeServiceAccount.new
+    auth = service_account.fetch_access_token!({ :connection => conn })
+    auth.should_not == nil?
+    auth["access_token"].should == "1/abcdef1234567890"
+    conn.verify
+  end
+end