uploader 0.2.4 → 0.2.5

data/README.rdoc

@@ -28,7 +28,7 @@ Another option is to use jRails
 http://ennerchi.com/projects/jrails
 
 === Create a model for uploads.
-We recommend creating a model called upload.rb.  acts_as_uploader accepts all valid options for paperclip via :has_attached_file => {}
+Creat an 'Upload' model in upload.rb.  acts_as_uploader accepts all valid options for paperclip via :has_attached_file => {}
 
   class Upload < ActiveRecord::Base
 

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.2.5

data/app/controllers/uploader/uploads_controller.rb

@@ -7,7 +7,8 @@ class Uploader::UploadsController < ApplicationController
  
   def create
     # Standard, one-at-a-time, upload action
-    @upload = @parent.uploads.build(params[:upload])
+    @upload = Upload.new(params[:upload])
+    @upload.uploadable = @parent
     @upload.creator = get_creator
     @upload.save!
     message = t('uploader.successful_upload')
@@ -34,12 +35,12 @@ class Uploader::UploadsController < ApplicationController
   end
 
   def swfupload
-    @upload = @parent.uploads.build
+    @upload = Upload.new
     @upload.is_public = true if params[:is_public] == true
     @upload.creator = get_creator
+    @upload.uploadable = @parent
     @upload.swfupload_local = params[:Filedata]
     @upload.save!
-    @parent.uploads << @upload
     respond_to do |format|
       format.js { render :text => get_upload_text(@upload) }
       format.json { render :json => basic_uploads_json(@upload) }
@@ -74,80 +75,91 @@ class Uploader::UploadsController < ApplicationController
 
   protected
 
-  def get_upload_text(upload)
-    raise 'implement get_upload_text in your controller'
-  end
+    def get_upload_text(upload)
+      raise 'implement get_upload_text in your controller'
+    end
 
-  def set_upload_for_destroy
-    @upload = Upload.find(params[:id])
-  end
+    def set_upload_for_destroy
+      @upload = Upload.find(params[:id])
+    end
 
-  def permission_denied
-    message = t("uploader.permission_denied")
-    respond_to do |format|
-      format.html do
-        flash[:notice] = message
-        redirect_to get_redirect(:permission_denied)
+    def permission_denied
+      message = t("uploader.permission_denied")
+      respond_to do |format|
+        format.html do
+          flash[:notice] = message
+          redirect_to get_redirect(:permission_denied)
+        end
+        format.js { render :text => message }
+        format.json { render :json => { :success => false, :message => message } }
       end
-      format.js { render :text => message }
-      format.json { render :json => { :success => false, :message => message } }
     end
-  end
 
-  # override this method in your controller to set the redirect file upload completion
-  # source can be :destroy_success, :create_success, :create_failure, :permission_denied
-  def get_redirect(source)
-    @parent
-  end
+    # override this method in your controller to set the redirect file upload completion
+    # source can be :destroy_success, :create_success, :create_failure, :permission_denied
+    def get_redirect(source)
+      @parent
+    end
 
-  # Attempts to create an @parent object using params
-  # or the url.
-  def setup_parent
-    @parent = get_parent
-    if @parent.blank?
-      render :text => t('muck.engine.missing_parent_error')
-      return false
+    # Attempts to create an @parent object using params
+    # or the url.
+    def setup_parent(*ignore)
+      @parent = get_parent(ignore)
+      @parent = get_creator if @parent.blank?
+      # if @parent.blank?
+      #   render :text => t('muck.engine.missing_parent_error')
+      #   return false
+      # end
     end
-  end
   
-  # Tries to get parent using parent_type and parent_id from the url.
-  # If that fails and attempt is then made using find_parent
-  def get_parent
-    if params[:parent_type].blank? || params[:parent_id].blank?
-      find_parent
-    else
-      klass = params[:parent_type].to_s.constantize
-      klass.find(params[:parent_id])
+    # Tries to get parent using parent_type and parent_id from the url.
+    # If that fails and attempt is then made using find_parent
+    # parameters:
+    # ignore: Names to ignore.  For example if the url is /foo/1/bar?thing_id=1
+    #         you might want to ignore thing_id so pass :thing.
+    def get_parent(*ignore)
+      if params[:parent_type].blank? || params[:parent_id].blank?
+        find_parent(ignore)
+      else
+        klass = params[:parent_type].to_s.constantize
+        klass.find(params[:parent_id])
+      end
     end
