google-api-client 0.6.4 → 0.7.0

data/spec/google/api_client/simple_file_store_spec.rb

@@ -0,0 +1,137 @@
+# encoding:utf-8
+
+# Copyright 2013 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/service/simple_file_store'
+
+describe Google::APIClient::Service::SimpleFileStore do
+
+  FILE_NAME = 'test.cache'
+
+  before(:all) do
+    File.delete(FILE_NAME) if File.exists?(FILE_NAME)
+  end
+
+  describe 'with no cache file' do
+    before(:each) do
+      File.delete(FILE_NAME) if File.exists?(FILE_NAME)
+      @cache = Google::APIClient::Service::SimpleFileStore.new(FILE_NAME)
+    end
+
+    it 'should return nil when asked if a key exists' do
+      @cache.exist?('invalid').should be_nil
+      File.exists?(FILE_NAME).should be_false
+    end
+
+    it 'should return nil when asked to read a key' do
+      @cache.read('invalid').should be_nil
+      File.exists?(FILE_NAME).should be_false
+    end
+
+    it 'should return nil when asked to fetch a key' do
+      @cache.fetch('invalid').should be_nil
+      File.exists?(FILE_NAME).should be_false
+    end
+
+    it 'should create a cache file when asked to fetch a key with a default' do
+      @cache.fetch('new_key') do
+        'value'
+      end.should == 'value'
+      File.exists?(FILE_NAME).should be_true
+    end
+
+    it 'should create a cache file when asked to write a key' do
+      @cache.write('new_key', 'value')
+      File.exists?(FILE_NAME).should be_true
+    end
+
+    it 'should return nil when asked to delete a key' do
+      @cache.delete('invalid').should be_nil
+      File.exists?(FILE_NAME).should be_false
+    end
+  end
+
+  describe 'with an existing cache' do
+    before(:each) do
+      File.delete(FILE_NAME) if File.exists?(FILE_NAME)
+      @cache = Google::APIClient::Service::SimpleFileStore.new(FILE_NAME)
+      @cache.write('existing_key', 'existing_value')
+    end
+
+    it 'should return true when asked if an existing key exists' do
+      @cache.exist?('existing_key').should be_true
+    end
+
+    it 'should return false when asked if a nonexistent key exists' do
+      @cache.exist?('invalid').should be_false
+    end
+
+    it 'should return the value for an existing key when asked to read it' do
+      @cache.read('existing_key').should == 'existing_value'
+    end
+
+    it 'should return nil for a nonexistent key when asked to read it' do
+      @cache.read('invalid').should be_nil
+    end
+
+    it 'should return the value for an existing key when asked to read it' do
+      @cache.read('existing_key').should == 'existing_value'
+    end
+
+    it 'should return nil for a nonexistent key when asked to fetch it' do
+      @cache.fetch('invalid').should be_nil
+    end
+
+    it 'should return and save the default value for a nonexistent key when asked to fetch it with a default' do
+      @cache.fetch('new_key') do
+        'value'
+      end.should == 'value'
+      @cache.read('new_key').should == 'value'
+    end
+
+    it 'should remove an existing value and return true when asked to delete it' do
+      @cache.delete('existing_key').should be_true
+      @cache.read('existing_key').should be_nil
+    end
+
+    it 'should return false when asked to delete a nonexistent key' do
+      @cache.delete('invalid').should be_false
+    end
+
+    it 'should convert keys to strings when storing them' do
+      @cache.write(:symbol_key, 'value')
+      @cache.read('symbol_key').should == 'value'
+    end
+
+    it 'should convert keys to strings when reading them' do
+      @cache.read(:existing_key).should == 'existing_value'
+    end
+
+    it 'should convert keys to strings when fetching them' do
+      @cache.fetch(:existing_key).should == 'existing_value'
+    end
+
+    it 'should convert keys to strings when deleting them' do
+      @cache.delete(:existing_key).should be_true
+      @cache.read('existing_key').should be_nil
+    end
+  end
+
+  after(:all) do
+    File.delete(FILE_NAME) if File.exists?(FILE_NAME)
+  end
+end

data/spec/google/api_client_spec.rb

@@ -15,7 +15,6 @@
 require 'spec_helper'
 
 require 'faraday'
-require 'faraday/utils'
 require 'signet/oauth_1/client'
 require 'google/api_client'
 require 'google/api_client/version'
@@ -36,7 +35,7 @@ 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.execute(:uri=>'http://www.google.com/')
+      client.execute(:uri=>'https://www.google.com/')
     end).should raise_error(TypeError)
   end
 
