Make #expiring_url behavior consistent with #url

Return the default path when the attachment has no remote file

lib/paperclip/storage/s3.rb

@@ -164,6 +164,8 @@ module Paperclip
         if path
         if path
           base_options = { :expires => time, :secure => use_secure_protocol?(style_name) }
           base_options = { :expires => time, :secure => use_secure_protocol?(style_name) }
           s3_object(style_name).url_for(:read, base_options.merge(s3_url_options)).to_s
           s3_object(style_name).url_for(:read, base_options.merge(s3_url_options)).to_s
+        else
+          url
         end
         end
       end
       end
 
 

test/storage/s3_test.rb

@@ -539,6 +539,18 @@ class S3Test < Test::Unit::TestCase
     end
     end
   end
   end
 
 
+  context "#expiring_url" do
+    setup { @dummy = Dummy.new }
+
+    context "with no attachment" do
+      setup { assert(!@dummy.avatar.exists?) }
+
+      should "return the default URL" do
+        assert_equal(@dummy.avatar.url, @dummy.avatar.expiring_url)
+      end
+    end
+  end
+
   context "Generating a url with an expiration for each style" do
   context "Generating a url with an expiration for each style" do
     setup do
     setup do
       rebuild_model :storage => :s3,
       rebuild_model :storage => :s3,