-  end
-
-  # Searches the params to try and find an entry ending with _id
-  # ie article_id, user_id, etc.  Will return the first value found.
-  def find_parent
-    params.each do |name, value|
-      if name =~ /(.+)_id$/
-        return $1.classify.constantize.find(value)
+  
+    # Searches the params to try and find an entry ending with _id
+    # ie article_id, user_id, etc.  Will return the first value found.
+    # parameters:
+    # ignore: Names to ignore.  For example if the url is /foo/1/bar?thing_id=1
+    #         you might want to ignore thing_id so pass 'thing' to be ignored.
+    def find_parent(*ignore)
+      ignore.flatten!
+      params.each do |name, value|
+        if name =~ /(.+)_id$/
+          if !ignore.include?($1)
+            return $1.classify.constantize.find(value)
+          end
+        end
       end
+      nil
     end
-    nil
-  end
 
-  def filter_permissions 
-    unless has_permission_to_upload(current_user, @parent)
-      permission_denied
+    def filter_permissions
+      unless has_permission_to_upload(current_user, @parent)
+        permission_denied
+      end
     end
-  end
 
-  def get_creator
-    current_user
-  end
+    def get_creator
+      current_user
+    end
   
-  def has_permission_to_upload(user, upload_parent)
-    upload_parent.can_upload?(user)
-  end
+    def has_permission_to_upload(user, upload_parent)
+      return true if upload_parent.blank? # upload will not be connected with a parent object only with the user
+      upload_parent.can_upload?(user)
+    end
 
-  def basic_uploads_json(upload)
-    upload.to_json(:only => [:id, :file_name], :methods => [:icon])
-  end
+    def basic_uploads_json(upload)
+      upload.to_json(:only => [:id], :methods => [:icon, :thumb, :file_name])
+    end
 
 end

data/app/helpers/uploader_helper.rb

@@ -29,6 +29,7 @@ module UploaderHelper
   end
   
   def make_parent_params(parent)
+    return {} if parent.blank?
     { :parent_id => parent.id, :parent_type => parent.class.to_s }
   end
  

data/app/views/uploads/_swf_javascript.html.erb

@@ -25,7 +25,7 @@
 
 	  var <%=container_prefix%>swfu;
 
-    jQuery(document).ready(function() {
+    window.onload = function () {
     	var settings = {
 
 				flash_url : '/swf/swfupload.swf',
@@ -76,7 +76,7 @@
 			};
 
 			<%=container_prefix%>swfu = new SWFUpload(settings);
-		});
+		};
 
 	</script>
 <% end -%>

data/lib/active_record/acts/uploader_upload.rb

@@ -14,7 +14,11 @@ module ActiveRecord
         # :url     => "/uploads/:class/:id/:style_:basename.:extension",
         # :path    => ":rails_root/public/uploads/:class/:id/:style_:basename.:extension",
         # :styles  => { :icon => "30x30!", :thumb => "100>", :small => "150>", :medium => "300>", :large => "660>"},
-        # :default_url => "/images/profile_default.jpg" }
+        # :default_url => "/images/profile_default.jpg" },
+        # :disable_halt_nonimage_processing => false
+        #
+        # disable_halt_nonimage_processing - By default all post processing is turned off for non image files.  This is useful if you want to setup styles to generate thumbnails for
+        #                                    images but don't want the default Geometry processor to die on non-image files.
         def acts_as_uploader(options)
 
           #Named scopes
@@ -26,6 +30,7 @@ module ActiveRecord
           named_scope :documents, :conditions => "local_content_type IN (#{(Uploader::MimeTypeGroups::WORD_TYPES + Uploader::MimeTypeGroups::EXCEL_TYPES + Uploader::MimeTypeGroups::PDF_TYPES).collect{|type| "'#{type}'"}.join(',')})" 
           named_scope :files, :conditions => "local_content_type NOT IN (#{Uploader::MimeTypeGroups::IMAGE_TYPES.collect{|type| "'#{type}'"}.join(',')})"
           named_scope :since, lambda { |*args| { :conditions => ["created_at > ?", (args.first || 7.days.ago.to_s(:db)) ]} }
+          named_scope :created_by, lambda { |*args| { :conditions => ["creator_id = ?", (args.first) ]} }
           named_scope :pending_s3_migration, lambda { { :conditions =>  ["remote_file_name IS NULL AND created_at <= ?", 20.minutes.ago.to_s(:db)], :order => 'created_at DESC' } }
 
           # Paperclip
@@ -40,6 +45,7 @@ module ActiveRecord
           class_eval <<-EOV
             
             before_post_process :transliterate_file_name
+            before_post_process :halt_nonimage_processing unless options[:disable_halt_nonimage_processing]
             before_create :add_width_and_height
             
             # prevents a user from submitting a crafted form that bypasses activation
@@ -144,6 +150,13 @@ module ActiveRecord
           end
         end
         
+        # Only works for images
+        def thumb
+          if self.is_image?
+            self.file.url(:thumb)
+          end
+        end
+        
         def display_name
           CGI::escapeHTML(self.local_file_name)
         end
@@ -224,6 +237,12 @@ module ActiveRecord
             end
           end
           
+          def halt_nonimage_processing
+            if !self.is_image? && self.local.options[:styles]
+              return false
+            end
+          end
+          
       end 
     end
   end

data/public/javascripts/swfupload/swfupload.js

@@ -50,7 +50,7 @@ SWFUpload.prototype.initSWFUpload = function (settings) {
 /* *************** */
 SWFUpload.instances = {};
 SWFUpload.movieCount = 0;
-SWFUpload.version = "2.2.0 Beta 3";
+SWFUpload.version = "2.2.0 2009-03-25";
 SWFUpload.QUEUE_ERROR = {
 	QUEUE_LIMIT_EXCEEDED	  		: -100,
 	FILE_EXCEEDS_SIZE_LIMIT  		: -110,
@@ -91,6 +91,27 @@ SWFUpload.WINDOW_MODE = {
 	OPAQUE : "opaque"
 };
 
+// Private: takes a URL, determines if it is relative and converts to an absolute URL
+// using the current site. Only processes the URL if it can, otherwise returns the URL untouched
+SWFUpload.completeURL = function(url) {
+	if (typeof(url) !== "string" || url.match(/^https?:\/\//i) || url.match(/^\//)) {
+		return url;
+	}
+	
+	var currentURL = window.location.protocol + "//" + window.location.hostname + (window.location.port ? ":" + window.location.port : "");
+	
+	var indexSlash = window.location.pathname.lastIndexOf("/");
+	if (indexSlash <= 0) {
+		path = "/";
+	} else {
+		path = window.location.pathname.substr(0, indexSlash) + "/";
+	}
+	
+	return /*currentURL +*/ path + url;
+	
+};
+
+
 /* ******************** */
 /* Instance Members  */
 /* ******************** */
@@ -104,11 +125,13 @@ SWFUpload.prototype.initSettings = function () {
 	
 	// Upload backend settings
 	this.ensureDefault("upload_url", "");
+	this.ensureDefault("preserve_relative_urls", false);
 	this.ensureDefault("file_post_name", "Filedata");
 	this.ensureDefault("post_params", {});
 	this.ensureDefault("use_query_string", false);
 	this.ensureDefault("requeue_on_error", false);
 	this.ensureDefault("http_success", []);
+	this.ensureDefault("assume_success_timeout", 0);
 	
 	// File Settings
 	this.ensureDefault("file_types", "*.*");
@@ -131,7 +154,8 @@ SWFUpload.prototype.initSettings = function () {
 	this.ensureDefault("button_text_left_padding", 0);
 	this.ensureDefault("button_action", SWFUpload.BUTTON_ACTION.SELECT_FILES);
 	this.ensureDefault("button_disabled", false);
-	this.ensureDefault("button_placeholder_id", null);
+	this.ensureDefault("button_placeholder_id", "");
+	this.ensureDefault("button_placeholder", null);
 	this.ensureDefault("button_cursor", SWFUpload.CURSOR.ARROW);
 	this.ensureDefault("button_window_mode", SWFUpload.WINDOW_MODE.WINDOW);
 	
@@ -161,57 +185,21 @@ SWFUpload.prototype.initSettings = function () {
 	this.customSettings = this.settings.custom_settings;
 	
 	// Update the flash url if needed
-	if (this.settings.prevent_swf_caching) {
-		this.settings.flash_url = this.settings.flash_url + "?swfuploadrnd=" + Math.floor(Math.random() * 999999999);
+	if (!!this.settings.prevent_swf_caching) {
+		this.settings.flash_url = this.settings.flash_url + (this.settings.flash_url.indexOf("?") < 0 ? "?" : "&") + "preventswfcaching=" + new Date().getTime();
 	}
 	
-	delete this.ensureDefault;
-};
-
-SWFUpload.prototype.loadFlash = function () {
-	if (this.settings.button_placeholder_id !== "") {
-		this.replaceWithFlash();
-	} else {
-		this.appendFlash();
+	if (!this.settings.preserve_relative_urls) {
+		//this.settings.flash_url = SWFUpload.completeURL(this.settings.flash_url);	// Don't need to do this one since flash doesn't look at it
+		this.settings.upload_url = SWFUpload.completeURL(this.settings.upload_url);
+		this.settings.button_image_url = SWFUpload.completeURL(this.settings.button_image_url);
 	}
-};
-
-// Private: appendFlash gets the HTML tag for the Flash
-// It then appends the flash to the body
-SWFUpload.prototype.appendFlash = function () {
-	var targetElement, container;
-
-	// Make sure an element with the ID we are going to use doesn't already exist
-	if (document.getElementById(this.movieName) !== null) {
-		throw "ID " + this.movieName + " is already in use. The Flash Object could not be added";
-	}
-
-	// Get the body tag where we will be adding the flash movie
-	targetElement = document.getElementsByTagName("body")[0];
-
-	if (targetElement == undefined) {
-		throw "Could not find the 'body' element.";
-	}
-
-	// Append the container and load the flash
-	container = document.createElement("div");
-	container.style.width = "1px";
-	container.style.height = "1px";
-	container.style.overflow = "hidden";
-
-	targetElement.appendChild(container);
-	container.innerHTML = this.getFlashHTML();	// Using innerHTML is non-standard but the only sensible way to dynamically add Flash in IE (and maybe other browsers)
-
-	// Fix IE Flash/Form bug
-	if (window[this.movieName] == undefined) {
-		window[this.movieName] = this.getMovieElement();
-	}
-	
 	
+	delete this.ensureDefault;
 };
 
-// Private: replaceWithFlash replaces the button_placeholder element with the flash movie.
-SWFUpload.prototype.replaceWithFlash = function () {
+// Private: loadFlash replaces the button_placeholder element with the flash movie.
+SWFUpload.prototype.loadFlash = function () {
 	var targetElement, tempParent;
 
 	// Make sure an element with the ID we are going to use doesn't already exist
@@ -220,10 +208,10 @@ SWFUpload.prototype.replaceWithFlash = function () {
 	}
 
 	// Get the element where we will be placing the flash movie
-	targetElement = document.getElementById(this.settings.button_placeholder_id);
+	targetElement = document.getElementById(this.settings.button_placeholder_id) || this.settings.button_placeholder;
 
 	if (targetElement == undefined) {
-		throw "Could not find the placeholder element.";
+		throw "Could not find the placeholder element: " + this.settings.button_placeholder_id;
 	}
 
 	// Append the container and load the flash
@@ -242,7 +230,7 @@ SWFUpload.prototype.replaceWithFlash = function () {
 SWFUpload.prototype.getFlashHTML = function () {
 	// Flash Satay object syntax: http://www.alistapart.com/articles/flashsatay
 	return ['<object id="', this.movieName, '" type="application/x-shockwave-flash" data="', this.settings.flash_url, '" width="', this.settings.button_width, '" height="', this.settings.button_height, '" class="swfupload">',
-				'<param name="wmode" value="', this.settings.button_window_mode , '" />',
+				'<param name="wmode" value="', this.settings.button_window_mode, '" />',
 				'<param name="movie" value="', this.settings.flash_url, '" />',
 				'<param name="quality" value="high" />',
 				'<param name="menu" value="false" />',
@@ -264,6 +252,7 @@ SWFUpload.prototype.getFlashVars = function () {
 			"&amp;useQueryString=", encodeURIComponent(this.settings.use_query_string),
 			"&amp;requeueOnError=", encodeURIComponent(this.settings.requeue_on_error),
 			"&amp;httpSuccess=", encodeURIComponent(httpSuccessString),
+			"&amp;assumeSuccessTimeout=", encodeURIComponent(this.settings.assume_success_timeout),
 			"&amp;params=", encodeURIComponent(paramString),
 			"&amp;filePostName=", encodeURIComponent(this.settings.file_post_name),
 			"&amp;fileTypes=", encodeURIComponent(this.settings.file_types),
@@ -325,11 +314,12 @@ SWFUpload.prototype.destroy = function () {
 		// Make sure Flash is done before we try to remove it
 		this.cancelUpload(null, false);
 		
+
 		// Remove the SWFUpload DOM nodes
 		var movieElement = null;
 		movieElement = this.getMovieElement();
 		
-		if (movieElement) {
+		if (movieElement && typeof(movieElement.CallFunction) === "unknown") { // We only want to do this in IE
 			// Loop through all the movie's properties and remove all function references (DOM/JS IE 6/7 memory leak workaround)
 			for (var i in movieElement) {
 				try {
@@ -345,7 +335,6 @@ SWFUpload.prototype.destroy = function () {
 			} catch (ex) {}
 		}
 		
-		
 		// Remove IE form fix reference
 		window[this.movieName] = null;
 
@@ -361,11 +350,12 @@ SWFUpload.prototype.destroy = function () {
 		
 		
 		return true;
-	} catch (ex1) {
+	} catch (ex2) {
 		return false;
 	}
 };
 
+
 // Public: displayDebugInfo prints out settings and configuration
 // information about this SWFUpload instance.
 // This function (and any references to it) can be deleted when placing
@@ -382,6 +372,7 @@ SWFUpload.prototype.displayDebugInfo = function () {
 			"\t", "use_query_string:         ", this.settings.use_query_string.toString(), "\n",
 			"\t", "requeue_on_error:         ", this.settings.requeue_on_error.toString(), "\n",
 			"\t", "http_success:             ", this.settings.http_success.join(", "), "\n",
+			"\t", "assume_success_timeout:   ", this.settings.assume_success_timeout, "\n",
 			"\t", "file_post_name:           ", this.settings.file_post_name, "\n",
 			"\t", "post_params:              ", this.settings.post_params.toString(), "\n",
 			"\t", "file_types:               ", this.settings.file_types, "\n",
@@ -394,6 +385,7 @@ SWFUpload.prototype.displayDebugInfo = function () {
 			"\t", "prevent_swf_caching:      ", this.settings.prevent_swf_caching.toString(), "\n",
 
 			"\t", "button_placeholder_id:    ", this.settings.button_placeholder_id.toString(), "\n",
+			"\t", "button_placeholder:       ", (this.settings.button_placeholder ? "Set" : "Not Set"), "\n",
 			"\t", "button_image_url:         ", this.settings.button_image_url.toString(), "\n",
 			"\t", "button_width:             ", this.settings.button_width.toString(), "\n",
 			"\t", "button_height:            ", this.settings.button_height.toString(), "\n",
@@ -468,7 +460,6 @@ SWFUpload.prototype.callFlash = function (functionName, argumentArray) {
 	return returnValue;
 };
 
-
 /* *****************************
 	-- Flash control methods --
 	Your UI should use these
@@ -636,6 +627,11 @@ SWFUpload.prototype.setHTTPSuccess = function (http_status_codes) {
 	this.callFlash("SetHTTPSuccess", [http_status_codes]);
 };
 
+// Public: setHTTPSuccess changes the http_success setting
+SWFUpload.prototype.setAssumeSuccessTimeout = function (timeout_seconds) {
+	this.settings.assume_success_timeout = timeout_seconds;
+	this.callFlash("SetAssumeSuccessTimeout", [timeout_seconds]);
+};
 
 // Public: setDebugEnabled changes the debug_enabled setting
 SWFUpload.prototype.setDebugEnabled = function (debugEnabled) {
@@ -776,24 +772,63 @@ SWFUpload.prototype.unescapeFilePostParams = function (file) {
 	return file;
 };
 
+// Private: Called by Flash to see if JS can call in to Flash (test if External Interface is working)
+SWFUpload.prototype.testExternalInterface = function () {
+	try {
+		return this.callFlash("TestExternalInterface");
+	} catch (ex) {
+		return false;
+	}
+};
+
+// Private: This event is called by Flash when it has finished loading. Don't modify this.
+// Use the swfupload_loaded_handler event setting to execute custom code when SWFUpload has loaded.
 SWFUpload.prototype.flashReady = function () {
 	// Check that the movie element is loaded correctly with its ExternalInterface methods defined
 	var movieElement = this.getMovieElement();
 
+	if (!movieElement) {
+		this.debug("Flash called back ready but the flash movie can't be found.");
+		return;
+	}
+
+	this.cleanUp(movieElement);
+	
+	this.queueEvent("swfupload_loaded_handler");
+};
+
+// Private: removes Flash added fuctions to the DOM node to prevent memory leaks in IE.
+// This function is called by Flash each time the ExternalInterface functions are created.
+SWFUpload.prototype.cleanUp = function (movieElement) {
 	// Pro-actively unhook all the Flash functions
-	if (typeof(movieElement.CallFunction) === "unknown") { // We only want to do this in IE
-		this.debug("Removing Flash functions hooks (this should only run in IE and should prevent memory leaks)");
-		for (var key in movieElement) {
-			try {
-				if (typeof(movieElement[key]) === "function") {
-					movieElement[key] = null;
+	try {
+		if (this.movieElement && typeof(movieElement.CallFunction) === "unknown") { // We only want to do this in IE
+			this.debug("Removing Flash functions hooks (this should only run in IE and should prevent memory leaks)");
+			for (var key in movieElement) {
+				try {
+					if (typeof(movieElement[key]) === "function") {
+						movieElement[key] = null;
+					}
+				} catch (ex) {
 				}
-			} catch (ex) {
 			}
 		}
-	}
+	} catch (ex1) {
 	
-	this.queueEvent("swfupload_loaded_handler");
+	}
+
+	// Fix Flashes own cleanup code so if the SWFMovie was removed from the page
+	// it doesn't display errors.
+	window["__flash__removeCallback"] = function (instance, name) {
+		try {
+			if (instance) {
+				instance[name] = null;
+			}
+		} catch (flashEx) {
+		
+		}
+	};
+
 };
 
 
@@ -818,8 +853,8 @@ SWFUpload.prototype.fileQueueError = function (file, errorCode, message) {
 
 /* Called after the file dialog has closed and the selected files have been queued.
 	You could call startUpload here if you want the queued files to begin uploading immediately. */
-SWFUpload.prototype.fileDialogComplete = function (numFilesSelected, numFilesQueued) {
-	this.queueEvent("file_dialog_complete_handler", [numFilesSelected, numFilesQueued]);
+SWFUpload.prototype.fileDialogComplete = function (numFilesSelected, numFilesQueued, numFilesInQueue) {
+	this.queueEvent("file_dialog_complete_handler", [numFilesSelected, numFilesQueued, numFilesInQueue]);
 };
 
 SWFUpload.prototype.uploadStart = function (file) {
@@ -859,9 +894,9 @@ SWFUpload.prototype.uploadError = function (file, errorCode, message) {
 	this.queueEvent("upload_error_handler", [file, errorCode, message]);
 };
 
-SWFUpload.prototype.uploadSuccess = function (file, serverData) {
+SWFUpload.prototype.uploadSuccess = function (file, serverData, responseReceived) {
 	file = this.unescapeFilePostParams(file);
-	this.queueEvent("upload_success_handler", [file, serverData]);
+	this.queueEvent("upload_success_handler", [file, serverData, responseReceived]);
 };
 
 SWFUpload.prototype.uploadComplete = function (file) {