Skip to content

Add support for Rails 6 #13

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support for Rails 6 #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 9 additions & 5 deletions lib/jpbuilder-handler.rb
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,20 @@

class JPbuilderHandler
cattr_accessor :default_format, :default_callback
self.default_format = Mime[:json]
self.default_callback = nil

def initialize
self.default_callback = nil
self.default_format = (Rails.version < '6.0.0') ? Mime[:json] : :json
end

def self.call(template)
def self.call(template, source=nil)
source =|| template.source
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
source =|| template.source
source ||= template.source

%{
if defined?(json)
#{template.source}
#{source}
else
result = JbuilderTemplate.encode(self) do |json|
#{template.source}
#{source}
end
result = result.each_char.to_a.map { |chr| chr.ord > 1000 ? "\\\\u\#{"%4.4x" % chr.ord}" : chr }.join
callback = params[:callback] || JPbuilderHandler.default_callback
Expand Down