Don't upload attachments that have already been uploaded.

lib/filer/attachment.rb

@@ -141,8 +141,17 @@ def display_hash
         }
       end
 
+      def uploaded?
+        @uploaded == true
+      end
+      def mark_uploaded!
+        @uploaded = true
+      end
+
       def need_upload?
-        if file.nil?
+        if uploaded?
+          false
+        elsif file.nil?
           false
         elsif file.kind_of?(FileLike)
           false

lib/filer/uploader.rb

@@ -26,14 +26,17 @@ def json_headers
 
       def upload_attachment(attachment)
         url = "#{Progstr::Filer.url_prefix}upload/new"
+        puts "upload to: #{url}"
         begin
           response = RestClient.post(url, {
                       :upload1 => attachment.file,
                       :authToken => Progstr::Filer.generate_auth_token,
                       :uploader => self.class.name,
                       :id => attachment.id
                     }, json_headers)
-          UploadStatus.new MultiJson.decode(response)
+          result = UploadStatus.new MultiJson.decode(response)
+          attachment.mark_uploaded!
+          result
         rescue => e
           if e.respond_to?(:response) && !e.response.nil?
             raise ApiError.new(MultiJson.decode(e.response))

test/test_upload_on_save.rb

@@ -31,6 +31,17 @@ class TestUploadOnSave < UserTest
     assert_equal "7933ad9a0f93457ab625a070fec3544f", saved_id
   end
 
+  should "not upload already uploaded attachments" do
+    u = User.new
+    f = FileMock.new
+    u.avatar = f
+    u.save!
+
+    $lastUploadedAtachment = nil
+    u.save!
+    assert_nil $lastUploadedAtachment
+  end
+
   should "delete the previous attachment on save" do
     u = User.new
     f1 = FileMock.new

test/user_data.rb

@@ -25,6 +25,7 @@ def self.down
 class MockUploader < Progstr::Filer::Uploader
   def upload_attachment(attachment)
     $lastUploadedAtachment = attachment
+    attachment.mark_uploaded!
   end
   def delete_attachment(attachment)
     $lastDeletedAtachment = attachment