Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/carrierwave/uploader/store.rb

.travis.yml

@@ -0,0 +1,22 @@
+rvm:
+ - 1.8.7
+ - 1.9.2
+ - 1.9.3
+ - ruby-head
+ - ree
+
+gemfile:
+  - gemfiles/rails3_2.gemfile
+  - gemfiles/rails_master.gemfile
+
+matrix:
+  exclude:
+    - rvm: 1.8.7
+      gemfile: gemfiles/rails_master.gemfile
+    - rvm: 1.9.2
+      gemfile: gemfiles/rails_master.gemfile
+    - rvm: ree
+      gemfile: gemfiles/rails_master.gemfile
+
+before_script:
+  - "mysql -e 'create database carrierwave_test;'"

Gemfile

@@ -1,3 +1,3 @@
-source :rubygems
+source "https://rubygems.org"
 
 gemspec

History.txt

@@ -1,17 +1,84 @@
-=== Unreleased https://github.com/jnicklas/carrierwave/compare/v0.5.4...master
+=== Version 0.6.2 2012-04-12
+
+* [fixed] Don't double-generate cache_id [skyeagle]
+* [added] Escape plus signs (+) in remote URLs [adrianpike]
+* [added] Enhance multi-page PDF support in RMagick [xtreme-tanzeeb-khalili]
+
+=== Version 0.6.1 2012-04-02
+
+* [fixed] Calling #serializable_hash with no options [matthewrudy]
+
+=== Version 0.6.0 2012-03-27
+
+* [BREAKING CHANGE] Require Rails 3.2 or Rails master (4.0) - depends on activesupport/activemodel [bensie]
+* [BREAKING CHANGE] Remove :S3 storage option in favor of Fog [bensie]
+* [BREAKING CHANGE] Remove :CloudFiles storage option in favor of Fog [bensie]
+* [changed] JSON / XML serialization hashes are consistent and work as expected with ActiveRecord's serializable_hash [bensie]
+* [added] fog_host now accepts a proc (useful for dynamic asset servers) [jtrim]
+* [added] Add ability to process a version from an existing version so you aren't always crunching the original, large file [ferblape]
+* [added] Allow brackets in remote URLs [ngauthier]
+* [added] CarrierWave::Storage::Fog::File#exists? to check the existence of the file without needing to fetch it [bensie]
+* [added] Gravity option on resize_to_fill (minimagick) [TheOddLinguist]
+* [added] Add query options for s3 to support response headers overwriting [meceo]
+* [added] Make storages File#url methods to work without any params [meceo]
+* [added] Set the CarrierWave.root correctly if Padrino is defined [futurechimp]
+* [added] Cache fog connections for improved performance [labocho]
+* [fixed] Fix slow fetching of content-length on remote file [geemus]
+* [fixed] Fog remote specs now passing and depend on Fog >= 1.3.1 [geemus]
+* [fixed] Fix an issue where multi-page PDFs can't be converted with RMagick [chanind]
+* [fixed] MiniMagick expects string args to mogrify commands [bensie]
+* [fixed] With Active Record ORM, setting remote_url marks mounted column as dirty [trevorturk]
+* [fixed] Fix possible race condition with CarrierWave.root [bensie]
+* [fixed] ActiveSupport::Memoizable deprecation warning [slbug]
+
+=== Version 0.5.8 2011-11-10
+
+* [added] Allow custom error messages [bartt]
+* [added] Add config.base_path to use as a prefix for uploader URLs [die-antwort]
+* [added] Support fog streaming uploads [chrisdurtschi]
+* [added] Support `move_to` in addition to the default `copy_to` when using the cache [jasonydes]
+* [fixed] Support for Sinatra 1.3 (with backward compatibility) [bensie]
+* [fixed] Fog get_object_url deprecated, use get_object_https_url or get_object_http_url [scottmessinger]
+
+=== Version 0.5.7 2011-08-12
+
+* [BREAKING CHANGE] Extracted Mongoid support into a separate gem (carrierwave-mongoid) [jnicklas]
+* [BREAKING CHANGE] Remove ImageScience support due to lack maintenance and 1.9.2 compatibility [jnicklas]
+* [BREAKING CHANGE] Combine delete_tmp_file_after_storage and delete_cache_id_after_storage options [bensie]
+* [changed] Cached and then remote-uploaded file will no longer have a content_type, please use CarrierWave::MimeTypes processor instead [trevorturk]
+* [changed] Allow writing over a previously assigned file when retrieving a remote file [Florent2]
+* [fixed] Fixed exception when nested or double-embedded Mongoid documents are saved [potatosalad]
+* [fixed] Fixed that store! can call process! twice [gzigzigzeo]
+* [fixed] Performance enhancements by reducing use of rescue [jamescook]
+
+=== Version 0.5.6 2011-07-12
+
+* [fixed] Remove cache file and directories after storing [scottwb]
+* [fixed] Add missing active_support/deprecation require [trevorturk]
+* [fixed] Remove redundant requires of sequel and datamapper [solnic]
+* [fixed] Running tests with REMOTE=true [geemus]
+
+=== Version 0.5.5 2011-07-09
 
 * [BREAKING CHANGE] Extracted DataMapper support into a separate gem (carrierwave-datamapper) [jnicklas]
 * [BREAKING CHANGE] Extracted Sequel support into a separate gem (carrierwave-sequel) [jnicklas]
 * [changed] Don't downcase filenames by default [bensie]
 * [changed] Orm mount modules default uploader to nil [jnicklas]
 * [changed] Remove alias_method :blank? from SanitizedFile to for performance re: issue #298 [trevorturk]
-* [added] conditional processing of versions [gucki]
+* [added] Conditional processing of versions [gucki]
+* [added] Remove Remove previously stored files after Active Record mounted uploader update re: issue #75 [trevorturk]
+* [added] Remove Remove previously stored files after Mongoid mounted uploader update re: issue #75 [did]
 * [added] Added _identifier to retrieve identifier/filename [jnicklas]
 * [added] clean_cached_files! clears all files older than 24 hours by default, but time frame can now be customized [cover]
+* [added] Versions now implement an enable_processing method which uses the parent when no value is set [mariovisic]
+* [added] Delete cache_id garbage dirs, closes GH issue #338 [clyfe]
+* [added] Added CarrierWave::MimeTypes processor for more advanced content-type guessing [JangoSteve]
 * [fixed] Active Record's will_change! method works when mount_on option is used [indrekj]
 * [fixed] Fixed problem with accepting URL uploads when the URL was already escaped [cover]
 * [fixed] Fixed ability to override sanitize_regexp [trevorturk]
 * [fixed] Fix that cached and then remote-uploaded file should have content_type [trevorturk]
+* [fixed] Fix validates_size/length_of in Rails 3.0.6 and above, closes #342 [bensie]
+* [fixed] Various Active Support compatibility updates [slbug, bensie, et al]
 
 === Version 0.5.4 2011-05-18