diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2017-07-09 00:24:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-09 00:24:25 +0200 |
| commit | 8f125d5b7970727064895f67887a59c1cedcf273 (patch) | |
| tree | cca972620338358423ddd0f73aa3b41a02f82795 /lib/active_storage/service | |
| parent | 839834ed6fc428f777360e7fda5dfb42676e839a (diff) | |
| parent | 92a4f5b3f42c92ec272eb28adebea83faa012afb (diff) | |
| download | rails-8f125d5b7970727064895f67887a59c1cedcf273.tar.gz rails-8f125d5b7970727064895f67887a59c1cedcf273.tar.bz2 rails-8f125d5b7970727064895f67887a59c1cedcf273.zip | |
Merge pull request #21 from jeremy/disk-binary-io
Disk service: use binary IO throughout, not UTF-8
Diffstat (limited to 'lib/active_storage/service')
| -rw-r--r-- | lib/active_storage/service/disk_service.rb | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/lib/active_storage/service/disk_service.rb b/lib/active_storage/service/disk_service.rb index 5576b3b125..f6c4fd8c4b 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 |