remotipart 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec23f3df5458657f694d92ab33cd1222754fdce5
-  data.tar.gz: 78bc0803e6c169d96490cd547e8dc7a1250bc5ae
+  metadata.gz: 8cd835a42fa4b39f9472499d433674c148afed2b
+  data.tar.gz: 487e0694c4122c8002f6da0f2b6466ec2b870a78
 SHA512:
-  metadata.gz: 04e4a54250dcb7077680533f570cce060a86858cc15c7912ce522f3ce41a52eeee02a7a4f89cd6e50ad5970bd610f70cc9a7ef84fc75e259b5257072d5ee959a
-  data.tar.gz: a07237bc926326c6033e6cb0ffd4f0ad634f21fd65eda3eb77cc578f00cc452fd4731df4f65ca2062f49364e793bde01208f69eca23eaba95302c7111615ee12
+  metadata.gz: 4173afdbc5e749e062b62d7370ff379d70302645fa0be40f0593d17f8a88d494f63c0606a396d79419ad3eb9b8776e53ea34f838deecc3748a9ee73d63688ba7
+  data.tar.gz: 457e29566c8271872d61703a68db861223dd5686421652cb35bdd7b7a75546bfe5afd900eefc848d7899c2a6bc2ebd056eeed000c13d8e8cd16a5514bfbcd8db

data/History.rdoc

@@ -1,5 +1,14 @@
 = History
 
+=== 1.4.0 / 2018-04-09
+
+* Added jQuery 3 compatibility.
+* Changed to use ActiveSupport lazy load hooks on initialization.
+* Changed jQuery iframe-transport to v1.0.1.
+* Fixed to preserve original return value of render call for non-remotipart requests.
+* Fixed remote javascript with " not being executed.
+* Fixed method signature of render_with_remotipart, making RJS templates not usable.
+
 === 1.3.1 / 2016-10-06
 
 * Fixed remote form submit not working with Firefox 49.

data/lib/remotipart/middleware.rb

@@ -24,8 +24,8 @@ module Remotipart
         end
 
         # Override the accepted format, because it isn't what we really want
-        if params['X-Http-Accept']
-          env['HTTP_ACCEPT'] = params['X-Http-Accept']
+        if params['X-HTTP-Accept']
+          env['HTTP_ACCEPT'] = params['X-HTTP-Accept']
         end
       end
 

data/lib/remotipart/rails/railtie.rb

@@ -23,13 +23,17 @@ module Remotipart
       end
 
       initializer "remotipart.view_helper" do
-        ActionView::Base.send :include, RequestHelper
-        ActionView::Base.send :include, ViewHelper
+        ActiveSupport.on_load(:action_view) do
+          include RequestHelper
+          include ViewHelper
+        end
       end
 
       initializer "remotipart.controller_helper" do
-        ActionController::Base.send :include, RequestHelper
-        ActionController::Base.send :include, RenderOverrides
+        ActiveSupport.on_load(:action_controller) do
+          include RequestHelper
+          include RenderOverrides
+        end
       end
 
       initializer "remotipart.include_middelware" do

data/lib/remotipart/rails/version.rb

@@ -1,6 +1,6 @@
 module Remotipart
   module Rails
-    VERSION = "1.3.1"
+    VERSION = "1.4.0"
     IFRAMETRANSPORT_VERSION = "02.06.2013"
   end
 end

data/lib/remotipart/render_overrides.rb

@@ -12,14 +12,16 @@ module Remotipart
       end
     end
 
-    def render_with_remotipart *args
-      render_without_remotipart *args
+    def render_with_remotipart(*args, &block)
+      render_return_value = render_without_remotipart(*args, &block)
       if remotipart_submitted?
         textarea_body = response.content_type == 'text/html' ? html_escape(response.body) : response.body
         response.body = %{<script type=\"text/javascript\">try{window.parent.document;}catch(err){document.domain=document.domain;}</script> <textarea data-type=\"#{response.content_type}\" data-status=\"#{response.response_code}\" data-statusText=\"#{response.message}\">#{textarea_body}</textarea>}
         response.content_type = ::Rails.version >= '5' ? Mime[:html] : Mime::HTML
+        response_body
+      else
+        render_return_value
       end
-      response_body
     end
   end
 end

data/lib/remotipart/view_helper.rb

@@ -1,9 +1,20 @@
 module Remotipart
   module ViewHelper
+
+    def escape_javascript(javascript)
+      if remotipart_submitted?
+        super("#{javascript}")
+      else
+        super
+      end
+    end
+    alias_method :j, :escape_javascript
+
     #No longer used
     #Retrained to prevent issues while updating
     def remotipart_response(options = {}, &block)
       with_output_buffer(&block)
     end
+
   end
 end

data/remotipart.gemspec

@@ -2,18 +2,18 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: remotipart 1.3.1 ruby lib
+# stub: remotipart 1.4.0 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "remotipart"
-  s.version = "1.3.1"
+  s.name = "remotipart".freeze
+  s.version = "1.4.0"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["Greg Leppert", "Steve Schwartz"]
-  s.date = "2016-10-06"
-  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.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Greg Leppert".freeze, "Steve Schwartz".freeze]
+  s.date = "2018-04-09"
+  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    ".freeze
+  s.email = ["greg@formasfunction.com".freeze, "steve@alfajango.com".freeze]
   s.extra_rdoc_files = [
     "LICENSE",
     "README.rdoc"
@@ -41,23 +41,23 @@ Gem::Specification.new do |s|
     "vendor/assets/javascripts/jquery.iframe-transport.js",
     "vendor/assets/javascripts/jquery.remotipart.js"
   ]
-  s.homepage = "http://opensource.alfajango.com/remotipart/"
-  s.rubygems_version = "2.5.1"
-  s.summary = "Remotipart is a Ruby on Rails gem enabling remote multipart forms (AJAX style file uploads) with jquery-rails."
+  s.homepage = "http://opensource.alfajango.com/remotipart/".freeze
+  s.rubygems_version = "2.5.2".freeze
+  s.summary = "Remotipart is a Ruby on Rails gem enabling remote multipart forms (AJAX style file uploads) with jquery-rails.".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<rake>.freeze, [">= 0"])
+      s.add_development_dependency(%q<jeweler>.freeze, [">= 0"])
     else
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<rake>.freeze, [">= 0"])
+      s.add_dependency(%q<jeweler>.freeze, [">= 0"])
     end
   else
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<rake>.freeze, [">= 0"])
+    s.add_dependency(%q<jeweler>.freeze, [">= 0"])
   end
 end
 

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

@@ -1,12 +1,12 @@
-// This [jQuery](http://jquery.com/) plugin implements an `<iframe>`
-// [transport](http://api.jquery.com/extending-ajax/#Transports) so that
+// This [jQuery](https://jquery.com/) plugin implements an `<iframe>`
+// [transport](https://api.jquery.com/jQuery.ajax/#extending-ajax) 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.
 
-// 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
-// or GPL Version 2 licenses.
+// The [source for the plugin](https://github.com/cmlenz/jquery-iframe-transport)
+// is available on [Github](https://github.com/) and licensed under the [MIT
+// license](https://github.com/cmlenz/jquery-iframe-transport/blob/master/LICENSE).
 
 // ## Usage
 
@@ -70,9 +70,9 @@
 // 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:
+// `complete()` callbacks. You can only 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."}
@@ -96,6 +96,7 @@
   // switches to the "iframe" data type if it is `true`.
   $.ajaxPrefilter(function(options, origOptions, jqXHR) {
     if (options.iframe) {
+      options.originalURL = options.url;
       return "iframe";
     }
   });
@@ -109,18 +110,18 @@
         name = "iframe-" + $.now(),
         files = $(options.files).filter(":file:enabled"),
         markers = null,
-        accepts;
+        accepts = null;
 
     // 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() {
-      markers.each(function(i){
-        $(this).replaceWith(files[i]);
-        markers.splice(i, 1);
+      files.each(function(i, file) {
+        var $file = $(file);
+        $file.data("clone").replaceWith($file);
       });
       form.remove();
-      iframe.bind("load", function() { iframe.remove(); });
+      iframe.one("load", function() { iframe.remove(); });
       iframe.attr("src", "about:blank");
     }
 
@@ -129,9 +130,14 @@
     // (unsupported) conversion from "iframe" to the actual type.
     options.dataTypes.shift();
 
+    // Use the data from the original AJAX options, as it doesn't seem to be 
+    // copied over since jQuery 1.7.
+    // See https://github.com/cmlenz/jquery-iframe-transport/issues/6
+    options.data = origOptions.data;
+
     if (files.length) {
       form = $("<form enctype='multipart/form-data' method='post'></form>").
-        hide().attr({action: options.url, target: name});
+        hide().attr({action: options.originalURL, 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
@@ -155,21 +161,27 @@
       $("<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
-      accepts = options.dataTypes[ 0 ] && options.accepts[ options.dataTypes[0] ] ?
-        options.accepts[ options.dataTypes[0] ] + ( options.dataTypes[ 0 ] !== "*" ? ", */*; q=0.01" : "" ) :
-        options.accepts[ "*" ]
-
-      $("<input type='hidden' name='X-Http-Accept'>")
-        .attr("value", accepts).appendTo(form);
+      // Borrowed straight from the JQuery source.
+      // Provides a way of specifying the accepted data type similar to the
+      // HTTP "Accept" header
+      if (options.dataTypes[0] && options.accepts[options.dataTypes[0]]) {
+        accepts = options.accepts[options.dataTypes[0]] +
+                  (options.dataTypes[0] !== "*" ? ", */*; q=0.01" : "");
+      } else {
+        accepts = options.accepts["*"];
+      }
+      $("<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);
+        var $this = $(this),
+            $clone = $this.clone().prop("disabled", true);
+        $this.data("clone", $clone);
+        return $clone;
       }).next();
       files.appendTo(form);
 
@@ -183,13 +195,13 @@
 
           // 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() {
+          iframe.one("load", function() {
 
             // The second load event gets fired when the response to the form
             // submission is received. The implementation detects whether the
             // 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() {
+            iframe.one("load", function() {
               var doc = this.contentWindow ? this.contentWindow.document :
                 (this.contentDocument ? this.contentDocument : this.document),
                 root = doc.documentElement ? doc.documentElement : doc.body,
@@ -204,9 +216,6 @@
                     root ? (root.textContent || root.innerText) : null
                 };
               cleanUp();
-              if (!jqXHR.responseText) {
-                jqXHR.responseText = content.text;
-              }
               completeCallback(status, statusText, content, type ?
                 ("Content-Type: " + type) :
                 null);
@@ -226,7 +235,7 @@
         // aborted.
         abort: function() {
           if (iframe !== null) {
-            iframe.unbind("load").attr("src", "javascript:false;");
+            iframe.unbind("load").attr("src", "about:blank");
             cleanUp();
           }
         }

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

@@ -51,7 +51,7 @@
           // Allow remotipartSubmit to be cancelled if needed
           if ($.rails.fire(form, 'ajax:remotipartSubmit', [xhr, settings])) {
             // Second verse, same as the first
-            $.rails.ajax(settings).complete(function(data){
+            $.rails.ajax(settings).always(function(data){
               $.rails.fire(form, 'ajax:remotipartComplete', [data]);
             });
             setTimeout(function(){ $.rails.disableFormElements(form); }, 20);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: remotipart
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Greg Leppert
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-06 00:00:00.000000000 Z
+date: 2018-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -92,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Remotipart is a Ruby on Rails gem enabling remote multipart forms (AJAX style