aboutsummaryrefslogtreecommitdiffstats
path: root/lib/active_file/sites
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2017-07-04 16:05:06 +0200
committerDavid Heinemeier Hansson <david@loudthinking.com>2017-07-04 16:05:06 +0200
commitccaba581c0cf8653f61ce212667eaa1cc6f0a28e (patch)
tree8477bb9652fc2242bf6435b7aa8239c8dbf989dd /lib/active_file/sites
parent8da081c36fa2523b8b44d5952fc97c8c012df54e (diff)
downloadrails-ccaba581c0cf8653f61ce212667eaa1cc6f0a28e.tar.gz
rails-ccaba581c0cf8653f61ce212667eaa1cc6f0a28e.tar.bz2
rails-ccaba581c0cf8653f61ce212667eaa1cc6f0a28e.zip
Differentiate between io streams and read data
Diffstat (limited to 'lib/active_file/sites')
-rw-r--r--lib/active_file/sites/disk_site.rb4
-rw-r--r--lib/active_file/sites/gcs_site.rb4
-rw-r--r--lib/active_file/sites/mirror_site.rb4
-rw-r--r--lib/active_file/sites/s3_site.rb4
4 files changed, 8 insertions, 8 deletions
diff --git a/lib/active_file/sites/disk_site.rb b/lib/active_file/sites/disk_site.rb
index 41b883498a..e5572073ed 100644
--- a/lib/active_file/sites/disk_site.rb
+++ b/lib/active_file/sites/disk_site.rb
@@ -9,9 +9,9 @@ class ActiveFile::Sites::DiskSite < ActiveFile::Site
end
- def upload(key, data)
+ def upload(key, io)
File.open(make_path_for(key), "wb") do |file|
- while chunk = data.read(65536)
+ while chunk = io.read(65536)
file.write(chunk)
end
end
diff --git a/lib/active_file/sites/gcs_site.rb b/lib/active_file/sites/gcs_site.rb
index 71f065c608..f5f8696f56 100644
--- a/lib/active_file/sites/gcs_site.rb
+++ b/lib/active_file/sites/gcs_site.rb
@@ -8,8 +8,8 @@ class ActiveFile::Sites::GCSSite < ActiveFile::Site
@bucket = @client.bucket(bucket)
end
- def upload(key, data)
- bucket.create_file(data, key)
+ def upload(key, io)
+ bucket.create_file(io, key)
end
def download(key)
diff --git a/lib/active_file/sites/mirror_site.rb b/lib/active_file/sites/mirror_site.rb
index f734f3ebf9..051d139af1 100644
--- a/lib/active_file/sites/mirror_site.rb
+++ b/lib/active_file/sites/mirror_site.rb
@@ -5,8 +5,8 @@ class ActiveFile::Sites::MirrorSite < ActiveFile::Site
@sites = sites
end
- def upload(key, data)
- perform_across_sites :upload, key, data
+ def upload(key, io)
+ perform_across_sites :upload, key, io
end
def download(key)
diff --git a/lib/active_file/sites/s3_site.rb b/lib/active_file/sites/s3_site.rb
index 4ede843cb4..e13b609881 100644
--- a/lib/active_file/sites/s3_site.rb
+++ b/lib/active_file/sites/s3_site.rb
@@ -8,8 +8,8 @@ class ActiveFile::Sites::S3Site < ActiveFile::Site
@bucket = @client.bucket(bucket)
end
- def upload(key, data)
- object_for(key).put(body: data)
+ def upload(key, io)
+ object_for(key).put(body: io)
end
def download(key)