kt-paperclip 5.4.0 → 7.1.1

data/.travis.yml

@@ -1,26 +1,45 @@
 language: ruby
-sudo: false
 
 rvm:
-  - 2.1
-  - 2.2
   - 2.3
   - 2.4
+  - 2.5
+  - 2.6
   - 2.7
 
 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
+  - gemfiles/6.1.gemfile
 
 matrix:
   fast_finish: true
   exclude:
+    - gemfile: gemfiles/6.0.gemfile
+      rvm: 2.3
+    - gemfile: gemfiles/6.0.gemfile
+      rvm: 2.4
+    - gemfile: gemfiles/6.1.gemfile
+      rvm: 2.3
+    - gemfile: gemfiles/6.1.gemfile
+      rvm: 2.4
+    - gemfile: gemfiles/4.2.gemfile
+      rvm: 2.7
     - gemfile: gemfiles/5.0.gemfile
-      rvm: 2.1
+      rvm: 2.7
+    - gemfile: gemfiles/5.1.gemfile
+      rvm: 2.7

data/Appraisals

@@ -1,7 +1,30 @@
 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
+
+appraise "6.1" do
+  gem "sqlite3", "~> 1.4", platforms: :ruby
+  gem "aruba", "~> 1.0", ">= 1.0.4"
+  gem "rails", "~> 6.1", ">= 6.1.1"
+end

data/CONTRIBUTING.md

@@ -10,8 +10,7 @@ Here's a quick guide for contributing:
 
 1. Fork the repo.
 
-1. Make sure you have ImageMagick and Ghostscript installed. See [this section]
-(./README.md#image-processor) of the README.
+1. Make sure you have ImageMagick and Ghostscript installed. See [this section](./README.md#image-processor) of the README.
 
 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`
@@ -78,9 +77,9 @@ Syntax
 
 * Two spaces, no tabs.
 * No trailing whitespace. Blank lines should not have any space.
-* Prefer &&/|| over and/or.
-* MyClass.my_method(my_arg) not my_method( my_arg ) or my_method my_arg.
-* a = b and not a=b.
+* Prefer `&&` instead of `and` ; prefer `||` instead of `or`.
+* Use `MyClass.my_method(my_arg)` instead of `MyClass.my_method( my_arg )` or `MyClass.my_method my_arg`.
+* `a = b` rather than `a=b` .
 * Follow the conventions you see used in the source already.
 
 And in case we didn't emphasize it enough: we love tests!

data/Gemfile

@@ -2,15 +2,18 @@ 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 "rspec"
+  # Hound only supports certain versions of Rubocop -- 1.22.1 is currently the most recent one supported.
+  gem "rubocop", "1.22.1", require: false
+  gem "rubocop-rails"
+  gem "sprockets", "3.7.2"
 end

data/NEWS

@@ -1,3 +1,55 @@
+[UNRELEASED]
+Issue file delete only once per unique style when nullifying attachment or destroying an object. Avoids triggering a rate limit error on Google Cloud Storage.
+
+7.0.0 (2021-05-28)
+* Replace `mimemagic` gem with `marcel` due to licensing issues. See https://github.com/kreeti/kt-paperclip/pull/54 for details and limitations
+
+6.4.1 (2021-01-30)
+* Improvement: Use URI.open in ruby > 2.5 (PR #45)
+
+6.4.0 (2020-12-14)
+* Improvement: Fix Ruby 2.7 method & syntax deprecation warnings (#38)
+
+6.3.0 (2020-08-10)
+* Feature: Add validation_errors_to option - customize copying of errors (#26)
+* Stability: Dropped support for ruby 2.1
+
+6.2.2 (2020-02-18)
+* Bugfix: Add support for Aliases in S3 credentials YAML (accidentally removed during 6.2.0 upgrade).
+
+6.2.1 (2020-01-30)
+
+* Bugfix: Auto-loading of the gem code (necessitated due to change in gem name).
+
+6.2.0 (2020-01-23):
+
+* Bugfix: Don't do post-processing on invalid attachments (#16).
+* Improvement: Use AWS::S3 built in download_file method (#9).
+* Stability: Rubocop recommended syntax updates (#10, #11, #13, #14).
+* Stability: Testing - replace mocha and bourne with rspec mocks (#6).
+* Stability: Fix test suite to run with Rails 5 and Rails 6 (#19, #20, #7).
+
+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,23 @@
 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/kt-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://travis-ci.com/kreeti/kt-paperclip.svg?branch=master)](https://travis-ci.com/kreeti/kt-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 +63,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 -->
 
@@ -74,10 +78,10 @@ packages). Attached files are saved to the filesystem and referenced in the
 browser by an easily understandable specification, which has sensible and
 useful defaults.
 
-See the documentation for `has_attached_file` in [`Paperclip::ClassMethods`](http://www.rubydoc.info/gems/paperclip/Paperclip/ClassMethods) for
+See the documentation for `has_attached_file` in [`Paperclip::ClassMethods`](http://www.rubydoc.info/gems/kt-paperclip/Paperclip/ClassMethods) for
 more detailed options.
 
-The complete [RDoc](http://www.rubydoc.info/gems/paperclip) is online.
+The complete [RDoc](http://www.rubydoc.info/gems/kt-paperclip) is online.
 
 ---
 
@@ -86,7 +90,7 @@ Requirements
 
 ### Ruby and Rails
 
-Paperclip now requires Ruby version **>= 2.1** and Rails version **>= 4.2**
+Paperclip now requires Ruby version **>= 2.3** and Rails version **>= 4.2**
 (only if you're going to use Paperclip with Ruby on Rails).
 
 ### Image Processor
@@ -167,13 +171,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.4", ">= 6.4.1"
 ```
 
 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 "kt-paperclip", git: "git://github.com/kreeti/kt-paperclip.git"
 ```
 
 If you're trying to use features that don't seem to be in the latest released gem, but are
@@ -305,7 +309,7 @@ You'll need to add `<attachment>_content_type` in case you want to use content t
 validation.
 
 More information about the options passed to `has_attached_file` is available in the
-documentation of [`Paperclip::ClassMethods`](http://www.rubydoc.info/gems/paperclip/Paperclip/ClassMethods).
+documentation of [`Paperclip::ClassMethods`](http://www.rubydoc.info/gems/kt-paperclip/Paperclip/ClassMethods).
 
 Validations
 -----------
@@ -337,11 +341,11 @@ Example Usage:
 validates_attachment_presence :avatar
 ```
 
-Lastly, you can also define multiple validations on a single attachment using `validates_attachment`:
+You can also define multiple validations on a single attachment using `validates_attachment`:
 
 ```ruby
 validates_attachment :avatar, presence: true,
-  content_type: { content_type: "image/jpeg" },
+  content_type: "image/jpeg",
   size: { in: 0..10.kilobytes }
 ```
 
@@ -368,7 +372,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,19 +404,41 @@ 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
 inferred content_type, regardless of the actual contents of the file.
 
+### Duplicate error messages
+
+By default Paperclip will copy validation errors from the attribute to the base
+of your model. Depending on how you display your validation errors, this can lead
+to confusing duplicate errors (one on the attribute and another referring to the
+base model).
+
+You can override this behaviour with the `add_validation_errors_to` option. By
+default this is set to `:both` but can be set to either `:attribute` or `:base`.
+
+* `:both` creates errors on both the attribute and base model.
+* `:attribute` only creates an error on the attribute of the model.
+* `:base` only creates an error on the base model.
+
+You can set this option globally:
+
+`Paperclip.options[:add_validation_errors_to] = :attribute`
+
+or pass it in to an individual validation declaration:
+
+`validates_attachment :document, content_type: { content_type: "application/pdf" }, add_validation_errors_to: :attribute`
+
 ---
 
 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 +593,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,15 +619,15 @@ _**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`.
 You can find more information about configuring and using S3 storage in
-[the `Paperclip::Storage::S3` documentation](http://www.rubydoc.info/gems/paperclip/Paperclip/Storage/S3).
+[the `Paperclip::Storage::S3` documentation](http://www.rubydoc.info/gems/kt-paperclip/Paperclip/Storage/S3).
 
 Files on the local filesystem (and in the Rails app's public directory) will be
 available to the internet at large. If you require access control, it's
@@ -663,7 +689,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 +710,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/kt-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
@@ -887,7 +913,7 @@ Your::Application.configure do
 end
 ```
 
-More information in the [rdocs](http://www.rubydoc.info/github/thoughtbot/paperclip/Paperclip.options)
+More information in the [rdocs](https://www.rubydoc.info/gems/kt-paperclip/Paperclip.options)
 
 ---
 
@@ -971,7 +997,7 @@ Testing
 -------
 
 Paperclip provides rspec-compatible matchers for testing attachments. See the
-documentation on [Paperclip::Shoulda::Matchers](http://www.rubydoc.info/gems/paperclip/Paperclip/Shoulda/Matchers)
+documentation on [Paperclip::Shoulda::Matchers](http://www.rubydoc.info/gems/kt-paperclip/Paperclip/Shoulda/Matchers)
 for more information.
 
 **Parallel Tests**
@@ -1031,33 +1057,19 @@ 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/kt-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/kt-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/kt-paperclip/graphs/contributors)!
 
 License
 -------
 
-Paperclip is Copyright © 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
+Copyright &copy; 2020-2021 Kreeti Technologies Pvt. Ltd.
+Copyright &copy; 2008-2017 thoughtbot, inc.
+It is free software, and may be redistributed under the terms specified in the MIT-LICENSE file.

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:

data/features/migration.feature

@@ -2,69 +2,28 @@ Feature: Migration
 
   Background:
     Given I generate a new rails application
-    And I write to "app/models/user.rb" with:
-      """
-      class User < ActiveRecord::Base; end
-      """
+    And I generate a "User" model:
 
   Scenario: Vintage syntax
-    When I write to "db/migrate/01_add_attachment_to_users.rb" with:
-      """
-      class AddAttachmentToUsers < ActiveRecord::Migration
-        def self.up
-          create_table :users do |t|
-            t.has_attached_file :avatar
-          end
-        end
+    Given I run a paperclip migration to add a paperclip "attach" to the "User" model
 
-        def self.down
-          drop_attached_file :users, :avatar
-        end
-      end
-      """
     And I run a migration
-    Then I should have attachment columns for "avatar"
+    Then I should have attachment columns for "attach"
 
     When I rollback a migration
-    Then I should not have attachment columns for "avatar"
+    Then I should not have attachment columns for "attach"
 
   Scenario: New syntax with create_table
-    When I write to "db/migrate/01_add_attachment_to_users.rb" with:
-      """
-      class AddAttachmentToUsers < ActiveRecord::Migration
-        def self.up
-          create_table :users do |t|
-            t.attachment :avatar
-          end
-        end
-      end
-      """
+    Given I run a paperclip migration to add a paperclip "attach" to the "User" model
+
     And I run a migration
-    Then I should have attachment columns for "avatar"
+    Then I should have attachment columns for "attach"
 
   Scenario: New syntax outside of create_table
-    When I write to "db/migrate/01_create_users.rb" with:
-      """
-      class CreateUsers < ActiveRecord::Migration
-        def self.up
-          create_table :users
-        end
-      end
-      """
-    And I write to "db/migrate/02_add_attachment_to_users.rb" with:
-      """
-      class AddAttachmentToUsers < ActiveRecord::Migration
-        def self.up
-          add_attachment :users, :avatar
-        end
+    Given I run a paperclip migration to add a paperclip "attachment_sample" to the "User" model
 
-        def self.down
-          remove_attachment :users, :avatar
-        end
-      end
-      """
     And I run a migration
-    Then I should have attachment columns for "avatar"
+    Then I should have attachment columns for "attachment_sample"
 
     When I rollback a migration
-    Then I should not have attachment columns for "avatar"
+    Then I should not have attachment columns for "attachment_sample"