paperclip 4.1.1 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b280fe3ddac312ba397836a6dbb268f3119b741a
-  data.tar.gz: 9034cfd55c882ef8c2b50ac8e98ccbcd212c746a
+  metadata.gz: cde0e56042ab5bd075c28a79c6fb2cac0948b01a
+  data.tar.gz: f690007f67429569502696dcd1b1601cfdb8aaf5
 SHA512:
-  metadata.gz: 4def9d053ea08b067da60d48e548bdaeaedd2e8c1e82d3b8228857d253313ea105484d9c894edab7803d4a08569b7fc44d69a05fd221c3e8b234004075ec46be
-  data.tar.gz: d7694572fa8b724c945496299fc916c2e410acf617de7272e7c03218da1140eb8cfc67736a2c02c16afde04b957ad1626ef815a14b2a7c59591c3de5a67ededa
+  metadata.gz: af5c881ab7c95be7c42bd61a9db37be53e8a50399e01371286d784ae543b339b16959e2c9327f771c12ee89b47769e86bcd989e67417b93a6093c0592f62ea82
+  data.tar.gz: 39d1b2daf02a337b137a4a289a337d898578eaa6997bebdc25f107fc2147677a539815da7d11e516fcbf8ddd6e6f403dbf97c8df205d2db194a89d9b58f15fa4

data/.gitignore

@@ -7,12 +7,6 @@ tmp
 
 *.log
 
-test/s3.yml
-test/paperclip.db
-test/doc
-test/pkg
-test/tmp
-
 public
 paperclip*.gem
 capybara*.html

data/.travis.yml

@@ -1,20 +1,17 @@
 rvm:
-  - 1.9.2
   - 1.9.3
   - jruby-19mode
-  - rbx-19mode
+  - rbx-2
   - 2.0.0
-  - 2.1.0
+  - 2.1.1
 
 install:
   - "travis_retry 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
@@ -23,10 +20,4 @@ matrix:
   fast_finish: true
   allow_failures:
     - rvm: jruby-19mode
-    - rvm: rbx-19mode
-
-  exclude:
-      - rvm: 1.9.2
-        gemfile: gemfiles/4.0.gemfile
-      - rvm: 1.9.2
-        gemfile: gemfiles/4.1.gemfile
+    - rvm: rbx-2

data/Appraisals

@@ -1,13 +1,3 @@
-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 => "../"
-end
-
 appraise "3.2" do
   gem "rails", "~> 3.2.15"
   gem "paperclip", :path => "../"

data/CONTRIBUTING.md

@@ -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,6 +36,10 @@ 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
@@ -47,15 +52,15 @@ version of Rails, which defined in `gemfiles/*.gemfile`.
 
     bundle exec 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,11 +2,15 @@ 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 'pry-byebug', :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

data/NEWS

@@ -1,6 +1,6 @@
 New in 4.1.1:
 
-* Improvement: Add defauly translations for spoof validation
+* 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

data/README.md

@@ -1,7 +1,7 @@
 Paperclip
 =========
 
