google-api-client 0.9.4 → 0.9.5

data/google-api-client.gemspec

@@ -17,6 +17,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib', 'generated', 'third_party']
 
+  spec.required_ruby_version = '~> 2.0'
+
   spec.add_runtime_dependency 'representable', '~> 2.3.0'
   spec.add_runtime_dependency 'retriable', '~> 2.0'
   spec.add_runtime_dependency 'addressable', '~> 2.3'

data/lib/google/apis.rb

@@ -39,10 +39,20 @@ module Google
       logger
     end
 
-    # Check to see if client is being used in a Rails environment and ge the logger if present
+    # Check to see if client is being used in a Rails environment and get the logger if present.
+    # Setting the ENV variable 'GOOGLE_API_USE_RAILS_LOGGER' to false will force the client
+    # to use its own logger.
+    #
     # @return [Logger]
     def self.rails_logger
-      ::Rails.logger if defined?(::Rails) && ::Rails.respond_to?(:logger) && ::Rails.logger
+      if 'true' == ENV.fetch('GOOGLE_API_USE_RAILS_LOGGER', 'true') &&
+          defined?(::Rails) &&
+          ::Rails.respond_to?(:logger) &&
+          !::Rails.logger.nil?
+        ::Rails.logger
+      else
+        nil
+      end
     end
   end
 end

data/lib/google/apis/version.rb

@@ -15,7 +15,7 @@
 module Google
   module Apis
     # Client library version
-    VERSION = '0.9.4'
+    VERSION = '0.9.5'
 
     # Current operating system
     # @private

data/script/generate

@@ -4,7 +4,7 @@
 
 DIR=$(dirname $( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ))
 
-APIS=(adexchangebuyer:v1.4 \
+API_IDS=(adexchangebuyer:v1.4 \
 	adexchangeseller:v2.0 \
 	admin:directory_v1 \
 	admin:datatransfer_v1 \
@@ -98,5 +98,8 @@ APIS=(adexchangebuyer:v1.4 \
 	youtubereporting:v1 \
 )
 
+URLS=(https://content.googleapis.com/discovery/v1/apis/youtubePartner/v1/rest \
+      https://content.googleapis.com/discovery/v1/apis/compute/beta/rest \
+)
 
-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[*]}
+echo 'a' | bundle exec bin/generate-api gen generated --from-discovery=true --names_out=$DIR/api_names_out.yaml --url=${URLS[*]}  --id=${API_IDS[*]}

data/spec/google/apis/logging_spec.rb

@@ -16,6 +16,7 @@ require 'spec_helper'
 require 'google/apis'
 require 'google/apis/core/logging'
 
+
 RSpec.describe Google::Apis do
   it 'should have a default logger' do
     expect(Google::Apis.logger).to be_an_instance_of(Logger)
@@ -40,6 +41,60 @@ RSpec.describe Google::Apis do
       Google::Apis.logger = Logger.new(STDERR)
       expect(service.logger).to be Google::Apis.logger
     end
+  end
+
+  context 'with Rails' do
+
+    before(:example) do
+      Google::Apis.logger = nil
+      Kernel.const_set('Rails', Module.new) unless defined?(::Rails)
+    end
+
+    let(:logger) { Logger.new(STDERR) }
+
+    let(:service) do
+      Class.new do
+        include Google::Apis::Core::Logging
+      end.new
+    end
+
+    context 'with logger present' do
+      before(:example) do
+        allow(::Rails).to receive(:logger).and_return(logger)
+      end
+
+      it 'should use the Rails logger' do
+        expect(service.logger).to be Rails.logger
+      end
+    end
+
+    context 'with ENV bypass' do
+      before(:example) do
+        allow(::Rails).to receive(:logger).and_return(logger)
+        allow(::ENV).to receive(:fetch).and_return('false')
+      end
+
+      it 'should use own logger' do
+        expect(service.logger).not_to be Rails.logger
+      end
 
+      it 'should have a logger' do
+        expect(service.logger).to be_an_instance_of(Logger)
+      end
+    end
+
+    context 'with logger not present' do
+      before(:example) do
+        allow(::Rails).to receive(:logger).and_return(nil)
+      end
+
+      it 'should use own logger' do
+        expect(service.logger).not_to be Rails.logger
+      end
+
+      it 'should have a logger' do
+        expect(service.logger).to be_an_instance_of(Logger)
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-api-client
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Steven Bazyl
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-11 00:00:00.000000000 Z
+date: 2016-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: representable
@@ -507,6 +507,10 @@ files:
 - generated/google/apis/script_v1/classes.rb
 - generated/google/apis/script_v1/representations.rb
 - generated/google/apis/script_v1/service.rb
+- generated/google/apis/sheets_v1.rb
+- generated/google/apis/sheets_v1/classes.rb
+- generated/google/apis/sheets_v1/representations.rb
+- generated/google/apis/sheets_v1/service.rb
 - generated/google/apis/site_verification_v1.rb
 - generated/google/apis/site_verification_v1/classes.rb
 - generated/google/apis/site_verification_v1/representations.rb
@@ -555,6 +559,10 @@ files:
 - generated/google/apis/youtube_analytics_v1/classes.rb
 - generated/google/apis/youtube_analytics_v1/representations.rb
 - generated/google/apis/youtube_analytics_v1/service.rb
+- generated/google/apis/youtube_partner_v1.rb
+- generated/google/apis/youtube_partner_v1/classes.rb
+- generated/google/apis/youtube_partner_v1/representations.rb
+- generated/google/apis/youtube_partner_v1/service.rb
 - generated/google/apis/youtube_v3.rb
 - generated/google/apis/youtube_v3/classes.rb
 - generated/google/apis/youtube_v3/representations.rb
@@ -669,9 +677,9 @@ require_paths:
 - third_party
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="