paperclip 4.2.0 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cde0e56042ab5bd075c28a79c6fb2cac0948b01a
-  data.tar.gz: f690007f67429569502696dcd1b1601cfdb8aaf5
+  metadata.gz: bfce4dd35d4417bbc321b3f2ca5c3a9fada39009
+  data.tar.gz: dde01d703ee5317817ebf0ba0758246cee52c5cc
 SHA512:
-  metadata.gz: af5c881ab7c95be7c42bd61a9db37be53e8a50399e01371286d784ae543b339b16959e2c9327f771c12ee89b47769e86bcd989e67417b93a6093c0592f62ea82
-  data.tar.gz: 39d1b2daf02a337b137a4a289a337d898578eaa6997bebdc25f107fc2147677a539815da7d11e516fcbf8ddd6e6f403dbf97c8df205d2db194a89d9b58f15fa4
+  metadata.gz: f629145edb2b10631f4b7364bd5384f637c8982843ac3d3978446997fe59915a6cad5284778bab30c662b33c1cd59bef5fd56a0355a69cd7f926584b3e22f387
+  data.tar.gz: 257d0074ad2ac069d17b5f691580a5ff83240722c07525d256370222afee012a4e7e42f578be8d3957c9b1925e1ad81def15fb1454101e1b8d8e1d595805e5ac

data/Appraisals

@@ -9,6 +9,11 @@ appraise "4.0" do
 end
 
 appraise "4.1" do
-  gem "rails", "~> 4.1.0.beta"
+  gem "rails", "~> 4.1.0"
+  gem "paperclip", :path => "../"
+end
+
+appraise "4.2" do
+  gem "rails", "~> 4.2.0.rc2"
   gem "paperclip", :path => "../"
 end

data/Gemfile

@@ -16,5 +16,5 @@ gem 'pry'
 # Prevents bundler from taking a long-time to resolve
 group :development, :test do
   gem 'mime-types', '~> 1.16'
-  gem 'builder', '~> 3.1.4'
+  gem 'builder'
 end

data/NEWS

@@ -1,3 +1,36 @@
+New in 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 liks 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:
+
+* 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!`
+
 New in 4.1.1:
 
 * Improvement: Add default translations for spoof validation

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) [![Inline docs](http://inch-ci.org/github/thoughtbot/paperclip.png)](http://inch-ci.org/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) [![Security](https://hakiri.io/github/thoughtbot/paperclip/master.svg)](https://hakiri.io/github/thoughtbot/paperclip/master)
 
 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
@@ -20,6 +20,7 @@ more detailed options.
 
 The complete [RDoc](http://rdoc.info/gems/paperclip) is online.
 
+---
 
 Requirements
 ------------
@@ -55,12 +56,46 @@ GhostScript to be installed. On Mac OS X, you can also install that using Homebr
 
     brew install gs
 
-### `file` command
+### `file`
 
 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`.
 
