google-api-client 0.7.1 → 0.8.0

data/lib/google/api_client/errors.rb

@@ -43,6 +43,11 @@ module Google
     class ClientError < TransmissionError
     end
 
+    ##
+    # A 401 HTTP error occurred.
+    class AuthorizationError < ClientError
+    end
+
     ##
     # A 5xx class HTTP error occurred.
     class ServerError < TransmissionError

data/lib/google/api_client/railtie.rb

@@ -1,3 +1,4 @@
+require 'rails/railtie'
 require 'google/api_client/logging'
 
 module Google
@@ -9,7 +10,7 @@ module Google
     #
     class Railtie < Rails::Railtie
       initializer 'google-api-client' do |app|
-        Google::APIClient.logger = Rails.logger
+        Google::APIClient.logger = app.logger
       end
     end
   end

data/lib/google/api_client/request.rb

@@ -14,7 +14,6 @@
 
 require 'faraday'
 require 'faraday/request/multipart'
-require 'multi_json'
 require 'compat/multi_json'
 require 'addressable/uri'
 require 'stringio'
@@ -168,7 +167,7 @@ module Google
 
         # Resumamble slightly different than other upload protocols in that it requires at least
         # 2 requests.
-        if result.status == 200 && self.upload_type == 'resumable'
+        if result.status == 200 && self.upload_type == 'resumable' && self.media
           upload = result.resumable_upload
           unless upload.complete?
             logger.debug { "#{self.class} Sending upload body" }

data/lib/google/api_client/result.rb

@@ -182,8 +182,9 @@ module Google
       # Build a request for fetching the next page of data
       # 
       # @return [Google::APIClient::Request]
-      #   API request for retrieving next page
+      #   API request for retrieving next page, nil if no page token available
       def next_page
+        return nil unless self.next_page_token
         merged_parameters = Hash[self.reference.parameters].merge({
           self.page_token_param => self.next_page_token
         })
@@ -215,8 +216,9 @@ module Google
       # Build a request for fetching the previous page of data
       # 
       # @return [Google::APIClient::Request]
-      #   API request for retrieving previous page
+      #   API request for retrieving previous page, nil if no page token available
       def prev_page
+        return nil unless self.prev_page_token
         merged_parameters = Hash[self.reference.parameters].merge({
           self.page_token_param => self.prev_page_token
         })

data/lib/google/api_client/service.rb

@@ -120,7 +120,7 @@ module Google
         if options.include? :cache_store
           @cache_store = options[:cache_store]
         else
-          cache_exists = File.exist?(DEFAULT_CACHE_FILE)
+          cache_exists = File.exists?(DEFAULT_CACHE_FILE)
           if (cache_exists && File.writable?(DEFAULT_CACHE_FILE)) ||
              (!cache_exists && File.writable?(Dir.pwd))
             @cache_store = Google::APIClient::Service::SimpleFileStore.new(
@@ -225,7 +225,7 @@ module Google
           result = @client.execute(params)
           return Google::APIClient::Service::Result.new(request, result)
         elsif request.instance_of? Google::APIClient::Service::BatchRequest
-          @client.execute(request.base_batch)
+          @client.execute(request.base_batch, {:connection => @connection})
         end
       end
     end

data/lib/google/api_client/service/batch.rb

@@ -80,6 +80,13 @@ module Google
             :api_method => call.method,
             :parameters => call.parameters
           }
+          if call.respond_to? :body
+            if call.body.respond_to? :to_hash
+              base_call[:body_object] = call.body
+            else
+              base_call[:body] = call.body
+            end
+          end
           @base_batch.add(base_call) do |base_result|
             result = Google::APIClient::Service::BatchedCallResult.new(
                 call, base_result)

data/lib/google/api_client/service/stub_generator.rb

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'active_support/inflector'
+
 module Google
   class APIClient
     class Service
@@ -25,7 +27,7 @@ module Google
 
           # Handle resources.
           root.discovered_resources.each do |resource|
-            method_name = Google::INFLECTOR.underscore(resource.name).to_sym
+            method_name = ActiveSupport::Inflector.underscore(resource.name).to_sym
             if !self.respond_to?(method_name)
               metaclass.send(:define_method, method_name) do
                 Google::APIClient::Service::Resource.new(service, resource)
