Merge pull request #686 from skyeagle/master

avoid double generation of cache_id

lib/carrierwave/uploader/versions.rb

@@ -216,6 +216,7 @@ def cache_versions!(new_file)
         active_versions.each do |name, v|
           next if v.cached?
 
+          v.send(:cache_id=, cache_id)
           # If option :from_version is present, create cache using cached file from
           # version indicated
           if self.class.versions[name][:options] && self.class.versions[name][:options][:from_version]
@@ -229,7 +230,6 @@ def cache_versions!(new_file)
           else
             v.cache!(processed_parent)
           end
-          v.send(:cache_id=, cache_id)
         end
       end
 

spec/uploader/versions_spec.rb

@@ -179,13 +179,15 @@ def rotate
       end
 
       it "should set store_path with versions" do
+        CarrierWave.should_receive(:generate_cache_id).once
         @uploader.cache!(File.open(file_path('test.jpg')))
         @uploader.store_path.should == 'uploads/test.jpg'
         @uploader.thumb.store_path.should == 'uploads/thumb_test.jpg'
         @uploader.thumb.store_path('kebab.png').should == 'uploads/thumb_kebab.png'
       end
 
       it "should move it to the tmp dir with the filename prefixed" do
+        CarrierWave.should_receive(:generate_cache_id).once
         @uploader.cache!(File.open(file_path('test.jpg')))
         @uploader.current_path.should == public_path('uploads/tmp/20071201-1234-345-2255/test.jpg')
         @uploader.thumb.current_path.should == public_path('uploads/tmp/20071201-1234-345-2255/thumb_test.jpg')
@@ -194,6 +196,7 @@ def rotate
       end
 
       it "should cache the files based on the parent" do
+        CarrierWave.should_receive(:generate_cache_id).once
         @uploader.cache!(File.open(file_path('bork.txt')))
 
         File.read(public_path(@uploader.to_s)).should == File.read(public_path(@uploader.thumb.to_s))