fix:aws sdk

[pettanr/pettanr.git] / lib / s3_picture.rb

diff --git a/lib/s3_picture.rb b/lib/s3_picture.rb
index 394821a..6e7df83 100644 (file)
--- a/lib/s3_picture.rb
+++ b/lib/s3_picture.rb
@@ -1,6 +1,8 @@
 require 'picture_io'
 class PictureIO
   class S3Picture
+    @@client = Aws::S3::Client.new
+    
     def initialize base_dir = 'pettanr'
       @base = base_dir
     end
@@ -29,7 +31,7 @@ class PictureIO
     def exist?(filename, subdir = nil)
       res = true
       begin
-        res = AWS::S3::S3Object.exist?(dir(subdir) + filename, base)
+        res = @@client.get_object(bucket: self.base, key: dir(subdir) + filename).exist?
       rescue
         raise PictureIO::Error
       end
@@ -39,7 +41,7 @@ class PictureIO
     def put(bindata, filename, subdir = nil)
       res = true
       begin
-        AWS::S3::S3Object.store(dir(subdir) + filename, bindata, base)
+        @@client.put_object(bucket: self.base, key: dir(subdir) + filename, body: bindata)
       rescue
         raise PictureIO::Error
       end
@@ -49,7 +51,7 @@ class PictureIO
     def get(filename, subdir = nil)
       bindata = ''
       begin
-        AWS::S3::S3Object.stream(dir(subdir) + filename, base) do |st|
+        @@client.get_object(bucket: self.base, key: dir(subdir) + filename) do |st|
           bindata += st if st
         end
       rescue
@@ -61,7 +63,7 @@ class PictureIO
     def delete(filename, subdir = nil)
       res = true
       begin
-        AWS::S3::S3Object.delete(dir(subdir) + filename, base)
+        @@client.delete_object(bucket: self.base, key: dir(subdir) + filename)
       rescue
         raise PictureIO::Error
       end