From 82356233621300b51b3e2a2c093e9c4107e12e81 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Tue, 30 May 2017 21:11:29 -0400 Subject: Improve spec coverage and clean up api/v1/media controller (#3467) --- app/controllers/api/v1/media_controller.rb | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'app/controllers') diff --git a/app/controllers/api/v1/media_controller.rb b/app/controllers/api/v1/media_controller.rb index aed3578d7..3d7dcef42 100644 --- a/app/controllers/api/v1/media_controller.rb +++ b/app/controllers/api/v1/media_controller.rb @@ -10,11 +10,11 @@ class Api::V1::MediaController < ApiController respond_to :json def create - @media = MediaAttachment.create!(account: current_user.account, file: media_params[:file]) + @media = current_account.media_attachments.create!(file: media_params[:file]) rescue Paperclip::Errors::NotIdentifiedByImageMagickError - render json: { error: 'File type of uploaded media could not be verified' }, status: 422 + render json: file_type_error, status: 422 rescue Paperclip::Error - render json: { error: 'Error processing thumbnail for uploaded media' }, status: 500 + render json: processing_error, status: 500 end private @@ -22,4 +22,12 @@ class Api::V1::MediaController < ApiController def media_params params.permit(:file) end + + def file_type_error + { error: 'File type of uploaded media could not be verified' } + end + + def processing_error + { error: 'Error processing thumbnail for uploaded media' } + end end -- cgit