@@ -35,7 +37,7 @@ module Google
 
           # Handle methods.
           root.discovered_methods.each do |method|
-            method_name = Google::INFLECTOR.underscore(method.name).to_sym
+            method_name = ActiveSupport::Inflector.underscore(method.name).to_sym
             if !self.respond_to?(method_name)
               metaclass.send(:define_method, method_name) do |*args|
                 if args.length > 1

data/lib/google/api_client/service_account.rb

@@ -16,3 +16,6 @@ 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'
+require 'google/api_client/auth/storage'
+require 'google/api_client/auth/storages/redis_store'
+require 'google/api_client/auth/storages/file_store'

data/lib/google/api_client/version.rb

@@ -13,19 +13,14 @@
 # limitations under the License.
 
 
-# Used to prevent the class/module from being loaded more than once
-if !defined?(::Google::APIClient::VERSION)
-
-
-  module Google
-    class APIClient
-      module VERSION
-        MAJOR = 0
-        MINOR = 7
-        TINY  = 1
-        PATCH = nil
-        STRING = [MAJOR, MINOR, TINY, PATCH].compact.join('.')
-      end
+module Google
+  class APIClient
+    module VERSION
+      MAJOR = 0
+      MINOR = 8
+      TINY  = 0
+      PATCH = nil
+      STRING = [MAJOR, MINOR, TINY, PATCH].compact.join('.')
     end
   end
 end

data/spec/google/api_client/auth/storage_spec.rb

@@ -0,0 +1,122 @@
+require 'spec_helper'
+
+require 'google/api_client'
+require 'google/api_client/version'
+
+describe Google::APIClient::Storage do
+  let(:client) { Google::APIClient.new(:application_name => 'API Client Tests') }
+  let(:root_path) { File.expand_path(File.join(__FILE__, '..', '..', '..')) }
+  let(:json_file) { File.expand_path(File.join(root_path, 'fixtures', 'files', 'auth_stored_credentials.json')) }
+
+  let(:store) { double }
+  let(:client_stub) { double }
+  subject { Google::APIClient::Storage.new(store) }
+
+  describe 'authorize' do
+    it 'should authorize' do
+      expect(subject).to respond_to(:authorization)
+      expect(subject.store).to be == store
+    end
+  end
+
+  describe 'authorize' do
+    describe 'with credentials' do
+
+      it 'should initialize a new OAuth Client' do
+        expect(subject).to receive(:load_credentials).and_return({:first => 'a dummy'})
+        expect(client_stub).to receive(:issued_at=)
+        expect(client_stub).to receive(:expired?).and_return(false)
+        expect(Signet::OAuth2::Client).to receive(:new).and_return(client_stub)
+        expect(subject).not_to receive(:refresh_authorization)
+        subject.authorize
+      end
+
+      it 'should refresh authorization' do
+        expect(subject).to receive(:load_credentials).and_return({:first => 'a dummy'})
+        expect(client_stub).to receive(:issued_at=)
+        expect(client_stub).to receive(:expired?).and_return(true)
+        expect(Signet::OAuth2::Client).to receive(:new).and_return(client_stub)
+        expect(subject).to receive(:refresh_authorization)
+        auth = subject.authorize
+        expect(auth).to be == subject.authorization
+        expect(auth).not_to be_nil
+      end
+    end
+
+    describe 'without credentials' do
+
+      it 'should return nil' do
+        expect(subject.authorization).to be_nil
+        expect(subject).to receive(:load_credentials).and_return({})
+        expect(subject.authorize).to be_nil
+        expect(subject.authorization).to be_nil
+      end
+    end
+  end
+
+  describe 'write_credentials' do
+    it 'should call store to write credentials' do
+      authorization_stub = double
+      expect(authorization_stub).to receive(:refresh_token).and_return(true)
+      expect(subject).to receive(:credentials_hash)
+      expect(subject.store).to receive(:write_credentials)
+      subject.write_credentials(authorization_stub)
+      expect(subject.authorization).to be == authorization_stub
+    end
+
+    it 'should not call store to write credentials' do
+      expect(subject).not_to receive(:credentials_hash)
+      expect(subject.store).not_to receive(:write_credentials)
+      expect {
+        subject.write_credentials()
+      }.not_to raise_error
+    end
+    it 'should not call store to write credentials' do
+      expect(subject).not_to receive(:credentials_hash)
+      expect(subject.store).not_to receive(:write_credentials)
+      expect {
+        subject.write_credentials('something')
+      }.not_to raise_error
+    end
+
+  end
+
+  describe 'refresh_authorization' do
+    it 'should call refresh and write credentials' do
+      expect(subject).to receive(:write_credentials)
+      authorization_stub = double
+      expect(subject).to receive(:authorization).and_return(authorization_stub)
+      expect(authorization_stub).to receive(:refresh!).and_return(true)
+      subject.refresh_authorization
+    end
+  end
+
+  describe 'load_credentials' do
+    it 'should call store to load credentials' do
+      expect(subject.store).to receive(:load_credentials)
+      subject.send(:load_credentials)
+    end
+  end
+
+  describe 'credentials_hash' do
+    it 'should return an hash' do
+      authorization_stub = double
+      expect(authorization_stub).to receive(:access_token)
+      expect(authorization_stub).to receive(:client_id)
+      expect(authorization_stub).to receive(:client_secret)
+      expect(authorization_stub).to receive(:expires_in)
+      expect(authorization_stub).to receive(:refresh_token)
+      expect(authorization_stub).to receive(:issued_at).and_return('100')
+      allow(subject).to receive(:authorization).and_return(authorization_stub)
+      credentials = subject.send(:credentials_hash)
+      expect(credentials).to include(:access_token)
+      expect(credentials).to include(:authorization_uri)
+      expect(credentials).to include(:client_id)
+      expect(credentials).to include(:client_secret)
+      expect(credentials).to include(:expires_in)
+      expect(credentials).to include(:refresh_token)
+      expect(credentials).to include(:token_credential_uri)
+      expect(credentials).to include(:issued_at)
+    end
+  end
+end

