Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion jsonapi_compliable.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 4 additions & 2 deletions lib/jsonapi_compliable/base.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion spec/support/scope_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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