Bump `representable` dependency to 3.0 (#532)
Also fixes a breaking change introduced between `representable` 2.3 and 3.0. Specifically, `:skip_undefined` is now be passed via the `:user_options` option.
This commit is contained in:
parent
2ea7f12106
commit
4f143ae551
|
@ -6,6 +6,9 @@ rvm:
|
|||
- 2.0.0
|
||||
- jruby-9000
|
||||
env:
|
||||
global:
|
||||
- JRUBY_OPTS='-X-C -J-Xmx1024m -J-XX:+UseConcMarkSweepGC'
|
||||
matrix:
|
||||
- RAILS_VERSION="~>3.2"
|
||||
- RAILS_VERSION="~>4.0.0"
|
||||
- RAILS_VERSION="~>4.1.0"
|
||||
|
|
|
@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
|
|||
|
||||
spec.required_ruby_version = '~> 2.0'
|
||||
|
||||
spec.add_runtime_dependency 'representable', '~> 2.3.0'
|
||||
spec.add_runtime_dependency 'representable', '~> 3.0'
|
||||
spec.add_runtime_dependency 'retriable', '>= 2.0', '< 4.0'
|
||||
spec.add_runtime_dependency 'addressable', '~> 2.3'
|
||||
spec.add_runtime_dependency 'mime-types', '>= 1.6'
|
||||
|
|
|
@ -55,7 +55,7 @@ module Google
|
|||
query[FIELDS_PARAM] = normalize_fields_param(query[FIELDS_PARAM]) if query.key?(FIELDS_PARAM)
|
||||
if request_representation && request_object
|
||||
header[:content_type] ||= JSON_CONTENT_TYPE
|
||||
self.body = request_representation.new(request_object).to_json(skip_undefined: true)
|
||||
self.body = request_representation.new(request_object).to_json(user_options: { skip_undefined: true })
|
||||
end
|
||||
super
|
||||
end
|
||||
|
|
|
@ -55,7 +55,7 @@ module Google
|
|||
def if_fn(name)
|
||||
ivar_name = "@#{name}".to_sym
|
||||
lambda do |opts|
|
||||
if opts[:skip_undefined]
|
||||
if opts[:options][:user_options] and opts[:options][:user_options][:skip_undefined]
|
||||
if respond_to?(:key?)
|
||||
self.key?(name) || instance_variable_defined?(ivar_name)
|
||||
else
|
||||
|
@ -137,7 +137,7 @@ module Google
|
|||
|
||||
def to_json
|
||||
representation = self.class.const_get(:Representation)
|
||||
representation.new(self).to_json(skip_undefined: true)
|
||||
representation.new(self).to_json(user_options: { skip_undefined: true })
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -109,7 +109,7 @@ RSpec.describe Google::Apis::Core::JsonRepresentation do
|
|||
end
|
||||
|
||||
context 'with model object' do
|
||||
let(:json) { representer_class.new(model).to_json(skip_undefined: true) }
|
||||
let(:json) { representer_class.new(model).to_json(user_options: { skip_undefined: true }) }
|
||||
let(:model) do
|
||||
model = model_class.new
|
||||
model.nil_value = nil
|
||||
|
@ -132,7 +132,7 @@ RSpec.describe Google::Apis::Core::JsonRepresentation do
|
|||
end
|
||||
|
||||
context 'with hash' do
|
||||
let(:json) { representer_class.new(model).to_json(skip_undefined: true) }
|
||||
let(:json) { representer_class.new(model).to_json(user_options: { skip_undefined: true }) }
|
||||
let(:model) do
|
||||
{
|
||||
nil_value: nil,
|
||||
|
|
Loading…
Reference in New Issue