@@ -51,7 +50,7 @@ shared_examples_for 'configurable user agent' do
         [200, {}, ['']]
       end
     end
-    client.execute(:uri=>'http://www.google.com/', :connection => conn)
+    client.execute(:uri=>'https://www.google.com/', :connection => conn)
     conn.verify
   end
 end
@@ -115,6 +114,7 @@ describe Google::APIClient do
       @connection = stub_connection do |stub|
         stub.post('/prediction/v1.2/training?data=12345') do |env|
           env[:request_headers]['Authorization'].should == 'Bearer 12345'
+          [200, {}, '{}']
         end
       end
     end
@@ -143,6 +143,21 @@ describe Google::APIClient do
       )
     end
     
+    it 'should accept options with batch/request style execute' do
+      client.authorization.access_token = "abcdef"
+      new_auth = Signet::OAuth2::Client.new(:access_token => '12345')
+      request = client.generate_request(
+        :api_method => @prediction.training.insert,
+        :parameters => {'data' => '12345'}
+      )
+      client.execute(
+        request,
+        :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')
@@ -152,4 +167,87 @@ describe Google::APIClient do
        )
      end
   end  
+
+  describe 'when retiries enabled' do
+    before do
+      client.retries = 2
+    end
+
+    after do
+      @connection.verify
+    end
+    
+    it 'should follow redirects' do
+      client.authorization = nil
+      @connection = stub_connection do |stub|
+        stub.get('/foo') do |env|
+          [302, {'location' => 'https://www.google.com/bar'}, '{}']
+        end
+        stub.get('/bar') do |env|
+          [200, {}, '{}']
+        end
+      end
+
+      client.execute(  
+        :uri => 'https://www.gogole.com/foo',
+        :connection => @connection
+      )
+    end
+
+    it 'should refresh tokens on 401 tokens' do
+      client.authorization.access_token = '12345'
+      expect(client.authorization).to receive(:fetch_access_token!)
+
+      @connection = stub_connection do |stub|
+        stub.get('/foo') do |env|
+          [401, {}, '{}']
+        end
+        stub.get('/foo') do |env|
+          [200, {}, '{}']
+        end
+      end
+
+      client.execute(  
+        :uri => 'https://www.gogole.com/foo',
+        :connection => @connection
+      )
+    end
+
+    it 'should retry on 500 errors' do
+      client.authorization = nil
+
+      @connection = stub_connection do |stub|
+        stub.get('/foo') do |env|
+          [500, {}, '{}']
+        end
+        stub.get('/foo') do |env|
+          [200, {}, '{}']
+        end
+      end
+
+      client.execute(  
+        :uri => 'https://www.gogole.com/foo',
+        :connection => @connection
+      ).status.should == 200
+
+    end
+
+    it 'should fail after max retries' do
+      client.authorization = nil
+      count = 0
+      @connection = stub_connection do |stub|
+        stub.get('/foo') do |env|
+          count += 1
+          [500, {}, '{}']
+        end
+      end
+
+      client.execute(  
+        :uri => 'https://www.gogole.com/foo',
+        :connection => @connection
+      ).status.should == 500
+      count.should == 3
+    end
+
+  end  
 end

data/spec/spec_helper.rb

@@ -4,6 +4,8 @@ $LOAD_PATH.uniq!
 require 'rspec'
 require 'faraday'
 
+Faraday::Adapter.load_middleware(:test)
+
 module Faraday
   class Connection
     def verify
@@ -22,6 +24,7 @@ module ConnectionHelpers
       block.call(stub)
     end
     connection = Faraday.new do |builder|
+      builder.options.params_encoder = Faraday::FlatParamsEncoder
       builder.adapter(:test, stubs)
     end
   end

data/tasks/gem.rake

@@ -16,19 +16,18 @@ namespace :gem do
     s.email = PKG_AUTHOR_EMAIL
     s.summary = PKG_SUMMARY
     s.description = PKG_DESCRIPTION
-
+    s.license = 'Apache 2.0'
     s.files = PKG_FILES.to_a
-    s.executables << 'google-api'
 
     s.extra_rdoc_files = %w( README.md )
     s.rdoc_options.concat ['--main',  'README.md']
 
     # Dependencies used in the main library
-    s.add_runtime_dependency('signet', '~> 0.4.5')
+    s.add_runtime_dependency('signet', '>= 0.5.0')
     s.add_runtime_dependency('addressable', '>= 2.3.2')
     s.add_runtime_dependency('uuidtools', '>= 2.1.0')
     s.add_runtime_dependency('autoparse', '>= 0.3.3')
