Merge pull request #2 from whitman/update_assets

Update assets

Author: Chris Whitman

README.md

@@ -1,10 +1,14 @@
-# jQuery File Upload for Rails 3.1 Asset Pipeline
+# jQuery File Upload for Rails
 
 [jQuery-File-Plugin](https://github.com/blueimp/jQuery-File-Upload) is a file upload plugin written by [Sebastian Tschan](https://github.com/blueimp). jQuery File Upload features multiple file selection, drag&drop support, progress bars and preview images for jQuery. Supports cross-domain, chunked and resumable file uploads and client-side image resizing.
 
-jquery-fileupload-rails is a library that integrates jQuery File Upload for Rails 3.1 Asset Pipeline.
+jquery-fileupload-rails is a library that integrates jQuery File Upload for Rails 3.1 Asset Pipeline (Rails 3.2 supported).
 
-jquery-fileupload-rails is currently using jQuery-File-Plugin version 6.7.0.
+## Plugin versions
+
+* jQuery File Upload User Interface Plugin 6.11
+* jQuery File Upload Plugin 5.19.3
+* jQuery UI Widget 1.9.1+amd
 
 ## Installing Gem
 
@@ -18,32 +22,45 @@ Require jquery-fileupload in your app/assets/application.js file.
 
 The snippet above will add the following js files to the mainfest file.
 
-    //=require jquery-fileupload/vendor/jquery.ui.widget
-    //=require jquery-fileupload/vendor/load-image
-    //=require jquery-fileupload/vendor/canvas-to-blob
-    //=require jquery-fileupload/vendor/tmpl
-    //=require jquery-fileupload/jquery.iframe-transport
-    //=require jquery-fileupload/jquery.fileupload
-    //=require jquery-fileupload/jquery.fileupload-fp
-    //=require jquery-fileupload/jquery.fileupload-ui
-    //=require jquery-fileupload/locale
+    //= require jquery-fileupload/vendor/jquery.ui.widget
+    //= require jquery-fileupload/vendor/load-image
+    //= require jquery-fileupload/vendor/canvas-to-blob
+    //= require jquery-fileupload/vendor/tmpl
+    //= require jquery-fileupload/jquery.iframe-transport
+    //= require jquery-fileupload/jquery.fileupload
+    //= require jquery-fileupload/jquery.fileupload-fp
+    //= require jquery-fileupload/jquery.fileupload-ui
+    //= require jquery-fileupload/locale
 
 If you only need the basic files, just add the code below to your application.js file. [Basic setup guide](https://github.com/blueimp/jQuery-File-Upload/wiki/Basic-plugin)
 
-    //=require jquery-fileupload/basic
+    //= require jquery-fileupload/basic
 
 The basic setup only includes the following files:
 
-    //=require jquery-fileupload/vendor/jquery.ui.widget
-    //=require jquery-fileupload/jquery.iframe-transport
-    //=require jquery-fileupload/jquery.fileupload
+    //= require jquery-fileupload/vendor/jquery.ui.widget
+    //= require jquery-fileupload/jquery.iframe-transport
+    //= require jquery-fileupload/jquery.fileupload
 
 ## Using the stylesheet
 
 Require the stylesheet file to app/assets/stylesheets/application.css
 
     *= require jquery.fileupload-ui
 
+## Using the middleware
+
+The `jquery.iframe-transport` fallback transport has some special caveats regarding the response data type, http status, and character encodings. `jquery-fileupload-rails` includes a middleware that handles these inconsistencies seamlessly. If you decide to use it, create an initializer that adds the middleware to your application's middleware stack.
+
+    Rails.application.config.middleware.use JQuery::FileUpload::Rails::Middleware
+
+## [Example app](https://github.com/tors/jquery-fileupload-rails-paperclip-example)
+This app uses paperclip and twitter-bootstrap-rails
+
+You can also check out Ryan Bate's RailsCast [jQuery File Upload episode](http://railscasts.com/episodes/381-jquery-file-upload). You will
+need a pro account to watch it though.
+
+
 ## Thanks
 Thanks to [Sebastian Tschan](https://github.com/blueimp) for writing an awesome file upload plugin.
 

lib/jquery/fileupload/rails/middleware.rb

@@ -0,0 +1,59 @@
+module JQuery
+  module FileUpload
+    module Rails
+      class Middleware
+        def initialize(app)
+          @app = app
+        end
+
+        def call(env)
+          dup._call(env)
+        end
+
+        def _call(env)
+          @status, @headers, @response = @app.call(env)
+          @request = Rack::Request.new(env)
+
+          if iframe_transport?
+            @headers['Content-Type'] = 'text/html'
+            [@status, @headers, self]
+          else
+            [@status, @headers, @response]
+          end
+        end
+
+        def each(&block)
+          block.call(html_document_left) if iframe_transport?
+          @response.each(&block)
+          block.call(html_document_right) if iframe_transport?
+        end
+
+        def iframe_transport?
+          @request.params['X-Requested-With'] == 'IFrame'
+        end
+
+        def html_document_left
+          "<!DOCTYPE html><html><body><textarea #{metadata}>"
+        end
+
+        def html_document_right
+          "</textarea></body></html>"
+        end
+
+        def metadata
+          meta = {}
+          meta['data-status'] = @response.status if @response.respond_to? :status
+          meta['data-statusText'] = @response.status_message if @response.respond_to? :status_message
+          meta['data-type'] = @headers['Content-Type'] if @headers.has_key?('Content-Type')
+          meta.map {|key,value| "#{key}='#{value}'" }.join(' ')
+        end
+
+        private
+
+        def method_missing(method, *args)
+          @response.send(method.intern, *args)
+        end
+      end
+    end
+  end
+end

lib/jquery/fileupload/rails/upload.rb

@@ -1,2 +1,3 @@
 require "jquery/fileupload/rails/engine"
 require "jquery/fileupload/rails/version"
+require "jquery/fileupload/rails/middleware"

lib/jquery/fileupload/rails/version.rb

@@ -1,7 +1,7 @@
 module JQuery
   module FileUpload
     module Rails
-      VERSION = "0.3.0"
+      VERSION = "0.4.1"
     end
   end
 end

vendor/assets/images/loading.gif

@@ -1,5 +1,5 @@
 /*
- * jQuery XDomainRequest Transport Plugin 1.1.2
+ * jQuery XDomainRequest Transport Plugin 1.1.3
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2011, Sebastian Tschan
@@ -36,6 +36,7 @@
                 var xdr;
                 return {
                     send: function (headers, completeCallback) {
+                        var addParamChar = /\?/.test(s.url) ? '&' : '?';
                         function callback(status, statusText, responses, responseHeaders) {
                             xdr.onload = xdr.onerror = xdr.ontimeout = $.noop;
                             xdr = null;
@@ -44,12 +45,13 @@
                         xdr = new XDomainRequest();
                         // XDomainRequest only supports GET and POST:
                         if (s.type === 'DELETE') {
-                            s.url = s.url + (/\?/.test(s.url) ? '&' : '?') +
-                                '_method=DELETE';
+                            s.url = s.url + addParamChar + '_method=DELETE';
                             s.type = 'POST';
                         } else if (s.type === 'PUT') {
-                            s.url = s.url + (/\?/.test(s.url) ? '&' : '?') +
-                                '_method=PUT';
+                            s.url = s.url + addParamChar + '_method=PUT';
+                            s.type = 'POST';
+                        } else if (s.type === 'PATCH') {
+                            s.url = s.url + addParamChar + '_method=PATCH';
                             s.type = 'POST';
                         }
                         xdr.open(s.type, s.url);