From https://github.com/pcreux/paperclip/commit/52374958ef83f1641cf008aead27c23b25fb842d

Conflicts:

	lib/paperclip/attachment.rb

This fixes #660

In some case, we seriously don't want to prepend the timestamp with & if there wasn't a query string there. If the original URL doesn't have any query string, we should add the ?.

There was some problem with command line parsing with a special character.

The original commit came from @amazonwebservices and @trevorrowe in #579.
I had to revise the commit and make sure all the test cases are passing.
All credits still goes to those guys, thanks a lot!

This also removes Pry.

Separate the UrlGenerator out from the Attachment. Some example plugins that could be written include generating thumbnails on the fly for different thumbnail sizes, or delaying the thumbnail generation until it is first called.

Fix a bug when passing a method name to `:if` and `:unless` option in `validates_attachment_presence`

Fixes #631

ones (:private and :public_read) in the s3_test
completed test for lambda permission value

formulate assert conditions

bit of work

Paperclip::InterpolatedString will ensure that we're not double escape the string, which was the cause of the escaped filename problem in #path method.