paperclip-aws 1.1.3 → 1.2.0

data/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
-  gem 'paperclip', '>=2.3.0'
-  gem 'aws-sdk', '>=1.1.0'
+  gem 'paperclip', '>=2.4.0'
+  gem 'aws-sdk', '>=1.2.0'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -1,37 +1,40 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.10)
-      activesupport (= 3.0.10)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.10)
-      activemodel (= 3.0.10)
-      activesupport (= 3.0.10)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activesupport (3.0.10)
-    arel (2.0.10)
-    aws-sdk (1.1.0)
+    activemodel (3.1.1)
+      activesupport (= 3.1.1)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activesupport (3.1.1)
+      multi_json (~> 1.0)
+    arel (2.2.1)
+    aws-sdk (1.2.2)
       httparty (~> 0.7)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
       uuidtools (~> 2.1)
-    builder (2.1.2)
+    builder (3.0.0)
     cocaine (0.2.0)
-    crack (0.1.8)
     git (1.2.5)
-    httparty (0.7.8)
-      crack (= 0.1.8)
-    i18n (0.5.0)
+    httparty (0.8.1)
+      multi_json
+      multi_xml
+    i18n (0.6.0)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    json (1.5.3)
-    mime-types (1.16)
+    json (1.6.1)
+    mime-types (1.17.2)
+    multi_json (1.0.3)
+    multi_xml (0.4.1)
     nokogiri (1.5.0)
-    paperclip (2.3.16)
+    paperclip (2.4.5)
       activerecord (>= 2.3.0)
       activesupport (>= 2.3.2)
       cocaine (>= 0.0.2)
@@ -39,16 +42,16 @@ GEM
     rake (0.9.2)
     rcov (0.9.10)
     shoulda (2.11.3)
-    tzinfo (0.3.29)
+    tzinfo (0.3.31)
     uuidtools (2.1.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  aws-sdk (>= 1.1.0)
+  aws-sdk (>= 1.2.0)
   bundler (~> 1.0.0)
   jeweler (~> 1.6.4)
-  paperclip (>= 2.3.0)
+  paperclip (>= 2.4.0)
   rcov
   shoulda

data/README.md

@@ -9,12 +9,13 @@
 * supports expiring urls;
 * can generate urls for `read`, `write` и `delete` operations;
 * correctly sets content-type of uploaded files;
+* **supports amazon server side encryption** (thanks to [pvertenten](https://github.com/pvertenten));
 
 
 ## Requirements ##
 
 * [paperclip][0] ~> 2.3
-* [aws-sdk][1] >= 1.0.3
+* [aws-sdk][1] >= 1.2.2
 
 ## Installation ##
 

data/VERSION

@@ -1 +1 @@
-1.1.3
+1.2.0

data/lib/paperclip-aws.rb

@@ -22,7 +22,8 @@ module Paperclip
           
           # setup permissions
           @s3_acl           = @options[:s3_acl]           || :public_read
-          
+          @s3_sse = @options[:s3_sse]
+
           # choose what storage class we use, 'standard' or 'reduced_redundancy'
           @s3_storage_class = @options[:s3_storage_class] || :standard
           
@@ -74,7 +75,14 @@ module Paperclip
       end
 
       def exists?(style = default_style)
-        @s3.buckets[@s3_bucket].objects[path(style)].exists?
+        if path(style).nil? || path(style).to_s.strip == ""
+          return false
+        end
+        begin
+          return @s3.buckets[@s3_bucket].objects[path(style)].exists?
+        rescue AWS::S3::Errors::NoSuchKey
+          return false
+        end
       end
 
       def choose_protocol(options={})
@@ -107,17 +115,18 @@ module Paperclip
         @queued_for_write.each do |style, file|
           begin
             log("saving #{path(style)}")
-            
+
             @s3.buckets[@s3_bucket].objects[path(style)].write(
               file,
               :acl => @s3_acl,
               :storage_class => @s3_storage_class,
-              :content_type => file.content_type
+              :content_type => file.content_type,
+              :server_side_encryption => @s3_sse
             )
           rescue AWS::S3::Errors::NoSuchBucket => e
             create_bucket
             retry
-          rescue AWS::S3::Errors::Base => e
+          rescue AWS::Errors::Base => e
             raise
           end
         end
@@ -129,7 +138,7 @@ module Paperclip
           begin
             log("deleting #{path}")
             @s3.buckets[@s3_bucket].objects[path].delete
-          rescue AWS::S3::Base => e
+          rescue AWS::Errors::Base => e
             raise
           end
         end
@@ -152,4 +161,4 @@ module Paperclip
 
     end
   end
-end
+end

data/paperclip-aws.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{paperclip-aws}
-  s.version = "1.1.3"
+  s.name = "paperclip-aws"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Igor Alexandrov"]
-  s.date = %q{2011-08-18}
-  s.description = %q{'paperclip-aws' is a full featured storage module that supports all S3 locations (US, European and Tokio) without any additional hacking.}
-  s.email = %q{igor.alexandrov@gmail.com}
+  s.date = "2011-11-10"
+  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 = [
     "LICENSE.txt",
     "README.md"
@@ -29,33 +29,33 @@ Gem::Specification.new do |s|
     "test/helper.rb",
     "test/test_papepclip-aws.rb"
   ]
-  s.homepage = %q{http://github.com/igor-alexandrov/paperclip-aws}
+  s.homepage = "http://github.com/igor-alexandrov/paperclip-aws"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.7.2}
-  s.summary = %q{Storage module to official 'aws-sdk' gem for Amazon S3}
+  s.rubygems_version = "1.8.10"
+  s.summary = "Storage module to official 'aws-sdk' gem for Amazon S3"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<paperclip>, [">= 2.3.0"])
-      s.add_runtime_dependency(%q<aws-sdk>, [">= 1.1.0"])
+      s.add_runtime_dependency(%q<paperclip>, [">= 2.4.0"])
+      s.add_runtime_dependency(%q<aws-sdk>, [">= 1.2.0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
-      s.add_dependency(%q<paperclip>, [">= 2.3.0"])
-      s.add_dependency(%q<aws-sdk>, [">= 1.1.0"])
+      s.add_dependency(%q<paperclip>, [">= 2.4.0"])
+      s.add_dependency(%q<aws-sdk>, [">= 1.2.0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<paperclip>, [">= 2.3.0"])
-    s.add_dependency(%q<aws-sdk>, [">= 1.1.0"])
+    s.add_dependency(%q<paperclip>, [">= 2.4.0"])
+    s.add_dependency(%q<aws-sdk>, [">= 1.2.0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-aws
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-18 00:00:00.000000000Z
+date: 2011-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70278361149580 !ruby/object:Gem::Requirement
+  requirement: &70106231922500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70278361149580
+  version_requirements: *70106231922500
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &70278361147340 !ruby/object:Gem::Requirement
+  requirement: &70106231921740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70278361147340
+  version_requirements: *70106231921740
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70278361145980 !ruby/object:Gem::Requirement
+  requirement: &70106231920980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70278361145980
+  version_requirements: *70106231920980
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70278359442060 !ruby/object:Gem::Requirement
+  requirement: &70106231920060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70278359442060
+  version_requirements: *70106231920060
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70278359440820 !ruby/object:Gem::Requirement
+  requirement: &70106231919420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70278359440820
+  version_requirements: *70106231919420
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70278359438220 !ruby/object:Gem::Requirement
+  requirement: &70106231918660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70278359438220
+  version_requirements: *70106231918660
 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
@@ -112,7 +112,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4585726686328687021
+      hash: -2842313220782093733
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Storage module to official 'aws-sdk' gem for Amazon S3