Skip to content

Rails 6 expects a different mime type format #1

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
paulkoegel merged 2 commits into from
Oct 29, 2020
Merged

Rails 6 expects a different mime type format #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18045fe
Rails 6 expects a different mime type format
DonSchado Oct 18, 2020
a7f025e
don't touch my emoji
DonSchado Oct 24, 2020
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
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 self.call(template)
def initialize
self.default_callback = nil
self.default_format = (Rails.version < '6.0.0') ? Mime[:json] : :json
end

def self.call(template, source=nil)
source ||= template.source
%{
if defined?(json)
#{template.source}
#{source}
else
result = JbuilderTemplate.encode(self) do |json|
#{template.source}
#{source}
end
callback = params[:callback] || JPbuilderHandler.default_callback
if callback.present?
Expand Down