uploader 1.0.0 → 1.0.1

data/README.rdoc

@@ -1,12 +1,9 @@
 = Uploader
 
-Uploader makes it easy to integrate multiple file uploads into your application using SWFUpload
+Uploader makes it easy to integrate multiple file uploads into your application using Uploadify or SWFUpload
 
 == ----NOTES----
-SWFUpload hasn't been updated in a while. Uploader 0.2.8 has been updated with the latest beta version of SWFUpload but it appears to have errors in some instances.
-Version 0.2.8 will be the last version to use swfupload.
-
-We are currently working on a new upload gem that will use pupload
+SWFUpload hasn't been updated in a while and tends to be buggy. We have added uploadify. We recommend using that instead.
 
 == Installation
 
@@ -28,12 +25,9 @@ http://jquery.com/
 
 Then include it in your layout:
   <%= javascript_include_tag 'jquery/jquery.js' %>
-            
-Another option is to use jRails
-http://ennerchi.com/projects/jrails
 
 === Create a model for uploads.
-Creat an 'Upload' model in upload.rb.  acts_as_uploader accepts all valid options for paperclip via :has_attached_file => {}
+Create an 'Upload' model in upload.rb.  acts_as_uploader accepts all valid options for paperclip via :has_attached_file => {}
 
   class Upload < ActiveRecord::Base
 
@@ -113,7 +107,7 @@ default functionality that you may consider overriding.
 Be sure to modify your routes file.  Add the following line to ensure that your application uses the new uploads 
 controller instead of directly using the one inside the gem:
 
-  map.resources :uploads, :collection => { :swfupload => :post }
+  map.resources :uploads, :collection => { :multiupload => :post }
   
 
   class UploadsController < Uploader::UploadsController
@@ -171,8 +165,14 @@ You'll need something like this in your layout so that uploader can add in the r
 <%= yield :head -%>
 
 Then to add an upload form:
+
+SWFUpload version:
 <%= upload_form(parent_object) %>
-parent_object should be the object which owns the uploads.  ie a user, photo_album, etc.
+
+Uploadify version (recommended):
+<%= uploadify_form(parent_object) %>
+
+See the uploader_helper.rb file for options. parent_object should be the object which owns the uploads.  ie a user, photo_album, etc.
 
 === Rake Tasks
 
@@ -304,12 +304,9 @@ 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  -%>
-
     setup_submit_delete();
-
     function upload_completed_callback(data){
       jQuery('#upload-list').prepend(data);
-      setup_submit_delete();
     }
   <% end -%>
   
@@ -318,7 +315,7 @@ I put the following in my main upload view
 The following jQuery code will do an ajax delete for you
 
   function setup_submit_delete(){
-  	jQuery(".submit-delete").click(function() {
+  	jQuery(".submit-delete").live('click', function() {
   		// if(!confirm("Are you sure?")){
   		// 	return false;
   		// }

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/app/controllers/uploader/uploads_controller.rb

@@ -1,8 +1,8 @@
 class Uploader::UploadsController < ApplicationController
   unloadable
   
-  before_filter :setup_parent, :only => [:create, :swfupload]
-  before_filter :filter_permissions, :only => [:create, :swfupload]
+  before_filter :setup_parent, :only => [:create, :multiupload]
+  before_filter :filter_permissions, :only => [:create, :multiupload]
   before_filter :set_upload_for_destroy, :only => [:destroy]
  
   def create

data/app/helpers/uploader_helper.rb

@@ -34,19 +34,20 @@ module UploaderHelper
     
     uploadify_options = {
           :uploader        => '/swf/uploadify.swf',
-          :script          => new_upload_path_with_parent_information(parent),
+          :script          => uploads_url,
           :cancelImg       => '/images/uploadify/cancel.png',
           :fileDesc        => "All Files",
           :fileExt         => "*.*",
           :auto            => true,
           :multi           => true,
           :buttonText      => 'Upload',
+          :onComplete      => 'oncomplete_replace_',
           :scriptData      => {
             '_http_accept'       => 'application/javascript',
             '_method'            => 'post',
             "#{session_key}"     => 'session_key_replace_',
             'authenticity_token' => 'authenticity_token_replace_'
-          }
+          }.merge(make_parent_params(parent))
       }.merge(options)
       
       uploadify_options_json = uploadify_options.to_json
@@ -54,6 +55,7 @@ module UploaderHelper
       # We need it to execute. The double encode is required - u on the server and encodeURIComponent on the client.
       uploadify_options_json.gsub!('"session_key_replace_"', "encodeURIComponent('#{u(cookies[session_key])}')")
       uploadify_options_json.gsub!('"authenticity_token_replace_"', "encodeURIComponent('#{u(form_authenticity_token)}')")
+      uploadify_options_json.gsub!('"oncomplete_replace_"', 'function(event, queueID, fileObj, response, data){ upload_completed_callback(response); return true; }')
       
     render :partial => 'uploads/uploadify', :locals => { :parent => parent,
                                                          :container_prefix => container_prefix,

data/lib/active_record/acts/uploader_upload.rb

@@ -7,7 +7,11 @@ module ActiveRecord
       end
 
       module ClassMethods
-
+        
+        # options:
+        #   S3_no_wait - Immediately send files to S3 instead of waiting for an aysnc process to send them over.
+        #   keep_local_file - If using S3 determines whether or not to keep files local as well as sending to S3.
+        #
         # acts_as_uploader requires an option for :has_attached_file.  These values will be passed to paperclip.
         # i.e.
         # acts_as_uploader :has_attached_file => {
@@ -19,8 +23,15 @@ module ActiveRecord
         #
         # 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)
+        def acts_as_uploader(options = {})
 
+          default_options = {
+            :S3_no_wait => false,
+            :keep_local_file => true
+          }
+          
+          options = default_options.merge(options)
+          
           #Named scopes
           named_scope :newest, :order => "created_at DESC"
           named_scope :by_filename, :order => "local_file_name DESC"
@@ -33,6 +44,8 @@ module ActiveRecord
           named_scope :created_by, lambda { |*args| { :conditions => ["creator_id = ?", (args.first) ]} }
           named_scope :pending_s3_migrations, lambda { { :conditions =>  ["remote_file_name IS NULL"], :order => 'created_at DESC' } }
 
+          @uploader_s3_no_wait = options.delete(:S3_no_wait)
+          @uploader_keep_file_local = options.delete(:keep_local_file)
           
           # Paperclip
           has_attached_file :local, options[:has_attached_file].merge(:storage => :filesystem) # Override any storage settings.  This one has to be local.
@@ -42,6 +55,8 @@ module ActiveRecord
 
           belongs_to :uploadable, :polymorphic => true
           belongs_to :creator, :class_name => 'User', :foreign_key => 'creator_id'
+          
+          before_save :determine_immediate_send_to_remote
                                         
           class_eval <<-EOV
             
@@ -61,6 +76,14 @@ module ActiveRecord
       # class methods
       module SingletonMethods
 
+        def s3_no_wait?
+          @uploader_s3_no_wait
+        end
+        
+        def keep_local_file?
+          @uploader_keep_file_local
+        end
+        
       end
       
       # All the methods available to a record that has had <tt>acts_as_uploader</tt> specified.
@@ -74,11 +97,17 @@ module ActiveRecord
           remote_file_name || local_file_name
         end
         
+        def determine_immediate_send_to_remote
+          if self.class.s3_no_wait?
+            self.remote = local.to_file # This will result in the file being sent to S3
+          end
+        end
+        
         def send_to_remote
           if local_file_name
             self.remote = local.to_file
             if self.save and remote.original_filename and remote.exists?
-              self.local = nil
+              self.local = nil unless keep_local_file?
               self.save
             else
               false

data/test/rails_root/test/unit/upload_test.rb

@@ -3,6 +3,16 @@ require File.dirname(__FILE__) + '/../test_helper'
 class UploadTest < ActiveSupport::TestCase
 
   context "upload" do
+    
+    context 'options' do
+      should 'not enable immediate transfers to S3 by default' do
+        assert false == Upload.s3_no_wait?
+      end
+      should 'keep a local copy of each upload by default' do
+        assert true == Upload.keep_local_file?
+      end
+    end
+    
     context 'upload instance' do
 
       should belong_to :uploadable

data/uploader.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{uploader}
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball", "Joel Duffin", "David South"]
-  s.date = %q{2010-08-30}
+  s.date = %q{2010-08-31}
   s.description = %q{Uploader gem that makes it simple add multiple file uploads to your Rails project using SWFUpload, Uploadify and Paperclip}
   s.email = %q{justinball@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: uploader
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Justin Ball
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-30 00:00:00 -06:00
+date: 2010-08-31 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency