jammit-s3 0.5.3.4 → 0.5.3.5

data/jammit-s3.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name      = 'jammit-s3'
-  s.version   = '0.5.3.4'
+  s.version   = '0.5.3.5'
 
   s.homepage    = "http://documentcloud.github.com/jammit/"
   s.summary     = "Asset Packaging for Rails with Deployment to S3/Cloudfront"
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'jammit',    '>= 0.5.3'
   s.add_dependency 'mimemagic',  '>= 0.1.7'
-  s.add_dependency 's3', ">= 0.3.4"
+  s.add_dependency 's3', ">= 0.3.7"
 
   s.files = Dir['lib/**/*', 'bin/*', 'jammit-s3.gemspec', 'LICENSE', 'README']
 end

data/lib/jammit/s3_uploader.rb

@@ -9,13 +9,13 @@ module Jammit
         @access_key_id = options[:access_key_id] || Jammit.configuration[:s3_access_key_id]
         @secret_access_key = options[:secret_access_key] || Jammit.configuration[:s3_secret_access_key]
         @bucket_location = options[:bucket_location] || Jammit.configuration[:s3_bucket_location]
-
+        @cache_control = options[:cache_control] || Jammit.configuration[:s3_cache_control]
+        
         @bucket = find_or_create_bucket
       end
     end
 
     def upload
-
       log "Pushing assets to S3 bucket: #{@bucket.name}"
       globs = []
 
@@ -60,6 +60,7 @@ module Jammit
 
         # save to s3
         new_object = @bucket.objects.build(remote_path)
+        new_object.cache_control = @cache_control if @cache_control
         new_object.content_type = MimeMagic.by_path(remote_path)
         new_object.content = open(local_path)
         new_object.content_encoding = "gzip" if use_gzip

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: jammit-s3
 version: !ruby/object:Gem::Version 
-  hash: 99
+  hash: 97
   prerelease: false
   segments: 
   - 0
   - 5
   - 3
-  - 4
-  version: 0.5.3.4
+  - 5
+  version: 0.5.3.5
 platform: ruby
 authors: 
 - Jacques Crocker
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-26 00:00:00 -07:00
+date: 2010-10-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,12 +60,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 29
         segments: 
         - 0
         - 3
-        - 4
-        version: 0.3.4
+        - 7
+        version: 0.3.7
   requirement: *id003
 description: "    Jammit-S3 is an extension to the awesome Jammit library that handles deployment to s3 and cloudfront.\n"
 email: railsjedi@gmail.com