jquery.fileupload-rails 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcbb03c9c287f9c4c5dd7ccce39665a1ef12274e
-  data.tar.gz: 6a722ff0944ea1f4a3328caa87e87767e47e310d
+  metadata.gz: 2bf21e6407433ab2910ed3579e010eca9f350626
+  data.tar.gz: 4879e8e4dfd53fa02cb9a5e92a87ee2798a5f75d
 SHA512:
-  metadata.gz: 16b71a23180856a31a12c5835444614f770944a03051e0eea95f2a65ceb72474d424989734ec7d5a42429ef6eda8ae260183a63999cae23d6713943833700c02
-  data.tar.gz: e51530ccaf3028d40db540b59a0388e0a5d054ec587ee6a95b434274d28e09b6fca0a3571bb92a041f73806d46b6e1ab70147243fdb907f216923ba98b93ca67
+  metadata.gz: a42d4ce5e2fb2cdccff283ecfb56628afc19f5b5fc57120fcb97cf9e753d1261890e6d5c31d6c493ccfe5838cace5a16ddf8b782316706a83079dc8382ab8bb7
+  data.tar.gz: 75d2ec6fa20bb3eefdda82cd079542a367f1e969d1cb1d3bd961cf2cbef770a6bd4e7e348aafc00b126c37329ec155d2770bd4c41edce626b7d55f1009a75fe6

data/Readme.md

@@ -8,13 +8,11 @@ There are no instructions here on how to use the library itself.
 
 ## Usage
 
-Add the following to your Gemfile.
+Add a line to your Gemfile.
 
-    group :assets do
-      gem 'jquery.fileupload-rails'
-    end
+    gem 'jquery.fileupload-rails'
 
-Then you can require the javascript library in application.js:
+Now you can require the javascript library in application.js:
 
     //= require jquery.fileupload
 
