google-api-client 0.9.2 → 0.9.3

data/generated/google/apis/youtubereporting_v1/representations.rb

@@ -24,34 +24,50 @@ module Google
       
       class Media
         class Representation < Google::Apis::Core::JsonRepresentation; end
+      
+        include Google::Apis::Core::JsonObjectSupport
       end
       
       class ListReportTypesResponse
         class Representation < Google::Apis::Core::JsonRepresentation; end
+      
+        include Google::Apis::Core::JsonObjectSupport
       end
       
       class ReportType
         class Representation < Google::Apis::Core::JsonRepresentation; end
+      
+        include Google::Apis::Core::JsonObjectSupport
       end
       
       class Job
         class Representation < Google::Apis::Core::JsonRepresentation; end
+      
+        include Google::Apis::Core::JsonObjectSupport
       end
       
       class ListJobsResponse
         class Representation < Google::Apis::Core::JsonRepresentation; end
+      
+        include Google::Apis::Core::JsonObjectSupport
       end
       
       class Empty
         class Representation < Google::Apis::Core::JsonRepresentation; end
+      
+        include Google::Apis::Core::JsonObjectSupport
       end
       
       class ListReportsResponse
         class Representation < Google::Apis::Core::JsonRepresentation; end
+      
+        include Google::Apis::Core::JsonObjectSupport
       end
       
       class Report
         class Representation < Google::Apis::Core::JsonRepresentation; end
+      
+        include Google::Apis::Core::JsonObjectSupport
       end
       
       class Media

data/google-api-client.gemspec

@@ -18,9 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib', 'generated', 'third_party']
 
   spec.add_runtime_dependency 'representable', '~> 2.3.0'
-  spec.add_runtime_dependency 'multi_json', '~> 1.11'
   spec.add_runtime_dependency 'retriable', '~> 2.0'
-  spec.add_runtime_dependency 'activesupport', '>= 3.2'
   spec.add_runtime_dependency 'addressable', '~> 2.3'
   spec.add_runtime_dependency 'mime-types', '>= 1.6'
   spec.add_runtime_dependency 'hurley', '~> 0.1'

data/lib/google/api_client/client_secrets.rb

@@ -12,8 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
-require 'compat/multi_json'
+require 'json'
 
 
 module Google
@@ -71,7 +70,7 @@ module Google
             search_path = File.expand_path(File.join(search_path, '..'))
           end
         end
-        data = File.open(filename, 'r') { |file| MultiJson.load(file.read) }
+        data = File.open(filename, 'r') { |file| JSON.load(file.read) }
         return self.new(data)
       end
 
@@ -119,7 +118,7 @@ module Google
       # @return [String]
       #   JSON
       def to_json
-        return MultiJson.dump(to_hash)
+        return Json.dump(to_hash)
       end
 
       def to_hash

data/lib/google/apis/core/api_command.rb

@@ -12,12 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'active_support/inflector'
 require 'addressable/uri'
 require 'addressable/template'
 require 'google/apis/core/http_command'
 require 'google/apis/errors'
-require 'multi_json'
+require 'json'
 require 'retriable'
 
 module Google
@@ -113,7 +112,7 @@ module Google
         #  HTTP response body
         # @return [Hash]
         def parse_error(body)
-          hash = MultiJson.load(body)
+          hash = JSON.load(body)
           hash['error']['errors'].first
         rescue
           nil
@@ -127,7 +126,9 @@ module Google
         #   Updated header value
         def normalize_fields_param(fields)
           # TODO: Generate map of parameter names during code gen. Small possibility that camelization fails
-          fields.gsub(/:/, '').gsub(/\w+/) { |str| ActiveSupport::Inflector.camelize(str, false) }
+          fields.gsub(/:/, '').gsub(/\w+/) do |str|
+            str.gsub(/(?:^|_)([a-z])/){ Regexp.last_match.begin(0) == 0 ? $1 : $1.upcase }
+          end
         end
       end
     end

data/lib/google/apis/core/http_command.rb

