remotipart 1.0 → 1.2.1

data/CONTRIBUTING.md

@@ -0,0 +1,53 @@
+## Note on Patches/Pull Requests
+
+* Fork the project.
+* Make your feature addition or bug fix.
+* Add tests for it. This is important so I don't break it in a
+  future version unintentionally.
+* Commit, do not mess with rakefile, version, or history.
+  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
+* Send me a pull request. Bonus points for topic branches.
+
+## Tests
+
+Because of the nature of AJAX file uploads and certain browser restrictions, we could not simply create unit tests (using qunit or jasmine)
+to test the file upload functionality of remotipart (since the browsers running those test suites won't allow us to set the target of a file
+upload input using javascript). So, instead we created a demo Rails app using remotipart with all remotipart functionality tested using RSpec and Capybara.
+
+* [Demo Rails App with
+  Tests](https://github.com/JangoSteve/Rails-jQuery-Demo/tree/remotipart)
+* [Tests](https://github.com/JangoSteve/Rails-jQuery-Demo/blob/remotipart/spec/features/comments_spec.rb)
+
+To run tests:
+
+Clone the remotipart branch of the demo app
+
+```
+git clone -b remotipart git://github.com/JangoSteve/Rails-jQuery-Demo.git
+```
+
+Install the dependencies
+
+```
+bundle install
+```
+
+Run the tests
+
+```
+bundle exec rspec spec/
+```
+
+If you need to test your own changes to remotipart, just update the Gemfile with your own fork/branch of remotipart:
+
+```
+gem 'remotipart', :git => 'git://github.com/MY_FORK/remotipart.git', :branch => 'MY_BRANCH'
+```
+
+To save time, you can also just bundle remotipart from your current
+local machine / filesystem without having to commit your changes
+or push them remotely:
+
+```
+gem 'remotipart', :path => '../remotipart'
+```

data/Gemfile

@@ -0,0 +1,10 @@
+source 'https://rubygems.org'
+
+group :development do
+  gem 'rake'
+  gem 'jeweler'
+  # This conflicts with jeweler gemspec generation,
+  # causes dependencies to be added to gemspec recursively
+  #gemspec
+end
+

data/Gemfile.lock

@@ -0,0 +1,20 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    git (1.2.5)
+    jeweler (1.8.4)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+      rdoc
+    json (1.7.6)
+    rake (10.0.3)
+    rdoc (3.12)
+      json (~> 1.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  jeweler
+  rake

data/History.rdoc

@@ -1,5 +1,50 @@
 = History
 
+=== 1.2.1 / 2013-07-07
+
+* Added automatic authenticity_token detection and appending to iframe submission.
+
+=== 1.2.0 / 2013-07-06
+
+* Removed support for older jquery-ujs and jquery < 1.7.
+* Fixed json (and other type) parsing issues, only html_escape HTML responses.
+
+=== 1.1.1 / 2013-07-05
+
+* Fixed issue with GET params not being available in middleware.
+* Fixed issue with clicked submit button not being submitted via remotipart ajax.
+* Fixed issue with HTML not being escaped correctly.
+* Fixed issue with iframe-transport on jQuery 1.10.x.
+* Fixed compatibility issue with Rails 4.
+
+=== 1.1.0 / 2013-07-04
+
+* Updated to latest iframe-transport.
+* Added status-text to js response.
+
+=== 1.0.5 / 2013-02-09
+
+* Fixed gem dependency info.
+
+=== 1.0.4 / 2013-02-09
+
+* Fixed render override compatibility with other gems that override render (e.g. wicked_pdf)
+
+=== 1.0.3 / 2013-02-08
+
+* Fixed for jquery-rails v2.2.x (i.e. jQuery v1.9.x)
+
+=== 1.0.2 / 2012-02-03
+
+* Minor Enhancements
+  * Fixed rendering when JS response contains `textarea` tag
+
+=== 1.0.1 / 2011-11-27
+
+* Minor Enhancements
+  * Added support for non-post methods from Rails's `_method` hidden input.
+  * Fixed IE form submit-bubbling support for jquery 1.7
+
 === 1.0 / 2011-08-26
 
 * New Features

data/README.rdoc

@@ -1,6 +1,6 @@
-= Remotipart
+= Remotipart: Rails jQuery File Upload
 
-Remotipart is a Ruby on Rails gem enabling AJAX file uploads with jQuery in Rails 3.0 and Rails 3.1 remote forms.
+Remotipart is a Ruby on Rails gem enabling AJAX file uploads with jQuery in Rails 3 and Rails 4 remote forms.
 This gem augments the native Rails jQuery remote form functionality enabling asynchronous file uploads with little to no modification to your application.
 
 * {Homepage and Demos}[http://www.alfajango.com/blog/remotipart-rails-gem/]
@@ -8,12 +8,12 @@ This gem augments the native Rails jQuery remote form functionality enabling asy
 
 == Dependencies
 
-* {Rails 3}[http://github.com/rails/rails]
-* {The jquery-rails gem}[http://rubygems.org/gems/jquery-rails], which really just installs {jQuery}[http://jquery.com] and the {Rails jQuery driver (jquery-ujs)}[https://github.com/rails/jquery-ujs]
+* {Rails 3 or Rails 4}[http://github.com/rails/rails]
+* {The jquery-rails gem}[http://rubygems.org/gems/jquery-rails] (included in Rails 3 and Rails 4 by default), which installs {jQuery}[http://jquery.com] and the {Rails jQuery driver (jquery-ujs)}[https://github.com/rails/jquery-ujs]
 
 == Installation
 
-<b>Your app should be using jquery-rails gem v1.0.12 or above.</b>
+<b>Your app should be using jquery-rails gem v2.3.0 or above.</b>
 
 If you're using an old version of the jquery-rails gem,
 make sure you have a supported jquery-ujs (rails.js or jquery_ujs.js) version from {VERSION_COMPATIBILITY}[https://github.com/JangoSteve/remotipart/blob/master/VERSION_COMPATIBILITY.rdoc].
@@ -23,7 +23,7 @@ make sure you have a supported jquery-ujs (rails.js or jquery_ujs.js) version fr
 
   * Add this line to your GEMFILE (use the appropriate version from the compatibilty chart if needed)
 
-   gem 'remotipart', '~> 1.0'
+   gem 'remotipart', '~> 1.2'
 
   * And run
 
@@ -139,4 +139,4 @@ Thank you to {Adam Kerr}[https://github.com/ajrkerr] for helping move over to th
 
 == Copyright
 
-Copyright (c) 2011 {Steve Schwartz}[https://github.com/JangoSteve], {Greg Leppert}[https://github.com/leppert]. See LICENSE for details.
+Copyright (c) 2013 {Steve Schwartz}[https://github.com/JangoSteve], {Greg Leppert}[https://github.com/leppert]. See LICENSE for details.

data/Rakefile

@@ -6,18 +6,17 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "remotipart"
-    gem.summary = %Q{Remotipart is a Ruby on Rails gem enabling remote multipart forms (AJAX style file uploads) with jQuery.}
-    gem.description = %Q{Remotipart is a Ruby on Rails gem enabling remote multipart forms (AJAX style file uploads) with jQuery.
+    gem.summary = %Q{Remotipart is a Ruby on Rails gem enabling remote multipart forms (AJAX style file uploads) with jquery-rails.}
+    gem.description = %Q{Remotipart is a Ruby on Rails gem enabling remote multipart forms (AJAX style file uploads) with jquery-rails.
     This gem augments the native Rails 3 jQuery-UJS remote form function enabling asynchronous file uploads with little to no modification to your application.
     }
     gem.email = %w{greg@formasfunction.com steve@alfajango.com}
-    gem.homepage = "http://www.alfajango.com/blog/remotipart-rails-gem/"
+    gem.homepage = "http://opensource.alfajango.com/remotipart/"
     gem.authors = ["Greg Leppert", "Steve Schwartz"]
-    gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
     gem.version = Remotipart::Rails::VERSION
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
-  Jeweler::GemcutterTasks.new
+  Jeweler::RubygemsDotOrgTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
@@ -42,12 +41,8 @@ rescue LoadError
   end
 end
 
-task :test => :check_dependencies
-
-task :default => :test
-
-require 'rake/rdoctask'
-require 'lib/remotipart/rails/version'
+require 'rdoc/task'
+require File.expand_path('../lib/remotipart/rails/version', __FILE__)
 Rake::RDocTask.new do |rdoc|
   version = Remotipart::Rails::VERSION
 

data/lib/remotipart/middleware.rb

@@ -8,23 +8,20 @@ module Remotipart
     end
 
     def call env
-      # For some reason, in Rails 3.0, `env['rack.request.form_hash']`
-      # isn't populated unless we manually initialize a new Rack::Request
-      # and call the `POST` method on it
-      if ::Rails.version < "3.1"
-        Rack::Request.new(env).POST
-      end
-      params = env['rack.request.form_hash']
+      # Get request params
+      params = Rack::Request.new(env).params
 
-      # This was using an iframe transport, and is therefore an XHR
-      # This is required if we're going to override the http_accept
-      if params and params['X-Requested-With'] == 'IFrame'
-        env['HTTP_X_REQUESTED_WITH'] = 'xmlhttprequest'
-      end
+      if params
+        # This was using an iframe transport, and is therefore an XHR
+        # This is required if we're going to override the http_accept
+        if params['X-Requested-With'] == 'IFrame'
+          env['HTTP_X_REQUESTED_WITH'] = 'xmlhttprequest'
+        end
 
-      # Override the accepted format, because it isn't what we really want
-      if params and params['X-Http-Accept']
-        env['HTTP_ACCEPT'] = params['X-Http-Accept']
+        # Override the accepted format, because it isn't what we really want
+        if params['X-Http-Accept']
+          env['HTTP_ACCEPT'] = params['X-Http-Accept']
+        end
       end
 
       @app.call(env)

data/lib/remotipart/rails.rb

@@ -1,6 +1,6 @@
 module Remotipart
   module Rails
-    if ::Rails.version < "3.1"
+    if ::Rails.version.to_s < "3.1"
       require 'remotipart/rails/railtie'
     else
       require 'remotipart/rails/engine'

data/lib/remotipart/rails/version.rb

@@ -1,6 +1,6 @@
 module Remotipart
   module Rails
-    VERSION = "1.0"
-    IFRAMETRANSPORT_VERSION = "07.05.2011"
+    VERSION = "1.2.1"
+    IFRAMETRANSPORT_VERSION = "02.06.2013"
   end
 end

data/lib/remotipart/render_overrides.rb

@@ -1,12 +1,20 @@
 module Remotipart
-
-  #Responder used to automagically wrap any non-xml replies in a text-area
-  # as expected by iframe-transport
+  # Responder used to automagically wrap any non-xml replies in a text-area
+  # as expected by iframe-transport.
   module RenderOverrides
-    def render *args
-      super
+    include ERB::Util
+
+    def self.included(base)
+      base.class_eval do
+        alias_method_chain :render, :remotipart
+      end
+    end
+
+    def render_with_remotipart *args
+      render_without_remotipart *args
       if remotipart_submitted?
-        response.body = %{<textarea data-type=\"#{content_type}\">#{response.body}</textarea>}
+        textarea_body = response.content_type == 'text/html' ? html_escape(response.body) : response.body
+        response.body = %{<textarea data-type=\"#{response.content_type}\" data-status=\"#{response.response_code}\" data-statusText=\"#{response.message}\">#{textarea_body}</textarea>}
         response.content_type = Mime::HTML
       end
       response_body

data/remotipart.gemspec

@@ -1,68 +1,63 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{remotipart}
-  s.version = "1.0"
+  s.name = "remotipart"
+  s.version = "1.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Greg Leppert", "Steve Schwartz"]
-  s.date = %q{2011-08-26}
-  s.description = %q{Remotipart is a Ruby on Rails gem enabling remote multipart forms (AJAX style file uploads) with jQuery.
-    This gem augments the native Rails 3 jQuery-UJS remote form function enabling asynchronous file uploads with little to no modification to your application.
-    }
+  s.date = "2013-07-08"
+  s.description = "Remotipart is a Ruby on Rails gem enabling remote multipart forms (AJAX style file uploads) with jquery-rails.\n    This gem augments the native Rails 3 jQuery-UJS remote form function enabling asynchronous file uploads with little to no modification to your application.\n    "
   s.email = ["greg@formasfunction.com", "steve@alfajango.com"]
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "History.rdoc",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION_COMPATIBILITY.rdoc",
-     "lib/generators/remotipart/install/install_generator.rb",
-     "lib/remotipart.rb",
-     "lib/remotipart/middleware.rb",
-     "lib/remotipart/rails.rb",
-     "lib/remotipart/rails/engine.rb",
-     "lib/remotipart/rails/railtie.rb",
-     "lib/remotipart/rails/version.rb",
-     "lib/remotipart/render_overrides.rb",
-     "lib/remotipart/request_helper.rb",
-     "lib/remotipart/view_helper.rb",
-     "remotipart.gemspec",
-     "test/helper.rb",
-     "test/test_remotipart.rb",
-     "vendor/assets/javascripts/jquery.iframe-transport.js",
-     "vendor/assets/javascripts/jquery.remotipart.js"
+    "CONTRIBUTING.md",
+    "Gemfile",
+    "Gemfile.lock",
+    "History.rdoc",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION_COMPATIBILITY.rdoc",
+    "lib/generators/remotipart/install/install_generator.rb",
+    "lib/remotipart.rb",
+    "lib/remotipart/middleware.rb",
+    "lib/remotipart/rails.rb",
+    "lib/remotipart/rails/engine.rb",
+    "lib/remotipart/rails/railtie.rb",
+    "lib/remotipart/rails/version.rb",
+    "lib/remotipart/render_overrides.rb",
+    "lib/remotipart/request_helper.rb",
+    "lib/remotipart/view_helper.rb",
+    "remotipart.gemspec",
+    "vendor/assets/javascripts/jquery.iframe-transport.js",
+    "vendor/assets/javascripts/jquery.remotipart.js"
   ]
-  s.homepage = %q{http://www.alfajango.com/blog/remotipart-rails-gem/}
-  s.rdoc_options = ["--charset=UTF-8"]
+  s.homepage = "http://opensource.alfajango.com/remotipart/"
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Remotipart is a Ruby on Rails gem enabling remote multipart forms (AJAX style file uploads) with jQuery.}
-  s.test_files = [
-    "test/helper.rb",
-     "test/test_remotipart.rb"
-  ]
+  s.rubygems_version = "1.8.15"
+  s.summary = "Remotipart is a Ruby on Rails gem enabling remote multipart forms (AJAX style file uploads) with jquery-rails."
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+      s.add_development_dependency(%q<rake>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
-      s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+      s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
-    s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+    s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
   end
 end
 

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

@@ -1,8 +1,8 @@
 // This [jQuery](http://jquery.com/) plugin implements an `<iframe>`
 // [transport](http://api.jquery.com/extending-ajax/#Transports) so that
 // `$.ajax()` calls support the uploading of files using standard HTML file
-// input fields. This is done by switching the exchange from `XMLHttpRequest` to
-// a hidden `iframe` element containing a form that is submitted.
+// input fields. This is done by switching the exchange from `XMLHttpRequest`
+// to a hidden `iframe` element containing a form that is submitted.
 
 // The [source for the plugin](http://github.com/cmlenz/jquery-iframe-transport)
 // is available on [Github](http://github.com/) and dual licensed under the MIT
@@ -10,7 +10,7 @@
 
 // ## Usage
 
-// To use this plugin, you simply add a `iframe` option with the value `true`
+// To use this plugin, you simply add an `iframe` option with the value `true`
 // to the Ajax settings an `$.ajax()` call, and specify the file fields to
 // include in the submssion using the `files` option, which can be a selector,
 // jQuery object, or a list of DOM elements containing one or more
@@ -25,12 +25,11 @@
 //         });
 //     });
 
-// The plugin will construct a hidden `<iframe>` element containing a copy of
-// the form the file field belongs to, will disable any form fields not
-// explicitly included, submit that form, and process the response.
+// The plugin will construct hidden `<iframe>` and `<form>` elements, add the
+// file field(s) to that form, submit the form, and process the response.
 
-// If you want to include other form fields in the form submission, include them
-// in the `data` option, and set the `processData` option to `false`:
+// If you want to include other form fields in the form submission, include
+// them in the `data` option, and set the `processData` option to `false`:
 
 //     $("#myform").submit(function() {
 //         $.ajax(this.action, {
@@ -43,123 +42,115 @@
 //         });
 //     });
 
-// ### The Server Side
+// ### Response Data Types
 
-// If the response is not HTML or XML, you (unfortunately) need to apply some
-// trickery on the server side. To send back a JSON payload, send back an HTML
-// `<textarea>` element with a `data-type` attribute that contains the MIME
+// As the transport does not have access to the HTTP headers of the server
+// response, it is not as simple to make use of the automatic content type
+// detection provided by jQuery as with regular XHR. If you can't set the
+// expected response data type (for example because it may vary depending on
+// the outcome of processing by the server), you will need to employ a
+// workaround on the server side: Send back an HTML document containing just a
+// `<textarea>` element with a `data-type` attribute that specifies the MIME
 // type, and put the actual payload in the textarea:
 
 //     <textarea data-type="application/json">
 //       {"ok": true, "message": "Thanks so much"}
 //     </textarea>
 
-// The iframe transport plugin will detect this and attempt to apply the same
-// conversions that jQuery applies to regular responses. That means for the
-// example above you should get a Javascript object as the `data` parameter of
-// the `complete` callback, with the properties `ok: true` and
-// `message: "Thanks so much"`.
+// The iframe transport plugin will detect this and pass the value of the
+// `data-type` attribute on to jQuery as if it was the "Content-Type" response
+// header, thereby enabling the same kind of conversions that jQuery applies
+// to regular responses. For the example above you should get a Javascript
+// object as the `data` parameter of the `complete` callback, with the
+// properties `ok: true` and `message: "Thanks so much"`.
+
+// ### Handling Server Errors
+
+// Another problem with using an `iframe` for file uploads is that it is
+// impossible for the javascript code to determine the HTTP status code of the
+// servers response. Effectively, all of the calls you make will look like they
+// are getting successful responses, and thus invoke the `done()` or
+// `complete()` callbacks. You can only determine communicate problems using
+// the content of the response payload. For example, consider using a JSON
+// response such as the following to indicate a problem with an uploaded file:
+
+//     <textarea data-type="application/json">
+//       {"ok": false, "message": "Please only upload reasonably sized files."}
+//     </textarea>
 
 // ### Compatibility
 
-// This plugin has primarily been tested on Safari 5, Firefox 4, and Internet
-// Explorer all the way back to version 6. While I haven't found any issues with
-// it so far, I'm fairly sure it still doesn't work around all the quirks in all
-// different browsers. But the code is still pretty simple overall, so you
-// should be able to fix it and contribute a patch :)
+// This plugin has primarily been tested on Safari 5 (or later), Firefox 4 (or
+// later), and Internet Explorer (all the way back to version 6). While I
+// haven't found any issues with it so far, I'm fairly sure it still doesn't
+// work around all the quirks in all different browsers. But the code is still
+// pretty simple overall, so you should be able to fix it and contribute a
+// patch :)
 
 // ## Annotated Source
 
 (function($, undefined) {
+  "use strict";
 
   // Register a prefilter that checks whether the `iframe` option is set, and
-  // switches to the iframe transport if it is `true`.
+  // switches to the "iframe" data type if it is `true`.
   $.ajaxPrefilter(function(options, origOptions, jqXHR) {
     if (options.iframe) {
       return "iframe";
     }
   });
 
-  // Register an iframe transport, independent of requested data type. It will
-  // only activate when the "files" option has been set to a non-empty list of
-  // enabled file inputs.
+  // Register a transport for the "iframe" data type. It will only activate
+  // when the "files" option has been set to a non-empty list of enabled file
+  // inputs.
   $.ajaxTransport("iframe", function(options, origOptions, jqXHR) {
     var form = null,
         iframe = null,
-        origAction = null,
-        origTarget = null,
-        origEnctype = null,
-        addedFields = [],
-        disabledFields = [],
-        files = $(options.files).filter(":file:enabled");
+        name = "iframe-" + $.now(),
+        files = $(options.files).filter(":file:enabled"),
+        markers = null,
+        accepts;
 
     // This function gets called after a successful submission or an abortion
     // and should revert all changes made to the page to enable the
     // submission via this transport.
     function cleanUp() {
-      $(addedFields).each(function() {
-        this.remove();
-      });
-      $(disabledFields).each(function() {
-        this.disabled = false;
-      });
-      form.attr("action", origAction || "")
-          .attr("target", origTarget || "")
-          .attr("enctype", origEnctype || "");
-      iframe.attr("src", "javascript:false;").remove();
+      markers.prop('disabled', false);
+      form.remove();
+      iframe.bind("load", function() { iframe.remove(); });
+      iframe.attr("src", "javascript:false;");
     }
 
     // Remove "iframe" from the data types list so that further processing is
     // based on the content type returned by the server, without attempting an
     // (unsupported) conversion from "iframe" to the actual type.
     options.dataTypes.shift();
-    
+
     if (files.length) {
-      // Determine the form the file fields belong to, and make sure they all
-      // actually belong to the same form.
-      files.each(function() {
-        if (form !== null && this.form !== form) {
-          jQuery.error("All file fields must belong to the same form");
-        }
-        form = this.form;
-      });
-      form = $(form);
-
-      // Store the original form attributes that we'll be replacing temporarily.
-      origAction = form.attr("action");
-      origTarget = form.attr("target");
-      origEnctype = form.attr("enctype");
-
-      // We need to disable all other inputs in the form so that they don't get
-      // included in the submitted data unexpectedly.
-      form.find(":input:not(:submit)").each(function() {
-        if (!this.disabled && (this.type != "file" || files.index(this) < 0)) {
-          this.disabled = true;
-          disabledFields.push(this);
-        }
-      });
+      form = $("<form enctype='multipart/form-data' method='post'></form>").
+        hide().attr({action: options.url, target: name});
 
       // If there is any additional data specified via the `data` option,
       // we add it as hidden fields to the form. This (currently) requires
       // the `processData` option to be set to false so that the data doesn't
       // get serialized to a string.
       if (typeof(options.data) === "string" && options.data.length > 0) {
-        jQuery.error("data must not be serialized");
+        $.error("data must not be serialized");
       }
       $.each(options.data || {}, function(name, value) {
         if ($.isPlainObject(value)) {
           name = value.name;
           value = value.value;
         }
-        addedFields.push($("<input type='hidden'>").attr("name", name)
-          .attr("value", value).appendTo(form));
+        $("<input type='hidden' />").attr({name:  name, value: value}).
+          appendTo(form);
       });
 
       // Add a hidden `X-Requested-With` field with the value `IFrame` to the
       // field, to help server-side code to determine that the upload happened
       // through this transport.
-      addedFields.push($("<input type='hidden' name='X-Requested-With'>")
-        .attr("value", "IFrame").appendTo(form));
+      $("<input type='hidden' value='IFrame' name='X-Requested-With' />").
+        appendTo(form);
 
       // Borrowed straight from the JQuery source
       // Provides a way of specifying the accepted data type similar to HTTP_ACCEPTS
@@ -167,17 +158,26 @@
         options.accepts[ options.dataTypes[0] ] + ( options.dataTypes[ 0 ] !== "*" ? ", */*; q=0.01" : "" ) :
         options.accepts[ "*" ]
 
-      addedFields.push($("<input type='hidden' name='X-Http-Accept'>")
-        .attr("value", accepts).appendTo(form));
+      $("<input type='hidden' name='X-Http-Accept'>")
+        .attr("value", accepts).appendTo(form);
+
+      // Move the file fields into the hidden form, but first remember their
+      // original locations in the document by replacing them with disabled
+      // clones. This should also avoid introducing unwanted changes to the
+      // page layout during submission.
+      markers = files.after(function(idx) {
+        return $(this).clone().prop("disabled", true);
+      }).next();
+      files.appendTo(form);
 
       return {
 
         // The `send` function is called by jQuery when the request should be
         // sent.
         send: function(headers, completeCallback) {
-          iframe = $("<iframe src='javascript:false;' name='iframe-" + $.now()
-            + "' style='display:none'></iframe>");
-          
+          iframe = $("<iframe src='javascript:false;' name='" + name +
+            "' id='" + name + "' style='display:none'></iframe>");
+
           // The first load event gets fired after the iframe has been injected
           // into the DOM, and is used to prepare the actual submission.
           iframe.bind("load", function() {
@@ -187,34 +187,36 @@
             // actual payload is embedded in a `<textarea>` element, and
             // prepares the required conversions to be made in that case.
             iframe.unbind("load").bind("load", function() {
-              
               var doc = this.contentWindow ? this.contentWindow.document :
                 (this.contentDocument ? this.contentDocument : this.document),
                 root = doc.documentElement ? doc.documentElement : doc.body,
                 textarea = root.getElementsByTagName("textarea")[0],
-                type = textarea ? textarea.getAttribute("data-type") : null;
-              
-              var status = 200,
-                statusText = "OK",
-                responses = { text: type ? textarea.value : root ? root.innerHTML : null },
-                headers = "Content-Type: " + (type || "text/html")
-
-              completeCallback(status, statusText, responses, headers);
-
-              setTimeout(cleanUp, 50);
+                type = textarea && textarea.getAttribute("data-type") || null,
+                status = textarea && textarea.getAttribute("data-status") || 200,
+                statusText = textarea && textarea.getAttribute("data-statusText") || "OK",
+                content = {
+                  html: root.innerHTML,
+                  text: type ?
+                    textarea.value :
+                    root ? (root.textContent || root.innerText) : null
+                };
+              cleanUp();
+              if (!jqXHR.responseText) {
+                jqXHR.responseText = content.text;
+              }
+              completeCallback(status, statusText, content, type ?
+                ("Content-Type: " + type) :
+                null);
             });
-            
-            // Now that the load handler has been set up, reconfigure and
-            // submit the form.
-            form.attr("action", options.url)
-              .attr("target", iframe.attr("name"))
-              .attr("enctype", "multipart/form-data")
-              .get(0).submit();
+
+            // Now that the load handler has been set up, submit the form.
+            form[0].submit();
           });
 
-          // After everything has been set up correctly, the iframe gets
-          // injected into the DOM so that the submission can be initiated.
-          iframe.insertAfter(form);
+          // After everything has been set up correctly, the form and iframe
+          // get injected into the DOM so that the submission can be
+          // initiated.
+          $("body").append(form, iframe);
         },
 
         // The `abort` function is called by jQuery when the request should be

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

@@ -8,6 +8,12 @@
   $.remotipart = remotipart = {
 
     setup: function(form) {
+      // Preserve form.data('ujs:submit-button') before it gets nulled by $.ajax.handleRemote
+      var button = form.data('ujs:submit-button'),
+          csrfParam = $('meta[name="csrf-param"]').attr('content'),
+          csrfToken = $('meta[name="csrf-token"]').attr('content'),
+          csrfInput = form.find('input[name="' + csrfParam + '"]').length;
+
       form
         // Allow setup part of $.rails.handleRemote to setup remote settings before canceling default remote handler
         // This is required in order to change the remote settings using the form details
@@ -20,16 +26,33 @@
           settings.iframe      = true;
           settings.files       = $($.rails.fileInputSelector, form);
           settings.data        = form.serializeArray();
+
+          // Insert the name/value of the clicked submit button, if any
+          if (button)
+            settings.data.push(button);
+
+          // jQuery 1.9 serializeArray() contains input:file entries
+          // so exclude them from settings.data, otherwise files will not be sent
+          settings.files.each(function(i, file){
+            for (var j = settings.data.length - 1; j >= 0; j--)
+              if (settings.data[j].name == file.name)
+                settings.data.splice(j, 1);
+          })
+
           settings.processData = false;
 
           // Modify some settings to integrate JS request with rails helpers and middleware
           if (settings.dataType === undefined) { settings.dataType = 'script *'; }
           settings.data.push({name: 'remotipart_submitted', value: true});
+          if (csrfToken && csrfParam && !csrfInput) {
+            settings.data.push({name: csrfParam, value: csrfToken});
+          }
 
           // Allow remotipartSubmit to be cancelled if needed
           if ($.rails.fire(form, 'ajax:remotipartSubmit', [xhr, settings])) {
             // Second verse, same as the first
             $.rails.ajax(settings);
+            setTimeout(function(){ $.rails.disableFormElements(form); }, 20);
           }
 
           //Run cleanup
@@ -51,15 +74,11 @@
     }
   };
 
-  $('form').live('ajax:aborted:file', function(){
+  $(document).on('ajax:aborted:file', 'form', function(){
     var form = $(this);
 
     remotipart.setup(form);
 
-    // If browser does not support submit bubbling, then this live-binding will be called before direct
-    // bindings. Therefore, we should directly call any direct bindings before remotely submitting form.
-    if (!$.support.submitBubbles && $.rails.callFormSubmitBindings(form) === false) return $.rails.stopEverything(e);
-
     // Manually call jquery-ujs remote call so that it can setup form and settings as usual,
     // and trigger the `ajax:beforeSend` callback to which remotipart binds functionality.
     $.rails.handleRemote(form);

metadata

@@ -1,51 +1,56 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: remotipart
-version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  version: "1.0"
+version: !ruby/object:Gem::Version
+  version: 1.2.1
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Greg Leppert
 - Steve Schwartz
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-26 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
+date: 2013-07-08 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70170920954340 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *70170920954340
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &70170920953080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-description: "Remotipart is a Ruby on Rails gem enabling remote multipart forms (AJAX style file uploads) with jQuery.\n    This gem augments the native Rails 3 jQuery-UJS remote form function enabling asynchronous file uploads with little to no modification to your application.\n    "
-email: 
+  prerelease: false
+  version_requirements: *70170920953080
+description: ! "Remotipart is a Ruby on Rails gem enabling remote multipart forms
+  (AJAX style file uploads) with jquery-rails.\n    This gem augments the native Rails
+  3 jQuery-UJS remote form function enabling asynchronous file uploads with little
+  to no modification to your application.\n    "
+email:
 - greg@formasfunction.com
 - steve@alfajango.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
 - .document
-- .gitignore
+- CONTRIBUTING.md
+- Gemfile
+- Gemfile.lock
 - History.rdoc
 - LICENSE
 - README.rdoc
@@ -62,44 +67,34 @@ files:
 - lib/remotipart/request_helper.rb
 - lib/remotipart/view_helper.rb
 - remotipart.gemspec
-- test/helper.rb
-- test/test_remotipart.rb
 - vendor/assets/javascripts/jquery.iframe-transport.js
 - vendor/assets/javascripts/jquery.remotipart.js
-has_rdoc: true
-homepage: http://www.alfajango.com/blog/remotipart-rails-gem/
+homepage: http://opensource.alfajango.com/remotipart/
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -3061483236240277448
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: Remotipart is a Ruby on Rails gem enabling remote multipart forms (AJAX style file uploads) with jQuery.
-test_files: 
-- test/helper.rb
-- test/test_remotipart.rb
+summary: Remotipart is a Ruby on Rails gem enabling remote multipart forms (AJAX style
+  file uploads) with jquery-rails.
+test_files: []

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC

data/test/helper.rb

@@ -1,10 +0,0 @@
-require 'rubygems'
-require 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'remotipart'
-
-class Test::Unit::TestCase
-end

data/test/test_remotipart.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestRemotipart < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end