fixes #837

app/models/upload.rb

@@ -364,6 +364,27 @@ class Upload < ActiveRecord::Base
     end
   end
   
+  module ApiMethods
+    def serializable_hash(options = {})
+      options ||= {}
+      options[:except] ||= []
+      options[:except] += hidden_attributes
+      unless options[:builder]
+        options[:methods] ||= []
+        options[:methods] += [:uploader_name]
+      end
+      hash = super(options)
+      hash
+    end
+    
+    def to_xml(options = {}, &block)
+      options ||= {}
+      options[:procs] ||= []
+      options[:procs] << lambda {|options, record| options[:builder].tag!("uploader-name", record.uploader_name)}
+      super(options, &block)
+    end
+  end
+  
   include ConversionMethods
   include ValidationMethods
   include FileMethods
@@ -376,6 +397,7 @@ class Upload < ActiveRecord::Base
   include StatusMethods
   include UploaderMethods
   extend SearchMethods
+  include ApiMethods
   
   def add_file_size_tags!(file_path)
     if file_size >= 10.megabytes
@@ -383,6 +405,10 @@ class Upload < ActiveRecord::Base
     end
   end
   
+  def uploader_name
+    User.id_to_name(uploader_id)
+  end
+  
   def presenter
     @presenter ||= UploadPresenter.new(self)
   end