Skip to content

Fix the shortcut form of #render #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 25, 2017
Merged

Fix the shortcut form of #render #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
260e20b
Provide :_reverse_mapping in the renderer proc
smaximov May 23, 2017
3f98732
Directly extend ActionController with class methods
smaximov May 23, 2017
f9a4a56
Add a note stating that the proc is evaluated in the controller context
May 25, 2017
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
11 changes: 0 additions & 11 deletions lib/jsonapi/rails/action_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,6 @@ module Rails
module ActionController
REVERSE_MAPPING_KEY = 'jsonapi_deserializable.reverse_mapping'.freeze

def self.prepended(base)
base.class_eval do
extend ClassMethods
end
end

def render(options = {})
reverse_mapping = request.env[REVERSE_MAPPING_KEY]
super(options.merge(_reverse_mapping: reverse_mapping))
end

module ClassMethods
def deserializable_resource(key, options = {}, &block)
_deserializable(key, options,
Expand Down
2 changes: 1 addition & 1 deletion lib/jsonapi/rails/railtie.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class Railtie < ::Rails::Railtie
initializer 'jsonapi-rails.action_controller' do
ActiveSupport.on_load(:action_controller) do
require 'jsonapi/rails/action_controller'
prepend ::JSONAPI::Rails::ActionController
extend ::JSONAPI::Rails::ActionController::ClassMethods

Mime::Type.register MEDIA_TYPE, :jsonapi

Expand Down
4 changes: 4 additions & 0 deletions lib/jsonapi/rails/renderer.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ def self.render(errors, options)
# @api private
def rails_renderer(renderer)
proc do |json, options|
# Renderer proc is evaluated in the controller context, so it
# has access to the request object.
reverse_mapping = request.env[ActionController::REVERSE_MAPPING_KEY]
options = options.merge(_reverse_mapping: reverse_mapping)
json = renderer.render(json, options) unless json.is_a?(String)
self.content_type ||= Mime[:jsonapi]
self.response_body = json
Expand Down