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

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

@@ -272,4 +272,13 @@ RSpec.describe Google::Apis::Core::HttpCommand do
     command.query['a'] = [1,2,3]
     command.execute(client)
   end
+
+  it 'should send falsey query parameters' do
+    stub_request(:get, 'https://www.googleapis.com/zoo/animals?a=0&b=false')
+      .to_return(status: [200, ''])
+    command = Google::Apis::Core::HttpCommand.new(:get, 'https://www.googleapis.com/zoo/animals')
+    command.query['a'] = 0
+    command.query['b'] = false
+    command.execute(client)
+  end
 end

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

@@ -129,6 +129,20 @@ RSpec.describe Google::Apis::Core::RawUploadCommand do
     end
   end
 
+  context('with Tempfile input') do
+    let(:file) do
+      temp_file = Tempfile.new("tempfile")
+      temp_file.write("Hello world\n")
+      temp_file.rewind
+      temp_file
+    end
+    include_examples 'should upload'
+
+    it 'should not close stream' do
+      expect(file.closed?).to be false
+    end
+  end
+
   context('with file path input') do
     let(:file) { File.join(FIXTURES_DIR, 'files', 'test.txt') }
     include_examples 'should upload'

data/spec/google/apis/options_spec.rb

@@ -37,12 +37,4 @@ RSpec.describe Google::Apis::RequestOptions do
   it 'should allow nil in merge' do
     expect(options.merge(nil)).to be_an_instance_of(Google::Apis::RequestOptions)
   end
-
-  it 'should override default options' do
-    Google::Apis::RequestOptions.default.header = 'Content-Length: 50'
-    opts = Google::Apis::RequestOptions.new
-    opts.header = 'Content-Length: 70'
-    expect(options.merge(opts).header).to eq 'Content-Length: 70' 
-  end
-
 end

data/spec/integration_tests/adsense_spec.rb

@@ -15,6 +15,7 @@ RSpec.describe Google::Apis::AdsenseV1_4, :if => run_integration_tests? do
   end
 
   it 'should download a report with multiple dimensions' do
+    pending "Not enabled for test account"
     report = @adsense.generate_report( Date.today.to_s, Date.today.to_s, dimension: ["DATE", "AD_UNIT_NAME"] )
 
     report_header_names = report.headers.map { |h| h.name }

data/spec/integration_tests/pubsub_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
-require 'google/apis/pubsub_v1beta2'
+require 'google/apis/pubsub_v1'
 require 'googleauth'
 
-Pubsub = Google::Apis::PubsubV1beta2
+Pubsub = Google::Apis::PubsubV1
 
-RSpec.describe Google::Apis::PubsubV1beta2, :if => run_integration_tests? do
+RSpec.describe Google::Apis::PubsubV1, :if => run_integration_tests? do
 
   before(:context) do
     WebMock.allow_net_connect!

data/spec/integration_tests/url_shortener_spec.rb

@@ -1,3 +1,17 @@
+# Copyright 2015 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/apis/urlshortener_v1'
 require 'googleauth'

data/spec/spec_helper.rb

@@ -19,13 +19,8 @@ GENERATED_DIR = File.expand_path(File.join(ROOT_DIR, 'generated'))
 THIRD_PARTY_DIR = File.expand_path(File.join(ROOT_DIR, 'third_party'))
 FIXTURES_DIR = File.expand_path(File.join(SPEC_DIR, 'fixtures'))
 
-$LOAD_PATH.unshift(SPEC_DIR)
-$LOAD_PATH.unshift(LIB_DIR)
-$LOAD_PATH.unshift(GENERATED_DIR)
-$LOAD_PATH.unshift(THIRD_PARTY_DIR)
 $LOAD_PATH.uniq!
 
-
 if defined?(JRUBY_VERSION)
   puts 'Skipping coverage on JRuby'
 else
@@ -87,11 +82,12 @@ end
 # Enable retries for tests
 Google::Apis::RequestOptions.default.retries = 5
 
+# Allow testing different adapters
+Google::Apis::ClientOptions.default.use_net_http = true if ENV['USE_NET_HTTP']
 # Temporarily patch WebMock to allow chunked responses for Net::HTTP
 module Net
   module WebMockHTTPResponse
     def eval_chunk(chunk)
-      puts chunk.is_a? Exception
       chunk if chunk.is_a?(String)
       chunk.read if chunk.is_a?(IO)
       chunk.call if chunk.is_a?(Proc)
@@ -121,6 +117,37 @@ module Net
   end
 end
 
+class WebMockHTTPClient
+  def eval_chunk(chunk)
+    chunk if chunk.is_a?(String)
+    chunk.read if chunk.is_a?(IO)
+    chunk.call if chunk.is_a?(Proc)
+    fail HTTPClient::TimeoutError if chunk == ::Timeout::Error
+    fail chunk if chunk.is_a?(Class)
+    chunk
+  end
+
+  def build_httpclient_response(webmock_response, stream = false, req_header = nil, &block)
+    body = stream ? StringIO.new(webmock_response.body) : webmock_response.body
+    response = HTTP::Message.new_response(body, req_header)
+    response.header.init_response(webmock_response.status[0])
+    response.reason = webmock_response.status[1]
+    webmock_response.headers.to_a.each { |name, value| response.header.set(name, value) }
+
+    raise HTTPClient::TimeoutError if webmock_response.should_timeout
+    webmock_response.raise_error_if_any
+
+    body_parts = Array(webmock_response.body)
+    body_parts.each do |chunk|
+      chunk = eval_chunk(chunk)
+      block.call(response, chunk) if block
+    end
+
+    response
+  end
+end
+
+
 def run_integration_tests?
   ENV['GOOGLE_APPLICATION_CREDENTIALS'] && ENV['GOOGLE_PROJECT_ID']
 end

data/{samples/translate/translate.rb → spec/spec_helper/load_path_spec.rb}

@@ -12,13 +12,22 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'spec_helper'
 
-require 'google/apis/translate_v2'
+RSpec.describe $LOAD_PATH do
+  it('should contain SPEC_DIR') do
+    expect($LOAD_PATH).to include(SPEC_DIR)
+  end
 
-Translate = Google::Apis::TranslateV2
+  it('should contain LIB_DIR') do
+    expect($LOAD_PATH).to include(LIB_DIR)
+  end
 
-translate = Translate::TranslateService.new
-translate.key = ARGV[0] || 'YOUR_API_KEY'
+  it('should contain GENERATED_DIR') do
+    expect($LOAD_PATH).to include(GENERATED_DIR)
+  end
 
-result = translate.list_translations(source: 'en', target: 'es', q: 'Hello world!')
-puts result.translations.first.translated_text
+  it('should contain THIRD_PARTY_DIR') do
+    expect($LOAD_PATH).to include(THIRD_PARTY_DIR)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-api-client
 version: !ruby/object:Gem::Version
-  version: 0.9.pre4
+  version: 0.9.pre5
 platform: ruby
 authors:
 - Steven Bazyl
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-17 00:00:00.000000000 Z
+date: 2016-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: representable
@@ -139,6 +139,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: memoist
   requirement: !ruby/object:Gem::Requirement
@@ -551,6 +565,7 @@ files:
 - lib/google/apis/core/batch.rb
 - lib/google/apis/core/download.rb
 - lib/google/apis/core/hashable.rb
+- lib/google/apis/core/http_client_adapter.rb
 - lib/google/apis/core/http_command.rb
 - lib/google/apis/core/json_representation.rb
 - lib/google/apis/core/logging.rb
@@ -577,10 +592,17 @@ files:
 - rakelib/rubocop.rake
 - rakelib/spec.rake
 - rakelib/yard.rake
-- samples/calendar/calendar.rb
-- samples/drive/drive.rb
-- samples/pubsub/pubsub.rb
-- samples/translate/translate.rb
+- samples/Gemfile
+- samples/README.md
+- samples/google-api-samples
+- samples/lib/base_cli.rb
+- samples/lib/samples/analytics.rb
+- samples/lib/samples/calendar.rb
+- samples/lib/samples/drive.rb
+- samples/lib/samples/gmail.rb
+- samples/lib/samples/pubsub.rb
+- samples/lib/samples/translate.rb
+- samples/lib/samples/you_tube.rb
 - script/generate
 - script/package
 - script/release
