lib/cloud_crowd/asset_store.rb in documentcloud-cloud-crowd-0.0.1 vs lib/cloud_crowd/asset_store.rb in documentcloud-cloud-crowd-0.0.2

@@ -1,36 +1,43 @@
+require 'tmpdir'
+
 module CloudCrowd
 
   # The CloudCrowd::AssetStore should provide a common API for stashing and retrieving
   # assets via URLs, in production this will be S3 but in development it may
   # be the filesystem or /tmp.
   class AssetStore
     include FileUtils
     
     def initialize
+      @use_auth = CloudCrowd.config[:use_s3_authentication]
       mkdir_p temp_storage_path unless File.exists? temp_storage_path
     end
     
     # Path to CloudCrowd's temporary local storage.
     def temp_storage_path
       "#{Dir.tmpdir}/cloud_crowd_tmp"
     end
     
-    # Copy a finished file from our local storage to S3.
+    # Copy a finished file from our local storage to S3. Save it publicly if
+    # we're not configured to use S3 authentication.
     def save(local_path, save_path)
       ensure_s3_connection
-      @bucket.put(save_path, File.open(local_path), {}, 'public-read')
+      permission = @use_auth ? 'private' : 'public-read'
+      @bucket.put(save_path, File.open(local_path), {}, permission)
     end
     
     # Cleanup all S3 files for a job that's been completed and retrieved.
     def cleanup_job(job)
       ensure_s3_connection
       @bucket.delete_folder("#{job.action}/job_#{job.id}")
     end
     
-    # Return the S3 public URL for a finshed file.
+    # Return the S3 public URL for a finshed file. Authenticated links expire
+    # after one day by default.
     def url(save_path)
-      @bucket.key(save_path).public_link
+      @use_auth ? @s3.interface.get_link(@bucket, save_path) :
+                  @bucket.key(save_path).public_link
     end
     
     private
     
     # Unused for the moment. Think about using the filesystem instead of S3
\ No newline at end of file