kt-paperclip 5.4.0 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c43af20e1568a3caee7670d68c39e71f86a0b0342fdaaf0acb7b6ae81204a731
-  data.tar.gz: 781342013a902bb2d1d21f805680418eb61f8976b20793f5eaedb86fdfdeb74a
+  metadata.gz: cc344d5ddaca988988e3be2fa011830636f2112928511008ac581495eb5ddfb9
+  data.tar.gz: e50691209dcecbc2ee0bcaaa58c222b77085e0e70a5c56c803c938abbf6b1f3a
 SHA512:
-  metadata.gz: 02b011a01c730ef79202a87367d778fde59ae39584465fd63981905890e550bf86718a028bce46a6cb6826324b2f37f78a19e73402428b771922b70cc0180a5a
-  data.tar.gz: 17cc690b1c20421a3b35b395eda2076235e70962b6f4cc10855285c6e268ad4a7bdc92e6212a660bc01d9945e9ae60496c6e3bb34c9bfd37546195cc4cfa3d24
+  metadata.gz: 5f9cb2f295d4f60c65accf057f3c19de3e675abda8c2c339005cca5683b2706e00995b014570de1d9d96f51c2cbd41f26a6a654acef4b3104e3cf0c6707b6d18
+  data.tar.gz: 0de4285c8b1c029650f662d3556e0d04cf92c01c9b3854423f85a3f2b7bcad3c7a9beb8530059cbbde3d7a518b9cb823be5256b006365f9c527d82cf50d71e3c

data/.github/issue_template.md

@@ -0,0 +1,3 @@
+## Deprecation notice
+
+Paperclip is currently undergoing [deprecation in favor of ActiveStorage](https://github.com/thoughtbot/paperclip/blob/master/MIGRATING.md). Maintainers of this repository will no longer be tending to new issues. We're leaving the issues page open so Paperclip users can still see & search through old issues, and continue existing discussions if they wish.

data/.hound.yml

@@ -79,7 +79,7 @@ Style/CaseIndentation:
   Description: Indentation of when in a case/when/[else/]end.
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#indent-when-to-case
   Enabled: true
-  IndentWhenRelativeTo: case
+  EnforcedStyle: case
   SupportedStyles:
   - case
   - end
@@ -157,10 +157,6 @@ Style/Encoding:
   Description: Use UTF-8 as the source file encoding.
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#utf-8
   Enabled: false
-  EnforcedStyle: always
-  SupportedStyles:
-  - when_needed
-  - always
 Style/FileName:
   Description: Use snake_case for source file names.
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#snake-case-files
@@ -169,7 +165,7 @@ Style/FileName:
 Style/FirstParameterIndentation:
   Description: Checks the indentation of the first parameter in a method call.
   Enabled: true
-  EnforcedStyle: special_for_inner_method_call_in_parentheses
+  EnforcedStyle: consistent
   SupportedStyles:
   - consistent
   - special_for_inner_method_call
@@ -210,11 +206,11 @@ Style/HashSyntax:
   SupportedStyles:
   - ruby19
   - hash_rockets
-Style/IfUnlessModifier:
+Metrics/LineLength:
   Description: Favor modifier if/unless usage when you have a single-line body.
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#if-as-a-modifier
   Enabled: false
-  MaxLineLength: 80
+  Max: 80
 Style/IndentationWidth:
   Description: Use 2 spaces for indentation.
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#spaces-indentation
@@ -311,7 +307,7 @@ Style/PredicateName:
   - is_
   - has_
   - have_
-  NamePrefixBlacklist:
+  ForbiddenPrefixes:
   - is_
 Style/RaiseArgs:
   Description: Checks the arguments passed to raise/fail.
@@ -435,7 +431,15 @@ Style/TrailingBlankLines:
   SupportedStyles:
   - final_newline
   - final_blank_line
-Style/TrailingCommaInLiteral:
+Style/TrailingCommaInArrayLiteral:
+  Description: Checks for trailing comma in parameter lists and literals.
+  StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-trailing-array-commas
+  Enabled: false
+  EnforcedStyleForMultiline: no_comma
+  SupportedStyles:
+  - comma
+  - no_comma
+Style/TrailingCommaInHashLiteral:
   Description: Checks for trailing comma in parameter lists and literals.
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-trailing-array-commas
   Enabled: false
@@ -450,7 +454,7 @@ Style/TrivialAccessors:
   ExactNameMatch: false
   AllowPredicates: false
   AllowDSLWriters: false
-  Whitelist:
+  AllowedMethods:
   - to_ary
   - to_a
   - to_c
@@ -476,11 +480,6 @@ Style/VariableName:
   SupportedStyles:
   - snake_case
   - camelCase
-Style/WhileUntilModifier:
-  Description: Favor modifier while/until usage when you have a single-line body.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#while-as-a-modifier
-  Enabled: false
-  MaxLineLength: 80
 Style/WordArray:
   Description: Use %w or %W for arrays of words.
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#percent-w
@@ -508,10 +507,10 @@ Metrics/CyclomaticComplexity:
   Enabled: false
   Max: 6
 Metrics/LineLength:
-  Description: Limit lines to 80 characters.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#80-character-limits
+  Description: Limit lines to 120 characters.
+  StyleGuide: https://github.com/bbatsov/ruby-style-guide#120-character-limits
   Enabled: true
-  Max: 80
+  Max: 120
   AllowURI: true
   URISchemes:
   - http
@@ -541,14 +540,14 @@ Lint/AssignmentInCondition:
 Lint/EndAlignment:
   Description: Align ends correctly.
   Enabled: true
-  AlignWith: keyword
+  EnforcedStyleAlignWith: keyword
   SupportedStyles:
   - keyword
   - variable
 Lint/DefEndAlignment:
   Description: Align ends corresponding to defs correctly.
   Enabled: true
-  AlignWith: start_of_line
+  EnforcedStyleAlignWith: start_of_line
   SupportedStyles:
   - start_of_line
   - def
@@ -752,7 +751,7 @@ Style/LineEndConcatenation:
   Description: Use \ instead of + or << to concatenate two string literals at line
     end.
   Enabled: false
-Style/MethodCallParentheses:
+Style/MethodCallWithoutArgsParentheses:
   Description: Do not use parentheses for method calls with no arguments.
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-args-no-parens
   Enabled: true
@@ -799,7 +798,7 @@ Style/OneLineConditional:
   Description: Favor the ternary operator(?:) over if/then/else/end constructs.
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#ternary-operator
   Enabled: false
-Style/OpMethod:
+Naming/BinaryOperatorParameterName:
   Description: When defining binary operators, name the argument other.
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#other-arg
   Enabled: false
@@ -905,10 +904,10 @@ Style/UnlessElse:
   Description: Do not use unless with else. Rewrite these with the positive case first.
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-else-with-unless
   Enabled: true
-Style/UnneededCapitalW:
+Style/RedundantCapitalW:
   Description: Checks for %W when interpolation is not needed.
   Enabled: true
-Style/UnneededPercentQ:
+Style/RedundantPercentQ:
   Description: Checks for %q/%Q when single quotes or double quotes would do.
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#percent-q
   Enabled: true
@@ -974,14 +973,10 @@ Lint/EnsureReturn:
 Lint/Eval:
   Description: The use of eval represents a serious security risk.
   Enabled: true
-Lint/HandleExceptions:
+Lint/SuppressedException:
   Description: Don't suppress exception.
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#dont-hide-exceptions
   Enabled: false
-Lint/InvalidCharacterLiteral:
-  Description: Checks for invalid character literals with a non-escaped whitespace
-    character.
-  Enabled: false
 Lint/LiteralInCondition:
   Description: Checks of literals used in conditions.
   Enabled: false
@@ -1012,7 +1007,7 @@ Lint/SpaceBeforeFirstArg:
   Description: Put a space between a method name and the first argument in a method
     call without parentheses.
   Enabled: true
-Lint/StringConversionInInterpolation:
+Lint/RedundantStringCoercion:
   Description: Checks for Object#to_s usage in string interpolation.
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-to-s
   Enabled: true
@@ -1037,7 +1032,7 @@ Lint/UselessAssignment:
   Description: Checks for useless assignment to a local variable.
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#underscore-unused-vars
   Enabled: true
-Lint/BinaryOperatorWithIdenticalOperands:
+Lint/UselessComparison:
   Description: Checks for comparison of something with itself.
   Enabled: true
 Lint/UselessElseWithoutRescue:

data/.travis.yml

@@ -1,26 +1,47 @@
 language: ruby
-sudo: false
 
 rvm:
   - 2.1
   - 2.2
   - 2.3
   - 2.4
-  - 2.7
+  - 2.5
+  - 2.6
 
 script: "bundle exec rake clean spec cucumber"
 
 addons:
   apt:
+    update: true
     packages:
     - ghostscript
 
+before_install:
+  - sudo rm /etc/ImageMagick-6/policy.xml
+
 gemfile:
   - gemfiles/4.2.gemfile
   - gemfiles/5.0.gemfile
+  - gemfiles/5.1.gemfile
+  - gemfiles/5.2.gemfile
+  - gemfiles/6.0.gemfile
 
 matrix:
   fast_finish: true
   exclude:
     - gemfile: gemfiles/5.0.gemfile
       rvm: 2.1
+    - gemfile: gemfiles/5.1.gemfile
+      rvm: 2.1
+    - gemfile: gemfiles/5.2.gemfile
+      rvm: 2.1
+    - gemfile: gemfiles/5.2.gemfile
+      rvm: 2.2
+    - gemfile: gemfiles/6.0.gemfile
+      rvm: 2.1
+    - gemfile: gemfiles/6.0.gemfile
+      rvm: 2.2
+    - gemfile: gemfiles/6.0.gemfile
+      rvm: 2.3
+    - gemfile: gemfiles/6.0.gemfile
+      rvm: 2.4

data/Appraisals

@@ -1,7 +1,24 @@
 appraise "4.2" do
+  gem "sqlite3", "~> 1.3.8", platforms: :ruby
   gem "rails", "~> 4.2.0"
 end
 
 appraise "5.0" do
+  gem "sqlite3", "~> 1.3.8", platforms: :ruby
   gem "rails", "~> 5.0.0"
 end
+
+appraise "5.1" do
+  gem "sqlite3", "~> 1.3.8", platforms: :ruby
+  gem "rails", "~> 5.1.0"
+end
+
+appraise "5.2" do
+  gem "sqlite3", "~> 1.3.8", platforms: :ruby
+  gem "rails", "~> 5.2.0"
+end
+
+appraise "6.0" do
+  gem "sqlite3", "~> 1.4", platforms: :ruby
+  gem "rails", "~> 6.0.0"
+end

data/Gemfile

@@ -2,15 +2,17 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'sqlite3', '~> 1.3.8', :platforms => :ruby
-gem 'pry'
+gem "pry"
 
 # Hinting at development dependencies
 # Prevents bundler from taking a long-time to resolve
 group :development, :test do
-  gem 'activerecord-import'
-  gem 'mime-types'
-  gem 'builder'
-  gem 'rubocop', require: false
-  gem 'rspec'
+  gem "activerecord-import"
+  gem 'bootsnap', require: false
+  gem "builder"
+  gem 'listen', '~> 3.0.8'
+  gem "mime-types"
+  gem "rspec"
+  gem "rubocop", require: false
+  gem "sprockets", "3.7.2"
 end

data/NEWS

@@ -1,3 +1,24 @@
+6.1.0 (2018-07-27):
+
+* BUGFIX: Don't double-encode URLs (Roderick Monje).
+* BUGFIX: Only use the content_type when it exists (Jean-Philippe Doyle).
+* STABILITY: Better handling of the content-disposition header. Now supports
+  file name that is either enclosed or not in double quotes and is case
+  insensitive as per RC6266 grammar (Hasan Kumar, Yves Riel).
+* STABILITY: Change database column type of attachment file size from unsigned 4-byte
+  `integer` to unsigned 8-byte `bigint`. The former type limits attachment size
+  to just over 2GB, which can easily be exceeded by a large video file (Laurent
+  Arnoud, Alen Zamanyan).
+* STABILITY: Better error message when thumbnail processing errors (Hayden Ball).
+* STABILITY: Fix file linking issues around Windows (Akihiko Odaki).
+* STABILITY: Files without an extension will now be checked for spoofing attempts
+  (George Walters II).
+* STABILITY: Manually close Tempfiles when we are done with them (Erkki Eilonen).
+
+6.0.0 (2018-03-09):
+
+* Improvement: Depend only on `aws-sdk-s3` instead of `aws-sdk` (https://github.com/thoughtbot/paperclip/pull/2481)
+
 5.3.0 (2018-03-09):
 
 * Improvement: Use `FactoryBot` instead of `FactoryGirl` (https://github.com/thoughtbot/paperclip/pull/2501)

data/README.md

@@ -1,18 +1,24 @@
 Paperclip
 =========
 
+We plan to support and maintain paperclip, as well as clean it up.
+
+Please feel free to contribute Issues and pull requests.
+
+# Existing documentation
+
 ## Documentation valid for `master` branch
 
 Please check the documentation for the paperclip version you are using:
-https://github.com/thoughtbot/paperclip/releases
+https://github.com/kreeti/paperclip/releases
 
 ---
 
-[![Build Status](https://secure.travis-ci.org/thoughtbot/paperclip.svg?branch=master)](http://travis-ci.org/thoughtbot/paperclip)
-[![Dependency Status](https://gemnasium.com/thoughtbot/paperclip.svg?travis)](https://gemnasium.com/thoughtbot/paperclip)
-[![Code Climate](https://codeclimate.com/github/thoughtbot/paperclip.svg)](https://codeclimate.com/github/thoughtbot/paperclip)
-[![Inline docs](http://inch-ci.org/github/thoughtbot/paperclip.svg)](http://inch-ci.org/github/thoughtbot/paperclip)
-[![Security](https://hakiri.io/github/thoughtbot/paperclip/master.svg)](https://hakiri.io/github/thoughtbot/paperclip/master)
+[![Build Status](https://secure.travis-ci.org/kreeti/paperclip.svg?branch=master)](http://travis-ci.org/kreeti/paperclip)
+[![Dependency Status](https://gemnasium.com/kreeti/paperclip.svg?travis)](https://gemnasium.com/kreeti/paperclip)
+[![Code Climate](https://codeclimate.com/github/kreeti/paperclip.svg)](https://codeclimate.com/github/kreeti/paperclip)
+[![Inline docs](http://inch-ci.org/github/kreeti/paperclip.svg)](http://inch-ci.org/github/kreeti/paperclip)
+[![Security](https://hakiri.io/github/kreeti/paperclip/master.svg)](https://hakiri.io/github/kreeti/paperclip/master)
 
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
@@ -58,7 +64,6 @@ https://github.com/thoughtbot/paperclip/releases
 - [Testing](#testing)
 - [Contributing](#contributing)
 - [License](#license)
-- [About thoughtbot](#about-thoughtbot)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
@@ -167,13 +172,13 @@ Paperclip is distributed as a gem, which is how it should be used in your app.
 Include the gem in your Gemfile:
 
 ```ruby
-gem "paperclip", "~> 5.2.1"
+gem "kt-paperclip", "~> 6.0.0"
 ```
 
 Or, if you want to get the latest, you can get master from the main paperclip repository:
 
 ```ruby
-gem "paperclip", git: "git://github.com/thoughtbot/paperclip.git"
+gem "paperclip", git: "git://github.com/kreeti/paperclip.git"
 ```
 
 If you're trying to use features that don't seem to be in the latest released gem, but are
@@ -341,7 +346,7 @@ Lastly, you can also define multiple validations on a single attachment using `v
 
 ```ruby
 validates_attachment :avatar, presence: true,
-  content_type: { content_type: "image/jpeg" },
+  content_type: "image/jpeg",
   size: { in: 0..10.kilobytes }
 ```
 
@@ -368,7 +373,7 @@ afterwards, then assign manually:
 ```ruby
 class Book < ActiveRecord::Base
   has_attached_file :document, styles: { thumbnail: "60x60#" }
-  validates_attachment :document, content_type: { content_type: "application/pdf" }
+  validates_attachment :document, content_type: "application/pdf"
   validates_something_else # Other validations that conflict with Paperclip's
 end
 
@@ -400,7 +405,7 @@ image-y ones:
 
 ```ruby
 validates_attachment :avatar,
-  content_type: { content_type: ["image/jpeg", "image/gif", "image/png"] }
+  content_type: ["image/jpeg", "image/gif", "image/png"]
 ```
 
 `Paperclip::ContentTypeDetector` will attempt to match a file's extension to an
@@ -412,7 +417,7 @@ Internationalization (I18n)
 ---------------------------
 
 For using or adding locale files in different languages, check the project
-https://github.com/thoughtbot/paperclip-i18n.
+https://github.com/kreeti/paperclip-i18n.
 
 Security Validations
 ====================
@@ -567,7 +572,7 @@ Storage
 Paperclip ships with 3 storage adapters:
 
 * File Storage
-* S3 Storage (via `aws-sdk`)
+* S3 Storage (via `aws-sdk-s3`)
 * Fog Storage
 
 If you would like to use Paperclip with another storage, you can install these
@@ -593,10 +598,10 @@ _**NOTE**: This is a change from previous versions of Paperclip, but is overall
 safer choice for the default file store._
 
 You may also choose to store your files using Amazon's S3 service. To do so, include
-the `aws-sdk` gem in your Gemfile:
+the `aws-sdk-s3` gem in your Gemfile:
 
 ```ruby
-gem 'aws-sdk', '~> 2.3.0'
+gem 'aws-sdk-s3'
 ```
 
 And then you can specify using S3 from `has_attached_file`.
@@ -663,7 +668,7 @@ has more information on the accepted style formats.
 For more fine-grained control of the conversion process, `source_file_options` and `convert_options` can be used to pass flags and settings directly to ImageMagick's powerful Convert tool, [documented here](https://www.imagemagick.org/script/convert.php). For example:
 
 ```ruby
-has_attached_file :image, styles: { regular: ['800x800>', :png]}, 
+has_attached_file :image, styles: { regular: ['800x800>', :png]},
     source_file_options: { regular: "-density 96 -depth 8 -quality 85" },
     convert_options: { regular: "-posterize 3"}
 ```
@@ -684,7 +689,7 @@ Custom Attachment Processors
 You can write your own custom attachment processors to carry out tasks like
 adding watermarks, compressing images, or encrypting files. Custom processors
 must be defined within the `Paperclip` module, inherit from
-`Paperclip::Processor` (see [`lib/paperclip/processor.rb`](https://github.com/thoughtbot/paperclip/blob/master/lib/paperclip/processor.rb)),
+`Paperclip::Processor` (see [`lib/paperclip/processor.rb`](https://github.com/kreeti/paperclip/blob/master/lib/paperclip/processor.rb)),
 and implement a `make` method that returns a `File`. All files in your Rails
 app's `lib/paperclip` and `lib/paperclip_processors` directories will be
 automatically loaded by Paperclip. Processors are specified using the
@@ -1031,33 +1036,18 @@ If you'd like to contribute a feature or bugfix: Thanks! To make sure your
 fix/feature has a high chance of being included, please read the following
 guidelines:
 
-1. Post a [pull request](https://github.com/thoughtbot/paperclip/compare/).
+1. Post a [pull request](https://github.com/kreeti/paperclip/compare/).
 2. Make sure there are tests! We will not accept any patch that is not tested.
    It's a rare time when explicit tests aren't needed. If you have questions
    about writing tests for paperclip, please open a
-   [GitHub issue](https://github.com/thoughtbot/paperclip/issues/new).
+   [GitHub issue](https://github.com/kreeti/paperclip/issues/new).
 
 Please see [`CONTRIBUTING.md`](./CONTRIBUTING.md) for more details on contributing and running test.
 
-Thank you to all [the contributors](https://github.com/thoughtbot/paperclip/graphs/contributors)!
+Thank you to all [the contributors](https://github.com/kreeti/paperclip/graphs/contributors)!
 
 License
 -------
 
-Paperclip is Copyright © 2008-2017 thoughtbot, inc. It is free software, and may be
+Paperclip is Copyright &copy; 2008-2017 thoughtbot, inc. It is free software, and may be
 redistributed under the terms specified in the MIT-LICENSE file.
-
-About thoughtbot
-----------------
-
-![thoughtbot](http://presskit.thoughtbot.com/images/thoughtbot-logo-for-readmes.svg)
-
-Paperclip is maintained and funded by thoughtbot.
-The names and logos for thoughtbot are trademarks of thoughtbot, inc.
-
-We love open source software!
-See [our other projects][community] or
-[hire us][hire] to design, develop, and grow your product.
-
-[community]: https://thoughtbot.com/community?utm_source=github
-[hire]: https://thoughtbot.com?utm_source=github

data/Rakefile

@@ -1,44 +1,52 @@
-require 'bundler/gem_tasks'
-require 'appraisal'
-require 'rspec/core/rake_task'
-require 'cucumber/rake/task'
+require "bundler/gem_tasks"
+require "appraisal"
+require "rspec/core/rake_task"
+require "cucumber/rake/task"
 
-desc 'Default: run unit tests.'
-task :default => [:clean, :all]
+desc "Default: run unit tests."
+task default: [:clean, :all]
 
-desc 'Test the paperclip plugin under all supported Rails versions.'
-task :all do |t|
-  if ENV['BUNDLE_GEMFILE']
-    exec('rake spec && cucumber')
+desc "Test the paperclip plugin under all supported Rails versions."
+task :all do |_t|
+  if ENV["BUNDLE_GEMFILE"]
+    exec("rake spec && cucumber")
   else
     exec("rm -f gemfiles/*.lock")
     Rake::Task["appraisal:gemfiles"].execute
     Rake::Task["appraisal:install"].execute
-    exec('rake appraisal')
+    exec("rake appraisal")
   end
 end
 
-desc 'Test the paperclip plugin.'
+desc "Test the paperclip plugin."
 RSpec::Core::RakeTask.new(:spec)
 
-desc 'Run integration test'
+desc "Run integration test"
 Cucumber::Rake::Task.new do |t|
   t.cucumber_opts = %w{--format progress}
 end
 
-desc 'Start an IRB session with all necessary files required.'
-task :shell do |t|
+desc "Start an IRB session with all necessary files required."
+task :shell do |_t|
   chdir File.dirname(__FILE__)
-  exec 'irb -I lib/ -I lib/paperclip -r rubygems -r active_record -r tempfile -r init'
+  exec "irb -I lib/ -I lib/paperclip -r rubygems -r active_record -r tempfile -r init"
 end
 
-desc 'Clean up files.'
-task :clean do |t|
+desc "Clean up files."
+task :clean do |_t|
   FileUtils.rm_rf "doc"
   FileUtils.rm_rf "tmp"
   FileUtils.rm_rf "pkg"
   FileUtils.rm_rf "public"
-  FileUtils.rm "test/debug.log" rescue nil
-  FileUtils.rm "test/paperclip.db" rescue nil
-  Dir.glob("paperclip-*.gem").each{|f| FileUtils.rm f }
+  begin
+    FileUtils.rm "test/debug.log"
+  rescue StandardError
+    nil
+  end
+  begin
+    FileUtils.rm "test/paperclip.db"
+  rescue StandardError
+    nil
+  end
+  Dir.glob("paperclip-*.gem").each { |f| FileUtils.rm f }
 end

data/UPGRADING

@@ -2,9 +2,9 @@
 #  NOTE FOR UPGRADING FROM 4.3.0 OR EARLIER      #
 ##################################################
 
-Paperclip is now compatible with aws-sdk >= 2.0.0.
+Paperclip is now compatible with aws-sdk-s3.
 
-If you are using S3 storage, aws-sdk >= 2.0.0 requires you to make a few small
+If you are using S3 storage, aws-sdk-s3 requires you to make a few small
 changes:
 
 * You must set the `s3_region`
@@ -13,5 +13,5 @@ changes:
   using a hyphen. For example, `:public_read` needs to be changed to
   `public-read`.
 
-For a walkthrough of upgrading from 4 to 5 and aws-sdk >= 2.0 you can watch
+For a walkthrough of upgrading from 4 to *5* (not 6) and aws-sdk >= 2.0 you can watch
 http://rubythursday.com/episodes/ruby-snack-27-upgrade-paperclip-and-aws-sdk-in-prep-for-rails-5

data/features/basic_integration.feature

@@ -8,6 +8,10 @@ Feature: Rails integration
     And I update my new user view to include the file upload field
     And I update my user view to include the attachment
     And I allow the attachment to be submitted
+    And I replace this snippet to app/views/layouts/application.html.erb:
+      """
+      <%= javascript_tag 'application', 'data-turbolinks-track': 'reload' %>
+      """
 
   Scenario: Configure defaults for all attachments through Railtie
     Given I add this snippet to config/application.rb: