jquery-rails 2.0.2 → 2.0.3

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 2.0.3 (16 August 2012)
+
+  - Updated to latest jquery-ujs
+    - created `rails:attachBindings` to allow for customization of $.rails object settings
+    - created `ajax:send` event to provide access to jqXHR object from ajax requests
+    - added support for `data-with-credentials`
+
 ## 2.0.2 (03 April 2012)
 
   - Updated to jQuery 1.7.2

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    jquery-rails (2.0.0)
-      railties (>= 3.2.0, < 5.0)
+    jquery-rails (2.0.3)
+      railties (>= 3.1.0, < 5.0)
       thor (~> 0.14)
 
 GEM

data/README.md

@@ -4,46 +4,70 @@ jQuery! For Rails! So great.
 
 This gem provides:
 
-* jQuery 1.7.2
-* jQuery UI 1.8.18
-* the latest jQuery UJS adapter
-* and Sam Ruby's assert_select_jquery function, which is automatically included for use in tests.
+  * jQuery 1.7.2
+  * jQuery UI 1.8.18 (javascript only)
+  * the jQuery UJS adapter
+  * assert_select_jquery to test jQuery responses in Ruby tests
 
-## Rails 3.1
+## Installation
 
-For Rails 3.1 and greater, the files will be added to the asset pipeline and available for you to use. These two lines will be added to the file `app/assets/javascripts/application.js` by default:
+Apps generated with Rails 3.1 or later include jquery-rails in the Gemfile by default. So just make a new app:
 
-    //= require jquery
-    //= require jquery_ujs
+```sh
+rails new myapp
+```
 
-If you wish to use jQuery UI as well, you can add this line to `application.js`:
+If upgrading from an older version of rails, or for rails 3.0 apps,
+add the jquery-rails gem to your Gemfile.
 
-    //= require jquery-ui
+```ruby
+gem "jquery-rails"
+```
 