-    s.add_runtime_dependency('faraday', '~> 0.8.4')
+    s.add_runtime_dependency('faraday', '>= 0.9.0')
     s.add_runtime_dependency('multi_json', '>= 1.0.0')
     s.add_runtime_dependency('extlib', '>= 0.9.15')
     s.add_runtime_dependency('jwt', '>= 0.1.5')

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-api-client
 version: !ruby/object:Gem::Version
-  version: 0.6.4
-  prerelease: 
+  version: 0.7.0
 platform: ruby
 authors:
 - Bob Aman
@@ -10,129 +9,162 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-03 00:00:00.000000000Z
+date: 2014-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: signet
-  requirement: &70272141588380 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.5
+        version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70272141588380
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70272141587760 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *70272141587760
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.2
 - !ruby/object:Gem::Dependency
   name: uuidtools
-  requirement: &70272141587280 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70272141587280
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: autoparse
-  requirement: &70272141586660 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *70272141586660
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.3
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70272141586100 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *70272141586100
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70272141585580 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70272141585580
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: extlib
-  requirement: &70272141585000 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.15
   type: :runtime
   prerelease: false
-  version_requirements: *70272141585000
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.15
 - !ruby/object:Gem::Dependency
   name: jwt
-  requirement: &70272141584460 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *70272141584460
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.5
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70272141583860 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70272141583860
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.1.1
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70272141583320 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *70272141583320
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70272141582660 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.11.0
   type: :development
   prerelease: false
-  version_requirements: *70272141582660
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.11.0
 description: ! 'The Google API Ruby Client makes it trivial to discover and access
   supported
 
@@ -140,14 +172,16 @@ description: ! 'The Google API Ruby Client makes it trivial to discover and acce
 
 '
 email: sbazyl@google.com
-executables:
-- google-api
+executables: []
 extensions: []
 extra_rdoc_files:
 - README.md
 files:
+- lib/cacerts.pem
 - lib/compat/multi_json.rb
 - lib/google/api_client.rb
+- lib/google/api_client/auth/compute_service_account.rb
+- lib/google/api_client/auth/file_storage.rb
 - lib/google/api_client/auth/installed_app.rb
 - lib/google/api_client/auth/jwt_asserter.rb
 - lib/google/api_client/auth/key_utils.rb
@@ -162,12 +196,20 @@ files:
 - lib/google/api_client/discovery/schema.rb
 - lib/google/api_client/environment.rb
 - lib/google/api_client/errors.rb
+- lib/google/api_client/gzip.rb
 - lib/google/api_client/logging.rb
 - lib/google/api_client/media.rb
 - lib/google/api_client/railtie.rb
 - lib/google/api_client/reference.rb
 - lib/google/api_client/request.rb
 - lib/google/api_client/result.rb
+- lib/google/api_client/service.rb
+- lib/google/api_client/service/batch.rb
+- lib/google/api_client/service/request.rb
+- lib/google/api_client/service/resource.rb
+- lib/google/api_client/service/result.rb
+- lib/google/api_client/service/simple_file_store.rb
+- lib/google/api_client/service/stub_generator.rb
 - lib/google/api_client/service_account.rb
 - lib/google/api_client/version.rb
 - lib/google/inflection.rb
@@ -176,9 +218,13 @@ files:
 - spec/fixtures/files/secret.pem
 - spec/google/api_client/batch_spec.rb
 - spec/google/api_client/discovery_spec.rb
+- spec/google/api_client/gzip_spec.rb
 - spec/google/api_client/media_spec.rb
+- spec/google/api_client/request_spec.rb
 - spec/google/api_client/result_spec.rb
 - spec/google/api_client/service_account_spec.rb
+- spec/google/api_client/service_spec.rb
+- spec/google/api_client/simple_file_store_spec.rb
 - spec/google/api_client_spec.rb
 - spec/spec_helper.rb
 - tasks/gem.rake
@@ -188,14 +234,15 @@ files:
 - tasks/wiki.rake
 - tasks/yard.rake
 - CHANGELOG.md
-- CONTRIB.md
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
-- bin/google-api
-homepage: http://code.google.com/p/google-api-ruby-client/
-licenses: []
+homepage: https://github.com/google/google-api-ruby-client
+licenses:
+- Apache 2.0
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --main
@@ -203,21 +250,19 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 2.0.7
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Package Summary
 test_files: []