data/spec/google/api_client/auth/storages/file_store_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+require 'google/api_client'
+require 'google/api_client/version'
+
+describe Google::APIClient::FileStore do
+  let(:root_path) { File.expand_path(File.join(__FILE__, '..','..','..', '..','..')) }
+  let(:json_file) { File.expand_path(File.join(root_path, 'fixtures', 'files', 'auth_stored_credentials.json')) }
+
+  let(:credentials_hash) {{
+      "access_token"=>"my_access_token",
+      "authorization_uri"=>"https://accounts.google.com/o/oauth2/auth",
+      "client_id"=>"123456_test_client_id@.apps.googleusercontent.com",
+      "client_secret"=>"123456_client_secret",
+      "expires_in"=>3600,
+      "refresh_token"=>"my_refresh_token",
+      "token_credential_uri"=>"https://accounts.google.com/o/oauth2/token",
+      "issued_at"=>1384440275
+  }}
+
+  subject{Google::APIClient::FileStore.new('a file path')}
+
+  it 'should have a path' do
+    expect(subject.path).to be == 'a file path'
+    subject.path = 'an other file path'
+    expect(subject.path).to be == 'an other file path'
+  end
+
+  it 'should load credentials' do
+    subject.path = json_file
+    credentials = subject.load_credentials
+    expect(credentials).to include('access_token', 'authorization_uri', 'refresh_token')
+  end
+
+  it 'should write credentials' do
+    io_stub = StringIO.new
+    expect(subject).to receive(:open).and_return(io_stub)
+    subject.write_credentials(credentials_hash)
+  end
+end

data/spec/google/api_client/auth/storages/redis_store_spec.rb

