jquery.fileupload-rails 1.0.0.beta → 1.0.0

data/Readme.md

@@ -23,9 +23,23 @@ Included (no need to require):
 * jQuery Iframe Transport for IE support.
 * jQuery UI widget from [jquery-ui-rails][2]
 
+## Upgrading 0.1 to 1.0
+
+You can remove all dependencies of the plugin from you manifest. Before:
+
+    //= require jquery.ui
+    //= require jquery.iframe-transport
+    //= require jquery.fileupload
+
+After:
+
+    //= require jquery.fileupload
+
+If you downloaded jquery.ui assets into your project, delete them and use [jquery-ui-rails][2] gem instead.
+
 ## Changelog
 
-1.0.0.beta. Core 5.17.6.
+1.0.0. Core 5.18.
 
 Now rake task generates assets from official repo and adds dependencies automatically.
 That means you can just require jquery.fileupload, no extra requires needed.

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

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

data/jquery.fileupload-rails.gemspec

@@ -1,22 +1,15 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "jquery.fileupload-rails/version"
 
 Gem::Specification.new do |s|
   s.name        = "jquery.fileupload-rails"
-  s.version     = JqueryFileUpload::Rails::VERSION
-  s.authors     = ["Semyon Perepelitsa"]
-  s.email       = ["sema@sema.in"]
+  s.version     = "1.0.0"
+  s.author      = "Semyon Perepelitsa"
+  s.email       = "sema@sema.in"
   s.homepage    = "https://github.com/semaperepelitsa/jquery.fileupload-rails"
   s.summary     = %q{Use jQuery File Upload plugin with Rails 3}
   s.description = %q{This gem packages jQuery File Upload plugin and it's dependencies for Rails asset pipeline.}
 
-  s.rubyforge_project = "jquery.fileupload-rails"
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.files       = File.read('Manifest.txt').split("\n")
 
   s.add_dependency 'sprockets', '~> 2.0'
   s.add_dependency 'jquery-ui-rails'

data/lib/jquery.fileupload-rails.rb

@@ -1,4 +1,3 @@
-require "jquery.fileupload-rails/version"
 require "jquery-ui-rails"
 
 module JqueryFileUpload

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

@@ -2,7 +2,7 @@
 //= require jquery.iframe-transport
 
 /*
- * jQuery File Upload Plugin 5.17.6
+ * jQuery File Upload Plugin 5.18
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2010, Sebastian Tschan
@@ -308,29 +308,18 @@
                 // Ignore non-multipart setting if not supported:
                 multipart = options.multipart || !$.support.xhrFileUpload,
                 paramName = options.paramName[0];
-            if (!multipart || options.blob) {
-                // For non-multipart uploads and chunked uploads,
-                // file meta data is not part of the request body,
-                // so we transmit this data as part of the HTTP headers.
-                // For cross domain requests, these headers must be allowed
-                // via Access-Control-Allow-Headers or removed using
-                // the beforeSend callback:
-                options.headers = $.extend(options.headers, {
-                    'X-File-Name': file.name,
-                    'X-File-Type': file.type,
-                    'X-File-Size': file.size
-                });
-                if (!options.blob) {
-                    // Non-chunked non-multipart upload:
-                    options.contentType = file.type;
-                    options.data = file;
-                } else if (!multipart) {
-                    // Chunked non-multipart upload:
-                    options.contentType = 'application/octet-stream';
-                    options.data = options.blob;
-                }
+            options.headers = options.headers || {};
+            if (options.contentRange) {
+                options.headers['Content-Range'] = options.contentRange;
             }
-            if (multipart && $.support.xhrFormDataFileUpload) {
+            if (!multipart) {
+                // For cross domain requests, the X-File-Name header
+                // must be allowed via Access-Control-Allow-Headers
+                // or removed using the beforeSend callback:
+                options.headers['X-File-Name'] = file.name;
+                options.contentType = file.type;
+                options.data = options.blob || file;
+            } else if ($.support.xhrFormDataFileUpload) {
                 if (options.postMessage) {
                     // window.postMessage does not allow sending FormData
                     // objects, so we just add the File/Blob objects to
@@ -360,6 +349,11 @@
                         });
                     }
                     if (options.blob) {
+                        // For cross domain requests, the X-File-* headers
+                        // must be allowed via Access-Control-Allow-Headers
+                        // or removed using the beforeSend callback:
+                        options.headers['X-File-Name'] = file.name;
+                        options.headers['X-File-Type'] = file.type;
                         formData.append(paramName, options.blob, file.name);
                     } else {
                         $.each(options.files, function (index, file) {
@@ -495,6 +489,16 @@
             return this._enhancePromise(promise);
         },
 
+        // Parses the Range header from the server response
+        // and returns the uploaded bytes:
+        _getUploadedBytes: function (jqXHR) {
+            var range = jqXHR.getResponseHeader('Range'),
+                parts = range && range.split('-'),
+                upperBytesPos = parts && parts.length > 1 &&
+                    parseInt(parts[1], 10);
+            return upperBytesPos && upperBytesPos + 1;
+        },
+
         // Uploads a file in multiple, sequential requests
         // by splitting the file up in multiple blob chunks.
         // If the second parameter is true, only tests if the file
@@ -507,10 +511,10 @@
                 ub = options.uploadedBytes = options.uploadedBytes || 0,
                 mcs = options.maxChunkSize || fs,
                 slice = file.slice || file.webkitSlice || file.mozSlice,
-                upload,
-                n,
+                dfd = $.Deferred(),
+                promise = dfd.promise(),
                 jqXHR,
-                pipe;
+                upload;
             if (!(this._isXHRUpload(options) && slice && (ub || mcs < fs)) ||
                     options.data) {
                 return false;
@@ -526,59 +530,63 @@
                     [null, 'error', file.error]
                 );
             }
-            // n is the number of blobs to upload,
-            // calculated via filesize, uploaded bytes and max chunk size:
-            n = Math.ceil((fs - ub) / mcs);
-            // The chunk upload method accepting the chunk number as parameter:
+            // The chunk upload method:
             upload = function (i) {
-                if (!i) {
-                    return that._getXHRPromise(true, options.context);
-                }
-                // Upload the blobs in sequential order:
-                return upload(i -= 1).pipe(function () {
-                    // Clone the options object for each chunk upload:
-                    var o = $.extend({}, options);
-                    o.blob = slice.call(
-                        file,
-                        ub + i * mcs,
-                        ub + (i + 1) * mcs
-                    );
-                    // Expose the chunk index:
-                    o.chunkIndex = i;
-                    // Expose the number of chunks:
-                    o.chunksNumber = n;
-                    // Store the current chunk size, as the blob itself
-                    // will be dereferenced after data processing:
-                    o.chunkSize = o.blob.size;
-                    // Process the upload data (the blob and potential form data):
-                    that._initXHRData(o);
-                    // Add progress listeners for this chunk upload:
-                    that._initProgressListener(o);
-                    jqXHR = ($.ajax(o) || that._getXHRPromise(false, o.context))
-                        .done(function () {
-                            // Create a progress event if upload is done and
-                            // no progress event has been invoked for this chunk:
-                            if (!o.loaded) {
-                                that._onProgress($.Event('progress', {
-                                    lengthComputable: true,
-                                    loaded: o.chunkSize,
-                                    total: o.chunkSize
-                                }), o);
-                            }
-                            options.uploadedBytes = o.uploadedBytes +=
-                                o.chunkSize;
-                        });
-                    return jqXHR;
-                });
+                // Clone the options object for each chunk upload:
+                var o = $.extend({}, options);
+                o.blob = slice.call(
+                    file,
+                    ub,
+                    ub + mcs
+                );
+                // Store the current chunk size, as the blob itself
+                // will be dereferenced after data processing:
+                o.chunkSize = o.blob.size;
+                // Expose the chunk bytes position range:
+                o.contentRange = 'bytes ' + ub + '-' +
+                    (ub + o.chunkSize - 1) + '/' + fs;
+                // Process the upload data (the blob and potential form data):
+                that._initXHRData(o);
+                // Add progress listeners for this chunk upload:
+                that._initProgressListener(o);
+                jqXHR = ($.ajax(o) || that._getXHRPromise(false, o.context))
+                    .done(function (result, textStatus, jqXHR) {
+                        ub = that._getUploadedBytes(jqXHR) ||
+                            (ub + o.chunkSize);
+                        // Create a progress event if upload is done and
+                        // no progress event has been invoked for this chunk:
+                        if (!o.loaded) {
+                            that._onProgress($.Event('progress', {
+                                lengthComputable: true,
+                                loaded: ub - o.uploadedBytes,
+                                total: ub - o.uploadedBytes
+                            }), o);
+                        }
+                        options.uploadedBytes = o.uploadedBytes = ub;
+                        if (ub < fs) {
+                            // File upload not yet complete,
+                            // continue with the next chunk:
+                            upload();
+                        } else {
+                            dfd.resolveWith(
+                                o.context,
+                                [result, textStatus, jqXHR]
+                            );
+                        }
+                    })
+                    .fail(function (jqXHR, textStatus, errorThrown) {
+                        dfd.rejectWith(
+                            o.context,
+                            [jqXHR, textStatus, errorThrown]
+                        );
+                    });
             };
-            // Return the piped Promise object, enhanced with an abort method,
-            // which is delegated to the jqXHR object of the current upload,
-            // and jqXHR callbacks mapped to the equivalent Promise methods:
-            pipe = upload(n);
-            pipe.abort = function () {
+            this._enhancePromise(promise);
+            promise.abort = function () {
                 return jqXHR.abort();
             };
-            return this._enhancePromise(pipe);
+            upload();
+            return promise;
         },
 
         _beforeSend: function (e, data) {
@@ -860,8 +868,10 @@
                         var entry;
                         if (item.webkitGetAsEntry) {
                             entry = item.webkitGetAsEntry();
-                            // Workaround for Chrome bug #149735:
-                            entry._file = item.getAsFile();
+                            if (entry) {
+                                // Workaround for Chrome bug #149735:
+                                entry._file = item.getAsFile();
+                            }
                             return entry;
                         }
                         return item.getAsEntry();

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: jquery.fileupload-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta
-  prerelease: 6
+  version: 1.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Semyon Perepelitsa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-05 00:00:00.000000000 Z
+date: 2012-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
@@ -45,8 +45,7 @@ dependencies:
         version: '0'
 description: This gem packages jQuery File Upload plugin and it's dependencies for
   Rails asset pipeline.
-email:
-- sema@sema.in
+email: sema@sema.in
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -108,7 +107,6 @@ files:
 - dependencies.json
 - jquery.fileupload-rails.gemspec
 - lib/jquery.fileupload-rails.rb
-- lib/jquery.fileupload-rails/version.rb
 - vendor/assets/javascripts/jquery.fileupload.js
 - vendor/assets/javascripts/jquery.iframe-transport.js
 - vendor/legacy_assets/javascripts/jquery.fileupload-fp.js
@@ -132,11 +130,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: jquery.fileupload-rails
+rubyforge_project: 
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3

data/lib/jquery.fileupload-rails/version.rb

@@ -1,5 +0,0 @@
-module JqueryFileUpload
-  module Rails
-    VERSION = "1.0.0.beta"
-  end
-end