lib/nightcrawler_swift/commands/upload.rb in nightcrawler_swift-0.5.0 vs lib/nightcrawler_swift/commands/upload.rb in nightcrawler_swift-0.6.0

@@ -1,22 +1,29 @@
 module NightcrawlerSwift
   class Upload < Command
 
-    def execute path, file
-      content = file.read
-      headers = {etag: etag(content), content_type: content_type(file)}
-      headers.merge!(cache_control: "public, max-age=#{options.max_age}") if options.max_age
-      response = put "#{connection.upload_url}/#{path}", body: content, headers: headers
+    def execute path, file, opts = {}
+      body = file.read
+      headers = {etag: etag(body), content_type: content_type(file)}
+
+      max_age = opts[:max_age] || options.max_age
+      headers.merge!(cache_control: "public, max-age=#{max_age}", expires: expires(max_age)) if max_age
+
+      response = put "#{connection.upload_url}/#{path}", body: body, headers: headers
       [200, 201].include?(response.code)
     end
 
     private
     def content_type file
       MultiMime.by_file(file).content_type
     end
 
     def etag content
       Digest::MD5.hexdigest(content)
+    end
+
+    def expires max_age
+      CGI.rfc1123_date(Time.now + max_age)
     end
 
   end
 end