paperclip 4.2.2 → 5.0.0

data/.rubocop.yml

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

data/.travis.yml

@@ -1,23 +1,26 @@
 rvm:
-  - 1.9.3
-  - jruby-19mode
-  - rbx-2
-  - 2.0.0
-  - 2.1.1
+  - 2.1
+  - 2.2.2
 
-install:
-  - "travis_retry bundle install"
-
-before_script: "sudo ntpdate -ub ntp.ubuntu.com pool.ntp.org; true"
 script: "bundle exec rake clean spec cucumber"
 
 gemfile:
-  - gemfiles/3.2.gemfile
-  - gemfiles/4.0.gemfile
-  - gemfiles/4.1.gemfile
+  - gemfiles/4.2.awsv2.0.gemfile
+  - gemfiles/4.2.awsv2.1.gemfile
+  - gemfiles/5.0.awsv2.0.gemfile
+  - gemfiles/5.0.awsv2.1.gemfile
 
 matrix:
   fast_finish: true
-  allow_failures:
-    - rvm: jruby-19mode
-    - rvm: rbx-2
+  exclude:
+    - gemfile: gemfiles/5.0.awsv2.0.gemfile
+      rvm: 2.0
+    - gemfile: gemfiles/5.0.awsv2.1.gemfile
+      rvm: 2.0
+    - gemfile: gemfiles/5.0.awsv2.0.gemfile
+      rvm: 2.1
+    - gemfile: gemfiles/5.0.awsv2.1.gemfile
+      rvm: 2.1
+
+sudo: false
+cache: bundler

data/Appraisals

@@ -1,19 +1,27 @@
-appraise "3.2" do
-  gem "rails", "~> 3.2.15"
-  gem "paperclip", :path => "../"
+appraise "4.2.awsv2.0" do
+  gem "rails", "~> 4.2.0"
+  gem "aws-sdk", "~> 2.0.0"
 end
 
-appraise "4.0" do
-  gem "rails", "~> 4.0.0"
-  gem "paperclip", :path => "../"
+appraise "4.2.awsv2.1" do
+  gem "rails", "~> 4.2.0"
+  gem "aws-sdk", "~> 2.1.0"
+
+  group :development, :test do
+    gem 'mime-types', '>= 1.16', '< 4'
+  end
 end
 
-appraise "4.1" do
-  gem "rails", "~> 4.1.0"
-  gem "paperclip", :path => "../"
+appraise "5.0.awsv2.0" do
+  gem "rails", "5.0.0.beta3"
+  gem "aws-sdk", "~> 2.0.0"
+
+  group :development, :test do
+    gem 'mime-types', '>= 1.16', '< 4'
+  end
 end
 
-appraise "4.2" do
-  gem "rails", "~> 4.2.0.rc2"
-  gem "paperclip", :path => "../"
+appraise "5.0.awsv2.1" do
+  gem "rails", "5.0.0.beta3"
+  gem "aws-sdk", "~> 2.1.0"
 end

data/CONTRIBUTING.md

@@ -1,20 +1,31 @@
 Contributing
 ============
 
