remotipart 0.3.1 → 0.3.2

data/README.rdoc

@@ -9,20 +9,36 @@ This gem augments the native Rails jQuery remote form function enabling asynchro
 * {jQuery}[http://jquery.com]
 * {The jquery-rails gem}[http://rubygems.org/gems/jquery-rails], which really just installs {the Rails jQuery driver (jquery-ujs)}[https://github.com/rails/jquery-ujs]
 
-  <b>PLEASE NOTE - DUE TO RECENT REFACTORING IN THE MASTER BRANCH OF JQUERY-UJS, SEE PREREQUISITE BELOW. A FIX IS ON THE WAY.</b>
+  <b>SEE VERSION COMPATIBILITY BELOW TO MATCH THE CORRECT VERSION OF REMOTIPART.JS TO YOUR VERSION OF RAILS.JS</b>
 * {The jQuery Form plugin}[http://jquery.malsup.com/form/]
 
+== Version Compatibility
+
+<table><tr><th>Remotipart version</th><th>Compatible with rails.js version</th></tr>
+<tr><td></td><td></td></tr>
+<tr><td></td><td></td></tr>
+<tr><td></td><td></td></tr>
+<tr><td></td><td></td></tr>
+</table>
+
 == Installation
 
-<b>Prerequisite: Make sure you have a supported jquery-ujs (rails.js) version. To be certain, replace public/javascripts/rails.js with {this version}[https://github.com/rails/jquery-ujs/raw/51272c68714748420d8c35984b3e2532ab14f748/src/rails.js] of rails.js.</b>
+<b>Prerequisite: Make sure you have a supported jquery-ujs (rails.js) version.</b>
+
+<b>To be certain, replace public/javascripts/rails.js with {this version}[https://github.com/rails/jquery-ujs/raw/51272c68714748420d8c35984b3e2532ab14f748/src/rails.js] of rails.js. Alternatively, follow {these instructions}[https://github.com/formasfunction/remotipart/wiki/Getting-Remotipart-to-work-with-latest-jquery-ujs] to get Remotipart working with the latest jquery-ujs.</b>
 
 1. Install the Remotipart gem
+   * Add this line to your GEMFILE
+
+    gem 'remotipart'
 
-	gem install remotipart
+   * And run
+
+    bundle install
 
 2. Run the Remotipart generator to add jquery.remotipart.js to public/javascripts/
 
-	  rails g remotipart
+	rails g remotipart
 
 3. Add the Javascript files for jQuery, the Rails jQuery driver, jQuery Form plugin, and Remotipart to your template, making sure to include jquery.remotipart.js *after* jQuery and the Rails jQuery driver
 
@@ -85,7 +101,9 @@ create.js.erb
   <% end %>
 
 == Note on Patches/Pull Requests
- 
+
+<b>If you have a general improvement, optimization, or refactoring, please {read this first}[https://github.com/formasfunction/remotipart/wiki/Refactoring-and-Improving-Remotipart].</b>
+
 * 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

data/lib/generators/templates/jquery.remotipart.js

@@ -1,4 +1,9 @@
 (function ($) {
+    function fire(obj, name, data) {
+	  	var event = new $.Event(name);
+	  	obj.trigger(event, data);
+	  	return event.result !== false;
+	  }
     $.fn.extend({
 		/**
 	     * Handles execution of remote calls involving file uploads, firing overridable events along the way
@@ -22,7 +27,6 @@
                 }))
                 .data('remotipartSubmitted', dataType);
 
-	            if (el.triggerAndReturn('ajax:before')) {
               if (dataType == 'script') {
 		          	url = url.split('?'); // split on GET params
 					      if(url[0].substr(-3) != '.js') url[0] += '.js'; // force rails to respond to respond to the request with :format = js
@@ -32,9 +36,14 @@
 	                el.ajaxSubmit({
 	                    url: url,
 	                    dataType: dataType,
-	                    beforeSend: function (xhr) {
-	                        el.trigger('ajax:loading', xhr);
-	                    },
+	                    beforeSend: function (xhr, settings) {
+                        if (settings.dataType === undefined) {
+                          xhr.setRequestHeader('accept', '*/*;q=0.5, ' + settings.accepts.script);
+                        }
+                        var proceed = fire(el, 'ajax:beforeSend', [xhr, settings, true]);
+                        if (proceed) { el.trigger('ajax:loading', [xhr]); }
+                        return proceed;
+                      },
 	                    success: function (data, status, xhr) {
 	                        el.trigger('ajax:success', [data, status, xhr]);
 	                    },
@@ -42,21 +51,22 @@
 	                        el.trigger('ajax:complete', xhr);
 	                    },
 	                    error: function (xhr, status, error) {
-	                        el.trigger('ajax:failure', [xhr, status, error]);
+	                        el.trigger('ajax:failure ajax:error', [xhr, status, error]);
 	                    }
 	                });
 	            }
 
 	            el.trigger('ajax:after');
-	        }
-		},
-		_callRemote: $.fn.callRemote, //store the original rails callRemote
-		callRemote: function(){ //override the rails callRemote and check for a file input
-			if(this.find('input:file').length){
-				this.callRemotipart();
-			} else {
-				this._callRemote();
-			}
 		}
 	});
+
+  $('form[data-remote]').live('ajax:beforeSend', function (evt, xhr, settings, remotipart) {
+
+    if (!remotipart && $(this).find('input:file').length) {
+      $(this).callRemotipart();
+      return false;
+    }
+    
+    return true;
+  });
 })(jQuery);

data/remotipart.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{remotipart}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   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-03-15}
+  s.date = %q{2011-05-01}
   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 jQuery remote form function enabling asynchronous file uploads with little to no modification to your application.
     It requires jQuery (http://jquery.com), the Rails jQuery driver (http://github.com/rails/jquery-ujs), and the jQuery Form plugin (http://jquery.malsup.com/form/).

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: remotipart
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Greg Leppert
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-15 00:00:00 -04:00
+date: 2011-05-01 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency