Fog storage handles missing files on size

lib/carrierwave/orm/activerecord.rb

@@ -31,6 +31,7 @@ def mount_uploader(column, uploader=nil, options={}, &block)
       after_commit :"mark_remove_#{column}_false", :on => :update
       before_update :"store_previous_model_for_#{column}"
       after_save :"remove_previously_stored_#{column}"
+      after_save :"invalidate_memoized_filename_for_#{column}"
 
       class_eval <<-RUBY, __FILE__, __LINE__+1
         def #{column}=(new_file)
@@ -51,6 +52,10 @@ def remove_#{column}!
           _mounter(:#{column}).write_identifier
         end
 
+        def invalidate_memoized_filename_for_#{column}
+          send(:instance_variable_set, :"@#{column}_regularized_filename", nil)
+        end
+
         def serializable_hash(options=nil)
           hash = {}
 

lib/carrierwave/storage/fog.rb

@@ -185,6 +185,7 @@ def content_type=(new_content_type)
         def delete
           # avoid a get by just using local reference
           directory.files.new(:key => path).destroy
+        rescue ::Fog::Service::NotFound
         end
 
         ##
@@ -236,7 +237,7 @@ def read
         # [Integer] size of file body
         #
         def size
-          file.content_length
+          file.nil? ? 0 : file.content_length
         end
 
         ##

lib/carrierwave/version.rb

@@ -1,3 +1,3 @@
 module CarrierWave
-  VERSION = "0.10.0"
+  VERSION = "0.10.0.1.skroutz"
 end

spec/storage/fog_helper.rb

@@ -175,6 +175,18 @@ class FogSpec#{fog_credentials[:provider]}Uploader < CarrierWave::Uploader::Base
             @fog_file.delete
             @directory.files.head(store_path).should == nil
           end
+
+          context "when the files has been deleted" do
+            before do
+              @fog_file.delete
+            end
+
+            it "does not blow up" do
+              expect {
+                @fog_file.size
+              }.not_to raise_error
+            end
+          end
         end
 
         describe '#retrieve!' do