Give a stable name to classes created by the mount_uploader block

Refs. #2407, #2471, a9de756

lib/carrierwave/mount.rb

@@ -394,7 +394,7 @@ def remove_rolled_back_#{column}
     def mount_base(column, uploader=nil, options={}, &block)
       include CarrierWave::Mount::Extension
 
-      uploader = build_uploader(uploader, &block)
+      uploader = build_uploader(uploader, column, &block)
       uploaders[column.to_sym] = uploader
       uploader_options[column.to_sym] = options
 
@@ -453,16 +453,15 @@ def mark_remove_#{column}_false
       RUBY
     end
 
-    def build_uploader(uploader, &block)
-      return uploader if uploader && !block_given?
+    def build_uploader(uploader, column, &block)
+      uploader ||= CarrierWave::Uploader::Base
+      return uploader unless block_given?
 
-      uploader = Class.new(uploader || CarrierWave::Uploader::Base)
-      const_set("Uploader#{uploader.object_id}".tr('-', '_'), uploader)
+      uploader = Class.new(uploader)
+      const_set("CarrierWave#{column.to_s.camelize}Uploader", uploader)
 
-      if block_given?
-        uploader.class_eval(&block)
-        uploader.recursively_apply_block_to_versions(&block)
-      end
+      uploader.class_eval(&block)
+      uploader.recursively_apply_block_to_versions(&block)
 
       uploader
     end

spec/mount_multiple_spec.rb

@@ -971,6 +971,10 @@ def fish
       it "applies any custom modifications to the uploader class" do
         expect(uploader.new).not_to respond_to(:fish)
       end
+
+      it "should give the generated class a stable name" do
+        expect(first_image.class).to eq klass.const_get :CarrierWaveImagesUploader
+      end
     end
   end
 

spec/mount_single_spec.rb

@@ -696,6 +696,10 @@ def fish
       it "should not apply any custom modifications to the uploader class" do
         expect(@uploader.new).not_to respond_to(:fish)
       end
+
+      it "should give the generated class a stable name" do
+        expect(@instance.image.class).to eq @class.const_get :CarrierWaveImageUploader
+      end
     end
   end