uploader 3.0.2 → 3.1.0

data/README.rdoc

@@ -193,6 +193,19 @@ SWFUpload version:
 
 See the uploader_helper.rb file for options. parent_object should be the object which owns the uploads.  ie a user, photo_album, etc.
 
+=== Support for Html 5 Drag and Drop file uploads
+The new XMLHttpRequest object will submit the raw file data as the only data in the request. Uploader provides support for this functionality.
+The file name should be specified in the header. "X-File-Upload" must be set to true or the request will be ignored.
+Here's an example of how to send data:
+
+  var xhr = new XMLHttpRequest();
+  xhr.open('POST', '/uploads', true);
+  xhr.setRequestHeader("Content-Type", file.type);
+  xhr.setRequestHeader("X-File-Name", file.fileName);
+  xhr.setRequestHeader("X-File-Size", file.fileSize);
+  xhr.setRequestHeader("X-File-Upload", true);				
+  xhr.send(file);
+
 === Rake Tasks
 
 rake uploader:sync  # will copy all required assets (css, javascript, images, migrations, etc) from uploadify into your project
@@ -310,10 +323,12 @@ Say you have chosen to display your upload in a table.  Your code might look lik
 
 I put the following in my main upload view
   <% content_for :javascript do  -%>
+    <script type="text/javascript" language="JavaScript">
     setup_submit_delete();
     function upload_completed_callback(data){
       jQuery('#upload-list').prepend(data);
     }
+    </script>
   <% end -%>
   
   

data/VERSION

@@ -1 +1 @@
-3.0.2
+3.1.0

data/app/controllers/uploader/uploads_controller.rb

@@ -6,14 +6,23 @@ class Uploader::UploadsController < ApplicationController
   before_filter :set_upload_for_destroy, :only => [:destroy]
  
   def create
-    # Standard, one-at-a-time, upload action
-    @upload = Upload.new(params[:upload])
+    # Standard, one-at-a-time, upload action       
+    if request.env['HTTP_X_FILE_UPLOAD'] == 'true'        
+      tempfile = Tempfile.new(request.env['HTTP_X_FILE_NAME'], Uploader.configuration.temp_dir)
+      tempfile << request.env['rack.input'].read
+      tempfile.flush
+      tempfile.rewind
+      @upload = Upload.new(:name => request.env['HTTP_X_FILE_NAME'], :hard_file_name => request.env['HTTP_X_FILE_NAME'])
+      # NOTE hard_file_name MUST be set before setting local or paperclip will process the file before the hard_file_name is set
+      @upload.local = tempfile
+    else
+      @upload = Upload.new(params[:upload])
+    end    
     @upload.uploadable = @parent
     @upload.creator = get_creator
-    @upload.save!
+    @upload.save!    
     message = t('uploader.successful_upload')
     upload_json = basic_uploads_json(@upload)
-
     respond_to do |format|
       format.html do
         flash[:notice] = message
@@ -31,6 +40,7 @@ class Uploader::UploadsController < ApplicationController
       end
       format.js { render :text => message }
       format.json { render :json => { :success => false, :message => message } }
+      # render :json => message, :status => :unprocessable_entity
     end
   end
 

data/lib/uploader/config.rb

@@ -6,8 +6,8 @@
 #     config.s3_no_wait = true
 #     config.keep_local_file = true
 #     config.has_attached_file_options = {
-#       :url     => "/system/:attachment/:id_partition/:style/:basename.:extension",
-#       :path    => ":rails_test/public/system/:attachment/:id_partition/:style/:basename.:extension",
+#       :url               => "/system/:attachment/:id_partition/:style/:basename.:extension",
+#       :path              => ":rails_root/public:url",
 #       :styles  => { :icon => "30x30!", 
 #                     :thumb => "100>", 
 #                     :small => "150>", 
@@ -41,15 +41,17 @@ module Uploader
     attr_accessor :s3_no_wait
     attr_accessor :keep_local_file
     attr_accessor :disable_halt_nonimage_processing
+    attr_accessor :temp_dir
 
     def initialize
       @enable_s3 = false
       @s3_no_wait = false
       @keep_local_file = true
       @disable_halt_nonimage_processing = false
+      @temp_dir = Dir::tmpdir
       @has_attached_file_options = {
-        :url     => "/system/:attachment/:id_partition/:style/:basename.:extension",
-        :path    => ":rails_test/public/system/:attachment/:id_partition/:style/:basename.:extension",
+        :url               => "/system/:attachment/:id_partition/:style/:basename.:extension",
+        :path              => ":rails_root/public:url", 
         :styles  => { :icon => "30x30!", 
                       :thumb => "100>", 
                       :small => "150>", 

data/lib/uploader/models/upload.rb

@@ -8,7 +8,7 @@ module Uploader
       included do
         
         scope :newest, order("created_at DESC")
-        scope :by_filename, order("local_file_name DESC")
+        scope :by_filename, order("local_file_name ASC")
         scope :newest, order("created_at DESC")
         scope :is_public, where('is_public = true')
         scope :images, where("local_content_type IN (#{Uploader::MimeTypeGroups::IMAGE_TYPES.collect{|type| "'#{type}'"}.join(',')})")
@@ -27,10 +27,13 @@ module Uploader
       
         before_save :determine_immediate_send_to_remote
         
+        before_post_process :set_hard_file_name
         before_post_process :transliterate_file_name
         before_post_process :halt_nonimage_processing unless Uploader.configuration.disable_halt_nonimage_processing
         before_create :add_width_and_height
       
+        attr_accessor :hard_file_name
+        
         # Protect data in the model
         attr_protected :creator_id, :uploadable_id, :uploadable_type
       end
@@ -190,9 +193,14 @@ module Uploader
     
       protected
       
+        def set_hard_file_name
+          name = @hard_file_name || local_file_name
+          self.local.instance_write(:file_name, name)
+        end
+        
         def transliterate_file_name
           extension = File.extname(local_file_name).gsub(/^\.+/, '')
-          filename = local_file_name.gsub(/\.#{extension}$/, '')
+          filename = local_file_name.gsub(/\.#{extension}$/, '')          
           self.local.instance_write(:file_name, "#{transliterate(filename)}.#{transliterate(extension)}")
         end