Use file content_type when file is ActionDispatch::Http::UploadedFile #155
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -49,7 +49,11 @@ def set_file(hash, key, top_level) | |||
| hash = hash[key] | |||
| end | |||
|
|
|||
| mime_type = MIME::Types.type_for(path).first || "application/octet-stream" | |||
| mime_type = MIME::Types.type_for(path).first | |||
There was a problem hiding this comment.
Maybe set mime_type = nil where the file is set, the override it inside the same defined?(ActionDispatch) && file.is_a?(ActionDispatch::Http::UploadedFile) block, while finally adding these two as fallbacks:
file = ...
mime_type = nil
case file
when ...
when ..
else
if defined?(ActionDispatch) && file.is_a?(ActionDispatch::Http::UploadedFile)
path = ...
mime_type = file.content_type
else
...
end
if path
mime_type ||= MIME::Types || ...
end
Not sure if it's cleaner, but it keeps the ActionDispatch logic in one place.
|
Either way, this fixes it so 👍. Do we need a patch release for < 1.0? |
|
👍 |
|
I'm going to try to upgrade HC to the most recent > 1.0, we'll see... |
vkmita
pushed a commit
that referenced
this pull request
Mar 11, 2014
…upload Use file content_type when file is ActionDispatch::Http::UploadedFile
|
Yup, working on a patch release for <1.0 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@steved555 @grosser @mcodella
https://zendesk.atlassian.net/browse/HC-2715
When uploading attachments using ActionDispatch::Http::UploadedFile, the temp_file path does not resolve to any mime type - i.e.
/var/folders/6l/2c1qltgj1p3526rgkkb2vpkr0000gp/T/RackMultipart20140310-86212-16fkt8o- but the ActionDispatch::Http::UploadedFile has the correct content_type.This should take care of that case. Let me know if this shouldn't be taken care of as a general solution in this gem.