chiu
/
google-api-ruby-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#403 - allow nil dates

This commit is contained in:
Steve Bazyl 2016-04-25 10:49:00 -07:00
parent 0aa133f978
commit 1ee88320e9
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/google/apis/core/json_representation.rb
View File

@ -69,11 +69,11 @@ module Google
def set_default_options(name, options) def set_default_options(name, options)
if options[:base64] if options[:base64]
options[:render_filter] = ->(value, _doc, *_args) { Base64.urlsafe_encode64(value) } options[:render_filter] = ->(value, _doc, *_args) { value.nil? ? nil : Base64.urlsafe_encode64(value) }
options[:parse_filter] = ->(fragment, _doc, *_args) { Base64.urlsafe_decode64(fragment) } options[:parse_filter] = ->(fragment, _doc, *_args) { Base64.urlsafe_decode64(fragment) }
end end
if options[:type] == DateTime if options[:type] == DateTime
options[:render_filter] = ->(value, _doc, *_args) { value.is_a?(DateTime) ? value.rfc3339(3) : value.to_s } options[:render_filter] = ->(value, _doc, *_args) { value.nil? ? nil : value.is_a?(DateTime) ? value.rfc3339(3) : value.to_s }
options[:parse_filter] = ->(fragment, _doc, *_args) { DateTime.parse(fragment) } options[:parse_filter] = ->(fragment, _doc, *_args) { DateTime.parse(fragment) }
end end

9
spec/google/apis/core/json_representation_spec.rb
View File

@ -31,6 +31,7 @@ RSpec.describe Google::Apis::Core::JsonRepresentation do
attr_accessor :boolean_value_true attr_accessor :boolean_value_true
attr_accessor :boolean_value_false attr_accessor :boolean_value_false
attr_accessor :date_value attr_accessor :date_value
attr_accessor :nil_date_value
attr_accessor :bytes_value attr_accessor :bytes_value
attr_accessor :items attr_accessor :items
attr_accessor :child attr_accessor :child
@ -48,6 +49,7 @@ RSpec.describe Google::Apis::Core::JsonRepresentation do
property :boolean_value_true, as: 'booleanValueTrue' property :boolean_value_true, as: 'booleanValueTrue'
property :boolean_value_false, as: 'booleanValueFalse' property :boolean_value_false, as: 'booleanValueFalse'
property :date_value, as: 'dateValue', type: DateTime property :date_value, as: 'dateValue', type: DateTime
property :nil_date_value, as: 'nullDateValue', type: DateTime
property :bytes_value, as: 'bytesValue', base64: true property :bytes_value, as: 'bytesValue', base64: true
property :items property :items
property :child, class: klass do property :child, class: klass do
@ -85,6 +87,10 @@ RSpec.describe Google::Apis::Core::JsonRepresentation do
expect(json).to be_json_eql(%("2015-05-01T12:00:00.000+00:00")).at_path('dateValue') expect(json).to be_json_eql(%("2015-05-01T12:00:00.000+00:00")).at_path('dateValue')
end end
it 'allows nil date values' do
expect(json).to be_json_eql(%(null)).at_path('nullDateValue')
end
it 'serializes byte values to base64' do it 'serializes byte values to base64' do
expect(json).to be_json_eql(%("SGVsbG8gd29ybGQ=")).at_path('bytesValue') expect(json).to be_json_eql(%("SGVsbG8gd29ybGQ=")).at_path('bytesValue')
end end
@ -117,10 +123,12 @@ RSpec.describe Google::Apis::Core::JsonRepresentation do
model.child = child_class.new model.child = child_class.new
model.child.value = 'child' model.child.value = 'child'
model.children = [model.child] model.children = [model.child]
model.nil_date_value = nil
model model
end end
include_examples 'it serializes' include_examples 'it serializes'
end end
context 'with hash' do context 'with hash' do
@ -131,6 +139,7 @@ RSpec.describe Google::Apis::Core::JsonRepresentation do
string_value: 'test', string_value: 'test',
numeric_value: 123, numeric_value: 123,
date_value: DateTime.new(2015, 5, 1, 12), date_value: DateTime.new(2015, 5, 1, 12),
nil_date_value: nil,
boolean_value_true: true, boolean_value_true: true,
boolean_value_false: false, boolean_value_false: false,
bytes_value: 'Hello world', bytes_value: 'Hello world',