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: aws s3, asset compile
[pettanr/pettanr.git]
/
lib
/
s3_picture.rb
diff --git
a/lib/s3_picture.rb
b/lib/s3_picture.rb
index
4985a54
..
394821a
100644
(file)
--- a/
lib/s3_picture.rb
+++ b/
lib/s3_picture.rb
@@
-1,5
+1,4
@@
require 'picture_io'
require 'picture_io'
-require 'aws/s3'
class PictureIO
class S3Picture
def initialize base_dir = 'pettanr'
class PictureIO
class S3Picture
def initialize base_dir = 'pettanr'
@@
-32,7
+31,7
@@
class PictureIO
begin
res = AWS::S3::S3Object.exist?(dir(subdir) + filename, base)
rescue
begin
res = AWS::S3::S3Object.exist?(dir(subdir) + filename, base)
rescue
- r
es = false
+ r
aise PictureIO::Error
end
res
end
end
res
end
@@
-42,7
+41,7
@@
class PictureIO
begin
AWS::S3::S3Object.store(dir(subdir) + filename, bindata, base)
rescue
begin
AWS::S3::S3Object.store(dir(subdir) + filename, bindata, base)
rescue
- r
es = false
+ r
aise PictureIO::Error
end
res
end
end
res
end
@@
-54,7
+53,7
@@
class PictureIO
bindata += st if st
end
rescue
bindata += st if st
end
rescue
- bindata = false
+ raise PictureIO::Error
end
bindata
end
end
bindata
end
@@
-64,7
+63,7
@@
class PictureIO
begin
AWS::S3::S3Object.delete(dir(subdir) + filename, base)
rescue
begin
AWS::S3::S3Object.delete(dir(subdir) + filename, base)
rescue
- r
es = false
+ r
aise PictureIO::Error
end
res
end
end
res
end