plupload-rails3 0.0.5 → 0.0.7

data/README.md

@@ -51,6 +51,7 @@ Options can be:
 * :filters => An array of hashes with :title and :extension keys specifying the files to look for. Defaults to [], which will show all files. 
 * :pluploader => a value of `true` indicates that you want to have the files submitted with your form instead of in individual requests. To make this work, you need to add `match 'plupload_rails/_plupload_uploader', :controller=>'plupload_rails', :action=>'_plupload_uploader', :as=>'pluploader'` to your config/routes.rb file so plupload can upload the files, and then this plugin will insert some extra form fields into your page via JavaScript. Those fields tell the middleware how to form the request parameters before they get to your controller.
 * :field_name => the name of the field, which defaults to model_name[method_name]
+* :runtimes => the comma delimited list of runtimes you want to use, in order of preference. Defaults to 'html5,flash,silverlight,gears,browserplus'
 
 Example filter: 
     
@@ -89,7 +90,7 @@ Consider the common case of an Album which has_many Photos.
 
 In your form for an album, you can use:
 
-    <%= plupload(@album, :photos, options={:plupload_container=>'uploader', :pluploader=>true, :field_name=>'album[photos][][payload]'}) %>
+    <%= plupload(@album, :photos, options={:plupload_container=>'uploader', :pluploader=>true, :field_name=>'album[photos_attributes][][payload]'}) %>
   <div id="uploader" name="uploader" style="width: 100%;"></div>
 
 

data/lib/app/controllers/plupload_rails_controller.rb

@@ -5,32 +5,32 @@ class PluploadRailsController < ActionController::Base
     FileUtils.mv(params[:file].tempfile, plupload_temp_path)
     add_fields_for_files_to_forms =<<END
       function _pluploadRails_addFieldsForFilesToForms(){
-        for(var i=0; document.forms.length; i++) {
-          var theForm = document.forms[i];
-          var input = document.createElement("input");
-          input.name='_plupload_files[]';
-          input.type='hidden';
-          input.value='#{File.expand_path(params[:file].tempfile.path)}';
-          theForm.appendChild(input);
+        $('form').each(function() {
+          var theForm = $(this);
           
-          var input = document.createElement("input");
-          input.name='_plupload_original_names[]';
-          input.type='hidden';
-          input.value='#{params[:file].original_filename}';
-          theForm.appendChild(input);
+          var default_input = $('<input />').attr('type', 'hidden');
           
-          var input = document.createElement("input");
-          input.name='_plupload_content_types[]';
-          input.type='hidden';
-          input.value='#{params[:file].content_type}';
-          theForm.appendChild(input);
+          var input = default_input.clone()
+          .attr('name', '_plupload_files[]')
+          .val('#{File.expand_path(params[:file].tempfile.path)}');
+          theForm.append(input);
           
-          var input = document.createElement("input");
-          input.name='_plupload_upload';
-          input.type='hidden';
-          input.value='#{params[:_plupload_upload]}';
-          if(document.getElementsByName(input.name).length == 0) theForm.appendChild(input);
-        }
+          var input = default_input.clone()
+          .attr('name', '_plupload_original_names[]')
+          .val('#{params[:file].original_filename}');
+          theForm.append(input);
+          
+          var input = default_input.clone()
+          .attr('name', '_plupload_content_types[]')
+          .val('#{params[:file].content_type}');
+          theForm.append(input);
+          
+          var input = default_input.clone()
+          .attr('name', '_plupload_upload')
+          .val('#{params[:_plupload_upload]}');
+          if(document.getElementsByName(input.name).length == 0) theForm.append(input);
+        
+        });
       }
       _pluploadRails_addFieldsForFilesToForms();
 END

data/lib/app/helpers/plupload_helper.rb

@@ -5,10 +5,12 @@ module PluploadHelper
     options[:filters] ||= []
     options[:params] ||= {}
     options[:field_name] ||= [model_object].flatten.pop.class.name.underscore.downcase + "[#{model_object_method}]"
-    render :partial=>'plupload/uploader_scripts', :locals=>{
-        :model_object=>model_object, 
-        :model_object_method=>model_object_method, 
-        :options=>options
+    options[:runtimes] ||= "html5,flash,silverlight,gears,browserplus"
+    render :partial => 'plupload/uploader_scripts',
+      :locals => {
+        :model_object => model_object, 
+        :model_object_method => model_object_method, 
+        :options => options
       }
   end  
 end

data/lib/app/middleware/plupload_params_renamer.rb

@@ -9,10 +9,10 @@ module ActionDispatch
       req = Rack::Request.new(env)
       form_hash = Rails.version < "3.1" ? req.POST : env['rack.request.form_hash']
       form_hash ||= {}
-      
+            
       if form_hash["_plupload_upload"]
         object, method = form_hash["_plupload_upload"].split(/[\[\]]/)
-        submethod =  form_hash["_plupload_upload"].split(/[\[\]]/)[-1]
+        submethod = form_hash["_plupload_upload"].split(/[\[\]]/)[-1]
         form_hash[object] ||= {} 
         if form_hash["_plupload_files"]
           form_hash[object][method] = []
@@ -23,9 +23,14 @@ module ActionDispatch
             original_filename = form_hash["_plupload_original_names"][i]
             content_type = form_hash["_plupload_content_types"][i]
 
-            uploaded_file = ActionDispatch::Http::UploadedFile.new(:tempfile=>File.new(file), :content_type=>content_type, :filename=>original_filename)
+            uploaded_file = ActionDispatch::Http::UploadedFile.new(
+              :tempfile => File.new(file),
+              :type => content_type,
+              :head => "Content-Disposition: form-data; name=\"file\"; filename=\"#{original_filename}\"\r\nContent-Type: #{content_type}\r\n",
+              :filename => original_filename
+            )
 
-            form_hash[object][method] << {submethod=>uploaded_file}
+            form_hash[object][method] << {submethod => uploaded_file}
           end
         else
           form_hash[object][method] = form_hash["file"] 

data/lib/app/views/plupload/_uploader_scripts.html.erb

@@ -18,7 +18,6 @@
 <% else %>
   
   <style type="text/css">@import url(/assets/plupload-rails3/plupload.queue.3.1.css);</style>
-  <%= stylesheet_link_tag 'plupload-rails3/plupload/js/plupload.full.js' %>
   <%= javascript_include_tag 'plupload-rails3/plupload/js/plupload.full.js' %>
   <%= javascript_include_tag 'plupload-rails3/plupload/js/jquery.plupload.queue/jquery.plupload.queue.js' %>
   <%= javascript_include_tag 'plupload-rails3/plupload/js/plupload.gears.js' %>
@@ -27,13 +26,13 @@
 
 
 <script type="text/javascript">
-  	
+
   // Convert divs to queue widgets when the DOM is ready
   $(function() {   
     var authtoken = $("input[name=authenticity_token]").val();
     $("#<%= options[:plupload_container] %>").pluploadQueue({
       // General settings
-      runtimes : 'html5,flash,silverlight,gears,browserplus',
+      runtimes : '<%= options[:runtimes] %>',
       <% unless options[:pluploader] %>
         url : '<%= url_for(model_object) %>',
       <% else %>
@@ -45,7 +44,7 @@
       multipart: true,
       multipart_params : 
       $.extend({
-          <% if options[:params].count > 0 %>'<%= CGI::unescape(options[:params].to_query.split("=").join("':'")) %>'<% end %>
+          <% if options[:params].count > 0 %>'<%= CGI::unescape(options[:params].to_param).split("=").join("':'").gsub("&", "', '") %>'<% end %>
         }, 
         {
           authenticity_token : authtoken, 

data/lib/plupload-rails3/asset_mover.rb

@@ -38,17 +38,17 @@ def install_plupload_assets
   
   dest = File.join(Rails.root, 'tmp/plupload-rails3')
   puts "Creating tmp folder at #{dest}"
-  FileUtils.mkdir(dest)
+  FileUtils.mkdir(dest) unless File.exists?(dest)
 end
 
 def uninstall_plupload_assets
   plupload_asset_destination.keys.each do |asset_type|
     directory = File.join(Rails.root, plupload_asset_destination[asset_type], "plupload-rails3")
     puts "Removing directory #{directory} and its contents"
-    FileUtils.rm_r(directory)
+    FileUtils.rm_r(directory) if File.exists?(directory)
   end
   
   directory = File.join(Rails.root,'tmp/plupload-rails3')
   puts "Removing directory #{directory} and its contents"
-  FileUtils.rm_r(directory)
+  FileUtils.rm_r(directory) if File.exists?(directory)
 end

data/lib/plupload-rails3/version.rb

@@ -1,5 +1,5 @@
 module Plupload
   module Rails3
-    VERSION = "0.0.5"
+    VERSION = "0.0.7"
   end
 end

data/lib/public/javascripts/plupload-rails3/plupload/js/i18n/cs.js

@@ -0,0 +1,14 @@
+// .po file like language pack
+plupload.addI18n({
+	'Select files' : 'Vyberte soubory',
+	'Add files to the upload queue and click the start button.' : 'Přidejte soubory do fronty a pak spusťte nahrávání.',
+	'Filename' : 'Název souboru',
+	'Status' : 'Status',
+	'Size' : 'Velikost',
+	'Add Files' : 'Přidat soubory',
+	'Stop current upload' : 'Zastavit nahrávání',
+	'Start uploading queue' : 'Spustit frontu nahrávání',
+	'Drag files here.' : 'Sem přetáhněte soubory.',
+	'Start Upload': 'Spustit nahrávání',
+	'Uploaded %d/%d files': 'Nahráno %d/%d souborů'
+});

data/lib/public/javascripts/plupload-rails3/plupload/js/i18n/da.js

@@ -0,0 +1,12 @@
+// .po file like language pack
+plupload.addI18n({
+	'Select files' : 'Vælg filer',
+	'Add files to the upload queue and click the start button.' : 'Tilføj filer til køen, og tryk på start.',
+	'Filename' : 'Filnavn',
+	'Status' : 'Status',
+	'Size' : 'Størrelse',
+	'Add files' : 'Tilføj filer',
+	'Stop current upload' : 'Stop upload',
+	'Start uploading queue' : 'Start upload',
+	'Drag files here.' : 'Træk filer her.'
+});

data/lib/public/javascripts/plupload-rails3/plupload/js/i18n/de.js

@@ -0,0 +1,25 @@
+// German
+plupload.addI18n({
+	'Select files' : 'Wählen Sie die Dateien:',
+	'Add files to the upload queue and click the start button.' : 'Dateien hinzufügen und danach auf \'Starten des Uploads\' klicken und die Datei hochzuladen.',
+	'Filename' : 'Dateiname',
+	'Status' : 'Status',
+	'Size' : 'Größe',
+	'Add files' : 'Hinzufügen von Dateien',
+	'Stop current upload' : 'Stop aktuellen Upload',
+	'Start uploading queue' : 'Starte Upload',
+	'Uploaded %d/%d files': '%d/%d Dateien sind Hochgeladen',
+	'N/A' : 'Nicht verfügbar',
+	'Drag files here.' : 'Ziehen Sie die Dateien hier hin',
+	'File extension error.': 'Dateiendungs Fehler.',
+	'File size error.': 'Dateigrößen Fehler.',
+	'Init error.': 'Initialisierungs Fehler.',
+	'HTTP Error.': 'HTTP Fehler.',
+	'Security error.': 'Sicherheits Fehler.',
+	'Generic error.': 'Generic Fehler.',
+	'IO error.': 'Ein/Ausgabe Fehler.',
+	'Stop Upload': 'Stoppen des Uploads.',
+	'Add Files': 'Dateien hinzufügen',
+	'Start Upload': 'Starten des Uploads.',
+	'%d files queued': '%d Dateien in der Warteschlange.'
+});

data/lib/public/javascripts/plupload-rails3/plupload/js/i18n/es.js

@@ -0,0 +1,25 @@
+// Spanish
+plupload.addI18n({
+	'Select files' : 'Elija archivos:',
+	'Add files to the upload queue and click the start button.' : 'Agregue archivos a la cola de subida y haga click en el boton de iniciar.',
+	'Filename' : 'Nombre de archivo',
+	'Status' : 'Estado',
+	'Size' : 'Tamaño',
+	'Add files' : 'Agregue archivos',
+	'Stop current upload' : 'Detener subida actual',
+	'Start uploading queue' : 'Iniciar subida de cola',
+	'Uploaded %d/%d files': 'Subidos %d/%d archivos',
+	'N/A' : 'No disponible',
+	'Drag files here.' : 'Arrastre archivos aquí',
+	'File extension error.': 'Error de extensión de archivo.',
+	'File size error.': 'Error de tamaño de archivo.',
+	'Init error.': 'Error de inicialización.',
+	'HTTP Error.': 'Error de HTTP.',
+	'Security error.': 'Error de seguridad.',
+	'Generic error.': 'Error genérico.',
+	'IO error.': 'Error de entrada/salida.',
+	'Stop Upload': 'Detener Subida.',
+	'Add Files': 'Agregar Archivos',
+	'Start Upload': 'Comenzar Subida.',
+	'%d files queued': '%d archivos en cola.'
+});

data/lib/public/javascripts/plupload-rails3/plupload/js/i18n/fi.js

@@ -0,0 +1,33 @@
+// .fi file like language pack
+plupload.addI18n({
+	'Select files' : 'Valitse tiedostoja',
+	'Add files to the upload queue and click the start button.' : 'Lisää tiedostoja latausjonoon ja klikkaa aloita-nappia.',
+	'Filename' : 'Tiedostonimi',
+	'Status' : 'Tila',
+	'Size' : 'Koko',
+	'Add files' : 'Lisää tiedostoja',
+	'Stop current upload' : 'Pysäytä nykyinen lataus',
+	'Start uploading queue' : 'Aloita jonon lataus',
+	'Drag files here.' : 'Raahaa tiedostot tänne.',
+	'Start upload' : 'Aloita lataus',
+	'Uploaded %d/%d files': 'Ladattu %d/%d tiedostoa',
+	'Stop upload': 'Pysäytä lataus',
+	'Start upload': 'Aloita lataus',
+	'%d files queued': '%d tiedostoa jonossa',
+	'File: %s': 'Tiedosto: %s',
+	'Close': 'Sulje',
+	'Using runtime: ': 'Käytetään ajonaikaista: ',
+	'File: %f, size: %s, max file size: %m': 'Tiedosto: %f, koko: %s, maksimi tiedostokoko: %m',
+	'Upload element accepts only %d file(s) at a time. Extra files were stripped.': 'Latauselementti sallii ladata vain %d tiedosto(a) kerrallaan. Ylimääräiset tiedostot ohitettiin.',
+	'Upload URL might be wrong or doesn\'t exist': 'Lataus URL saattaa olla väärin tai ei ole olemassa',
+	'Error: File too large: ': 'Virhe: Tiedosto liian suuri: ',
+	'Error: Invalid file extension: ': 'Virhe: Kelpaamaton tiedostopääte: ',
+	'File extension error.': 'Tiedostopäätevirhe.',
+	'File size error.': 'Tiedostokokovirhe.',
+	'File count error.': 'Tiedostolaskentavirhe.',
+	'Init error.': 'Init virhe.',
+	'HTTP Error.': 'HTTP virhe.',
+	'Security error.': 'Tietoturvavirhe.',
+	'Generic error.': 'Yleinen virhe.',
+	'IO error.': 'I/O virhe.'
+});

data/lib/public/javascripts/plupload-rails3/plupload/js/i18n/fr.js

@@ -0,0 +1,25 @@
+// .po file like language pack
+plupload.addI18n({
+    'Select files' : 'Sélectionnez les fichiers',
+    'Add files to the upload queue and click the start button.' : 'Ajoutez des fichiers à la file et appuyez sur le bouton démarrer.',
+    'Filename' : 'Nom de fichier',
+    'Status' : 'Status',
+    'Size' : 'Taille',
+    'Add files' : 'Ajouter Fichiers',
+    'Stop current upload' : 'Arrêter l\'envoi en cours',
+    'Start uploading queue' : 'Démarrer l\'envoi',
+    'Uploaded %d/%d files': '%d/%d fichiers envoyés',
+    'N/A' : 'Non applicable',
+    'Drag files here.' : 'Déposer les fichiers ici.',
+    'File extension error.': 'Erreur extension fichier',
+    'File size error.': 'Erreur taille fichier.',
+    'Init error.': 'Erreur d\'initialisation.',
+    'HTTP Error.': 'Erreur HTTP.',
+    'Security error.': 'Erreur de sécurité.',
+    'Generic error.': 'Erreur générique.',
+    'IO error.': 'Erreur E/S.',
+    'Stop Upload': 'Arrêter les envois.',
+    'Add Files': 'Ajouter des fichiers',
+    'Start Upload': 'Démarrer les envois.',
+    '%d files queued': '%d fichiers en attente.'
+});

data/lib/public/javascripts/plupload-rails3/plupload/js/i18n/it.js

@@ -0,0 +1,21 @@
+// .po file like language pack
+plupload.addI18n({
+	'Select files' : 'Seleziona i files',
+	'Add files to the upload queue and click the start button.' : 'Aggiungi i file alla coda di caricamento e clicca il pulsante di avvio.',
+	'Filename' : 'Nome file',
+	'Status' : 'Stato',
+	'Size' : 'Dimensione',
+	'Add files' : 'Aggiungi file',
+	'Stop current upload' : 'Interrompi il caricamento',
+	'Start uploading queue' : 'Avvia il caricamento',
+	'Uploaded %d/%d files': 'Caricati %d/%d file',
+	'N/A' : 'N/D',
+	'Drag files here.' : 'Trascina i file qui.',
+	'File extension error.': 'Errore estensione file.',
+	'File size error.': 'Errore dimensione file.',
+	'Init error.': 'Errore inizializzazione.',
+	'HTTP Error.': 'Errore HTTP.',
+	'Security error.': 'Errore sicurezza.',
+	'Generic error.': 'Errore generico.',
+	'IO error.': 'Errore IO.'
+});

data/lib/public/javascripts/plupload-rails3/plupload/js/i18n/ja.js

@@ -0,0 +1,37 @@
+// Japanese
+plupload.addI18n({
+   'Select files' : 'ファイル選択',
+   'Add files to the upload queue and click the start button.' : 'ファイルをアップロードキューに追加してスタートボタンをクリックしてください',
+   'Filename' : 'ファイル名',
+   'Status' : 'ステータス',
+   'Size' : 'サイズ',
+   'Add Files' : 'ファイルを追加',
+   'Stop Upload' : 'アップロード停止',
+   'Start Upload' : 'アップロード',
+   'Add files' : 'ファイルを追加',
+   'Add files.' : 'ファイルを追加',
+   'Stop current upload' : '現在のアップロードを停止',
+   'Start uploading queue' : 'アップロード',
+   'Stop upload' : 'アップロード停止',
+   'Start upload' : 'アップロード',
+   'Uploaded %d/%d files': 'アップロード中 %d/%d ファイル',
+   'N/A' : 'N/A',
+   'Drag files here.' : 'ここにファイルをドラッグ',
+   'File extension error.': 'ファイル拡張子エラー',
+   'File size error.': 'ファイルサイズエラー',
+   'File count error.': 'ファイル数エラー',
+   'Init error.': 'イニシャライズエラー',
+   'HTTP Error.': 'HTTP エラー',
+   'Security error.': 'セキュリティエラー',
+   'Generic error.': 'エラー',
+   'IO error.': 'IO エラー',
+   'File: %s': 'ファイル: %s',
+   'Close': '閉じる',
+   '%d files queued': '%d ファイルが追加されました',
+   'Using runtime: ': 'モード: ',
+   'File: %f, size: %s, max file size: %m': 'ファイル: %f, サイズ: %s, 最大ファイルサイズ: %m',
+   'Upload element accepts only %d file(s) at a time. Extra files were stripped.': 'アップロード可能なファイル数は %d です。余分なファイルは削除されました',
+   'Upload URL might be wrong or doesn\'t exist': 'アップロード先の URL が存在しません',
+   'Error: File too large: ': 'エラー: サイズが大きすぎます: ',
+   'Error: Invalid file extension: ': 'エラー: 拡張子が許可されていません: '
+});

data/lib/public/javascripts/plupload-rails3/plupload/js/i18n/lv.js

@@ -0,0 +1,33 @@
+// .lv file like language pack
+plupload.addI18n({
+    'Select files' : 'Izvēlieties failus',
+    'Add files to the upload queue and click the start button.' : 'Pieveinojiet failus rindai un klikšķiniet uz "Sākt augšupielādi" pogas.',
+    'Filename' : 'Faila nosaukums',
+    'Status' : 'Statuss',
+    'Size' : 'Izmērs',
+    'Add files' : 'Pievienot failus',
+    'Stop current upload' : 'Apturēt pašreizējo augšupielādi',
+    'Start uploading queue' : 'Sākt augšupielādi',
+    'Drag files here.' : 'Ievelciet failus šeit',
+    'Start upload' : 'Sākt augšupielādi',
+    'Uploaded %d/%d files': 'Augšupielādēti %d/%d faili',
+    'Stop upload': 'Pārtraukt augšupielādi',
+    'Start upload': 'Sākt augšupielādi',
+    '%d files queued': '%d faili pievienoti rindai',
+    'File: %s': 'Fails: %s',
+    'Close': 'Aizvērt',
+    'Using runtime: ': 'Lieto saskarni: ',
+    'File: %f, size: %s, max file size: %m': 'Fails: %f, izmērs: %s, maksimālais faila izmērs: %m',
+    'Upload element accepts only %d file(s) at a time. Extra files were stripped.': 'Iespējams ielādēt tikai %d failus vienā reizē. Atlikušie faili netika pievienoti',
+    'Upload URL might be wrong or doesn\'t exist': 'Augšupielādes URL varētu būt nepareizs vai neeksistē',
+    'Error: File too large: ': 'Kļūda: Fails pārāk liels: ',
+    'Error: Invalid file extension: ': 'Kļūda: Nekorekts faila paplašinājums:',
+    'File extension error.': 'Faila paplašinājuma kļūda.',
+    'File size error.': 'Faila izmēra kļūda.',
+    'File count error.': 'Failu skaita kļūda',
+    'Init error.': 'Inicializācijas kļūda.',
+    'HTTP Error.': 'HTTP kļūda.',
+    'Security error.': 'Drošības kļūda.',
+    'Generic error.': 'Vispārēja rakstura kļūda.',
+    'IO error.': 'Ievades/Izvades kļūda.'
+});

data/lib/public/javascripts/plupload-rails3/plupload/js/i18n/nl.js

@@ -0,0 +1,21 @@
+// Dutch
+plupload.addI18n({
+   'Select files' : 'Selecteer bestand(en):',
+   'Add files to the upload queue and click the start button.' : 'Voeg bestanden toe aan de wachtrij en druk op \'Start\'.',
+   'Filename' : 'Bestandsnaam',
+   'Status' : 'Status',
+   'Size' : 'Grootte',
+   'Add files' : 'Voeg bestanden toe',
+   'Stop current upload' : 'Stop upload',
+   'Start uploading queue' : 'Start upload',
+   'Uploaded %d/%d files': '%d/%d bestanden ge-upload',
+   'N/A' : 'Niet beschikbaar',
+   'Drag files here.' : 'Sleep bestanden hierheen.',
+   'File extension error.': 'Ongeldig bestandstype.',
+   'File size error.': 'Bestandsgrootte Error.',
+   'Init error.': 'Initialisatie error.',
+   'HTTP Error.': 'HTTP Error.',
+   'Security error.': 'Beveiliging error.',
+   'Generic error.': 'Onbekende error.',
+   'IO error.': 'IO error.'
+});