+**Manual Installation**
+
+If you're using Windows 7+ as a development environment, you may need to install the `file.exe` application manually. The `file spoofing` system in Paperclip 4+ relies on this; if you don't have it working, you'll receive `Validation failed: Upload file has an extension that does not match its contents.` errors.
+
+To manually install, you should perform the following:
+
+> **Download & install `file` from [this URL](http://gnuwin32.sourceforge.net/packages/file.htm)**
+
+To test, you can use the following:
+![untitled](https://cloud.githubusercontent.com/assets/1104431/4524452/a1f8cce4-4d44-11e4-872e-17adb96f79c9.png)
+
+Next, you need to integrate with your environment - preferrably through the `PATH` variable, or by changing your `config/environments/development.rb` file
+
+**PATH**
+
+    1. Click "Start"
+    2. On "Computer", right-click and select "Properties"
+    3. In properties, select "Advanced System Settings"
+    4. Click the "Environment Variables" button
+    5. Locate the "PATH" var - at the end, add the path to your newly installed `file.exe` (typically `C:\Program Files (x86)\GnuWin32\bin`)
+    6. Restart any CMD shells you have open & see if it works
+
+OR 
+
+**Environment**
+
+    1. Open `config/environments/development.rb`
+    2. Add the following line: `Paperclip.options[:command_path] = 'C:\Program Files (x86)\GnuWin32\bin'`
+    3. Restart your Rails server
+
+Either of these methods will give your Rails setup access to the `file.exe` functionality, this providing the ability to check the contents of a file (fixing the spoofing problem)
+
+---
+
 Installation
 ------------
 
@@ -69,7 +104,7 @@ 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", "~> 4.1"
+gem "paperclip", "~> 4.2"
 ```
 
 If you're still using Rails 2.3.x, you should do this instead:
@@ -98,6 +133,8 @@ class ModuleName < ActiveRecord::Base
 end
 ```
 
+---
+
 Quick Start
 -----------
 
@@ -189,6 +226,7 @@ Set the attribute to `nil` and save.
 @user.avatar = nil
 @user.save
 ```
+---
 
 Usage
 -----
@@ -311,6 +349,8 @@ validates_attachment :avatar,
 `Paperclip::ContentTypeDetector` will attempt to match a file's extension to an
 inferred content_type, regardless of the actual contents of the file.
 
+---
+
 Security Validations
 ====================
 
@@ -347,6 +387,20 @@ being uploaded as JPEGs, but will not prevent GIFs from being uploaded with a
 .jpg extension. This validation will only add validation errors to the form. It
 will not cause Errors to be raised.
 
+This can sometimes cause false validation errors in applications that use custom 
+file extensions. In these cases you may wish to add your custom extension to the
+list of file extensions allowed for your mime type configured by the mime-types 
+gem:
+
+```ruby
+# Allow ".foo" as an extension for files with the mime type "text/plain".
+text_plain = MIME::Types["text/plain"].first
+text_plain.extensions << "foo"
+MIME::Types.index_extensions text_plain
+```
+
+---
+
 Defaults
 --------
 Global defaults for all your paperclip attachments can be defined by changing the Paperclip::Attachment.default_options Hash, this can be useful for setting your default storage settings per example so you won't have to define them in every has_attached_file definition.
@@ -373,6 +427,7 @@ Paperclip::Attachment.default_options[:fog_credentials] = {:provider => "Local",
 Paperclip::Attachment.default_options[:fog_directory] = ""
 Paperclip::Attachment.default_options[:fog_host] = "http://localhost:3000"
 ```
+---
 
 Migrations
 ----------
@@ -433,6 +488,8 @@ end
 Vintage syntax (such as `t.has_attached_file` and `drop_attached_file`) are still supported in
 Paperclip 3.x, but you're advised to update those migration files to use this new syntax.
 
+---
+
 Storage
 -------
 
@@ -481,6 +538,8 @@ both the `:path` and `:url` options in order to make sure the files are unavaila
 to the public. Both `:path` and `:url` allow the same set of interpolated
 variables.
 
+---
+
 Post Processing
 ---------------
 
@@ -489,9 +548,10 @@ a set of styles for an attachment, by default it is expected that those
 "styles" are actually "thumbnails". However, you can do much more than just
 thumbnail images. By defining a subclass of Paperclip::Processor, you can
 perform any processing you want on the files that are attached. Any file in
-your Rails app's lib/paperclip\_processors directory is automatically loaded by
-paperclip, allowing you to easily define custom processors. You can specify a
-processor with the :processors option to `has_attached_file`:
+your Rails app's `lib/paperclip` and `lib/paperclip_processors` directories is
+automatically loaded by paperclip, allowing you to easily define custom
+processors. You can specify a processor with the :processors option to
+`has_attached_file`:
 
 ```ruby
 has_attached_file :scan, :styles => { :text => { :quality => :better } },
@@ -539,6 +599,8 @@ database, take a look at the [paperclip-meta](https://github.com/teeparham/paper
 Also, if you're interested in generating the thumbnail on-the-fly, you might want
 to look into the [attachment_on_the_fly](https://github.com/drpentode/Attachment-on-the-Fly) gem.
 
+---
+
 Events
 ------
 
@@ -569,6 +631,8 @@ class Message < ActiveRecord::Base
 end
 ```
 
+---
+
 URI Obfuscation
 ---------------
 
@@ -624,6 +688,8 @@ has_attached_file :some_attachment, {
 
 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
 -------
 
@@ -641,6 +707,7 @@ implementation pattern of the thumbnail processor would be a way to implement a
 watermark processor.  All kinds of attachment processors can be created;
 a few utility examples would be compression and encryption processors.
 
+---
 
 Dynamic Configuration
 ---------------------
@@ -681,10 +748,12 @@ processors, where a defined `watermark` processor is invoked after the
 ```ruby
 class User < ActiveRecord::Base
   has_attached_file :avatar, :processors => lambda { |instance| instance.processors }
-  attr_accessor :watermark
+  attr_accessor :processors
 end
 ```
 
+---
+
 Logging
 ----------
 
@@ -699,6 +768,8 @@ end
 
 More information in the [rdocs](http://rdoc.info/github/thoughtbot/paperclip/Paperclip.options)
 
+---
+
 Deployment
 ----------
 
@@ -759,6 +830,8 @@ Then in `RAILS_ROOT/public/system/paperclip_attachments.yml`:
   - :thumb
 ```
 
+---
+
 Testing
 -------
 
@@ -803,6 +876,7 @@ config.after(:suite) do
   FileUtils.rm_rf(Dir["#{Rails.root}/spec/test_files/"])
 end
 ```
+---
 
 Contributing
 ------------
@@ -819,6 +893,8 @@ guidelines:
 
 Please see `CONTRIBUTING.md` for more details on contributing and running test.
 
+---
+
 Credits
 -------
 
@@ -830,6 +906,8 @@ Thank you to all [the contributors](https://github.com/thoughtbot/paperclip/cont
 
 The names and logos for thoughtbot are trademarks of thoughtbot, inc.
 
+---
+
 License
 -------
 

data/features/basic_integration.feature

@@ -24,6 +24,21 @@ Feature: Rails integration
     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 "spec/support/fixtures/5k.png"
 
+  Scenario: Add custom processors
+    Given I add a "test" processor in "lib/paperclip"
+    And I add a "cool" processor in "lib/paperclip_processors"
+    And I attach :attachment with:
+      """
+      styles: { original: {} }, processors: [:test, :cool]
+      """
+    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 "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"
+
   Scenario: Filesystem integration test
     Given I attach :attachment with:
       """

data/features/step_definitions/rails_steps.rb

@@ -196,6 +196,35 @@ Given /^I am using Rails newer than ([\d\.]+)$/ do |version|
   end
 end
 
+Given(/^I add a "(.*?)" processor in "(.*?)"$/) do |processor, directory|
+  filename = "#{directory}/#{processor}.rb"
+  in_current_dir do
+    FileUtils.mkdir_p directory
+    File.open(filename, "w") do |f|
+      f.write(<<-CLASS)
+        module Paperclip
+          class #{processor.capitalize} < Processor
+            def make
+              basename = File.basename(file.path, File.extname(file.path))
+              dst_format = options[:format] ? ".\#{options[:format]}" : ''
+
+              dst = Tempfile.new([basename, dst_format])
+              dst.binmode
+
+              convert(':src :dst',
+                src: File.expand_path(file.path),
+                dst: File.expand_path(dst.path)
+              )
+
+              dst
+            end
+          end
+        end
+      CLASS
+    end
+  end
+end
+
 def transform_file(filename)
   if File.exist?(filename)
     content = File.read(filename)

data/gemfiles/3.2.gemfile

@@ -2,12 +2,18 @@
 
 source "https://rubygems.org"
 
-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 "jruby-openssl", :platforms => :jruby
+gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
+gem "rubysl", :platforms => :rbx
+gem "racc", :platforms => :rbx
+gem "pry"
 gem "rails", "~> 3.2.15"
-gem "paperclip", :path=>"../"
+gem "paperclip", :path => "../"
 
-gemspec :path=>"../"
+group :development, :test do
+  gem "mime-types", "~> 1.16"
+  gem "builder"
+end
+
+gemspec :path => "../"

data/gemfiles/4.0.gemfile

@@ -2,12 +2,18 @@
 
 source "https://rubygems.org"
 
-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 "jruby-openssl", :platforms => :jruby
+gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
+gem "rubysl", :platforms => :rbx
+gem "racc", :platforms => :rbx
+gem "pry"
 gem "rails", "~> 4.0.0"
-gem "paperclip", :path=>"../"
+gem "paperclip", :path => "../"
 
-gemspec :path=>"../"
+group :development, :test do
+  gem "mime-types", "~> 1.16"
+  gem "builder"
+end
+
+gemspec :path => "../"

data/gemfiles/4.1.gemfile

@@ -2,12 +2,18 @@
 
 source "https://rubygems.org"
 
-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 "rails", "~> 4.1.0.beta"
-gem "paperclip", :path=>"../"
-
-gemspec :path=>"../"
+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 "pry"
+gem "rails", "~> 4.1.0"
+gem "paperclip", :path => "../"
+
+group :development, :test do
+  gem "mime-types", "~> 1.16"
+  gem "builder"
+end
+
+gemspec :path => "../"