google-api-client 0.9.pre3 → 0.9.pre4

data/lib/google/apis/generator/annotator.rb

@@ -97,11 +97,20 @@ module Google
         #  Fragment of the discovery doc describing the method
         def infer_method_name_for_rpc(method)
           return nil if method.request.nil?
-          verb = ActiveSupport::Inflector.underscore(method.id.split('.').last)
+          parts = method.id.split('.')
+          parts.shift
+          verb = ActiveSupport::Inflector.underscore(parts.pop)
           match = method.request._ref.match(/(.*)(?i:request)/)
           return nil if match.nil?
           name = ActiveSupport::Inflector.underscore(match[1])
           return nil unless name == verb || name.start_with?(verb + '_')
+          if !parts.empty?
+            resource_name = ActiveSupport::Inflector.singularize(parts.pop)
+            resource_name = ActiveSupport::Inflector.underscore(resource_name)
+            if !name.include?(resource_name)
+              name = name.split('_').insert(1, resource_name).join('_')
+            end
+          end
           name
         end
 
@@ -112,17 +121,24 @@ module Google
         def infer_method_name_from_id(method)
           parts = method.id.split('.')
           parts.shift
-          verb = parts.pop
-          return ActiveSupport::Inflector.underscore(verb) if parts.empty?
-          resource_name = parts.pop
-          method_name = verb + '_'
-          method_name += parts.map { |p| ActiveSupport::Inflector.singularize(p) }.join('_') + '_' unless parts.empty?
+          verb = ActiveSupport::Inflector.underscore(parts.pop)
+          return verb if parts.empty?
+          resource_name = ActiveSupport::Inflector.underscore(parts.pop)
           if pluralize_method?(verb)
-            method_name += ActiveSupport::Inflector.pluralize(resource_name)
+            resource_name = ActiveSupport::Inflector.pluralize(resource_name)
           else
-            method_name += ActiveSupport::Inflector.singularize(resource_name)
+            resource_name = ActiveSupport::Inflector.singularize(resource_name)
           end
-          ActiveSupport::Inflector.underscore(method_name)
+          if parts.empty?
+            resource_path = resource_name
+          else
+            resource_path = parts.map do |p|
+              p = ActiveSupport::Inflector.singularize(p)
+              ActiveSupport::Inflector.underscore(p)
+            end.join('_') + '_' + resource_name
+          end
+          method_name = verb.split('_').insert(1, resource_path.split('_')).join('_')
+          method_name
         end
       end
 
@@ -260,7 +276,10 @@ module Google
 
         def check_duplicate_method(m)
           if @all_methods.include?(m.generated_name)
-            logger.error { sprintf('Duplicate method %s generated', m.generated_name) }
+            logger.error do
+              sprintf('Duplicate method %s generated, path %s',
+                m.generated_name, @names.key)
+            end
             fail 'Duplicate name generated'
           end
           @all_methods[m.generated_name] = m

data/lib/google/apis/generator/helpers.rb

@@ -6,7 +6,7 @@ module Google
       module NameHelpers
         KEYWORDS = %w(__ENCODING__ def in self __LINE__ defined? module super __FILE__ do next then BEGIN
                       else nil true END elsif not undef alias end or unless and ensure redo until begin
-                      false rescue when break for retry while case if return yield class)
+                      false rescue when break for retry while case if return yield class command)
         PLURAL_METHODS = %w(list search)
 
         # Check to see if the method name should be plauralized

data/lib/google/apis/generator/templates/_method.tmpl

@@ -50,24 +50,23 @@
 # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification
 # @raise [Google::Apis::AuthorizationError] Authorization is required
 def <%= api_method.generated_name %>(<% for param in api_method.required_parameters %><%= param.generated_name %>, <% end %><% if api_method.request %><%= api.schemas[api_method.request._ref].generated_name %>_object = nil, <% end %><% for param in api_method.optional_query_parameters %><%= param.generated_name %>: nil, <% end %><% for param in api.parameters.values.reject {|p| p.name == 'key'} %><%= param.generated_name %>: nil, <% end %><% if api_method.supports_media_upload? %>upload_source: nil, content_type: nil, <% elsif api_method.supports_media_download? %>download_dest: nil, <%  end  %>options: nil, &block)
