From c810c630bd8ffec23a86d07198154637ffb34dd7 Mon Sep 17 00:00:00 2001 From: aki Date: Mon, 19 Jun 2017 22:22:05 +0900 Subject: [PATCH 1/2] Change file size of error message to human size --- lib/carrierwave/uploader/file_size.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/carrierwave/uploader/file_size.rb b/lib/carrierwave/uploader/file_size.rb index bd96c594e..aff07b035 100644 --- a/lib/carrierwave/uploader/file_size.rb +++ b/lib/carrierwave/uploader/file_size.rb @@ -29,9 +29,9 @@ def check_size!(new_file) expected_size_range = size_range if expected_size_range.is_a?(::Range) if size < expected_size_range.min - raise CarrierWave::IntegrityError, I18n.translate(:"errors.messages.min_size_error", :min_size => expected_size_range.min) + raise CarrierWave::IntegrityError, I18n.translate(:"errors.messages.min_size_error", :min_size => ActiveSupport::NumberHelper.number_to_human_size(expected_size_range.min)) elsif size > expected_size_range.max - raise CarrierWave::IntegrityError, I18n.translate(:"errors.messages.max_size_error", :max_size => expected_size_range.max) + raise CarrierWave::IntegrityError, I18n.translate(:"errors.messages.max_size_error", :max_size => ActiveSupport::NumberHelper.number_to_human_size(expected_size_range.max)) end end end From 9a91108a016f786c027a3e8f9e1730ceba4e0005 Mon Sep 17 00:00:00 2001 From: aki Date: Sat, 1 Jul 2017 09:35:51 +0900 Subject: [PATCH 2/2] Add tests --- lib/carrierwave/uploader/file_size.rb | 2 ++ spec/uploader/file_size_spec.rb | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/carrierwave/uploader/file_size.rb b/lib/carrierwave/uploader/file_size.rb index aff07b035..d16fd0910 100644 --- a/lib/carrierwave/uploader/file_size.rb +++ b/lib/carrierwave/uploader/file_size.rb @@ -1,3 +1,5 @@ +require 'active_support' + module CarrierWave module Uploader module FileSize diff --git a/spec/uploader/file_size_spec.rb b/spec/uploader/file_size_spec.rb index 42088195e..b66e44268 100644 --- a/spec/uploader/file_size_spec.rb +++ b/spec/uploader/file_size_spec.rb @@ -28,7 +28,7 @@ let(:range) { 2097152..4194304 } it "raises an integrity error" do - is_expected.to raise_error(CarrierWave::IntegrityError) + is_expected.to raise_error(CarrierWave::IntegrityError, 'File size should be greater than 2 MB') end end @@ -36,7 +36,7 @@ let(:range) { 0..10 } it "raises an integrity error" do - is_expected.to raise_error(CarrierWave::IntegrityError) + is_expected.to raise_error(CarrierWave::IntegrityError, 'File size should be less than 10 Bytes') end end