@@ -0,0 +1,70 @@
+require 'spec_helper'
+
+require 'google/api_client'
+require 'google/api_client/version'
+
+
+describe Google::APIClient::RedisStore do
+  let(:root_path) { File.expand_path(File.join(__FILE__, '..', '..', '..', '..', '..')) }
+  let(:json_file) { File.expand_path(File.join(root_path, 'fixtures', 'files', 'auth_stored_credentials.json')) }
+  let(:redis) {double}
+
+  let(:credentials_hash) { {
+      "access_token" => "my_access_token",
+      "authorization_uri" => "https://accounts.google.com/o/oauth2/auth",
+      "client_id" => "123456_test_client_id@.apps.googleusercontent.com",
+      "client_secret" => "123456_client_secret",
+      "expires_in" => 3600,
+      "refresh_token" => "my_refresh_token",
+      "token_credential_uri" => "https://accounts.google.com/o/oauth2/token",
+      "issued_at" => 1384440275
+  } }
+
+  subject { Google::APIClient::RedisStore.new('a redis instance') }
+
+  it 'should have a redis instance' do
+    expect(subject.redis).to be == 'a redis instance'
+    subject.redis = 'an other redis instance'
+    expect(subject.redis).to be == 'an other redis instance'
+  end
+
+  describe 'load_credentials' do
+
+    it 'should load credentials' do
+      subject.redis= redis
+      expect(redis).to receive(:get).and_return(credentials_hash.to_json)
+      expect(subject.load_credentials).to be == credentials_hash
+    end
+
+    it 'should return nil' do
+      subject.redis= redis
+      expect(redis).to receive(:get).and_return(nil)
+      expect(subject.load_credentials).to be_nil
+    end
+  end
+
+  describe 'redis_credentials_key' do
+    context 'without given key' do
+      it 'should return default key' do
+        expect(subject.redis_credentials_key).to be == "google_api_credentials"
+      end
+    end
+    context 'with given key' do
+      let(:redis_store) { Google::APIClient::RedisStore.new('a redis instance', 'another_google_api_credentials') }
+      it 'should use given key' do
+        expect(redis_store.redis_credentials_key).to be == "another_google_api_credentials"
+      end
+    end
+
+  end
+
+  describe 'write credentials' do
+
+    it 'should write credentials' do
+      subject.redis= redis
+      expect(redis).to receive(:set).and_return('ok')
+      expect(subject.write_credentials(credentials_hash)).to be_truthy
+    end
+  end
+
+end

data/spec/google/api_client/batch_spec.rb

@@ -14,9 +14,8 @@
 
 require 'spec_helper'
 require 'google/api_client'
-require 'google/api_client/version'
 
-describe Google::APIClient::BatchRequest do
+RSpec.describe Google::APIClient::BatchRequest do
   CLIENT = Google::APIClient.new(:application_name => 'API Client Tests') unless defined?(CLIENT)
 
   after do
@@ -28,9 +27,9 @@ describe Google::APIClient::BatchRequest do
   it 'should raise an error if making an empty batch request' do
     batch = Google::APIClient::BatchRequest.new
 
-    (lambda do
+    expect(lambda do
       CLIENT.execute(batch)
-    end).should raise_error(Google::APIClient::BatchError)
+    end).to raise_error(Google::APIClient::BatchError)
   end
 
   it 'should allow query parameters in batch requests' do
@@ -39,7 +38,7 @@ describe Google::APIClient::BatchRequest do
       'a' => '12345'
     })
     method, uri, headers, body = batch.to_http_request
-    body.read.should include("/?a=12345")
+    expect(body.read).to include("/?a=12345")
   end
 
   describe 'with the discovery API' do
@@ -73,8 +72,8 @@ describe Google::APIClient::BatchRequest do
         expected_ids = ids.clone
         batch = Google::APIClient::BatchRequest.new do |result|
           block_called += 1
-          result.status.should == 200
-          expected_ids.should include(result.response.call_id)
+          expect(result.status).to eq(200)
+          expect(expected_ids).to include(result.response.call_id)
           expected_ids.delete(result.response.call_id)
         end
 
@@ -82,7 +81,7 @@ describe Google::APIClient::BatchRequest do
         batch.add(@call2, ids[1])
 
         CLIENT.execute(batch)
-        block_called.should == 2
+        expect(block_called).to eq(2)
       end
 
       it 'should execute both when using individual callbacks' do
