paperclip 2.5.0 → 2.5.1

data/ChangeLog

@@ -0,0 +1,14 @@
+2012-01-20	Jon Yurek <jyurek@thoughtbot.com>
+
+	* lib/paperclip/railtie.rb (insert): Hide ActiveRecord-specific stuff in
+	the Railtie
+
+2012-01-18	Luke Griffiths <wlgriffiths@gmail.com>
+
+	* lib/paperclip/storage/s3.rb (self.extended),
+	test/storage/s3_live_test.rb, test/storage/s3_test.rb: Add S3 encryption
+
+2012-01-16	Jeremy McNevin <jeremy.mcnevin@thedolancompany.com> and ralph <ralph@rvdh.de>
+
+	* lib/paperclip/storage/fog.rb (flush_writes), fog_test.rb: Pass the
+	content type to Fog.

data/NEWS

@@ -1,3 +1,9 @@
+New in 2.5.1:
+
+* Feature: After we've computed the content type, pass it to Fog.
+* Feature: S3 encryption with the new :s3_server_side_encryption option.
+* Feature: Works without ActiveRecord, allowing for e.g. mongo backends.
+
 New in 2.5.0:
 
 * Performance: Only connect to S3 when absolutely needed.

data/lib/paperclip/railtie.rb

@@ -18,14 +18,18 @@ module Paperclip
 
   class Railtie
     def self.insert
-      ActiveRecord::Base.send(:include, Paperclip::Glue)
-      File.send(:include, Paperclip::Upfile)
+      Paperclip.options[:logger] = Rails.logger
+
+      if defined?(ActiveRecord)
+        ActiveRecord::Base.send(:include, Paperclip::Glue)
+        Paperclip.options[:logger] = ActiveRecord::Base.logger
 
-      Paperclip.options[:logger] = defined?(ActiveRecord) ? ActiveRecord::Base.logger : Rails.logger
+        ActiveRecord::ConnectionAdapters::AbstractAdapter.send(:include, Paperclip::Schema)
+        ActiveRecord::ConnectionAdapters::Table.send(:include, Paperclip::Schema)
+        ActiveRecord::ConnectionAdapters::TableDefinition.send(:include, Paperclip::Schema)
+      end
 
-      ActiveRecord::ConnectionAdapters::AbstractAdapter.send(:include, Paperclip::Schema)
-      ActiveRecord::ConnectionAdapters::Table.send(:include, Paperclip::Schema)
-      ActiveRecord::ConnectionAdapters::TableDefinition.send(:include, Paperclip::Schema)
+      File.send(:include, Paperclip::Upfile)
     end
   end
 end

data/lib/paperclip/storage/fog.rb

@@ -80,9 +80,10 @@ module Paperclip
           retried = false
           begin
             directory.files.create(fog_file.merge(
-              :body   => file,
-              :key    => path(style),
-              :public => fog_public
+              :body         => file,
+              :key          => path(style),
+              :public       => fog_public,
+              :content_type => file.content_type.to_s.strip
             ))
           rescue Excon::Errors::NotFound
             raise if retried

data/lib/paperclip/storage/s3.rb

@@ -115,6 +115,8 @@ module Paperclip
 
           @s3_headers[:storage_class] = @options[:s3_storage_class] if @options[:s3_storage_class]
 
+          @s3_server_side_encryption = @options[:s3_server_side_encryption]
+
           unless @options[:url].to_s.match(/^:s3.*url$/) || @options[:url] == ":asset_host"
             @options[:path] = @options[:path].gsub(/:url/, @options[:url]).gsub(/^:rails_root\/public\/system/, '')
             @options[:url]  = ":s3_path_url"
@@ -281,6 +283,9 @@ module Paperclip
               :acl => acl
             }
             write_options[:metadata] = @s3_metadata unless @s3_metadata.empty?
+            unless @s3_server_side_encryption.blank?
+              write_options[:server_side_encryption] = @s3_server_side_encryption
+            end
             write_options.merge!(@s3_headers)
             s3_object(style).write(file, write_options)
           rescue AWS::S3::Errors::NoSuchBucket => e

data/lib/paperclip/version.rb

@@ -1,3 +1,3 @@
 module Paperclip
-  VERSION = "2.5.0" unless defined? Paperclip::VERSION
+  VERSION = "2.5.1" unless defined? Paperclip::VERSION
 end

data/test/storage/fog_test.rb

@@ -110,6 +110,13 @@ class FogTest < Test::Unit::TestCase
         directory.destroy
       end
 
+      should "pass the content type to the Fog::Storage::AWS::Files instance" do
+        Fog::Storage::AWS::Files.any_instance.expects(:create).with do |hash|
+          hash[:content_type]
+        end
+        @dummy.save
+      end
+
       context "without a bucket" do
         setup do
           @connection.directories.get(@fog_directory).destroy

data/test/storage/s3_live_test.rb

@@ -134,5 +134,41 @@ unless ENV["S3_BUCKET"].blank?
         assert_not_found_response url
       end
     end
+
+    context "An attachment that uses S3 for storage and uses AES256 encryption" do
+      setup do
+        rebuild_model :styles => { :thumb => "100x100", :square => "32x32#" },
+                      :storage => :s3,
+                      :bucket => ENV["S3_BUCKET"],
+                      :path => ":class/:attachment/:id/:style.:extension",
+                      :s3_credentials => File.new(File.join(File.dirname(__FILE__), "..", "fixtures", "s3.yml")),
+                      :s3_server_side_encryption => :aes256
+
+        Dummy.delete_all
+        @dummy = Dummy.new
+      end
+
+      context "when assigned" do
+        setup do
+          @file = File.new(fixture_file('5k.png'), 'rb')
+          @dummy.avatar = @file
+        end
+
+        teardown do
+          @file.close
+          @dummy.destroy
+        end
+
+        context "and saved" do
+          setup do
+            @dummy.save
+          end
+
+          should "be encrypted on S3" do
+            assert @dummy.avatar.s3_object.server_side_encryption == :aes256
+          end
+        end
+      end
+    end
   end
 end

data/test/storage/s3_test.rb

@@ -684,6 +684,45 @@ class S3Test < Test::Unit::TestCase
     end
   end
 
+  context "An attachment with S3 storage and using AES256 encryption" do
+    setup do
+      rebuild_model :storage => :s3,
+                    :bucket => "testing",
+                    :path => ":attachment/:style/:basename.:extension",
+                    :s3_credentials => {
+                      'access_key_id' => "12345",
+                      'secret_access_key' => "54321"
+                    },
+                    :s3_server_side_encryption => :aes256
+    end
+
+    context "when assigned" do
+      setup do
+        @file = File.new(File.join(File.dirname(__FILE__), '..', 'fixtures', '5k.png'), 'rb')
+        @dummy = Dummy.new
+        @dummy.avatar = @file
+      end
+
+      teardown { @file.close }
+
+      context "and saved" do
+        setup do
+          object = stub
+          @dummy.avatar.stubs(:s3_object).returns(object)
+          object.expects(:write).with(anything,
+                                      :content_type => "image/png",
+                                      :acl => :public_read,
+                                      :server_side_encryption => :aes256)
+          @dummy.save
+        end
+
+        should "succeed" do
+          assert true
+        end
+      end
+    end
+  end
+
   context "An attachment with S3 storage and storage class set using the :storage_class option" do
     setup do
       rebuild_model :storage => :s3,

metadata

@@ -1,287 +1,215 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: paperclip
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 2.5.1
   prerelease: 
-  segments: 
-  - 2
-  - 5
-  - 0
-  version: 2.5.0
 platform: ruby
-authors: 
+authors:
 - Jon Yurek
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-13 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2012-01-27 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &14283600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 3
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.0
-  prerelease: false
-  name: activerecord
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 3
-        - 2
-        version: 2.3.2
   prerelease: false
+  version_requirements: *14283600
+- !ruby/object:Gem::Dependency
   name: activesupport
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &14282500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 0
-        - 2
-        version: 0.0.2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.2
+  type: :runtime
   prerelease: false
+  version_requirements: *14282500
+- !ruby/object:Gem::Dependency
   name: cocaine
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &14280720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+  type: :runtime
   prerelease: false
+  version_requirements: *14280720
+- !ruby/object:Gem::Dependency
   name: mime-types
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &14279580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
+  version_requirements: *14279580
+- !ruby/object:Gem::Dependency
   name: shoulda
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  requirement: &14276160 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *14276160
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: &14274240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 4
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.4.0
-  prerelease: false
-  name: appraisal
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
   prerelease: false
+  version_requirements: *14274240
+- !ruby/object:Gem::Dependency
   name: mocha
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &14273340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: *14273340
+- !ruby/object:Gem::Dependency
   name: aws-sdk
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  requirement: &14272400 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *14272400
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &14271240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 3
-        - 4
+      - !ruby/object:Gem::Version
         version: 1.3.4
-  prerelease: false
-  name: sqlite3
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *14271240
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: &14270340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 1
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.1.0
-  prerelease: false
-  name: cucumber
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
   prerelease: false
+  version_requirements: *14270340
+- !ruby/object:Gem::Dependency
   name: aruba
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &14269680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: *14269680
+- !ruby/object:Gem::Dependency
   name: capybara
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &14268260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: *14268260
+- !ruby/object:Gem::Dependency
   name: bundler
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &14264560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 2
-        version: "0.2"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: *14264560
+- !ruby/object:Gem::Dependency
   name: cocaine
-  version_requirements: *id014
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  requirement: &14262640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :development
   prerelease: false
+  version_requirements: *14262640
+- !ruby/object:Gem::Dependency
   name: fog
-  version_requirements: *id015
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  requirement: &14253520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: *14253520
+- !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: *id016
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  requirement: &14249900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: *14249900
+- !ruby/object:Gem::Dependency
   name: fakeweb
-  version_requirements: *id017
+  requirement: &14244620 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *14244620
 description: Easy upload management for ActiveRecord
-email: 
+email:
 - jyurek@thoughtbot.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Appraisals
 - CONTRIBUTING.md
+- ChangeLog
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -385,31 +313,29 @@ files:
 - test/url_generator_test.rb
 homepage: https://github.com/thoughtbot/paperclip
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -125325840175155071
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-requirements: 
+      hash: -125325840175155071
+requirements:
 - ImageMagick
 rubyforge_project: paperclip
 rubygems_version: 1.8.11
@@ -417,4 +343,3 @@ signing_key:
 specification_version: 3
 summary: File attachments as attributes for ActiveRecord
 test_files: []
-