Changed capitalize -> camelcase for storage module names.

geemus · Jul 21, 2011 · c8a271e · c8a271e
1 parent cfe406b
commit c8a271e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/lib/paperclip/attachment.rb b/lib/paperclip/attachment.rb
@@ -323,7 +323,7 @@ def valid_assignment? file #:nodoc:
     end
 
     def initialize_storage #:nodoc:
-      storage_class_name = @storage.to_s.camelize
+      storage_class_name = @storage.to_s.downcase.camelize
       begin
         @storage_module = Paperclip::Storage.const_get(storage_class_name)
       rescue NameError

diff --git a/test/attachment_test.rb b/test/attachment_test.rb
@@ -496,6 +496,19 @@ class Paperclip::Test < Paperclip::Processor; end
     rebuild_model :storage => :FileSystem
     @dummy = Dummy.new
     assert @dummy.avatar.is_a?(Paperclip::Storage::Filesystem)
+
+    rebuild_model :storage => :Filesystem
+    @dummy = Dummy.new
+    assert @dummy.avatar.is_a?(Paperclip::Storage::Filesystem)
+  end
+
+  should "convert underscored storage name to camelcase" do
+    rebuild_model :storage => :not_here
+    @dummy = Dummy.new
+    exception = assert_raises(Paperclip::StorageMethodNotFound) do |e|
+      @dummy.avatar
+    end
+    assert exception.message.include?("NotHere")
   end
 
   should "raise an error if you try to include a storage module that doesn't exist" do
@@ -1061,4 +1074,4 @@ def do_after_all; end
     end
   end
 
-end
+end