require 'picture_io'
-require 'aws/s3'
class PictureIO
+ Aws.config.update(
+ region: Rails.application.secrets.aws_region,
+ credentials: Aws::Credentials.new(
+ Rails.application.secrets.aws_access_key_id,
+ Rails.application.secrets.aws_secret_access_key
+ )
+ )
class S3Picture
- def initialize base_dir = 'pettanr'
- @base = base_dir
+ @@client = Aws::S3::Client.new
+
+ def initialize host_dir = 'pettanr', base_dir = ''
+ @host_dir = host_dir
+ @base_dir = base_dir
+ s3 = Aws::S3::Resource.new
+ @bucket = s3.bucket(@host_dir)
+ end
+
+ def self.client
+ @@client
+ end
+
+ def bucket
+ @bucket
end
- def base
- @base
+ def host_dir
+ @host_dir
end
- def base=(b)
- @base = b
+ def host_dir=(d)
+ @host_dir = d
end
def self.subdirs
else
subdir.to_s + '/'
end
- sd
+ @base_dir + '/' + sd
end
def exist?(filename, subdir = nil)
res = true
begin
- res = AWS::S3::S3Object.exist?(dir(subdir) + filename, base)
+ res = self.bucket.object(dir(subdir) + filename).exists?
rescue
- res = false
+ raise PictureIO::Error
end
res
end
def put(bindata, filename, subdir = nil)
res = true
begin
- AWS::S3::S3Object.store(dir(subdir) + filename, bindata, base)
+ @@client.put_object(bucket: self.host_dir, key: dir(subdir) + filename, body: bindata)
rescue
- res = false
+ raise PictureIO::Error
end
res
end
def get(filename, subdir = nil)
bindata = ''
begin
- AWS::S3::S3Object.stream(dir(subdir) + filename, base) do |st|
+ @@client.get_object(bucket: self.host_dir, key: dir(subdir) + filename) do |st|
bindata += st if st
end
rescue
- bindata = false
+ raise PictureIO::Error
end
bindata
end
def delete(filename, subdir = nil)
res = true
begin
- AWS::S3::S3Object.delete(dir(subdir) + filename, base)
+ @@client.delete_object(bucket: self.host_dir, key: dir(subdir) + filename)
rescue
- res = false
+ raise PictureIO::Error
end
res
end