-  path = '<%= api_method.path %>'
 <% if api_method.supports_media_upload? -%>
   if upload_source.nil?
-    command =  make_simple_command(:<%= api_method.http_method.downcase %>, path, options)
+    command =  make_simple_command(:<%= api_method.http_method.downcase %>, '<%= api_method.path %>', options)
   else
-    command = make_upload_command(:<%= api_method.http_method.downcase %>, path, options)
+    command = make_upload_command(:<%= api_method.http_method.downcase %>, '<%= api_method.path %>', options)
     command.upload_source = upload_source
     command.upload_content_type = content_type
   end
 <% elsif api_method.supports_media_download? -%>
   if download_dest.nil?
-    command =  make_simple_command(:<%= api_method.http_method.downcase %>, path, options)
+    command =  make_simple_command(:<%= api_method.http_method.downcase %>, '<%= api_method.path %>', options)
   else
-    command = make_download_command(:<%= api_method.http_method.downcase %>, path, options)
+    command = make_download_command(:<%= api_method.http_method.downcase %>, '<%= api_method.path %>', options)
     command.download_dest = download_dest
   end
 <% else -%>
-  command =  make_simple_command(:<%= api_method.http_method.downcase %>, path, options)
+  command =  make_simple_command(:<%= api_method.http_method.downcase %>, '<%= api_method.path %>', options)
 <% end -%>
 <% if api_method.request -%>
   command.request_representation = <%= api.schemas[api_method.request._ref].generated_type %>::Representation

data/lib/google/apis/options.rb

@@ -24,7 +24,8 @@ module Google
       :authorization,
       :retries,
       :header,
-      :timeout_sec)
+      :timeout_sec,
+      :open_timeout_sec)
 
     # General client options
     class ClientOptions
@@ -44,12 +45,14 @@ module Google
 
     # Request options
     class RequestOptions
-      # @!attribute [rw] credentials
+      # @!attribute [rw] authorization
       #   @return [Signet::OAuth2::Client, #apply(Hash)] OAuth2 credentials
       # @!attribute [rw] retries
       #   @return [Fixnum] Number of times to retry requests on server error
       # @!attribute [rw] timeout_sec
       #   @return [Fixnum] How long, in seconds, before requests time out
+      # @!attribute [rw] open_timeout_sec
+      #   @return [Fixnum] How long, in seconds, before failed connections time out
       # @!attribute [rw] header
       #   @return [Hash<String,String] Additional HTTP headers to include in requests
 
@@ -63,7 +66,7 @@ module Google
         return self if options.nil?
 
         new_options = dup
-        %w(authorization retries timeout_sec).each do |opt|
+        members.each do |opt|
           opt = opt.to_sym
           new_options[opt] = options[opt] unless options[opt].nil?
         end
@@ -75,5 +78,6 @@ module Google
     ClientOptions.default.application_version = '0.0.0'
 
     RequestOptions.default.retries = 0
+    RequestOptions.default.open_timeout_sec = 20
   end
 end

data/lib/google/apis/version.rb

@@ -15,7 +15,7 @@
 module Google
   module Apis
     # Client library version
-    VERSION = '0.9.pre3'
+    VERSION = '0.9.pre4'
 
     # Current operating system
     # @private

data/samples/calendar/calendar.rb

@@ -33,7 +33,7 @@ puts "Created event '#{event.summary}' (#{event.id})"
 events = calendar.list_events('primary', max_results: 10, single_events: true,
                               order_by: 'startTime', time_min: Time.now.iso8601)
 puts "Upcoming events:"
-events.items.each do |evt|
+events.items.each do |event|
   start = event.start.date || event.start.date_time
   puts "- #{event.summary} (#{start}) (ID: #{event.id})"
 end

data/samples/drive/drive.rb