@@ -91,25 +90,25 @@ describe Google::APIClient::BatchRequest do
         call1_returned, call2_returned = false, false
         batch.add(@call1) do |result|
           call1_returned = true
-          result.status.should == 200
+          expect(result.status).to eq(200)
         end
         batch.add(@call2) do |result|
           call2_returned = true
-          result.status.should == 200
+          expect(result.status).to eq(200)
         end
 
         CLIENT.execute(batch)
-        call1_returned.should == true
-        call2_returned.should == true
+        expect(call1_returned).to be_truthy
+        expect(call2_returned).to be_truthy
       end
 
       it 'should raise an error if using the same call ID more than once' do
         batch = Google::APIClient::BatchRequest.new
 
-        (lambda do
+        expect(lambda do
           batch.add(@call1, 'my_id')
           batch.add(@call2, 'my_id')
-        end).should raise_error(Google::APIClient::BatchError)
+        end).to raise_error(Google::APIClient::BatchError)
       end
     end
 
@@ -138,13 +137,13 @@ describe Google::APIClient::BatchRequest do
         expected_ids = ids.clone
         batch = Google::APIClient::BatchRequest.new do |result|
           block_called += 1
-          expected_ids.should include(result.response.call_id)
+          expect(expected_ids).to include(result.response.call_id)
           expected_ids.delete(result.response.call_id)
           if result.response.call_id == ids[0]
-            result.status.should == 200
+            expect(result.status).to eq(200)
           else
-            result.status.should >= 400
-            result.status.should < 500
+            expect(result.status).to be >= 400
+            expect(result.status).to be < 500
           end
         end
 
@@ -152,7 +151,7 @@ describe Google::APIClient::BatchRequest do
         batch.add(@call2, ids[1])
 
         CLIENT.execute(batch)
-        block_called.should == 2
+        expect(block_called).to eq(2)
       end
 
       it 'should execute both when using individual callbacks' do
@@ -161,17 +160,17 @@ describe Google::APIClient::BatchRequest do
         call1_returned, call2_returned = false, false
         batch.add(@call1) do |result|
           call1_returned = true
-          result.status.should == 200
+          expect(result.status).to eq(200)
         end
         batch.add(@call2) do |result|
           call2_returned = true
-          result.status.should >= 400
-          result.status.should < 500
+          expect(result.status).to be >= 400
+          expect(result.status).to be < 500
         end
 
         CLIENT.execute(batch)
-        call1_returned.should == true
-        call2_returned.should == true
+        expect(call1_returned).to be_truthy
+        expect(call2_returned).to be_truthy
       end
     end
   end
@@ -236,12 +235,12 @@ describe Google::APIClient::BatchRequest do
         batch.add(@call1, '1').add(@call2, '2')
         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'
-        request[:request_headers]['Content-Type'].should == "multipart/mixed;boundary=#{boundary}"
-        # TODO - Fix headers
-        #expected_body = /--#{Regexp.escape(boundary)}\nContent-Type: +application\/http\nContent-ID: +<[\w-]+\+1>\n\nPOST +https:\/\/www.googleapis.com\/calendar\/v3\/calendars\/myemail@mydomain.tld\/events +HTTP\/1.1\nContent-Type: +application\/json\n\n#{Regexp.escape(@call1[:body])}\n\n--#{boundary}\nContent-Type: +application\/http\nContent-ID: +<[\w-]+\+2>\n\nPOST +https:\/\/www.googleapis.com\/calendar\/v3\/calendars\/myemail@mydomain.tld\/events HTTP\/1.1\nContent-Type: +application\/json\n\n#{Regexp.escape(@call2[:body])}\n\n--#{Regexp.escape(boundary)}--/
-        #request[:body].read.gsub("\r", "").should =~ expected_body
+        expect(request[:method].to_s.downcase).to eq('post')
+        expect(request[:url].to_s).to eq('https://www.googleapis.com/batch')
+        expect(request[:request_headers]['Content-Type']).to eq("multipart/mixed;boundary=#{boundary}")
+        body = request[:body].read
+        expect(body).to include(@call1[:body])
+        expect(body).to include(@call2[:body])
       end
     end