-In order to use the themed parts of jQuery UI, you will also need to supply your own theme CSS. See [jqueryui.com](http://jqueryui.com) for more information.
+And run `bundle install`. The rest of the installation depends on
+whether the asset pipeline is being used.
 
-### Installation
+### Rails 3.1 or greater (with asset pipeline *enabled*)
 
-New Rails 3.1 apps include jquery-rails in the Gemfile by default. So just make a new app:
+The jquery and jquery-ujs files will be added to the asset pipeline and available for you to use. If they're not already in `app/assets/javascripts/application.js` by default, add these lines:
 
-    rails new myapp
+```js
+//= require jquery
+//= require jquery_ujs
+```
 
-You're done!
-
-## Rails 3.0
+For jQuery UI, we recommend the [jquery-ui-rails](https://github.com/joliss/jquery-ui-rails) gem, as it includes the jquery-ui css and allows easier customization. This gem still packages the jQuery UI javascript for compatibility. To use it, add the following line to your `application.js`:
 
-This gem adds a single generator to Rails 3, jquery:install. Running the generator will remove any Prototype JS files you may happen to have, fetch jQuery and the jQuery-ujs driver for Rails, and (optionally) fetch jQuery UI.
+```js
+//= require jquery-ui
+```
 
-The gem will also hook into the Rails configuration process, removing Prototype and adding jQuery to the javascript files included by the `javascript_include_tag(:defaults)` call. While the plugin downloads minified and un-minified versions of jQuery and jQuery UI, only the minified versions are included in :default.
+In order to use the themed parts of jQuery UI, you will also need to supply [your own theme CSS](http://jqueryui.com) (or use the jquery-ui-rails gem mentioned above).
 
-### Installation
+### Rails 3.0 (or greater with asset pipeline *disabled*)
 
-In your Gemfile, add this line:
+This gem adds a single generator: `jquery:install`. Running the generator will remove any Prototype JS files you may happen to have, and copy jQuery and the jQuery-ujs driver for Rails (and optionally, jQuery UI) to the `public/javascripts` directory.
 
-    gem "jquery-rails"
+This gem will also hook into the Rails configuration process, removing Prototype and adding jQuery to the javascript files included by the `javascript_include_tag(:defaults)` call. While this gem contains the minified and un-minified versions of jQuery and jQuery UI, only the minified versions are included in `:defaults`.
 
-Then, run `bundle install`. To invoke the generator, run:
+To invoke the generator, run:
 
-    rails generate jquery:install #--ui to enable jQuery UI
+```sh
+rails generate jquery:install #--ui to enable jQuery UI
+```
 
 You're done!
+
+## Contributing
+
+Feel free to open an issue ticket if you find something that could be improved. A couple notes:
+
+* If it's an issue pertaining to the jquery-ujs javascript, please report it to the [jquery-ujs project](https://github.com/rails/jquery-ujs).
+
+* If the jquery or jquery-ui scripts are outdated (i.e. maybe a new version of jquery was released yesterday), feel free to open an issue and prod us to get that thing updated. However, for security reasons, we won't be accepting pull requests with updated jquery or jquery-ui scripts.
+
+## Acknowledgements
+
+Many thanks are due to all of [the jquery-rails contributors](https://github.com/rails/jquery-rails/graphs/contributors). Special thanks to [JangoSteve](http://github.com/JangoSteve) for tirelessly answering questions and accepting patches, and the [Rails Core Team](https://github.com/organizations/rails/teams/617) for making jquery-rails an official part of Rails 3.1.
+
+Copyright [André Arko](http://arko.net), released under the MIT License.

data/Rakefile

@@ -1,10 +1,2 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
-
-# require "spec/rake/spectask"
-# desc "Run all examples"
-# Spec::Rake::SpecTask.new(:spec) do |t|
-#   t.ruby_opts  = ['-r test/unit']
-#   t.spec_opts = %w[--color]
-# end
-task :default => :spec

data/jquery-rails.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "jquery-rails"
 
-  s.add_dependency "railties", ">= 3.2.0", "< 5.0"
+  s.add_dependency "railties", ">= 3.1.0", "< 5.0"
   s.add_dependency "thor",     "~> 0.14"
 
   s.files        = `git ls-files`.split("\n")

data/lib/jquery/rails/version.rb

@@ -1,8 +1,8 @@
 module Jquery
   module Rails
-    VERSION = "2.0.2"
+    VERSION = "2.0.3"
     JQUERY_VERSION = "1.7.2"
     JQUERY_UI_VERSION  = "1.8.18"
-    JQUERY_UJS_VERSION = "caabad7f7ba6c35de1588ea263295ed5bc166a43"
+    JQUERY_UJS_VERSION = "8674fb14552d8c6e394da39dd352c68b25b78142"
   end
 end

data/vendor/assets/javascripts/jquery_ujs.js

@@ -45,6 +45,17 @@
  *     });
  */
 
+  // Cut down on the number if issues from people inadvertently including jquery_ujs twice
+  // by detecting and raising an error when it happens.
+  var alreadyInitialized = function() {
+    var events = $(document).data('events');
+    return events && events.click && $.grep(events.click, function(e) { return e.namespace === 'rails'; }).length;
+  }
+
+  if ( alreadyInitialized() ) {
+    $.error('jquery-ujs has already been loaded!');
+  }
+
   // Shorthand to make it a little easier to call public rails functions from within rails.js
   var rails;
 
@@ -59,7 +70,7 @@
     formSubmitSelector: 'form',
 
     // Form input elements bound by jquery-ujs
-    formInputClickSelector: 'form input[type=submit], form input[type=image], form button[type=submit], form button:not(button[type])',
+    formInputClickSelector: 'form input[type=submit], form input[type=image], form button[type=submit], form button:not([type])',
 
     // Form input elements disabled during form submission
     disableSelector: 'input[data-disable-with], button[data-disable-with], textarea[data-disable-with]',
@@ -106,10 +117,12 @@
 
     // Submits "remote" forms and links with ajax
     handleRemote: function(element) {
-      var method, url, data, crossDomain, dataType, options;
+      var method, url, data, elCrossDomain, crossDomain, withCredentials, dataType, options;
 
       if (rails.fire(element, 'ajax:before')) {
-        crossDomain = element.data('cross-domain') || null;
+        elCrossDomain = element.data('cross-domain');
+        crossDomain = elCrossDomain === undefined ? null : elCrossDomain;
+        withCredentials = element.data('with-credentials') || null;
         dataType = element.data('type') || ($.ajaxSettings && $.ajaxSettings.dataType);
 
         if (element.is('form')) {
@@ -134,7 +147,7 @@
         }
 
         options = {
-          type: method || 'GET', data: data, dataType: dataType, crossDomain: crossDomain,
+          type: method || 'GET', data: data, dataType: dataType,
           // stopping the "ajax:beforeSend" event will cancel the ajax request
           beforeSend: function(xhr, settings) {
             if (settings.dataType === undefined) {
@@ -150,12 +163,18 @@
           },
           error: function(xhr, status, error) {
             element.trigger('ajax:error', [xhr, status, error]);
-          }
+          },
+          xhrFields: {
+            withCredentials: withCredentials
+          },
+          crossDomain: crossDomain
         };
         // Only pass url to `ajax` options if not blank
         if (url) { options.url = url; }
 
-        return rails.ajax(options);
+        var jqxhr = rails.ajax(options);
+        element.trigger('ajax:send', jqxhr);
+        return jqxhr;
       } else {
         return false;
       }
@@ -232,12 +251,13 @@
 
     // Helper function which checks for blank inputs in a form that match the specified CSS selector
     blankInputs: function(form, specifiedSelector, nonBlank) {
-      var inputs = $(), input,
+      var inputs = $(), input, valueToCheck,
         selector = specifiedSelector || 'input,textarea';
       form.find(selector).each(function() {
         input = $(this);
-        // Collect non-blank inputs if nonBlank option is true, otherwise, collect blank inputs
-        if (nonBlank ? input.val() : !input.val()) {
+        valueToCheck = input.is(':checkbox,:radio') ? input.is(':checked') : input.val();
+        // If nonBlank and valueToCheck are both truthy, or nonBlank and valueToCheck are both falsey
+        if (valueToCheck == !!nonBlank) {
           inputs = inputs.add(input);
         }
       });
@@ -274,7 +294,7 @@
       element.data('ujs:enable-with', element.html()); // store enabled state
       element.html(element.data('disable-with')); // set to disabled state
       element.bind('click.railsDisable', function(e) { // prevent further clicking
-        return rails.stopEverything(e)
+        return rails.stopEverything(e);
       });
     },
 
@@ -291,87 +311,98 @@
 
   };
 
-  $.ajaxPrefilter(function(options, originalOptions, xhr){ if ( !options.crossDomain ) { rails.CSRFProtection(xhr); }});
+  if (rails.fire($(document), 'rails:attachBindings')) {
 
-  $(document).delegate(rails.linkDisableSelector, 'ajax:complete', function() {
-      rails.enableElement($(this));
-  });
+    $.ajaxPrefilter(function(options, originalOptions, xhr){ if ( !options.crossDomain ) { rails.CSRFProtection(xhr); }});
 
-  $(document).delegate(rails.linkClickSelector, 'click.rails', function(e) {
-    var link = $(this), method = link.data('method'), data = link.data('params');
-    if (!rails.allowAction(link)) return rails.stopEverything(e);
+    $(document).delegate(rails.linkDisableSelector, 'ajax:complete', function() {
+        rails.enableElement($(this));
+    });
 
-    if (link.is(rails.linkDisableSelector)) rails.disableElement(link);
+    $(document).delegate(rails.linkClickSelector, 'click.rails', function(e) {
+      var link = $(this), method = link.data('method'), data = link.data('params');
+      if (!rails.allowAction(link)) return rails.stopEverything(e);
 
-    if (link.data('remote') !== undefined) {
-      if ( (e.metaKey || e.ctrlKey) && (!method || method === 'GET') && !data ) { return true; }
+      if (link.is(rails.linkDisableSelector)) rails.disableElement(link);
 
-      if (rails.handleRemote(link) === false) { rails.enableElement(link); }
-      return false;
+      if (link.data('remote') !== undefined) {
+        if ( (e.metaKey || e.ctrlKey) && (!method || method === 'GET') && !data ) { return true; }
 
-    } else if (link.data('method')) {
-      rails.handleMethod(link);
-      return false;
-    }
-  });
+        if (rails.handleRemote(link) === false) { rails.enableElement(link); }
+        return false;
 
-  $(document).delegate(rails.inputChangeSelector, 'change.rails', function(e) {
-    var link = $(this);
-    if (!rails.allowAction(link)) return rails.stopEverything(e);
+      } else if (link.data('method')) {
+        rails.handleMethod(link);
+        return false;
+      }
+    });
 
-    rails.handleRemote(link);
-    return false;
-  });
+    $(document).delegate(rails.inputChangeSelector, 'change.rails', function(e) {
+      var link = $(this);
+      if (!rails.allowAction(link)) return rails.stopEverything(e);
 
-  $(document).delegate(rails.formSubmitSelector, 'submit.rails', function(e) {
-    var form = $(this),
-      remote = form.data('remote') !== undefined,
-      blankRequiredInputs = rails.blankInputs(form, rails.requiredInputSelector),
-      nonBlankFileInputs = rails.nonBlankInputs(form, rails.fileInputSelector);
+      rails.handleRemote(link);
+      return false;
+    });
 
-    if (!rails.allowAction(form)) return rails.stopEverything(e);
+    $(document).delegate(rails.formSubmitSelector, 'submit.rails', function(e) {
+      var form = $(this),
+        remote = form.data('remote') !== undefined,
+        blankRequiredInputs = rails.blankInputs(form, rails.requiredInputSelector),
+        nonBlankFileInputs = rails.nonBlankInputs(form, rails.fileInputSelector);
 
-    // skip other logic when required values are missing or file upload is present
-    if (blankRequiredInputs && form.attr("novalidate") == undefined && rails.fire(form, 'ajax:aborted:required', [blankRequiredInputs])) {
-      return rails.stopEverything(e);
-    }
+      if (!rails.allowAction(form)) return rails.stopEverything(e);
 
-    if (remote) {
-      if (nonBlankFileInputs) {
-        return rails.fire(form, 'ajax:aborted:file', [nonBlankFileInputs]);
+      // skip other logic when required values are missing or file upload is present
+      if (blankRequiredInputs && form.attr("novalidate") == undefined && rails.fire(form, 'ajax:aborted:required', [blankRequiredInputs])) {
+        return rails.stopEverything(e);
       }
 
-      // 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 && $().jquery < '1.7' && rails.callFormSubmitBindings(form, e) === false) return rails.stopEverything(e);
+      if (remote) {
+        if (nonBlankFileInputs) {
+          setTimeout(function(){ rails.disableFormElements(form); }, 13);
+          return rails.fire(form, 'ajax:aborted:file', [nonBlankFileInputs]);
+        }
 
-      rails.handleRemote(form);
-      return false;
+        // 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 && $().jquery < '1.7' && rails.callFormSubmitBindings(form, e) === false) return rails.stopEverything(e);
 
-    } else {
-      // slight timeout so that the submit button gets properly serialized
-      setTimeout(function(){ rails.disableFormElements(form); }, 13);
-    }
-  });
+        rails.handleRemote(form);
+        return false;
+
+      } else {
+        // slight timeout so that the submit button gets properly serialized
+        setTimeout(function(){ rails.disableFormElements(form); }, 13);
+      }
+    });
+
+    $(document).delegate(rails.formInputClickSelector, 'click.rails', function(event) {
+      var button = $(this);
 
-  $(document).delegate(rails.formInputClickSelector, 'click.rails', function(event) {
-    var button = $(this);
+      if (!rails.allowAction(button)) return rails.stopEverything(event);
 
-    if (!rails.allowAction(button)) return rails.stopEverything(event);
+      // register the pressed submit button
+      var name = button.attr('name'),
+        data = name ? {name:name, value:button.val()} : null;
 
-    // register the pressed submit button
-    var name = button.attr('name'),
-      data = name ? {name:name, value:button.val()} : null;
+      button.closest('form').data('ujs:submit-button', data);
+    });
 
-    button.closest('form').data('ujs:submit-button', data);
-  });
+    $(document).delegate(rails.formSubmitSelector, 'ajax:beforeSend.rails', function(event) {
+      if (this == event.target) rails.disableFormElements($(this));
+    });
 
-  $(document).delegate(rails.formSubmitSelector, 'ajax:beforeSend.rails', function(event) {
-    if (this == event.target) rails.disableFormElements($(this));
-  });
+    $(document).delegate(rails.formSubmitSelector, 'ajax:complete.rails', function(event) {
+      if (this == event.target) rails.enableFormElements($(this));
+    });
 
-  $(document).delegate(rails.formSubmitSelector, 'ajax:complete.rails', function(event) {
-    if (this == event.target) rails.enableFormElements($(this));
-  });
+    $(function(){
+      // making sure that all forms have actual up-to-date token(cached forms contain old one)
+      csrf_token = $('meta[name=csrf-token]').attr('content');
+      csrf_param = $('meta[name=csrf-param]').attr('content');
+      $('form input[name="' + csrf_param + '"]').val(csrf_token);
+    });
+  }
 
 })( jQuery );

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jquery-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,25 +9,25 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-03 00:00:00.000000000Z
+date: 2012-08-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70336830029280 !ruby/object:Gem::Requirement
+  requirement: &70150002916600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.1.0
     - - <
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70336830029280
+  version_requirements: *70150002916600
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70336830028560 !ruby/object:Gem::Requirement
+  requirement: &70150002927720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -35,7 +35,7 @@ dependencies:
         version: '0.14'
   type: :runtime
   prerelease: false
-  version_requirements: *70336830028560
+  version_requirements: *70150002927720
 description: This gem provides jQuery and the jQuery-ujs driver for your Rails 3 application.
 email:
 - andre@arko.net
@@ -57,8 +57,6 @@ files:
 - lib/jquery/rails.rb
 - lib/jquery/rails/engine.rb
 - lib/jquery/rails/version.rb
-- spec/lib/jquery-rails_spec.rb
-- spec/spec_helper.rb
 - vendor/assets/javascripts/jquery-ui.js
 - vendor/assets/javascripts/jquery-ui.min.js
 - vendor/assets/javascripts/jquery.js
@@ -76,6 +74,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4351608392553699936
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/spec/lib/jquery-rails_spec.rb

@@ -1,3 +0,0 @@
-require 'spec_helper'
-
-it "should probably test something, but I'm damned if I know what"

data/spec/spec_helper.rb

@@ -1,29 +0,0 @@
-# Set up RSpec
-require 'webmock/rspec'
-
-Spec::Runner.configure do |config|
-  config.include WebMock::API
-end
-
-# Set up generator tests
-require 'rails/all'
-require 'rails/generators'
-require 'rails/generators/test_case'
-
-class TestApp < Rails::Application
-  config.root = File.dirname(__FILE__)
-end
-Rails.application = TestApp
-
-module Rails
-  def self.root
-    @root ||= File.expand_path("../../tmp/rails", __FILE__)
-  end
-end
-Rails.application.config.root = Rails.root
-
-# Call configure to load the settings from
-# Rails.application.config.generators to Rails::Generators
-Rails::Generators.configure!
-
-