paperclip-aws 1.3.5 → 1.4.0

data/README.md

@@ -12,6 +12,7 @@
 * supports different permissions for each Paperclip style;
 * can generate urls for `read`, `write` и `delete` operations;
 * correctly sets content-type of uploaded files;
+* ability to set content-disposition of uploaded files;
 * **supports amazon server side encryption** (thanks to [pvertenten](https://github.com/pvertenten));
 * highly compatible with included in Paperclip S3 storage module
 
@@ -52,9 +53,17 @@ After this add 'paperclip-aws' to your `Gemfile` or `environment.rb`
                         :s3_options => {
                           :sse => 'AES256',
                           :storage_class => :reduced_redundancy
+                          :content_disposition => 'attachment'
                         },
                         
                         :path => "company_documents/:id/:style/:data_file_name"  
+                        
+      # You also can modify @s3_options hash directly.
+      before_save do
+        self.data.s3_options[:content_disposition] = "attachment; filename=#{self.data_file_name}"
+        self.data.s3_options[:sse] = true if self.confidential_information?
+        self.data.s3_options[:storage_class] = true if self.unimportant_information?
+      end                          
     end
                       
 ## Possible options ##

data/VERSION

@@ -1 +1 @@
-1.3.5
+1.4.0

data/lib/paperclip-aws.rb

@@ -15,7 +15,10 @@ module Paperclip
           raise e
         end unless defined?(AWS)
         
-        base.instance_eval do         
+        attr_accessor :s3_options
+        base.instance_eval do
+
+                   
           @s3_credentials = parse_credentials(@options.s3_credentials)
           @s3_permissions = set_permissions(@options.s3_permissions)
           
@@ -33,9 +36,17 @@ module Paperclip
           
           @s3_options     = @options.s3_options     || {}
           # setup Amazon Server Side encryption
-          @s3_sse           = @s3_options[:sse]            || false
-          # choose what storage class we use, 'standard' or 'reduced_redundancy'
-          @s3_storage_class = @s3_options[:storage_class]  || :standard
+          @s3_options.reverse_merge!({
+            :sse => false,
+            :storage_class => :standard,
+            :content_disposition => nil
+          })
+          
+          # @s3_sse           = @s3_options[:sse]            || false
+          # # choose what storage class we use, 'standard' or 'reduced_redundancy'
+          # @s3_storage_class = @s3_options[:storage_class]  || :standard
+          # 
+          # @s3_content_disposition = @s3_options[:content_disposition] || ''
           
           @s3_endpoint      = @s3_credentials[:endpoint] || 's3.amazonaws.com'
                     
@@ -138,11 +149,12 @@ module Paperclip
             log("saving #{path(style)}")
             
             @s3.buckets[@s3_bucket].objects[path(style)].write(
-              file,
+              :file => file.path,
               :acl => @s3_permissions[:style.to_sym] || @s3_permissions[:default],
-              :storage_class => @s3_storage_class.to_sym,
+              :storage_class => @s3_options[:storage_class],
               :content_type => file.content_type,
-              :server_side_encryption => @s3_sse
+              :content_disposition => @s3_options[:content_disposition],
+              :server_side_encryption => @s3_options[:sse]
             )
           rescue AWS::S3::Errors::NoSuchBucket => e
             create_bucket

data/paperclip-aws.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "paperclip-aws"
-  s.version = "1.3.5"
+  s.version = "1.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Igor Alexandrov"]
-  s.date = "2011-11-29"
+  s.date = "2011-11-30"
   s.description = "'paperclip-aws' is a full featured storage module that supports all S3 locations (US, European and Tokio) without any additional hacking."
   s.email = "igor.alexandrov@gmail.com"
   s.extra_rdoc_files = [

data/test/debug.log

@@ -2000,3 +2000,55 @@ D, [2011-11-14T00:55:21.090579 #53187] DEBUG -- :    (0.1ms)  D
 D, [2011-11-14T00:55:21.092194 #53187] DEBUG -- :    (0.3ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 
 D, [2011-11-14T00:55:21.116832 #53187] DEBUG -- :    (0.2ms)  DROP TABLE "dummies"
 D, [2011-11-14T00:55:21.117867 #53187] DEBUG -- :    (0.2ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 
+D, [2011-11-30T15:57:04.811133 #9144] DEBUG -- :    (0.5ms)  select sqlite_version(*)
+D, [2011-11-30T15:57:04.838768 #9144] DEBUG -- :    (10.2ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 
+I, [2011-11-30T15:57:05.913050 #9144]  INFO -- : Command :: identify -format %wx%h '/var/folders/h0/qs28mjnd4yz2g_2s_1lfr94c0000gn/T/stream20111130-9144-kx32ax.png[0]'
+I, [2011-11-30T15:57:05.960309 #9144]  INFO -- : Command :: convert '/var/folders/h0/qs28mjnd4yz2g_2s_1lfr94c0000gn/T/stream20111130-9144-kx32ax.png[0]' -resize "x500" -crop "500x500+1393+0" +repage '/var/folders/h0/qs28mjnd4yz2g_2s_1lfr94c0000gn/T/stream20111130-9144-kx32ax20111130-9144-1jkx9ja.jpg'
+D, [2011-11-30T15:57:06.251656 #9144] DEBUG -- :    (0.4ms)  DROP TABLE "dummies"
+D, [2011-11-30T15:57:06.253313 #9144] DEBUG -- :    (0.4ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 
+I, [2011-11-30T15:57:06.309254 #9144]  INFO -- : Command :: identify -format %wx%h '/var/folders/h0/qs28mjnd4yz2g_2s_1lfr94c0000gn/T/stream20111130-9144-50yu82.png[0]'
+I, [2011-11-30T15:57:06.336693 #9144]  INFO -- : Command :: convert '/var/folders/h0/qs28mjnd4yz2g_2s_1lfr94c0000gn/T/stream20111130-9144-50yu82.png[0]' -resize "x500" -crop "500x500+1393+0" +repage '/var/folders/h0/qs28mjnd4yz2g_2s_1lfr94c0000gn/T/stream20111130-9144-50yu8220111130-9144-1hzigdn.jpg'
+D, [2011-11-30T15:57:06.555197 #9144] DEBUG -- :    (1.0ms)  DROP TABLE "dummies"
+D, [2011-11-30T15:57:06.556130 #9144] DEBUG -- :    (0.3ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 
+I, [2011-11-30T15:57:06.593267 #9144]  INFO -- : Command :: identify -format %wx%h '/var/folders/h0/qs28mjnd4yz2g_2s_1lfr94c0000gn/T/stream20111130-9144-1enekak.png[0]'
+I, [2011-11-30T15:57:06.618549 #9144]  INFO -- : Command :: convert '/var/folders/h0/qs28mjnd4yz2g_2s_1lfr94c0000gn/T/stream20111130-9144-1enekak.png[0]' -resize "x500" -crop "500x500+1393+0" +repage '/var/folders/h0/qs28mjnd4yz2g_2s_1lfr94c0000gn/T/stream20111130-9144-1enekak20111130-9144-soee2v.jpg'
+D, [2011-11-30T15:57:06.855306 #9144] DEBUG -- :    (0.2ms)  DROP TABLE "dummies"
+D, [2011-11-30T15:57:06.856071 #9144] DEBUG -- :    (0.2ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 
+I, [2011-11-30T15:57:06.876352 #9144]  INFO -- : Command :: identify -format %wx%h '/var/folders/h0/qs28mjnd4yz2g_2s_1lfr94c0000gn/T/stream20111130-9144-k756kd.png[0]'
+I, [2011-11-30T15:57:06.894074 #9144]  INFO -- : Command :: convert '/var/folders/h0/qs28mjnd4yz2g_2s_1lfr94c0000gn/T/stream20111130-9144-k756kd.png[0]' -resize "x500" -crop "500x500+1393+0" +repage '/var/folders/h0/qs28mjnd4yz2g_2s_1lfr94c0000gn/T/stream20111130-9144-k756kd20111130-9144-f6hni5.jpg'
+D, [2011-11-30T15:57:07.140518 #9144] DEBUG -- :    (0.3ms)  DROP TABLE "dummies"
+D, [2011-11-30T15:57:07.141724 #9144] DEBUG -- :    (0.2ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 
+D, [2011-11-30T15:57:07.193022 #9144] DEBUG -- :    (0.3ms)  DROP TABLE "dummies"
+D, [2011-11-30T15:57:07.193802 #9144] DEBUG -- :    (0.2ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 
+D, [2011-11-30T15:57:07.211433 #9144] DEBUG -- :    (0.2ms)  DROP TABLE "dummies"
+D, [2011-11-30T15:57:07.213791 #9144] DEBUG -- :    (0.5ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 
+D, [2011-11-30T15:57:07.249979 #9144] DEBUG -- :    (0.2ms)  DROP TABLE "dummies"
+D, [2011-11-30T15:57:07.250656 #9144] DEBUG -- :    (0.2ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 
+D, [2011-11-30T15:57:07.261649 #9144] DEBUG -- :    (0.1ms)  DROP TABLE "dummies"
+D, [2011-11-30T15:57:07.262740 #9144] DEBUG -- :    (0.2ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 
+D, [2011-11-30T15:57:07.282432 #9144] DEBUG -- :    (0.3ms)  DROP TABLE "dummies"
+D, [2011-11-30T15:57:07.285659 #9144] DEBUG -- :    (0.3ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 
+D, [2011-11-30T15:57:07.400516 #9144] DEBUG -- :    (0.1ms)  DROP TABLE "dummies"
+D, [2011-11-30T15:57:07.401169 #9144] DEBUG -- :    (0.2ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 
+D, [2011-11-30T15:57:07.422467 #9144] DEBUG -- :    (0.1ms)  DROP TABLE "dummies"
+D, [2011-11-30T15:57:07.422989 #9144] DEBUG -- :    (0.1ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 
+D, [2011-11-30T15:57:07.564313 #9144] DEBUG -- :    (0.2ms)  DROP TABLE "dummies"
+D, [2011-11-30T15:57:07.565048 #9144] DEBUG -- :    (0.2ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 
+D, [2011-11-30T15:57:07.681554 #9144] DEBUG -- :    (0.7ms)  DROP TABLE "dummies"
+D, [2011-11-30T15:57:07.682747 #9144] DEBUG -- :    (0.2ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 
+D, [2011-11-30T15:57:07.728276 #9144] DEBUG -- :    (0.1ms)  DROP TABLE "dummies"
+D, [2011-11-30T15:57:07.729199 #9144] DEBUG -- :    (0.2ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 
+D, [2011-11-30T15:57:07.754217 #9144] DEBUG -- :    (0.1ms)  DROP TABLE "dummies"
+D, [2011-11-30T15:57:07.754790 #9144] DEBUG -- :    (0.2ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 
+D, [2011-11-30T15:57:07.775813 #9144] DEBUG -- :    (0.1ms)  DROP TABLE "dummies"
+D, [2011-11-30T15:57:07.776689 #9144] DEBUG -- :    (0.3ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 
+D, [2011-11-30T15:57:07.865466 #9144] DEBUG -- :    (0.2ms)  DROP TABLE "dummies"
+D, [2011-11-30T15:57:07.866903 #9144] DEBUG -- :    (0.4ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 
+D, [2011-11-30T15:57:07.905806 #9144] DEBUG -- :    (0.1ms)  DROP TABLE "dummies"
+D, [2011-11-30T15:57:07.906556 #9144] DEBUG -- :    (0.2ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 
+D, [2011-11-30T15:57:08.016449 #9144] DEBUG -- :    (0.2ms)  DROP TABLE "dummies"
+D, [2011-11-30T15:57:08.017967 #9144] DEBUG -- :    (0.2ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 
+D, [2011-11-30T15:57:08.066210 #9144] DEBUG -- :    (0.2ms)  DROP TABLE "dummies"
+D, [2011-11-30T15:57:08.066988 #9144] DEBUG -- :    (0.2ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 
+D, [2011-11-30T15:57:08.107915 #9144] DEBUG -- :    (0.1ms)  DROP TABLE "dummies"
+D, [2011-11-30T15:57:08.108540 #9144] DEBUG -- :    (0.2ms)  CREATE TABLE "dummies" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "other" varchar(255), "avatar_file_name" varchar(255), "avatar_content_type" varchar(255), "avatar_file_size" integer, "avatar_updated_at" datetime, "avatar_fingerprint" varchar(255)) 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-aws
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-29 00:00:00.000000000 Z
+date: 2011-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70307361234160 !ruby/object:Gem::Requirement
+  requirement: &70336624699780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70307361234160
+  version_requirements: *70336624699780
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &70307360990860 !ruby/object:Gem::Requirement
+  requirement: &70336624698400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70307360990860
+  version_requirements: *70336624698400
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70307360988420 !ruby/object:Gem::Requirement
+  requirement: &70336624628000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70307360988420
+  version_requirements: *70336624628000
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70307361261020 !ruby/object:Gem::Requirement
+  requirement: &70336624622700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70307361261020
+  version_requirements: *70336624622700
 description: ! '''paperclip-aws'' is a full featured storage module that supports
   all S3 locations (US, European and Tokio) without any additional hacking.'
 email: igor.alexandrov@gmail.com
@@ -94,7 +94,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -620318264857174187
+      hash: 2734313854826493874
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: