From 92a4f5b3f42c92ec272eb28adebea83faa012afb Mon Sep 17 00:00:00 2001 From: Jeremy Daer Date: Sat, 8 Jul 2017 15:11:27 -0700 Subject: Disk service: use binary IO throughout, not UTF-8 --- lib/active_storage/service/disk_service.rb | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'lib/active_storage/service') diff --git a/lib/active_storage/service/disk_service.rb b/lib/active_storage/service/disk_service.rb index 6164caf86c..d1e82525d8 100644 --- a/lib/active_storage/service/disk_service.rb +++ b/lib/active_storage/service/disk_service.rb @@ -1,5 +1,6 @@ require "fileutils" require "pathname" +require "digest/md5" require "active_support/core_ext/numeric/bytes" class ActiveStorage::Service::DiskService < ActiveStorage::Service @@ -10,24 +11,19 @@ class ActiveStorage::Service::DiskService < ActiveStorage::Service end def upload(key, io, checksum: nil) - File.open(make_path_for(key), "wb") do |file| - while chunk = io.read(64.kilobytes) - file.write(chunk) - end - end - + IO.copy_stream(io, make_path_for(key)) ensure_integrity_of(key, checksum) if checksum end def download(key) if block_given? File.open(path_for(key)) do |file| - while data = file.read(64.kilobytes) + while data = file.binread(64.kilobytes) yield data end end else - File.open path_for(key), &:read + File.binread path_for(key) end end -- cgit v1.2.3