-[![Build Status](https://secure.travis-ci.org/thoughtbot/paperclip.png?branch=master)](http://travis-ci.org/thoughtbot/paperclip) [![Dependency Status](https://gemnasium.com/thoughtbot/paperclip.png?travis)](https://gemnasium.com/thoughtbot/paperclip) [![Code Climate](https://codeclimate.com/github/thoughtbot/paperclip.png)](https://codeclimate.com/github/thoughtbot/paperclip)
+[![Build Status](https://secure.travis-ci.org/thoughtbot/paperclip.png?branch=master)](http://travis-ci.org/thoughtbot/paperclip) [![Dependency Status](https://gemnasium.com/thoughtbot/paperclip.png?travis)](https://gemnasium.com/thoughtbot/paperclip) [![Code Climate](https://codeclimate.com/github/thoughtbot/paperclip.png)](https://codeclimate.com/github/thoughtbot/paperclip) [![Inline docs](http://inch-ci.org/github/thoughtbot/paperclip.png)](http://inch-ci.org/github/thoughtbot/paperclip)
 
 Paperclip is intended as an easy file attachment library for Active Record. The
 intent behind it was to keep setup as easy as possible and to treat files as
@@ -55,6 +55,11 @@ GhostScript to be installed. On Mac OS X, you can also install that using Homebr
 
     brew install gs
 
+### `file` command
+
+The Unix [`file` command](http://en.wikipedia.org/wiki/File_(command)) is required for content type checking.
+This utility isn't available in Windows, but comes bundled with Ruby [Devkit](https://github.com/oneclick/rubyinstaller/wiki/Development-Kit), 
+so Windows users must make sure that the devkit is installed and added to system `PATH`.
 
 Installation
 ------------
@@ -191,7 +196,7 @@ Usage
 The basics of paperclip are quite simple: Declare that your model has an
 attachment with the `has_attached_file` method, and give it a name.
 
-Paperclip will wrap up up to four attributes (all prefixed with that attachment's name,
+Paperclip will wrap up to four attributes (all prefixed with that attachment's name,
 so you can have multiple attachments per model if you wish) and give them a
 friendly front end. These attributes are:
 
@@ -221,6 +226,8 @@ Example Usage:
 ```ruby
 validates :avatar, :attachment_presence => true
 validates_with AttachmentPresenceValidator, :attributes => :avatar
+validates_with AttachmentSizeValidator, :attributes => :avatar, :less_than => 1.megabytes
+
 ```
 
 Validators can also be defined using the old helper style:
@@ -239,7 +246,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/jpg" },
+  :content_type => { :content_type => "image/jpeg" },
   :size => { :in => 0..10.kilobytes }
 ```
 
@@ -298,7 +305,7 @@ image-y ones:
 
 ```ruby
 validates_attachment :avatar,
-  :content_type => { :content_type => ["image/jpg", "image/gif", "image/png"] }
+  :content_type => { :content_type => ["image/jpeg", "image/gif", "image/png"] }
 ```
 
 `Paperclip::ContentTypeDetector` will attempt to match a file's extension to an
@@ -319,11 +326,11 @@ do this.
 ```ruby
 class ActiveRecord::Base
   has_attached_file :avatar
-# Validate content type
+  # Validate content type
   validates_attachment_content_type :avatar, :content_type => /\Aimage/
-# Validate filename
+  # Validate filename
   validates_attachment_file_name :avatar, :matches => [/png\Z/, /jpe?g\Z/]
-# Explicitly do not validate
+  # Explicitly do not validate
   do_not_validate_attachment_file_type :avatar
 end
 ```
@@ -604,6 +611,19 @@ class AddAvatarFingerprintColumnToUser < ActiveRecord::Migration
 end
 ```
 
+File Preservation for Soft-Delete
+-------
+
+An option is available to preserve attachments in order to play nicely with soft-deleted models. (acts_as_paranoid, paranoia, etc.)
+
+```ruby
+has_attached_file :some_attachment, {
+    :preserve_files => "true",
+}
+```
+
+This will prevent ```some_attachment``` from being wiped out when the model gets destroyed, so it will still exist when the object is restored later.
+
 Custom Attachment Processors
 -------
 
@@ -695,12 +715,14 @@ Here is an example for Capistrano:
 ```ruby
 namespace :deploy do
   desc "build missing paperclip styles"
-  task :build_missing_paperclip_styles, :roles => :app do
-    run "cd #{release_path}; RAILS_ENV=production bundle exec rake paperclip:refresh:missing_styles"
+  task :build_missing_paperclip_styles do
+    on roles(:app) do
+      execute "cd #{current_path}; RAILS_ENV=production bundle exec rake paperclip:refresh:missing_styles"
+    end
   end
 end
 
-after("deploy:update_code", "deploy:build_missing_paperclip_styles")
+after("deploy:compile_assets", "deploy:build_missing_paperclip_styles")
 ```
 
 Now you don't have to remember to refresh thumbnails in production every time you add a new style.
@@ -763,6 +785,25 @@ end
 The important part here being the inclusion of `ENV['TEST_ENV_NUMBER']`, or the
 similar mechanism for whichever parallel testing library you use.
 
+**Integration Tests**
+
+Using integration tests with FactoryGirl may save multiple copies of
+your test files within the app. To avoid this, specify a custom path in
+the `config/environments/test.rb` like so:
+
+```ruby
+Paperclip::Attachment.default_options[:path] = "#{Rails.root}/spec/test_files/:class/:id_partition/:style.:extension"
+```
+
+Then, make sure to delete that directory after the test suite runs by adding
+this to `spec_helper.rb`.
+
+```ruby
+config.after(:suite) do
+  FileUtils.rm_rf(Dir["#{Rails.root}/spec/test_files/"])
+end
+```
+
 Contributing
 ------------
 

data/Rakefile

@@ -1,6 +1,6 @@
 require 'bundler/gem_tasks'
 require 'appraisal'
-require 'rake/testtask'
+require 'rspec/core/rake_task'
 require 'cucumber/rake/task'
 
 desc 'Default: run unit tests.'
@@ -9,19 +9,17 @@ task :default => [:clean, :all]
 desc 'Test the paperclip plugin under all supported Rails versions.'
 task :all do |t|
   if ENV['BUNDLE_GEMFILE']
-    exec('rake test cucumber')
+    exec('rake spec cucumber')
   else
+    exec("rm gemfiles/*.lock")
+    Rake::Task["appraisal:gemfiles"].execute
     Rake::Task["appraisal:install"].execute
-    exec('rake appraisal test cucumber')
+    exec('rake appraisal')
   end
 end
 
 desc 'Test the paperclip plugin.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib' << 'profile'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end
+RSpec::Core::RakeTask.new(:spec)
 
 desc 'Run integration test'
 Cucumber::Rake::Task.new do |t|

data/features/basic_integration.feature

@@ -18,11 +18,11 @@ Feature: Rails integration
     And I start the rails application
     When I go to the new user page
     And I fill in "Name" with "something"
-    And I attach the file "test/fixtures/5k.png" to "Attachment"
+    And I attach the file "spec/support/fixtures/5k.png" to "Attachment"
     And I press "Submit"
     Then I should see "Name: something"
     And I should see an image with a path of "/paperclip/custom/attachments/original/5k.png"
-    And the file at "/paperclip/custom/attachments/original/5k.png" should be the same as "test/fixtures/5k.png"
+    And the file at "/paperclip/custom/attachments/original/5k.png" should be the same as "spec/support/fixtures/5k.png"
 
   Scenario: Filesystem integration test
     Given I attach :attachment with:
@@ -32,11 +32,11 @@ Feature: Rails integration
     And I start the rails application
     When I go to the new user page
     And I fill in "Name" with "something"
-    And I attach the file "test/fixtures/5k.png" to "Attachment"
+    And I attach the file "spec/support/fixtures/5k.png" to "Attachment"
     And I press "Submit"
     Then I should see "Name: something"
     And I should see an image with a path of "/system/attachments/original/5k.png"
-    And the file at "/system/attachments/original/5k.png" should be the same as "test/fixtures/5k.png"
+    And the file at "/system/attachments/original/5k.png" should be the same as "spec/support/fixtures/5k.png"
 
   Scenario: S3 Integration test
     Given I attach :attachment with:
@@ -55,7 +55,7 @@ Feature: Rails integration
     And I start the rails application
     When I go to the new user page
     And I fill in "Name" with "something"
-    And I attach the file "test/fixtures/5k.png" to "Attachment" on S3
+    And I attach the file "spec/support/fixtures/5k.png" to "Attachment" on S3
     And I press "Submit"
     Then I should see "Name: something"
     And I should see an image with a path of "http://s3.amazonaws.com/paperclip/attachments/original/5k.png"

data/features/step_definitions/attachment_steps.rb

@@ -1,6 +1,6 @@
 module AttachmentHelpers
   def fixture_path(filename)
-    File.expand_path("#{PROJECT_ROOT}/test/fixtures/#{filename}")
+    File.expand_path("#{PROJECT_ROOT}/spec/support/fixtures/#{filename}")
   end
 
   def attachment_path(filename)
@@ -35,7 +35,7 @@ end
 
 Then /^the attachment "([^"]*)" should exist$/ do |filename|
   in_current_dir do
-    File.exists?(attachment_path(filename)).should be
+    File.exist?(attachment_path(filename)).should be
   end
 end
 
@@ -85,7 +85,7 @@ Then /^I should have attachment columns for "([^"]*)"$/ do |attachment_name|
       ["#{attachment_name}_updated_at", :datetime]
     ]
 
-    expect_columns.all?{ |column| columns.include? column }.should be_true
+    expect_columns.all?{ |column| columns.include? column }.should eq true
   end
 end
 
@@ -99,6 +99,6 @@ Then /^I should not have attachment columns for "([^"]*)"$/ do |attachment_name|
       ["#{attachment_name}_updated_at", :datetime]
     ]
 
-    expect_columns.none?{ |column| columns.include? column }.should be_true
+    expect_columns.none?{ |column| columns.include? column }.should eq true
   end
 end

data/features/step_definitions/rails_steps.rb

@@ -8,18 +8,18 @@ Given /^I generate a new rails application$/ do
       """
       source "http://rubygems.org"
       gem "rails", "#{framework_version}"
-      gem "sqlite3", :platform => :ruby
+      gem "sqlite3", "1.3.8", :platform => [:ruby, :rbx]
       gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
       gem "jruby-openssl", :platform => :jruby
       gem "capybara"
       gem "gherkin"
       gem "aws-sdk"
+      gem "racc", :platform => :rbx
+      gem "rubysl", :platform => :rbx
       """
     And I remove turbolinks
     And I empty the application.js file
     And I configure the application to use "paperclip" from this project
-    And I reset Bundler environment variable
-    And I successfully run `bundle install --local`
   }
 end
 
@@ -197,7 +197,7 @@ Given /^I am using Rails newer than ([\d\.]+)$/ do |version|
 end
 
 def transform_file(filename)
-  if File.exists?(filename)
+  if File.exist?(filename)
     content = File.read(filename)
     File.open(filename, "w") do |f|
       content = yield(content)

data/features/step_definitions/web_steps.rb

