Merge branch 'before_whitespace'

earnold · Mar 14, 2008 · faa45a4 · faa45a4
2 parents d303cd0 + c3403c7
commit faa45a4
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/lib/technoweenie/attachment_fu/backends/s3_backend.rb b/lib/technoweenie/attachment_fu/backends/s3_backend.rb
@@ -140,13 +140,7 @@ def self.included(base) #:nodoc:
 
           @@bucket_name = s3_config[:bucket_name]
 
-          Base.establish_connection!(
-            :access_key_id     => s3_config[:access_key_id],
-            :secret_access_key => s3_config[:secret_access_key],
-            :server            => s3_config[:server],
-            :port              => s3_config[:port],
-            :use_ssl           => s3_config[:use_ssl]
-          )
+          Base.establish_connection!(s3_config.slice(:access_key_id, :secret_access_key, :server, :port, :use_ssl, :persistent, :proxy))
 
           # Bucket.create(@@bucket_name)
 
@@ -306,4 +300,4 @@ def save_to_storage
       end
     end
   end
-end
+end