diff --git a/Appraisals b/Appraisals index 540b227..bed79c4 100644 --- a/Appraisals +++ b/Appraisals @@ -1,11 +1,11 @@ appraise "rails-4" do gem "rails", "~> 4.1" - gem 'jsonapi-rails', '~> 0.1', require: 'jsonapi/rails' + gem 'jsonapi-rails', '~> 0.2.0', require: 'jsonapi/rails' gem 'rspec-rails' end appraise "rails-5" do gem "rails", "~> 5.0" - gem 'jsonapi-rails', '~> 0.1', require: 'jsonapi/rails' + gem 'jsonapi-rails', '~> 0.2.0', require: 'jsonapi/rails' gem 'rspec-rails' end diff --git a/jsonapi_compliable.gemspec b/jsonapi_compliable.gemspec index 59e502b..18d8360 100644 --- a/jsonapi_compliable.gemspec +++ b/jsonapi_compliable.gemspec @@ -17,7 +17,7 @@ Gem::Specification.new do |spec| spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } spec.require_paths = ["lib"] - spec.add_dependency 'jsonapi-serializable', '~> 0.1' + spec.add_dependency 'jsonapi-serializable', '~> 0.2.1' spec.add_development_dependency "activerecord", ['>= 4.1', '< 6'] spec.add_development_dependency "kaminari", '~> 0.17' diff --git a/lib/jsonapi_compliable/base.rb b/lib/jsonapi_compliable/base.rb index eb0080f..7aa34b2 100644 --- a/lib/jsonapi_compliable/base.rb +++ b/lib/jsonapi_compliable/base.rb @@ -190,7 +190,7 @@ def jsonapi_update # this, pass +scope: false+ # # This builds relevant options and sends them to - # +JSONAPI::Serializable::Renderer.render+from + # +JSONAPI::Serializable::SuccessRenderer#render+from # {http://jsonapi-rb.org jsonapi-rb} # # @example Build Scope by Default @@ -247,7 +247,9 @@ def force_includes? end def perform_render_jsonapi(opts) - JSONAPI::Serializable::Renderer.render(opts.delete(:jsonapi), opts) + # TODO(beauby): Reuse renderer. + JSONAPI::Serializable::SuccessRenderer.new + .render(opts.delete(:jsonapi), opts).to_json end def _persist diff --git a/spec/support/scope_helper.rb b/spec/support/scope_helper.rb index a85c6b6..0366c19 100644 --- a/spec/support/scope_helper.rb +++ b/spec/support/scope_helper.rb @@ -17,7 +17,7 @@ def render(object, opts = {}) opts[:expose] = { context: resource.context } opts = JsonapiCompliable::Util::RenderOptions.generate(object, query.to_hash[:authors], opts) resolved = opts.delete(:jsonapi) - raw_json = JSONAPI::Serializable::Renderer.render(resolved, opts) + raw_json = JSONAPI::Serializable::SuccessRenderer.new.render(resolved, opts).to_json JSON.parse(raw_json) end end