allow proc for fog_directory so its possible to call model methods to…

… set the directory

lib/paperclip/storage/fog.rb

@@ -168,7 +168,13 @@ def connection
       end
 
       def directory
-        @directory ||= connection.directories.new(:key => @options[:fog_directory])
+        dir = if @options[:fog_directory].is_a?(Proc)
+          @options[:fog_directory].call(self)
+        else
+          @options[:fog_directory]
+        end
+
+        @directory ||= connection.directories.new(:key => dir)
       end
     end
   end

test/storage/fog_test.rb

@@ -220,6 +220,21 @@ class FogTest < Test::Unit::TestCase
 
       end
 
+      context "with a proc for a bucket name evaluating a model method" do
+        setup do
+          @dynamic_fog_directory = 'dynamicpaperclip'
+          rebuild_model(@options.merge(:fog_directory => lambda { |attachment| attachment.instance.bucket_name }))
+          @dummy = Dummy.new
+          @dummy.stubs(:bucket_name).returns(@dynamic_fog_directory)
+          @dummy.avatar = @file
+          @dummy.save
+        end
+
+        should "have created the bucket" do
+          assert @connection.directories.get(@dynamic_fog_directory).inspect
+        end
+
+      end
     end
 
   end