@@ -145,6 +145,15 @@ module Google
           header.update(options.header) if options && options.header
           self.url = url.expand(params) if url.is_a?(Addressable::Template)
           url.query_values = query.merge(url.query_values || {})
+
+          if [:post, :put].include?(method)  && body.nil?
+            @form_encoded = true
+            self.body = Addressable::URI.form_encode(url.query_values(Array))
+            self.header['Content-Type'] = 'application/x-www-form-urlencoded; charset=UTF-8'
+            self.url.query_values = {}
+          else
+            @form_encoded = false
+          end
         end
 
         # Release any resources used by this command
@@ -242,7 +251,7 @@ module Google
         # @raise [StandardError] if no block
         def error(err, rethrow: false, &block)
           logger.debug { sprintf('Error - %s', PP.pp(err, '')) }
-          err = Google::Apis::TransmissionError.new(err) if err.is_a?(Hurley::ClientError)
+          err = Google::Apis::TransmissionError.new(err) if err.is_a?(Hurley::ClientError) || err.is_a?(SocketError)
           block.call(nil, err) if block_given?
           fail err if rethrow || block.nil?
         end
@@ -263,9 +272,11 @@ module Google
             response = client.send(method, url, body) do |req|
               # Temporary workaround for Hurley bug where the connection preference
               # is ignored and it uses nested anyway
-              req.url.query_class = Hurley::Query::Flat
-              query.each do | k, v|
-                req.url.query[k] = normalize_query_value(v)
+              unless form_encoded?
+                req.url.query_class = Hurley::Query::Flat
+                query.each do | k, v|
+                 req.url.query[k] = normalize_query_value(v)
+                end
               end
               # End workaround
               apply_request_options(req)
@@ -292,10 +303,15 @@ module Google
           end
           req.header.update(header)
           req.options.timeout = options.timeout_sec
+          req.options.open_timeout = options.open_timeout_sec
         end
 
         private
 
+        def form_encoded?
+          @form_encoded
+        end
+
         def normalize_query_value(v)
           case v
           when Array

data/lib/google/apis/core/json_representation.rb

@@ -38,8 +38,8 @@ module Google
           def getter_fn(name)
             ivar_name = "@#{name}".to_sym
             lambda do |_|
-              if respond_to?(:[])
-                self[name] || instance_variable_get(ivar_name)
+              if respond_to?(:fetch)
+                fetch(name, instance_variable_get(ivar_name))
               else
                 instance_variable_get(ivar_name)
               end
@@ -122,6 +122,24 @@ module Google
         include Representable::JSON
         feature JsonRepresentationSupport
       end
+
+      module JsonObjectSupport
+        def self.included(base)
+          base.extend(ClassMethods)
+        end
+
+        module ClassMethods
+          def from_json(json)
+            representation = self.const_get(:Representation)
+            representation.new(self.new).from_json(json, unwrap: self)
+          end
+        end
+
+        def to_json
+          representation = self.class.const_get(:Representation)
+          representation.new(self).to_json(skip_undefined: true)
+        end
+      end
     end
   end
 end

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

@@ -15,7 +15,7 @@
 require 'logger'
 require 'erb'
 require 'yaml'
-require 'multi_json'
+require 'json'
 require 'active_support/inflector'
 require 'google/apis/core/logging'
 require 'google/apis/generator/template'

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

@@ -7,6 +7,8 @@ class <%= cls.generated_class_name %>
 <%= indent(include('representation_stub', :cls => child_class), 2) -%>
 <%     end -%>
 <%   end -%>
+
+  include Google::Apis::Core::JsonObjectSupport
 end
 <% elsif cls.items && cls.items._ref.nil? -%>
 <%= include('representation_stub', :cls => cls.items, :api => api) -%>

data/lib/google/apis/version.rb

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

data/script/generate

@@ -69,7 +69,7 @@ APIS=(adexchangebuyer:v1.4 \
 	pagespeedonline:v2 \
 	partners:v2 \
 	people:v1 \
-        plus:v1 \
+    plus:v1 \
 	plusDomains:v1 \
 	prediction:v1.6 \
 	proximitybeacon:v1beta1 \
@@ -89,6 +89,7 @@ APIS=(adexchangebuyer:v1.4 \
 	tasks:v1 \
 	translate:v2 \
 	urlshortener:v1 \
+    vision:v1 \
 	webmasters:v3 \
 	youtube:v3 \
 	youtubeAnalytics:v1 \

data/spec/google/api_client/client_secrets_spec.rb

@@ -23,7 +23,7 @@ FIXTURES_PATH = File.expand_path('../../../fixtures', __FILE__)
 RSpec.describe Google::APIClient::ClientSecrets do
   describe '::new' do
     let(:filename) { File.join(FIXTURES_PATH, 'files', 'client_secrets.json') }
-    let(:data) { File.open(filename, 'r') { |file| MultiJson.load(file.read) } }
+    let(:data) { File.open(filename, 'r') { |file| JSON.load(file.read) } }
 
     context 'without options' do
       subject { Google::APIClient::ClientSecrets.new(data) }
@@ -367,7 +367,7 @@ RSpec.describe Google::APIClient::ClientSecrets do
   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)
+      expect { Google::APIClient::ClientSecrets.load(file) }.to raise_exception(JSON::ParserError)
     end
   end
 

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

@@ -103,7 +103,7 @@ RSpec.describe Google::Apis::Core::HttpCommand do
   context('with a field parameter') do
     let(:command) do
       command = Google::Apis::Core::ApiCommand.new(:get, 'https://www.googleapis.com/zoo/animals')
-      command.query['fields'] = ':items(:id, :long_name)'
+      command.query['fields'] = ':items(:id, :long_name, :a_really_long_name), shouldBeLeftAlone '
       command
     end
 
@@ -115,7 +115,7 @@ RSpec.describe Google::Apis::Core::HttpCommand do
     it 'should normalize fields params' do
       command.execute(client)
       expect(a_request(:get, 'https://www.googleapis.com/zoo/animals')
-        .with(query: { 'fields' => 'items(id, longName)' })) .to have_been_made
+        .with(query: { 'fields' => 'items(id, longName, aReallyLongName), shouldBeLeftAlone ' })) .to have_been_made
     end
   end
 

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

@@ -281,4 +281,23 @@ RSpec.describe Google::Apis::Core::HttpCommand do
     command.query['b'] = false
     command.execute(client)
   end
+
+  it 'should form encode parameters when method is POST and no body present' do
+    stub_request(:post, 'https://www.googleapis.com/zoo/animals')
+        .with(body: 'a=1&a=2&a=3&b=hello&c=&d=0')
+        .to_return(status: [200, ''])
+    command = Google::Apis::Core::HttpCommand.new(:post, 'https://www.googleapis.com/zoo/animals')
+    command.query['a'] = [1,2,3]
+    command.query['b'] = 'hello'
+    command.query['c'] = nil
+    command.query['d'] = 0
+    command.execute(client)
+  end
+
+  it 'should raise transmission error instead of socket error' do
+    stub_request(:get, 'https://www.googleapis.com/zoo/animals').to_raise(SocketError)
+    command = Google::Apis::Core::HttpCommand.new(:get, 'https://www.googleapis.com/zoo/animals')
+    command.options.retries = 0
+    expect { command.execute(client) }.to raise_error(Google::Apis::TransmissionError)
+  end
 end

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

@@ -28,7 +28,8 @@ RSpec.describe Google::Apis::Core::JsonRepresentation do
       attr_accessor :nil_value
       attr_accessor :numeric_value
       attr_accessor :string_value
-      attr_accessor :boolean_value
+      attr_accessor :boolean_value_true
+      attr_accessor :boolean_value_false
       attr_accessor :date_value
       attr_accessor :bytes_value
       attr_accessor :items
