lib/attached/storage/aws.rb in attached-0.1.7 vs lib/attached/storage/aws.rb in attached-0.1.8

@@ -10,10 +10,11 @@
 module Attached
 	module Storage
 		class AWS < Base
 			
 			
+			attr_reader :access
 			attr_reader :bucket
 			attr_reader :access_key_id
 			attr_reader :secret_access_key
 			
 			
@@ -25,10 +26,11 @@
 			#		Attached::Storage::S3.new("s3.yml")
 			
 			def initialize(credentials)
 				credentials = parse(credentials)
 				
+				@access            = :public_read
 				@bucket						 = credentials[:bucket]            || credentials['bucket']
 				@access_key_id		 = credentials[:access_key_id]     || credentials['access_key_id']
 				@secret_access_key = credentials[:secret_access_key] || credentials['secret_access_key']
 			end
 			
@@ -52,11 +54,11 @@
       # * path - The path to save.
       
       def save(file, path)
         connect()
         begin
-          ::AWS::S3::S3Object.store(path, file, bucket, :access => :public_read)
+          ::AWS::S3::S3Object.store(path, file, bucket, :access => access)
         rescue AWS::S3::NoSuchBucket => e
   			  ::AWS::S3::Bucket.create(bucket)
           retry
         end
       end
@@ -69,13 +71,11 @@
       # * path - The path to destroy.
       
       def destroy(path)
         connect()
         begin
-          ::AWS::S3::S3Object.delete(path, bucket, :access => :authenticated_read)
+          ::AWS::S3::S3Object.delete(path, bucket)
         rescue AWS::S3::NoSuchBucket => e
-  			  ::AWS::S3::Bucket.create(bucket)
-          retry
         end
       end
 			
 			
 		private
\ No newline at end of file