@@ -164,7 +164,7 @@ Then /^the "([^"]*)" checkbox(?: within (.*))? should be checked$/ do |label, pa
   with_scope(parent) do
     field_checked = find_field(label)['checked']
     if field_checked.respond_to? :should
-      field_checked.should be_true
+      field_checked.should eq true
     else
       assert field_checked
     end
@@ -175,7 +175,7 @@ Then /^the "([^"]*)" checkbox(?: within (.*))? should not be checked$/ do |label
   with_scope(parent) do
     field_checked = find_field(label)['checked']
     if field_checked.respond_to? :should
-      field_checked.should be_false
+      field_checked.should eq false
     else
       assert !field_checked
     end

data/features/support/env.rb

@@ -1,10 +1,10 @@
 require 'aruba/cucumber'
 require 'capybara/cucumber'
-require 'test/unit/assertions'
+require 'rspec/matchers'
 
 $CUCUMBER=1
 
-World(Test::Unit::Assertions)
+World(RSpec::Matchers)
 
 Before do
   @aruba_timeout_seconds = 120

data/features/support/fixtures/gemfile.txt

@@ -2,4 +2,4 @@ source "http://rubygems.org"
 
 gem "rails", "RAILS_VERSION"
 gem "rdoc"
-gem "sqlite3"
+gem "sqlite3", "1.3.8"