-We love pull requests. Here's a quick guide:
+We love pull requests from everyone. By participating in this project, you agree
+to abide by the thoughtbot [code of conduct].
+
+[code of conduct]: https://thoughtbot.com/open-source-code-of-conduct
+
+Here's a quick guide for contributing:
 
 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`
+1. Make sure you have ImageMagick and Ghostscript installed. See [this section]
+(./README.md#image-processor) of the README.
 
-3. Add a test for your change. Only refactoring and documentation changes
+1. Run the tests. We only take pull requests with passing tests, and it's great
+to know that you have a clean slate: `bundle && bundle exec rake`
+
+1. 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
 a test!
 
-4. Make the test pass.
+1. Make the test pass.
+
+1. Mention how your changes affect the project to other developers and users in
+   the `NEWS.md` file.
 
-5. Push to your fork and submit a pull request.
+1. 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 seven business days (most of the work on Paperclip
@@ -43,14 +54,14 @@ 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 RSpec and Cucumber against all version of Rails
 

data/Gemfile

@@ -2,19 +2,14 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'sqlite3', '1.3.8', :platforms => :ruby
-
-gem 'jruby-openssl', :platforms => :jruby
-gem 'activerecord-jdbcsqlite3-adapter', :platforms => :jruby
-
-gem 'rubysl', :platforms => :rbx
-gem 'racc', :platforms => :rbx
-
+gem 'sqlite3', '~> 1.3.8', :platforms => :ruby
 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 'activerecord-import'
+  gem 'mime-types'
   gem 'builder'
+  gem 'rubocop', require: false
 end

data/LICENSE

@@ -3,7 +3,7 @@ LICENSE
 
 The MIT License
 
-Copyright (c) 2008-2014 Jon Yurek and thoughtbot, inc.
+Copyright (c) 2008-2016 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

data/NEWS

@@ -1,8 +1,78 @@
-New in 4.2.2:
+master:
+
+5.0.0 (2016-07-01):
+
+* Improvement: Add `read_timeout` configuration for URI Adapter download_content method.
+* README adjustments for Ruby beginners (add links, elucidate model in Quick Start)
+* Bugfix: Now it's possible to save images from URLs with special characters [#1932]
+* Bugfix: Return false when file to copy is not present in cloud storage [#2173]
+* Automatically close file while checking mime type [#2016]
+* Add `read_timeout` option to `UriAdapter#download_content` method [#2232]
+* Fix a nil error in content type validation matcher [#1910]
+* Documentation improvements
+
+5.0.0.beta2 (2016-04-01):
+
+* Bugfix: Dynamic fog directory option is now respected
+* Bugfix: Fixes cocaine duplicated paths [#2169]
+* Removal of dead code (older versions of Rails and AWS SDK)
+* README adjustments
+
+5.0.0.beta1 (2016-03-13):
+
+* Bug Fix: megabytes of mime-types info in logs when a spoofed media type is detected.
+* Drop support to end-of-life'd ruby 2.0.
+* Drop support for end-of-life'd Rails 3.2 and 4.1
+* Drop support for AWS v1
+* Remove tests for JRuby and Rubinius from Travis CI (they were failing)
+* Improvement: Add `fog_options` configuration to send options to fog when
+  storing files.
+* Extracted repository for locales only:  https://github.com/thoughtbot/paperclip-i18n
+* Bugfix: Original file could be unlinked during `post_process_style`, producing failures
+* Bugfix for image magick scaling images up
+* Memory consumption improvements
+* `url` on a unpersisted record returns `default_url` rather than `nil`
+* Improvement: aws-sdk v2 support
+  https://github.com/thoughtbot/paperclip/pull/1903
+
+  If your Gemfile contains aws-sdk (>= 2.0.0) and aws-sdk-v1, paperclip will use
+  aws-sdk v2. With aws-sdk v2, S3 storage requires you to set the s3_region.
+  s3_region may be nested in s3_credentials, and (if not nested in
+  s3_credentials) it may be a Proc.
+
+4.3
+
+See patch versions in v4.3 NEWS:
+https://github.com/thoughtbot/paperclip/blob/v4.3/NEWS
+
+4.3.0 (2015-06-18):
+
+* 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 (2015-06-05):
+
+* 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
 
-New in 4.2.1:
+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.
@@ -12,14 +82,14 @@ New in 4.2.1:
 * 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 liks integer id
+* 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`
 
-New in 4.2.0:
+4.2.0:
 
 * Improvement: Converted test suite from test/unit to RSpec
 * Improvement: Refactored Paperclip::Attachment#assign
@@ -35,7 +105,7 @@ New in 4.2.0:
 * Improvement: Allow `nil` geometry strings
 * Improvement: Use `eager_load!`
 
-New in 4.1.1:
+4.1.1:
 
 * Improvement: Add default translations for spoof validation
 * Bug Fix: Don't check for spoofs if the file hasn't changed
@@ -46,7 +116,7 @@ New in 4.1.1:
 * Improvement: Allow travis-ci to finish-fast
 
 
-New in 4.1.0:
+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
@@ -54,7 +124,7 @@ New in 4.1.0:
 * Improvement: Make MIME type optional for Data URIs.
 * Improvement: Add default format for styles
 
-New in 4.0.0:
+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.
@@ -62,7 +132,7 @@ New in 4.0.0:
 * Improvement: Added bullets to the 3.5.3 list of changes. Very important.
 * Improvement: Updated the copyright to 2014
 
-New in 3.5.3:
+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
@@ -84,14 +154,14 @@ New in 3.5.3:
 * 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:
+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
@@ -99,7 +169,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
@@ -115,7 +185,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
@@ -125,7 +195,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
@@ -138,7 +208,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
@@ -168,11 +238,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.
@@ -181,14 +251,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.
@@ -200,17 +270,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:
 
@@ -249,11 +319,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.
@@ -276,7 +346,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.
@@ -285,13 +355,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
@@ -310,7 +380,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.
@@ -319,25 +389,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.