pothoven-attachment_fu 3.2.9 → 3.2.10

data/CHANGELOG

@@ -1,3 +1,6 @@
+* Aug 22, 2013 *
+* Added cache-control header option and Ruby 1.9 fix for S3 from tricycle
+
 * Aug 21, 2013 *
 * Added S3 :encrypted_storage option support from cschulte22
 

data/lib/technoweenie/attachment_fu.rb

@@ -98,6 +98,7 @@ module Technoweenie # :nodoc:
         options[:s3_access]        ||= :public_read
         options[:cloudfront]       ||= false
         options[:content_type] = [options[:content_type]].flatten.collect! { |t| t == :image ? ::Technoweenie::AttachmentFu.content_types : t }.flatten unless options[:content_type].nil?
+        options[:cache_control]    ||= "max-age=315360000" # 10 years
 
         unless options[:thumbnails].is_a?(Hash)
           raise ArgumentError, ":thumbnails option should be a hash: e.g. :thumbnails => { :foo => '50x50' }"

data/lib/technoweenie/attachment_fu/backends/s3_backend.rb

@@ -291,9 +291,9 @@ module Technoweenie # :nodoc:
 
         def public_filename(*args)
           if attachment_options[:cloudfront]
-            cloudfront_url(args)
+            cloudfront_url(*args)
           else
-            s3_url(args)
+            s3_url(*args)
           end
         end
 
@@ -386,6 +386,7 @@ module Technoweenie # :nodoc:
                                (temp_path ? File.open(temp_path) : temp_data),
                                bucket_name,
                                :content_type => content_type,
+                               :cache_control => attachment_options[:cache_control],
                                :access => attachment_options[:s3_access],
                                'x-amz-server-side-encryption' => 'AES256',
                                'Content-Disposition' => "attachment; filename=\"#{filename}\""
@@ -396,6 +397,7 @@ module Technoweenie # :nodoc:
                                (temp_path ? File.open(temp_path) : temp_data),
                                bucket_name,
                                :content_type => content_type,
+                               :cache_control => attachment_options[:cache_control],
                                :access => attachment_options[:s3_access]
                                )
               end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pothoven-attachment_fu
 version: !ruby/object:Gem::Version
-  version: 3.2.9
+  version: 3.2.10
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-21 00:00:00.000000000 Z
+date: 2013-08-22 00:00:00.000000000 Z
 dependencies: []
 description: This is a fork of Rick Olson's attachment_fu adding Ruby 1.9 and Rails
   3.2 support as well as some other enhancements.