paperclip 3.5.4 → 4.3.7

data/.rubocop.yml

@@ -0,0 +1 @@
+inherit_from: .hound.yml

data/.travis.yml

@@ -1,28 +1,22 @@
 rvm:
-  - 1.9.2
-  - 1.9.3
+  - 2.0
+  - 2.1
+  - 2.2.2
   - jruby-19mode
-  - rbx-19mode
-  - 2.0.0
-  - 2.1.0
+  - rbx-2
 
-install:
-  - "bundle install"
-
-before_script: "sudo ntpdate -ub ntp.ubuntu.com pool.ntp.org; true"
-script: "bundle exec rake clean test cucumber"
+script: "bundle exec rake clean spec cucumber"
 
 gemfile:
-  - gemfiles/3.0.gemfile
-  - gemfiles/3.1.gemfile
   - gemfiles/3.2.gemfile
-  - gemfiles/4.0.gemfile
+  - gemfiles/4.1.gemfile
+  - gemfiles/4.2.gemfile
 
 matrix:
+  fast_finish: true
   allow_failures:
     - rvm: jruby-19mode
-    - rvm: rbx-19mode
+    - rvm: rbx-2
 
-  exclude:
-      - rvm: 1.9.2
-        gemfile: gemfiles/4.0.gemfile
+sudo: false
+cache: bundler

data/Appraisals

@@ -1,19 +1,11 @@
-appraise "3.0" do
-  gem "rails", "~> 3.0.20"
-  gem "paperclip", :path => "../"
-end
-
-appraise "3.1" do
-  gem "rails", "~> 3.1.12"
-  gem "paperclip", :path => "../"
+appraise "3.2" do
+  gem "rails", "~> 3.2.0"
 end
 
-appraise "3.2" do
-  gem "rails", "~> 3.2.15"
-  gem "paperclip", :path => "../"
+appraise "4.1" do
+  gem "rails", "~> 4.1.0"
 end
 
-appraise "4.0" do
-  gem "rails", "~> 4.0.0"
-  gem "paperclip", :path => "../"
+appraise "4.2" do
+  gem "rails", "~> 4.2.0"
 end

data/CONTRIBUTING.md

@@ -6,7 +6,7 @@ We love pull requests. Here's a quick guide:
 1. Fork the repo.
 
 2. Run the tests. We only take pull requests with passing tests, and it's great
-to know that you have a clean slate: `bundle && rake`
+to know that you have a clean slate: `bundle && bundle exec rake`
 
 3. Add a test for your change. Only refactoring and documentation changes
 require no new tests. If you are adding functionality or fixing a bug, we need
@@ -17,8 +17,9 @@ a test!
 5. Push to your fork and submit a pull request.
 
 At this point you're waiting on us. We like to at least comment on, if not
-accept, pull requests within three business days (and, typically, one business
-day). We may suggest some changes or improvements or alternatives.
+accept, pull requests within seven business days (most of the work on Paperclip
+gets done on Fridays). We may suggest some changes or improvements or
+alternatives.
 
 Some things that will increase the chance that your pull request is accepted,
 taken straight from the Ruby on Rails guide:
@@ -35,27 +36,31 @@ Paperclip uses [Appraisal](https://github.com/thoughtbot/appraisal) to aid
 testing against multiple version of Ruby on Rails. This helps us to make sure
 that Paperclip performs correctly with them.
 
+Paperclip also uses [RSpec](http://rspec.info) for its unit tests. If you submit
+tests that are not written for Cucumber or RSpec without a very good reason, you
+will be asked to rewrite them before we'll accept.
+
 ### Bootstrapping your test suite:
 
     bundle install
-    bundle exec rake appraisal:install
+    bundle exec appraisal install
 
 This will install all the required gems that requires to test against each
 version of Rails, which defined in `gemfiles/*.gemfile`.
 
 ### To run a full test suite:
 
-    bundle exec rake
+    bundle exec appraisal rake
 
-This will run Test::Unit and Cucumber against all version of Rails
+This will run RSpec and Cucumber against all version of Rails
 
 ### To run single Test::Unit or Cucumber test
 
 You need to specify a `BUNDLE_GEMFILE` pointing to the gemfile before running
 the normal test command:
 
-    BUNDLE_GEMFILE=gemfiles/3.2.gemfile ruby -Itest test/schema_test.rb
-    BUNDLE_GEMFILE=gemfiles/3.2.gemfile cucumber features/basic_integration.feature
+    BUNDLE_GEMFILE=gemfiles/4.1.gemfile rspec spec/paperclip/attachment_spec.rb
+    BUNDLE_GEMFILE=gemfiles/4.1.gemfile cucumber features/basic_integration.feature
 
 Syntax
 ------

data/Gemfile

@@ -2,7 +2,20 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'jruby-openssl', :platform => :jruby
-gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
+gem 'sqlite3', '~> 1.3.8', :platforms => :ruby
 
-gem 'pry', :platform => :ruby
+gem 'jruby-openssl', :platforms => :jruby
+gem 'activerecord-jdbcsqlite3-adapter', :platforms => :jruby
+
+gem 'rubysl', :platforms => :rbx
+gem 'racc', :platforms => :rbx
+
+gem 'pry'
+
+# Hinting at development dependencies
+# Prevents bundler from taking a long-time to resolve
+group :development, :test do
+  gem 'mime-types', '~> 1.16'
+  gem 'builder'
+  gem 'rubocop', require: false
+end

data/LICENSE

@@ -3,7 +3,7 @@ LICENSE
 
 The MIT License
 
-Copyright (c) 2008-2013 Jon Yurek and thoughtbot, inc.
+Copyright (c) 2008-2015 Jon Yurek and thoughtbot, inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -22,5 +22,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
-
-

data/NEWS

@@ -1,37 +1,155 @@
-New in 3.5.4:
-
-Bug Fix: Users were reporting IOErrors. Stop closing extra files to prevent.
-
-New in 3.5.3:
-
-Improvement: After three long, hard years... we know how to upgrade
-Bug Fix: #expiring_url returns 'missing' urls if nothing is attached
-Improvement: Lots of documentation fixes
-Improvement: Lots of fixes for Ruby warnings
-Improvement: Test the most appropriate Ruby/Rails comobinations on Travis
-Improvement: Delegate more IO methods through IOAdapters
-Improvement: Remove Rails 4 deprecations
-Improvement: Both S3's and Fog's #expiring_url can take a Time or Int
-Bug Fix: Both S3's and Fog's expiring_url respect style when missing the file
-Bug Fix: Timefiles will have a reasonable-length name. They're all MD5 hashes now
-Bug Fix: Don't delete files off S3 when reprocessing due to AWS inconsistencies
-Bug Fix: "swallow_stream" isn't thread dafe. Use :swallow_stderr
-Improvement: Regexps use \A and \Z instead of ^ and $
-Improvement: :s3_credentials can take a lambda as an argument
-Improvement: Search up the class heirarchy for attachments
-Improvement: deep_merge options instead of regular merge
-Bug Fix: Prevent file deletion on transaction rollback
-Test Improvement: Ensure more files are properly closed during tests
-Test Bug Fix: Return the gemfile's syntax to normal
-
-New in 3.5.2:
+4.3.7 (7/1/2016):
+
+* Add deprecation warnings
+* Improvement: Add `fog_options` configuration to send options to fog when storing files.
+* Improvement: the `URI adapter` now uses the content-disposition header to name the downloaded file.
+
+4.3.6 (3/13/2016):
+
+* Bug Fix: When a spoofed media type is detected, megabytes of mime-types info are added to logs. See https://cwe.mitre.org/data/definitions/779.html.
+
+4.3.5 (2/8/2016):
+
+* Bug Fix: Remove deprecation warnings for v5.0 for now. Will re-add once the version has landed.
+
+4.3.4 (2/2/2016):
+
+* Bug Fix: Fix incompatible change from v4.3.3.
+
+4.3.3 (1/29/2016):
+
+* Improvement: Add deprecation warnings in preparation for release of v5.0
+
+4.3.2 (11/18/2015):
+
+* Performance: Reduce memory allocations (#2056)
+
+4.3.1 (9/9/2015):
+
+* Backport of bugfix to `remove_column`, so it works in Rails 3 and 4
+  c740fb171fe2f88c60b999d2a1c2122f2b8f43e9
+* Fix GeometryParser regex for usage of '@>' flag
+* `url` on a unpersisted record returns default_url
+* spec deprecation warnings and failures
+* README adjustments
+
+4.3.0 (6/18/2015):
+
+* Improvement: Update aws-sdk and cucumber gem versions.
+* Improvement: Add `length` alias for `size` method in AbstractAdapter.
+* Improvement: Removed some cruft
+* Improvement: deep_merge! Attachment definitions
+* Improvement: Switch to mimemagic gem for content-type detection
+* Improvement: Allows multiple content types for spoof detector
+* Bug Fix: Don't assume we have Rails.env if we have Rails
+* Performance: Decrease Memory footprint
+* Ruby Versioning: Drop support for 1.9.3 (EOL'ed)
+* Rails Versioning: Drop support for 4.0.0 (EOL'ed)
+
+4.2.4:
+
+* Rollback backwards incompatible change, allowing paperclip to run on
+  Ruby >= 1.9.2.
+
+4.2.3:
+
+* Fix dependency specifications (didn't work with Rails 4.1)
+* Fix paperclip tests in CI
+
+4.2.2:
+
+* Security fix: Fix a potential security issue with spoofing
+
+4.2.1:
+
+* Improvement: Added `validate_media_type` options to allow/bypass spoof check
+* Improvement: Added incremental backoff when AWS gives us a SlowDown error.
+* Improvement: Stream downloads when usign aws-sdk.
+* Improvement: Documentation fixes, includes Windows instructions.
+* Improvement: Added pt-BR, zh-HK, zh-CN, zh-TW, and ja-JP locales.
+* Improvement: Better escaping for characters in URLs
+* Improvement: Honor `fog_credentials[:scheme]`
+* Improvement: Also look for custom processors in lib/paperclip
+* Improvement: id partitioning for string IDs works like integer id
+* Improvement: Can pass options to DB adapters in migrations
+* Improvement: Update expiring_url creation for later versions of fog
+* Improvement: `path` can be a Proc in S3 attachments
+* Test Fix: Improves speed and reliability of the specs
+* Bug Fix: #original_filename= does not error when passed `nil`
+
+4.2.0:
+
+* Improvement: Converted test suite from test/unit to RSpec
+* Improvement: Refactored Paperclip::Attachment#assign
+* Improvement: Added Spanish and German locales
+* Improvement: Required Validators accept validator subclasses
+* Improvement: EXIF orientation checking can be turned off for performance
+* Improvement: Documentation updates
+* Improvement: Better #human_size method for AttachmentSizeValidators
+* Bug Fix: Allow MIME-types with dots in them
+* Improvement: Travis CI updates
+* Improvement: Validators can take multiple messages
+* Improvement: Per-style options for S3 storage
+* Improvement: Allow `nil` geometry strings
+* Improvement: Use `eager_load!`
+
+4.1.1:
+
+* Improvement: Add default translations for spoof validation
+* Bug Fix: Don't check for spoofs if the file hasn't changed
+* Bug Fix: Callback chain terminator is different in Rails 4.1, remove warnings
+* Improvement: Fixed various Ruby warnings
+* Bug Fix: Give bundler a hint, so it doesn't run forever on a fresh bundle
+* Improvement: Documentation fixes
+* Improvement: Allow travis-ci to finish-fast
+
+
+4.1.0:
+
+* Improvement: Add :content_type_mappings to correct for missing spoof types
+* Improvement: Credit Egor Homakov with discovering the content_type spoof bug
+* Improvement: Memoize calls to identify in the thumbnail processor
+* Improvement: Make MIME type optional for Data URIs.
+* Improvement: Add default format for styles
+
+4.0.0:
+
+* Security: Attachments are checked to make sure they're not pulling a fast one.
+* Security: It is now *enforced* that every attachment has a file/mime validation.
+* Bug Fix: Removed a call to IOAdapter#close that was causing issues.
+* Improvement: Added bullets to the 3.5.3 list of changes. Very important.
+* Improvement: Updated the copyright to 2014
+
+3.5.3:
+
+* Improvement: After three long, hard years... we know how to upgrade
+* Bug Fix: #expiring_url returns 'missing' urls if nothing is attached
+* Improvement: Lots of documentation fixes
+* Improvement: Lots of fixes for Ruby warnings
+* Improvement: Test the most appropriate Ruby/Rails comobinations on Travis
+* Improvement: Delegate more IO methods through IOAdapters
+* Improvement: Remove Rails 4 deprecations
+* Improvement: Both S3's and Fog's #expiring_url can take a Time or Int
+* Bug Fix: Both S3's and Fog's expiring_url respect style when missing the file
+* Bug Fix: Timefiles will have a reasonable-length name. They're all MD5 hashes now
+* Bug Fix: Don't delete files off S3 when reprocessing due to AWS inconsistencies
+* Bug Fix: "swallow_stream" isn't thread dafe. Use :swallow_stderr
+* Improvement: Regexps use \A and \Z instead of ^ and $
+* Improvement: :s3_credentials can take a lambda as an argument
+* Improvement: Search up the class heirarchy for attachments
+* Improvement: deep_merge options instead of regular merge
+* Bug Fix: Prevent file deletion on transaction rollback
+* Test Improvement: Ensure more files are properly closed during tests
+* Test Bug Fix: Return the gemfile's syntax to normal
+
+3.5.2:
 
 * Security: Force cocaine to at least 0.5.3 to include a security fix
 * Improvement: Fixed some README exmaples
 * Feature: Added HTTP URL Proxy Adapter, can assign string URLs as attachments
 * Improvement: Put validation errors on the base attribute and the sub-attribute
 
-New in 3.5.1:
+3.5.1:
 
 * Bug Fix: Returned the class-level `attachment_definitions` method for compatability.
 * Improvement: Ensured compatability with Rails 4
@@ -39,7 +157,7 @@ New in 3.5.1:
 * Bug Fix: #1296, where validations were generating errors
 * Improvement: Specify MIT license in the gemspec
 
-New in 3.5.0:
+3.5.0:
 
 * Feature: Handle Base64-encoded data URIs as uploads
 * Feature: Add a FilenameCleaner class to allow custom filename sanitation
@@ -55,7 +173,7 @@ New in 3.5.0:
 * Improvement: Added Ruby 2.0.0 as a supported platform and removed 1.8.7
 * Improvement: Fixed some incompatabilities in the test suite
 
-New in 3.4.2:
+3.4.2:
 
 * Improvement: Use https for Gemfile urls
 * Improvement: Updated and more correct documentation
@@ -65,7 +183,7 @@ New in 3.4.2:
 * Improvement: Remove path clash checking, as it's unnecessary
 * Bug Fix: Do not rely on checking version numbers for aws-sdk
 
-New in 3.4.1:
+3.4.1:
 
 * Improvement: Various documentation fixes and improvements
 * Bug Fix: Clearing an attachment with `preserve_files` on should still clear the attachment
@@ -78,7 +196,7 @@ New in 3.4.1:
 * Improvement: Update to latest cocaine
 * Improvement: Update copyrights, various typos
 
-New in 3.4.0:
+3.4.0:
 
 * Bug Fix: Allow UploadedFileAdapter to force the use of `file`
 * Bug Fix: Close the file handle when dealing with URIs
@@ -108,11 +226,11 @@ New In 3.3.1:
 
 * Bug Fix: Moved Filesystem's copy_to_local_file to the right place.
 
-New in 3.3.0:
+3.3.0:
 
 * Improvement: Upgrade cocaine to 0.4
 
-New in 3.2.0:
+3.2.0:
 
 * Bug Fix: Use the new correct Amazon S3 encryption header.
 * Bug Fix: The rake task respects the updated_at column.
@@ -121,14 +239,14 @@ New in 3.2.0:
 * Feature: Automatically rotate images.
 * Feature: Reduce class-oriented programming of the attachment definitions.
 
-New in 3.1.4:
+3.1.4:
 
 * Bug Fix: Allow user to be able to set path without `:style` attribute and not raising an error.
   This is a regression introduced in 3.1.3, and that feature will be postponed to another minor
   release instead.
 * Feature: Allow for URI Adapter as an optional paperclip io adapter.
 
-New in 3.1.3:
+3.1.3:
 
 * Bug Fix: Copy empty attachment between instances is now working.
 * Bug Fix: Correctly rescue Fog error.
@@ -140,17 +258,17 @@ New in 3.1.3:
 * Bug Fix: Paperclip now gracefully handles msising file command.
 * Bug Fix: `StringIOAdapter` now accepts content type.
 
-New in 3.1.2:
+3.1.2:
 
 * Bug Fix: #remove_attachment on 3.1.0 and 3.1.1 mistakenly trying to remove the column that has
   the same name as data type (such as :string, :datetime, :interger.) You're advised to update to
   Paperclip 3.1.2 as soon as possible.
 
-New in 3.1.1:
+3.1.1:
 
 * Bug Fix: Paperclip will only load Paperclip::Schema only when Active Record is available.
 
-New in 3.1.0:
+3.1.0:
 
 * Feature: Paperclip now support new migration syntax (sexy migration) that reads better:
 
@@ -189,11 +307,11 @@ New in 3.1.0:
   the best_content_type to throw an error on trying nil.content_type.
 * Bug Fix: Fix problem when the gem cannot be installed on the system that has Asepsis installed.
 
-New in 3.0.4:
+3.0.4:
 
 * Feature: Adds support for S3 scheme-less URL generation.
 
-New in 3.0.3:
+3.0.3:
 
 * Bug Fix: ThumbnailProcessor now correctly detects and preserve animated GIF.
 * Bug Fix: File extension is now preserved in generated Tempfile from adapter.
@@ -216,7 +334,7 @@ New in 3.0.3:
 * Bug Fix: Fix attachment.reprocess! when using storage providers fog and s3.
 * Bug Fix: Fix a problem with incorrect content_type detected with 'file' command for an empty file on Mac.
 
-New in 3.0.2:
+3.0.2:
 
 * API CHANGE: Generated migration class name is now plural (AddAttachmentToUsers instead of AddAttachmentToUser)
 * API CHANGE: Remove Rails plugin initialization code.
@@ -225,13 +343,13 @@ New in 3.0.2:
 * Bug Fix: Fix a problem when there's no logger specified.
 * Bug Fix: Fix a problem when attaching Rack::Test::UploadedFile instance.
 
-New in 3.0.1:
+3.0.1:
 
 * Feature: Introduce Paperlip IO adapter.
 * Bug Fix: Regression in AttachmentContentTypeValidator has been fixed.
 * API CHANGE: #to_file has been removed. Use the #copy_to_local_file method instead.
 
-New in 3.0.0:
+3.0.0:
 
 * API CHANGE: Paperclip now requires at least Ruby on Rails version 3.0.0
 * API CHANGE: The default :url and :path have changed. The new scheme avoids
@@ -250,7 +368,7 @@ New in 3.0.0:
 * Bug Fix: File given to S3 and Fog storage will now be rewinded after flush_write.
 * Feature: You can now pass addional parameter to S3 expiring URL, such as :content_type.
 
-New in 2.7.0:
+2.7.0:
 
 * Bug Fix: Checking the existence of a file on S3 handles all AWS errors.
 * Bug Fix: Clear the fingerprint when removing an attachment.
@@ -259,25 +377,25 @@ New in 2.7.0:
 * Compatibility: Support for ActiveSupport < 2.3.12.
 * Compatibility: Support for Rails 3.2.
 
-New in 2.6.0:
+2.6.0:
 
 * Bug Fix: Files are re-wound after reading.
 * Feature: Remove Rails dependency from specs that need Paperclip.
 * Feature: Validation matchers support conditionals.
 
-New in 2.5.2:
+2.5.2:
 
 * Bug Fix: Can be installed on Windows.
 * Feature: The Fog bucket name, authentication, and host can be determined at runtime via Proc.
 * Feature: Special characters are replaced with underscores in #url and #path.
 
-New in 2.5.1:
+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:
+2.5.0:
 
 * Performance: Only connect to S3 when absolutely needed.
 * Bug Fix: STI with cached classes respect new options.