@@ -613,6 +635,7 @@ files:
 - spec/integration_tests/pubsub_spec.rb
 - spec/integration_tests/url_shortener_spec.rb
 - spec/spec_helper.rb
+- spec/spec_helper/load_path_spec.rb
 - third_party/hurley_patches.rb
 homepage: https://github.com/google/google-api-ruby-client
 licenses:
@@ -670,4 +693,5 @@ test_files:
 - spec/integration_tests/pubsub_spec.rb
 - spec/integration_tests/url_shortener_spec.rb
 - spec/spec_helper.rb
+- spec/spec_helper/load_path_spec.rb
 has_rdoc: 

data/samples/calendar/calendar.rb

@@ -1,43 +0,0 @@
-# Copyright 2015 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 'googleauth'
-require 'google/apis/calendar_v3'
-
-Calendar = Google::Apis::CalendarV3
-
-calendar = Calendar::CalendarService.new
-calendar.authorization = Google::Auth.get_application_default([Calendar::AUTH_CALENDAR])
-
-# Create an event, adding any emails listed in the command line as attendees
-event = Calendar::Event.new(summary: 'A sample event',
-                            location: '1600 Amphitheatre Parkway, Mountain View, CA 94045',
-                            attendees: ARGV.map { |email| Calendar::EventAttendee.new(email: email) },
-                            start: Calendar::EventDateTime.new(date_time: DateTime.parse('2015-12-31T20:00:00')),
-                            end: Calendar::EventDateTime.new(date_time: DateTime.parse('2016-01-01T02:00:00')))
-event = calendar.insert_event('primary', event, send_notifications: true)
-puts "Created event '#{event.summary}' (#{event.id})"
-
-# List upcoming events
-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 |event|
-  start = event.start.date || event.start.date_time
-  puts "- #{event.summary} (#{start}) (ID: #{event.id})"
-end
-
-# Delete the event we created earlier
-calendar.delete_event('primary', event.id, send_notifications: true)
-puts "Event deleted"

data/samples/drive/drive.rb

@@ -1,47 +0,0 @@
-# Copyright 2015 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.
-
-# 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'
-
-Drive = Google::Apis::DriveV2
-
-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: __FILE__)
-puts "Created file #{file.title} (#{file.id})"
-
-# Search for it
-files = drive.list_files(q: "title = 'drive.rb'")
-puts "Search results:"
-files.items.each do |file|
-  puts "- File: #{file.title} (#{file.id})"
-end
-
-# Read it back
-tmp = drive.get_file(file.id, download_dest: Tempfile.new('drive'))
-
-# Delete it
-drive.delete_file(file.id)
-puts "File deleted"

data/samples/pubsub/pubsub.rb

@@ -1,51 +0,0 @@
-# Copyright 2015 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 'googleauth'
-require 'google/apis/pubsub_v1'
-
-Pubsub = Google::Apis::PubsubV1
-
-pubsub = Pubsub::PubsubService.new
-pubsub.authorization = Google::Auth.get_application_default([Pubsub::AUTH_PUBSUB])
-
-project = ARGV[0] || 'YOUR_PROJECT_NAME'
-
-topic = "projects/#{project}/topics/foo"
-subscription = "projects/#{project}/subscriptions/bar"
-
-# Create topic & subscription
-pubsub.create_topic(topic)
-pubsub.create_subscription(subscription, Pubsub::Subscription.new(topic: topic))
-
-# Publish messages
-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(topic, request)
-
-# Pull messages
-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}"
-end
-
-# Acknowledge receipt
-ack_ids = response.received_messages.map{ |msg| msg.ack_id }
-pubsub.acknowledge_subscription(subscription, Pubsub::AcknowledgeRequest.new(ack_ids: ack_ids))
-
-# Delete the subscription & topic
-pubsub.delete_subscription(subscription)
-pubsub.delete_topic(topic)