@@ -12,6 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# Pass all auth variables to .env file
+# Read more about auth on https://developers.google.com/drive/web/about-auth
+# For example, in my case I added GOOGLE_APPLICATION_CREDENTIALS=credentials.json
+
+require 'dotenv'
+Dotenv.load
+
 require 'tempfile'
 require 'googleauth'
 require 'google/apis/drive_v2'
@@ -22,7 +29,7 @@ drive = Drive::DriveService.new
 drive.authorization = Google::Auth.get_application_default([Drive::AUTH_DRIVE])
 
 # Insert a file
-file = drive.insert_file({title: 'drive.rb'}, upload_source: 'drive.rb')
+file = drive.insert_file({title: 'drive.rb'}, upload_source: __FILE__)
 puts "Created file #{file.title} (#{file.id})"
 
 # Search for it
@@ -37,4 +44,4 @@ tmp = drive.get_file(file.id, download_dest: Tempfile.new('drive'))
 
 # Delete it
 drive.delete_file(file.id)
-puts "File deleted"
+puts "File deleted"

data/samples/pubsub/pubsub.rb

@@ -13,9 +13,9 @@
 # limitations under the License.
 
 require 'googleauth'
-require 'google/apis/pubsub_v1beta2'
+require 'google/apis/pubsub_v1'
 
-Pubsub = Google::Apis::PubsubV1beta2
+Pubsub = Google::Apis::PubsubV1
 
 pubsub = Pubsub::PubsubService.new
 pubsub.authorization = Google::Auth.get_application_default([Pubsub::AUTH_PUBSUB])
@@ -33,10 +33,10 @@ pubsub.create_subscription(subscription, Pubsub::Subscription.new(topic: topic))
 request = Pubsub::PublishRequest.new(messages: [])
 request.messages << Pubsub::Message.new(attributes: { "language" => "en" }, data: 'Hello')
 request.messages << Pubsub::Message.new(attributes: { "language" => "en" }, data: 'World')
-pubsub.publish(topic, request)
+pubsub.publish_topic(topic, request)
 
 # Pull messages
-response = pubsub.pull(subscription, Pubsub::PullRequest.new(max_messages: 5))
+response = pubsub.pull_subscription(subscription, Pubsub::PullRequest.new(max_messages: 5))
 response.received_messages.each do |received_message|
   data = received_message.message.data
   puts "Received #{data}"
@@ -44,9 +44,8 @@ end
 
 # Acknowledge receipt
 ack_ids = response.received_messages.map{ |msg| msg.ack_id }
-pubsub.acknowledge(subscription, Pubsub::AcknowledgeRequest.new(ack_ids: ack_ids))
+pubsub.acknowledge_subscription(subscription, Pubsub::AcknowledgeRequest.new(ack_ids: ack_ids))
 
 # Delete the subscription & topic
 pubsub.delete_subscription(subscription)
 pubsub.delete_topic(topic)
-

data/samples/translate/translate.rb

@@ -12,11 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'tempfile'
-require 'googleauth'
-require 'google/apis/translate_v2'
 
-Google::Apis.logger.level = Logger::DEBUG
+require 'google/apis/translate_v2'
 
 Translate = Google::Apis::TranslateV2
 
@@ -25,4 +22,3 @@ translate.key = ARGV[0] || 'YOUR_API_KEY'
 
 result = translate.list_translations(source: 'en', target: 'es', q: 'Hello world!')
 puts result.translations.first.translated_text
-

data/script/generate

