Skip to content
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

Jump to bottom

fixed to_json encoding error that occurs with uploaded file parameters #481

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

fixed to_json encoding error that occurs with uploaded file parameters #481

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
26 changes: 14 additions & 12 deletions lib/apipie/extractor/writer.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,22 +77,24 @@ def ordered_call(call)
ordered_call = OrderedHash.new
%w[title verb path versions query request_data response_data code show_in_doc recorded].each do |k|
next unless call.has_key?(k)
ordered_call[k] = case call[k]
when ActiveSupport::HashWithIndifferentAccess
# UploadedFiles break the to_json call, turn them into a string so they don't break
call[k].each do |pkey, pval|
if (pval.is_a?(Rack::Test::UploadedFile) || pval.is_a?(ActionDispatch::Http::UploadedFile))
call[k][pkey] = "<FILE CONTENT '#{pval.original_filename}'>"
end
end
JSON.parse(call[k].to_json) # to_hash doesn't work recursively and I'm too lazy to write the recursion:)
else
call[k]
end
ordered_call[k] = preserve_call call[k]
end
return ordered_call
end

def preserve_call call
if call.is_a?(Rack::Test::UploadedFile) || call.is_a?(ActionDispatch::Http::UploadedFile)
"<FILE CONTENT '#{call.original_filename}'>"
elsif call.is_a? ActiveSupport::HashWithIndifferentAccess
call.each do |pkey, pval|
call[pkey] = preserve_call pval
end
JSON.parse(call.to_json)
else
call
end
end

def load_recorded_examples
self.class.load_recorded_examples
end
Expand Down