carrierwave 0.5.5 → 0.5.6

data/lib/carrierwave.rb

@@ -108,6 +108,4 @@ elsif defined?(Sinatra)
 
 end
 
-require 'carrierwave/orm/datamapper' if defined?(DataMapper)
-require 'carrierwave/orm/sequel' if defined?(Sequel)
 require 'carrierwave/orm/mongoid' if defined?(Mongoid)

data/lib/carrierwave/uploader/store.rb

@@ -70,8 +70,16 @@ module CarrierWave
       #
       def delete_cache_id
         if @cache_id
-          path = File.join(cache_dir, @cache_id)
-          FileUtils.rm_rf(path) if File.exists?(path) && File.directory?(path)
+          path = File.expand_path(File.join(cache_dir, @cache_id), CarrierWave.root)
+          begin
+            Dir.rmdir(path)
+          rescue Errno::ENOENT
+            # Ignore: path does not exist
+          rescue Errno::ENOTDIR
+            # Ignore: path is not a dir
+          rescue Errno::ENOTEMPTY, Errno::EEXIST
+            # Ignore: dir is not empty
+          end
         end
       end
 

data/lib/carrierwave/uploader/versions.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 
+require 'active_support/deprecation'
+
 module CarrierWave
   module Uploader
     module Versions

data/lib/carrierwave/version.rb

@@ -1,3 +1,3 @@
 module CarrierWave
-  VERSION = "0.5.5"
+  VERSION = "0.5.6"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: carrierwave
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: 
   segments: 
   - 0
   - 5
-  - 5
-  version: 0.5.5
+  - 6
+  version: 0.5.6
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-09 00:00:00 -05:00
+date: 2011-07-12 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency