thorsson_carrierwave 0.4.6 → 0.4.8

data/lib/carrierwave/storage/right_s3.rb

@@ -3,7 +3,6 @@ require 'right_aws'
 
 module CarrierWave
   module Storage
-
     ##
     # Uploads things to Amazon S3 webservices using the RightAWS libraries (right_aws gem). 
     # In order for CarrierWave to connect to Amazon S3, you'll need to specify an access key id, secret key
@@ -51,6 +50,7 @@ module CarrierWave
           @uploader = uploader
           @path = path
           @base = base
+          @headers = {'x-amz-acl' => uploader.s3_access_policy}.merge(uploader.s3_headers)
         end
 
         ##
@@ -108,13 +108,18 @@ module CarrierWave
         #end
 
         def store(file)
-          connection.put(bucket, @path, file.read, {'x-amz-acl' => @uploader.s3_access_policy}.merge(@uploader.s3_headers)
+#          File.open('/home/ivan/output', 'w') {|f| f.write(@path) }
+          connection.put(bucket, @path, file.read,
+          {'x-amz-acl' => @uploader.s3_access_policy,
+            'x-amz-content-type' => @uploader.s3_headers['Content-Type'],
+            'content-type' => @uploader.s3_headers['Content-Type']}#file.content_type
+          )
         end
 
       private
       
         def headers
-          @headers ||= @uploader.s3_headers
+          @headers ||= {}
         end
 
         def bucket
@@ -122,7 +127,8 @@ module CarrierWave
         end
 
         def connection
-          @base.connection
+          RightAws::S3Interface.new(@uploader.s3_access_key_id, @uploader.s3_secret_access_key)
+          #@base.connection
         end
 
       end
@@ -159,9 +165,9 @@ module CarrierWave
       end
 
       def connection
-        @connection ||= RightAws::S3Interface.new(uploader.s3_access_key_id, uploader.s3_secret_access_key)
+        @connection ||= RightAws::S3Interface.new(uploader.s3_access_key_id, uploader.s3_secret_access_key, {:logger => Logger.new('/home/ivan/s3.log')})
       end
 
     end # RightS3
   end # Storage
-end # CarrierWave
+end # CarrierWave

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 6
-  version: 0.4.6
+  - 8
+  version: 0.4.8
 platform: ruby
 authors: 
 - Jonas Nicklas, Ivan Turkovic