@@ -44,7 +45,8 @@ RSpec.describe Google::Apis::Core::JsonRepresentation do
       property :nil_value, as: 'nilValue'
       property :numeric_value, as: 'numericValue'
       property :string_value, as: 'stringValue'
-      property :boolean_value, as: 'booleanValue'
+      property :boolean_value_true, as: 'booleanValueTrue'
+      property :boolean_value_false, as: 'booleanValueFalse'
       property :date_value, as: 'dateValue', type: DateTime
       property :bytes_value, as: 'bytesValue', base64: true
       property :items
@@ -75,7 +77,8 @@ RSpec.describe Google::Apis::Core::JsonRepresentation do
     end
 
     it 'serializes boolean values' do
-      expect(json).to be_json_eql(%(true)).at_path('booleanValue')
+      expect(json).to be_json_eql(%(true)).at_path('booleanValueTrue')
+      expect(json).to be_json_eql(%(false)).at_path('booleanValueFalse')
     end
 
     it 'serializes date values' do
@@ -107,7 +110,8 @@ RSpec.describe Google::Apis::Core::JsonRepresentation do
       model.numeric_value = 123
       model.string_value = 'test'
       model.date_value = DateTime.new(2015, 5, 1, 12)
-      model.boolean_value = true
+      model.boolean_value_true = true
+      model.boolean_value_false = false
       model.bytes_value = 'Hello world'
       model.items = [1, 2, 3]
       model.child = child_class.new
@@ -127,7 +131,8 @@ RSpec.describe Google::Apis::Core::JsonRepresentation do
         string_value: 'test',
         numeric_value: 123,
         date_value: DateTime.new(2015, 5, 1, 12),
-        boolean_value: true,
+        boolean_value_true: true,
+        boolean_value_false: false,
         bytes_value: 'Hello world',
         items: [1, 2, 3],
         child: {
@@ -146,7 +151,8 @@ RSpec.describe Google::Apis::Core::JsonRepresentation do
       json = <<EOF
 { "stringValue": "test",
   "nilValue": null,
-  "booleanValue": true,
+  "booleanValueTrue": true,
+  "booleanValueFalse": false,
   "numericValue": 123,
   "dateValue": "2015-05-01T12:00:00+00:00",
   "bytesValue": "SGVsbG8gd29ybGQ=",
@@ -170,7 +176,8 @@ EOF
     end
 
     it 'deserializes boolean values' do
-      expect(model.boolean_value).to be_truthy
+      expect(model.boolean_value_true).to be_truthy
+      expect(model.boolean_value_false).to be_falsey
     end
 
     it 'deserializes date values' do

data/spec/google/apis/generator/generator_spec.rb

@@ -120,6 +120,58 @@ RSpec.describe Google::Apis::Generator do
         it 'should define subresource methods' do
           expect(service.method(:list_thing_subthings)).to_not be_nil
         end
+
+        context 'With the from_json method' do
+          let(:json) do
+            <<EOF
+{
+  "name" : "A thing",
+  "properties": {
+    "prop_a" : "value_a"
+  },
+  "photo": {
+    "filename": "image.jpg"
+  },
+  "hat": {
+    "type": "topHat",
+    "height": 100
+  }
+}
+EOF
+          end
+
+          let(:thing) { Google::Apis::TestV1::Thing.from_json(json) }
+
+          it 'should return a thing' do
+            expect(thing).to be_instance_of(Google::Apis::TestV1::Thing)
+          end
+
+          it 'should parse properties' do
+            expect(thing.name).to eq 'A thing'
+          end
+
+          it 'should parse subtypes' do
+            expect(thing.photo.filename).to eq "image.jpg"
+          end
+        end
+
+        context 'With the to_json method' do
+          let(:thing) do
+            Google::Apis::TestV1::Thing.new(
+                name: "A thing",
+                properties: {
+                    prop_a: "value_a"
+                },
+                photo: {
+                    filename: "image.jpg"
+                },
+                hat: {
+                    type: "topHat",
+                    height: 100
+                }
+            )
+          end
+        end
       end
 
       context 'with the get_thing method' do