@@ -41,6 +39,8 @@ If you downloaded jquery.ui assets into your project, delete them and use [jquer
 
 ## Changelog
 
+1.8.0. Core 5.40.0, updated demo app.
+
 1.7.0. Core 5.34.0.
 
 1.6.1. Core 5.32.5, jQuery UI Rails 4 compatibility.

data/demo/.gitignore

@@ -1,16 +1,3 @@
-# See http://help.github.com/ignore-files/ for more about ignoring files.
-#
-# If you find yourself ignoring temporary files generated by your text editor
-# or operating system, you probably want to add a global ignore instead:
-#   git config --global core.excludesfile ~/.gitignore_global
-
-# Ignore bundler config
 /.bundle
-/bin
-
-# Ignore the default SQLite database.
-/db/*.sqlite3
-
-# Ignore all logfiles and tempfiles.
 /log/*.log
 /tmp

data/demo/Gemfile

@@ -1,8 +1,8 @@
 source 'https://rubygems.org'
 
-gem 'rails', '3.2.14'
+gem 'rails', '4.0.1'
 
-gem 'coffee-rails', '~> 3.2.1'
+gem 'coffee-rails', '~> 4.0.0'
 gem 'jquery-rails', '~> 3.0.0'
 gem 'jquery-ui-rails', '~> 4.0.0'
 gem 'jquery.fileupload-rails', path: '..'

data/demo/Rakefile

@@ -0,0 +1,2 @@
+require File.expand_path('../config/application', __FILE__)
+Rails.application.load_tasks

data/demo/app/assets/javascripts/application.js.coffee

@@ -6,4 +6,4 @@ $ ->
   $('#basic').fileupload
     done: (e, data)->
       console.log "Done", data.result
-      $(data.result).appendTo(this)
+      $("body").append(data.result)

data/demo/bin/bundle

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+load Gem.bin_path('bundler', 'bundle')

data/demo/bin/rails

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
+require_relative '../config/boot'
+require 'rails/commands'

data/demo/bin/rake

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run

data/demo/config/application.rb

@@ -2,14 +2,16 @@ require File.expand_path('../boot', __FILE__)
 
 require 'action_controller/railtie'
 require 'sprockets/railtie'
-Bundler.require(*Rails.groups(:assets => %w(development test)))
+Bundler.require
 
 module Demo
   class Application < Rails::Application
     config.cache_classes = false
+    config.eager_load = false
     config.consider_all_requests_local = true
 
     config.session_store :disabled
+    config.secret_key_base = "no"
     config.active_support.deprecation = :log
     config.action_dispatch.best_standards_support = :builtin
 

data/demo/config/routes.rb

@@ -2,5 +2,5 @@ Demo::Application.routes.draw do
   get '/' => 'application#basic'
   post '/' => 'application#create'
 
-  match ':action', controller: "application"
+  get ':action', controller: "application"
 end

data/jquery.fileupload-rails.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "jquery.fileupload-rails"
-  s.version     = "1.7.0"
+  s.version     = "1.8.0"
   s.author      = "Semyon Perepelitsa"
   s.email       = "sema@sema.in"
   s.homepage    = "https://github.com/semaperepelitsa/jquery.fileupload-rails"

data/vendor/assets/javascripts/jquery.fileupload.js

@@ -2,7 +2,7 @@
 //= require jquery.iframe-transport
 
 /*
- * jQuery File Upload Plugin 5.34.0
+ * jQuery File Upload Plugin 5.40.0
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2010, Sebastian Tschan
@@ -12,8 +12,8 @@
  * http://www.opensource.org/licenses/MIT
  */
 
-/*jslint nomen: true, unparam: true, regexp: true */
-/*global define, window, document, location, File, Blob, FormData */
+/* jshint nomen:false */
+/* global define, window, document, location, Blob, FormData */
 
 (function (factory) {
     'use strict';
@@ -43,9 +43,11 @@
         $('<input type="file">').prop('disabled'));
 
     // The FileReader API is not actually used, but works as feature detection,
-    // as e.g. Safari supports XHR file uploads via the FormData API,
-    // but not non-multipart XHR file uploads:
-    $.support.xhrFileUpload = !!(window.XMLHttpRequestUpload && window.FileReader);
+    // as some Safari versions (5?) support XHR file uploads via the FormData API,
+    // but not non-multipart XHR file uploads.
+    // window.XMLHttpRequestUpload is not available on IE10, so we check for
+    // window.ProgressEvent instead to detect XHR2 file upload capability:
+    $.support.xhrFileUpload = !!(window.ProgressEvent && window.FileReader);
     $.support.xhrFormDataFileUpload = !!window.FormData;
 
     // Detect support for Blob slicing (required for chunked uploads):
@@ -91,6 +93,14 @@
             // To limit the number of files uploaded with one XHR request,
             // set the following option to an integer greater than 0:
             limitMultiFileUploads: undefined,
+            // The following option limits the number of files uploaded with one
+            // XHR request to keep the request size under or equal to the defined
+            // limit in bytes:
+            limitMultiFileUploadSize: undefined,
+            // Multipart file uploads add a number of bytes to each uploaded file,
+            // therefore the following option adds an overhead for each file used
+            // in the limitMultiFileUploadSize configuration:
+            limitMultiFileUploadSizeOverhead: 512,
             // Set the following option to true to issue all file upload requests
             // in a sequential order:
             sequentialUploads: false,
@@ -286,7 +296,7 @@
 
         _getFormData: function (options) {
             var formData;
-            if (typeof options.formData === 'function') {
+            if ($.type(options.formData) === 'function') {
                 return options.formData(options.form);
             }
             if ($.isArray(options.formData)) {
@@ -412,7 +422,8 @@
                 file = options.files[0],
                 // Ignore non-multipart setting if not supported:
                 multipart = options.multipart || !$.support.xhrFileUpload,
-                paramName = options.paramName[0];
+                paramName = $.type(options.paramName) === 'array' ?
+                    options.paramName[0] : options.paramName;
             options.headers = $.extend({}, options.headers);
             if (options.contentRange) {
                 options.headers['Content-Range'] = options.contentRange;
@@ -422,7 +433,7 @@
                     encodeURI(file.name) + '"';
             }
             if (!multipart) {
-                options.contentType = file.type;
+                options.contentType = file.type || 'application/octet-stream';
                 options.data = options.blob || file;
             } else if ($.support.xhrFormDataFileUpload) {
                 if (options.postMessage) {
@@ -439,7 +450,8 @@
                     } else {
                         $.each(options.files, function (index, file) {
                             formData.push({
-                                name: options.paramName[index] || paramName,
+                                name: ($.type(options.paramName) === 'array' &&
+                                    options.paramName[index]) || paramName,
                                 value: file
                             });
                         });
@@ -462,9 +474,10 @@
                             if (that._isInstanceOf('File', file) ||
                                     that._isInstanceOf('Blob', file)) {
                                 formData.append(
-                                    options.paramName[index] || paramName,
+                                    ($.type(options.paramName) === 'array' &&
+                                        options.paramName[index]) || paramName,
                                     file,
-                                    file.name
+                                    file.uploadName || file.name
                                 );
                             }
                         });
@@ -610,16 +623,23 @@
         // Adds convenience methods to the data callback argument:
         _addConvenienceMethods: function (e, data) {
             var that = this,
-                getPromise = function (data) {
-                    return $.Deferred().resolveWith(that, [data]).promise();
+                getPromise = function (args) {
+                    return $.Deferred().resolveWith(that, args).promise();
                 };
             data.process = function (resolveFunc, rejectFunc) {
                 if (resolveFunc || rejectFunc) {
                     data._processQueue = this._processQueue =
-                        (this._processQueue || getPromise(this))
-                            .pipe(resolveFunc, rejectFunc);
+                        (this._processQueue || getPromise([this])).pipe(
+                            function () {
+                                if (data.errorThrown) {
+                                    return $.Deferred()
+                                        .rejectWith(that, [data]).promise();
+                                }
+                                return getPromise(arguments);
+                            }
+                        ).pipe(resolveFunc, rejectFunc);
                 }
-                return this._processQueue || getPromise(this);
+                return this._processQueue || getPromise([this]);
             };
             data.submit = function () {
                 if (this.state() !== 'pending') {
@@ -636,7 +656,9 @@
                 if (this.jqXHR) {
                     return this.jqXHR.abort();
                 }
-                return that._getXHRPromise();
+                this.errorThrown = 'abort';
+                that._trigger('fail', null, this);
+                return that._getXHRPromise(false);
             };
             data.state = function () {
                 if (this.jqXHR) {
@@ -646,6 +668,10 @@
                     return that._getDeferredState(this._processQueue);
                 }
             };
+            data.processing = function () {
+                return !this.jqXHR && this._processQueue && that
+                    ._getDeferredState(this._processQueue) === 'pending';
+            };
             data.progress = function () {
                 return this._progress;
             };
@@ -923,32 +949,59 @@
             var that = this,
                 result = true,
                 options = $.extend({}, this.options, data),
+                files = data.files,
+                filesLength = files.length,
                 limit = options.limitMultiFileUploads,
+                limitSize = options.limitMultiFileUploadSize,
+                overhead = options.limitMultiFileUploadSizeOverhead,
+                batchSize = 0,
                 paramName = this._getParamName(options),
                 paramNameSet,
                 paramNameSlice,
                 fileSet,
-                i;
-            if (!(options.singleFileUploads || limit) ||
+                i,
+                j = 0;
+            if (limitSize && (!filesLength || files[0].size === undefined)) {
+                limitSize = undefined;
+            }
+            if (!(options.singleFileUploads || limit || limitSize) ||
                     !this._isXHRUpload(options)) {
-                fileSet = [data.files];
+                fileSet = [files];
                 paramNameSet = [paramName];
-            } else if (!options.singleFileUploads && limit) {
+            } else if (!(options.singleFileUploads || limitSize) && limit) {
                 fileSet = [];
                 paramNameSet = [];
-                for (i = 0; i < data.files.length; i += limit) {
-                    fileSet.push(data.files.slice(i, i + limit));
+                for (i = 0; i < filesLength; i += limit) {
+                    fileSet.push(files.slice(i, i + limit));
                     paramNameSlice = paramName.slice(i, i + limit);
                     if (!paramNameSlice.length) {
                         paramNameSlice = paramName;
                     }
                     paramNameSet.push(paramNameSlice);
                 }
+            } else if (!options.singleFileUploads && limitSize) {
+                fileSet = [];
+                paramNameSet = [];
+                for (i = 0; i < filesLength; i = i + 1) {
+                    batchSize += files[i].size + overhead;
+                    if (i + 1 === filesLength ||
+                            ((batchSize + files[i + 1].size + overhead) > limitSize) ||
+                            (limit && i + 1 - j >= limit)) {
+                        fileSet.push(files.slice(j, i + 1));
+                        paramNameSlice = paramName.slice(j, i + 1);
+                        if (!paramNameSlice.length) {
+                            paramNameSlice = paramName;
+                        }
+                        paramNameSet.push(paramNameSlice);
+                        j = i + 1;
+                        batchSize = 0;
+                    }
+                }
             } else {
                 paramNameSet = paramName;
             }
-            data.originalFiles = data.files;
-            $.each(fileSet || data.files, function (index, element) {
+            data.originalFiles = files;
+            $.each(fileSet || files, function (index, element) {
                 var newData = $.extend({}, data);
                 newData.files = fileSet ? element : [element];
                 newData.paramName = paramNameSet[index];

data/vendor/assets/javascripts/jquery.iframe-transport.js

@@ -1,5 +1,5 @@
 /*
- * jQuery Iframe Transport Plugin 1.8.0
+ * jQuery Iframe Transport Plugin 1.8.2
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2011, Sebastian Tschan
@@ -9,8 +9,7 @@
  * http://www.opensource.org/licenses/MIT
  */
 
-/*jslint unparam: true, nomen: true */
-/*global define, window, document */
+/* global define, window, document */
 
 (function (factory) {
     'use strict';
@@ -41,7 +40,9 @@
         if (options.async) {
             // javascript:false as initial iframe src
             // prevents warning popups on HTTPS in IE6:
+            /*jshint scripturl: true */
             var initialIframeSrc = options.initialIframeSrc || 'javascript:false;',
+            /*jshint scripturl: false */
                 form,
                 iframe,
                 addParamChar;
@@ -141,6 +142,8 @@
                                 .prop('enctype', 'multipart/form-data')
                                 // enctype must be set as encoding for IE:
                                 .prop('encoding', 'multipart/form-data');
+                            // Remove the HTML5 form attribute from the input(s):
+                            options.fileInput.removeAttr('form');
                         }
                         form.submit();
                         // Insert the file input fields at their original location
@@ -148,7 +151,10 @@
                         if (fileInputClones && fileInputClones.length) {
                             options.fileInput.each(function (index, input) {
                                 var clone = $(fileInputClones[index]);
-                                $(input).prop('name', clone.prop('name'));
+                                // Restore the original name and form properties:
+                                $(input)
+                                    .prop('name', clone.prop('name'))
+                                    .attr('form', clone.attr('form'));
                                 clone.replaceWith(input);
                             });
                         }

metadata

@@ -1,47 +1,47 @@
 --- !ruby/object:Gem::Specification
 name: jquery.fileupload-rails
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Semyon Perepelitsa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-17 00:00:00.000000000 Z
+date: 2014-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
 description: This gem packages jQuery File Upload plugin and it's dependencies for
@@ -51,13 +51,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .gitmodules
+- ".gitignore"
+- ".gitmodules"
 - Gemfile
 - Rakefile
 - Readme.md
 - demo/.gitignore
 - demo/Gemfile
+- demo/Rakefile
 - demo/Readme.md
 - demo/app/assets/javascripts/application.js.coffee
 - demo/app/controllers/application_controller.rb
@@ -65,13 +66,15 @@ files:
 - demo/app/views/application/create.html.erb
 - demo/app/views/application/ui.html.erb
 - demo/app/views/layouts/application.html.erb
+- demo/bin/bundle
+- demo/bin/rails
+- demo/bin/rake
 - demo/config.ru
 - demo/config/application.rb
 - demo/config/boot.rb
 - demo/config/environment.rb
 - demo/config/routes.rb
 - demo/log/.gitkeep
-- demo/script/rails
 - dependencies.json
 - jquery.fileupload-rails.gemspec
 - lib/jquery.fileupload-rails.rb
@@ -93,17 +96,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.8
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Use jQuery File Upload plugin with Rails 3

data/demo/script/rails

@@ -1,6 +0,0 @@
-#!/usr/bin/env ruby
-# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
-
-APP_PATH = File.expand_path('../../config/application',  __FILE__)
-require File.expand_path('../../config/boot',  __FILE__)
-require 'rails/commands'