OSDN Git Service
(root)
/
pettanr
/
pettanr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix:error dlg
[pettanr/pettanr.git]
/
lib
/
s3_picture.rb
diff --git
a/lib/s3_picture.rb
b/lib/s3_picture.rb
index
394821a
..
0b06157
100644
(file)
--- a/
lib/s3_picture.rb
+++ b/
lib/s3_picture.rb
@@
-1,16
+1,36
@@
require 'picture_io'
class PictureIO
require 'picture_io'
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
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
end
- def
base
- @
base
+ def
host_dir
+ @
host_dir
end
end
- def
base=(b
)
- @
base = b
+ def
host_dir=(d
)
+ @
host_dir = d
end
def self.subdirs
end
def self.subdirs
@@
-23,13
+43,13
@@
class PictureIO
else
subdir.to_s + '/'
end
else
subdir.to_s + '/'
end
- sd
+
@base_dir + '/' +
sd
end
def exist?(filename, subdir = nil)
res = true
begin
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
raise PictureIO::Error
end
rescue
raise PictureIO::Error
end
@@
-39,7
+59,7
@@
class PictureIO
def put(bindata, filename, subdir = nil)
res = true
begin
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
raise PictureIO::Error
end
rescue
raise PictureIO::Error
end
@@
-49,7
+69,7
@@
class PictureIO
def get(filename, subdir = nil)
bindata = ''
begin
def get(filename, subdir = nil)
bindata = ''
begin
-
AWS::S3::S3Object.stream(dir(subdir) + filename, bas
e) do |st|
+
@@client.get_object(bucket: self.host_dir, key: dir(subdir) + filenam
e) do |st|
bindata += st if st
end
rescue
bindata += st if st
end
rescue
@@
-61,7
+81,7
@@
class PictureIO
def delete(filename, subdir = nil)
res = true
begin
def delete(filename, subdir = nil)
res = true
begin
-
AWS::S3::S3Object.delete(dir(subdir) + filename, bas
e)
+
@@client.delete_object(bucket: self.host_dir, key: dir(subdir) + filenam
e)
rescue
raise PictureIO::Error
end
rescue
raise PictureIO::Error
end