@@ -7,12 +7,14 @@ DIR=$(dirname $( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ))
 APIS=(adexchangebuyer:v1.3 \
 	adexchangeseller:v2.0 \
 	admin:directory_v1 \
+  admin:datatransfer_v1 \
 	admin:reports_v1 \
 	adsense:v1.4 \
 	adsensehost:v4.1 \
 	analytics:v3 \
 	androidenterprise:v1 \
 	androidpublisher:v2 \
+  appengine:v1beta4 \
 	appsactivity:v1 \
 	appstate:v1 \
 	autoscaler:v1beta2 \
@@ -21,33 +23,40 @@ APIS=(adexchangebuyer:v1.3 \
 	books:v1 \
 	calendar:v3 \
 	civicinfo:v2 \
-	classroom:v1beta1 \
+	classroom:v1 \
+  cloudbilling:v1 \
+  clouddebugger:v2 \
   cloudmonitoring:v2beta2 \
 	cloudresourcemanager:v1beta1 \
+  cloudtrace:v1 \
+	clouduseraccounts:beta \
 	compute:v1 \
+	compute:beta \
 	container:v1 \
 	content:v2 \
 	coordinate:v1 \
 	customsearch:v1 \
 	datastore:v1beta2 \
-	deploymentmanager:v2beta2 \
+  deploymentmanager:v2 \
 	dfareporting:v2.1 \
 	discovery:v1 \
 	dns:v1 \
 	doubleclickbidmanager:v1 \
 	doubleclicksearch:v2 \
 	drive:v2 \
+	drive:v3 \
 	fitness:v1 \
 	fusiontables:v2 \
 	games:v1 \
 	gamesConfiguration:v1configuration \
-	gamesConfiguration:v1management \
+	gamesManagement:v1management \
 	gan:v1beta1 \
 	genomics:v1 \
 	gmail:v1 \
 	groupsmigration:v1 \
 	groupssettings:v1 \
 	identitytoolkit:v3 \
+	kgsearch:v1 \
 	licensing:v1 \
 	logging:v1beta3 \
 	manager:v1beta2 \
@@ -55,18 +64,22 @@ APIS=(adexchangebuyer:v1.3 \
 	mirror:v1 \
 	oauth2:v2 \
 	pagespeedonline:v2 \
+  partners:v2 \
 	plus:v1 \
 	plusDomains:v1 \
 	prediction:v1.6 \
-	pubsub:v1beta2 \
+  proximitybeacon:v1beta1 \
+	pubsub:v1 \
 	qpxExpress:v1 \
 	replicapool:v1beta2 \
 	replicapoolupdater:v1beta1 \
 	reseller:v1 \
 	resourceviews:v1beta2 \
+	script:v1 \
 	siteVerification:v1 \
 	sqladmin:v1beta4 \
 	storage:v1 \
+	storagetransfer:v1 \
 	tagmanager:v1 \
 	taskqueue:v1beta2 \
 	tasks:v1 \
@@ -75,6 +88,8 @@ APIS=(adexchangebuyer:v1.3 \
 	webmasters:v3 \
 	youtube:v3 \
 	youtubeAnalytics:v1 \
+	youtubereporting:v1 \
 )
 
-echo 'a' | bundle exec bin/generate-api gen generated --names_out=$DIR/api_names_out.yaml --id=${APIS[*]}
+
+echo 'a' | bundle exec bin/generate-api gen generated --from-discovery=true --names_out=$DIR/api_names_out.yaml --url='https://content.googleapis.com/discovery/v1/apis/compute/beta/rest'  --id=${APIS[*]}

data/spec/fixtures/files/invalid.json

@@ -0,0 +1 @@
+{"invalid"}

data/spec/google/api_client/client_secrets_spec.rb

@@ -48,6 +48,43 @@ RSpec.describe Google::APIClient::ClientSecrets do
         expect(hash["installed"]["client_secret"]).to be == 'i8YaXdGgiQ4_KrTVNGsB7QP1'
       end
 
+      it 'should remove empty value' do
+        expect(hash["installed"]["redirect_uris"]).to be nil
+      end
+
+      it 'should remove nil values' do
+        expect(hash["installed"]["issued_at"]).to be nil
+      end
+    end
+  end
+
+  context 'with no existing JSON file' do
+    it 'should raise exception' do
+      file = File.join(FIXTURES_PATH, 'files', 'no_file.json')
+      expect { Google::APIClient::ClientSecrets.load(file) }.to raise_exception(Errno::ENOENT)
+    end
+  end
+
+  context 'with invalid JSON file' do
+    it 'should raise exception' do
+      file = File.join(FIXTURES_PATH, 'files', 'invalid.json')
+      expect { Google::APIClient::ClientSecrets.load(file) }.to raise_exception(MultiJson::ParseError)
     end
   end
-end
+
+  context 'with folder name, which have json file in parents' do
+    it 'should load the correct client id' do
+      folder = File.join(FIXTURES_PATH, 'files', 'child')
+      secrets = Google::APIClient::ClientSecrets.load(folder)
+      expect(secrets.client_id).to be == '898243283568.apps.googleusercontent.com'
+    end
+  end
+
+  context 'with folder wihout client_secrets.json' do
+    it "should raise exception", fakefs: true do
+      FileUtils.mkdir("/tmp")
+      expect { Google::APIClient::ClientSecrets.load('/tmp') }.to raise_exception(ArgumentError)
+    end
+  end
+
+end

data/spec/google/apis/core/batch_spec.rb

@@ -42,9 +42,12 @@ RSpec.describe Google::Apis::Core::BatchCommand do
   end
 
   before(:example) do
+    allow(SecureRandom).to receive(:uuid).and_return('ffe23d1b-e8f7-47f5-8c01-2a30cf8ecb8f')
+
     response = <<EOF
 --batch123
 Content-Type: application/http
+Content-ID: <response-ffe23d1b-e8f7-47f5-8c01-2a30cf8ecb8f+0>
 
 HTTP/1.1 200 OK
 Content-Type: text/plain; charset=UTF-8
@@ -52,18 +55,20 @@ Content-Type: text/plain; charset=UTF-8
 Hello
 --batch123
 Content-Type: application/http
+Content-ID: <response-ffe23d1b-e8f7-47f5-8c01-2a30cf8ecb8f+2>
 
-HTTP/1.1 200 OK
+HTTP/1.1 500 Server Error
 Content-Type: text/plain; charset=UTF-8
 
-world
+Error!
 --batch123
 Content-Type: application/http
+Content-ID: <response-ffe23d1b-e8f7-47f5-8c01-2a30cf8ecb8f+1>
 
-HTTP/1.1 500 Server Error
+HTTP/1.1 200 OK
 Content-Type: text/plain; charset=UTF-8
 
-Error!
+world
 --batch123--
 EOF
     stub_request(:post, 'https://www.googleapis.com/batch')
@@ -80,6 +85,7 @@ EOF
     expected_body = <<EOF.gsub(/\n/, "\r\n")
 --RubyApiBatchRequest
 Content-Length: 58
+Content-ID: <ffe23d1b-e8f7-47f5-8c01-2a30cf8ecb8f+0>
 Content-Type: application/http
 Content-Transfer-Encoding: binary
 
@@ -89,6 +95,7 @@ Host: www.googleapis.com
 
 --RubyApiBatchRequest
 Content-Length: 96
+Content-ID: <ffe23d1b-e8f7-47f5-8c01-2a30cf8ecb8f+1>
 Content-Type: application/http
 Content-Transfer-Encoding: binary
 
@@ -99,6 +106,7 @@ Host: www.googleapis.com
 Hello world
 --RubyApiBatchRequest
 Content-Length: 93
+Content-ID: <ffe23d1b-e8f7-47f5-8c01-2a30cf8ecb8f+2>
 Content-Type: application/http
 Content-Transfer-Encoding: binary
 
@@ -115,11 +123,17 @@ EOF
 
   it 'should send decode responses' do
     expect do |b|
-      command.add(get_command, &b)
-      command.add(post_with_string_command, &b)
-      command.add(post_with_io_command, &b)
+      command.add(get_command) do |res, err|
+        b.to_proc.call(1, res, err)
+      end
+      command.add(post_with_string_command) do |res, err|
+        b.to_proc.call(2, res, err)
+      end
+      command.add(post_with_io_command) do |res, err|
+        b.to_proc.call(3, res, err)
+      end
       command.execute(client)
-    end.to yield_successive_args(['Hello', nil], ['world', nil], [nil, an_instance_of(Google::Apis::ServerError)])
+    end.to yield_successive_args([1, 'Hello', nil], [3, nil, an_instance_of(Google::Apis::ServerError)], [2, 'world', nil],)
   end
 
   it 'should raise error if batch is empty' do