uploader 2.0.0 → 2.0.2

data/README.rdoc

@@ -6,6 +6,7 @@ Uploader makes it easy to integrate multiple file uploads into your application
 SWFUpload hasn't been updated in a while and tends to be buggy. We have added uploadify. We recommend using that instead.
 
 This branch has been setup to maintain compatibility with Rails2. Future versions of uploader will focus on Rails 3.
+Note that all 2.x.x versions of uploader will work with Rails 2 while 3.x.x versions are slated for Rails 3.
 
 == Installation
 

data/VERSION

@@ -1 +1 @@
-2.0.0
+2.0.2

data/app/helpers/uploader_helper.rb

@@ -25,16 +25,27 @@ module UploaderHelper
 
   # Output a form capable of uploading multiple files to the server using uploadify.
   # parent: The object to which the uploads will be attached
-  # display_upload_indicators: Indicates whether or not to show the upload progress
-  # container_prefix: Prefixes each id in the html with the specified text.  Useful if there is to be more than one form on a page.
+  # options:
+  #     display_upload_indicators: Indicates whether or not to show the upload progress
+  #     container_prefix: Prefixes each id in the html with the specified text.  Useful if there is to be more than one form on a page.
+  #     format: either js or json. js will fire a callback.
+  #     omit_initializer: Remove the call to jQuery('#element').uploadify. If this is set to true the calling code 
+  #                       must call .uploadify for the upload to work.
   # Options is a hash containing any valid option for uploadify:
   #     http://www.uploadify.com/documentation/
-  # format: either js or json. js will fire a callback.
-  def uploadify_form(parent, display_upload_indicators = true, container_prefix = '', options = {}, format = 'js')
-    container_prefix = 'uploadify' if container_prefix.blank?
+  def uploadify_form(parent, options = {}, uploadify_options = {})
+    
+    options = {
+      :display_upload_indicators => true,
+      :format => 'js',
+      :omit_initializer =>  false
+    }.merge(options)
+    
+    options[:container_prefix] = 'uploadify' if options[:container_prefix].blank?
+    
     uploadify_options = {
           :uploader        => '/swf/uploadify.swf',
-          :script          => multiupload_uploads_path({:format => format}),
+          :script          => multiupload_uploads_path({:format => options[:format]}),
           :cancelImg       => '/images/uploadify/cancel.png',
           :fileDesc        => "All Files",
           :fileExt         => "*.*",
@@ -48,17 +59,17 @@ module UploaderHelper
             "#{session_key}"     => 'session_key_replace_',
             'authenticity_token' => 'authenticity_token_replace_'
           }.merge(make_parent_params(parent))
-      }.merge(options)
+      }.merge(uploadify_options)
       
-      uploadify_options_json = uploadify_options.to_json
-      # This is a bit of a hack but to_json will surround 'encodeURIComponent' with quotes so it won't execute. 
-      # 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; }')
+    uploadify_options_json = uploadify_options.to_json
+    # This is a bit of a hack but to_json will surround 'encodeURIComponent' with quotes so it won't execute. 
+    # 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,
+                                                         :options => options,
                                                          :uploadify_options => uploadify_options_json}
   end
   

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

@@ -6,11 +6,20 @@
   <% end -%>
 <% end -%>
 
-<% form_for :upload, :url => uploads_path(make_parent_params(parent)), :html => { :multipart => true, :id => container_prefix } do |f| -%>
-  <p><%= f.file_field :local, :size => 25 %></p>
-  <%= submit_tag t('uploader.upload_file') %>
-<% end %>
+<div id="<%=options[:container_prefix]%>_upload">
+  <% form_for :upload, :url => uploads_path(make_parent_params(parent)), :html => { :multipart => true, :id => "#{options[:container_prefix]}_form" } do |f| -%>
+    <p><%= f.file_field :local, :size => 25 %></p>
+    <%= submit_tag t('uploader.upload_file') %>
+  <% end %>
+</div>
 
 <script type='text/javascript'>
-jQuery('form#<%=container_prefix%>').uploadify(<%=uploadify_options%>);
+  <% if options[:omit_initializer] -%>
+    var <%=options[:container_prefix]%>_options = <%=uploadify_options%>;
+  <% else -%>
+    jQuery(document).ready(function() {
+      jQuery('#<%=options[:container_prefix]%>_upload').uploadify(<%=uploadify_options%>);
+    });
+  <% end -%>
 </script>
+

data/uploader.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{uploader}
-  s.version = "2.0.0"
+  s.version = "2.0.2"
 
   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-09-01}
+  s.date = %q{2010-09-03}
   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: 15
+  hash: 11
   prerelease: false
   segments: 
   - 2
   - 0
-  - 0
-  version: 2.0.0
+  - 2
+  version: 2.0.2
 platform: ruby
 authors: 
 - Justin Ball
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-01 00:00:00 -06:00
+date: 2010-09-03 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency