jquery-rails 4.1.1 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1de8e28727522dbf3117a3eb28fdb73400081822
-  data.tar.gz: 15b7094fc48bec31875aa548874961c491b25791
+SHA256:
+  metadata.gz: dcc6d11eb09cef26ed783513d708893c0d8fcede0b5027fc5906e59feeb880b9
+  data.tar.gz: 0e0c30ec8043042ccdc6099fb6f5f2b6055f8b52a42298fb35144280d15661da
 SHA512:
-  metadata.gz: 063d686e51ca1ca75d124c3791bf837a949f85dbc4f64a7bde7e600814dc0851586c542c02bbf8a75db6e313094a20a68e1528438e8e5d8773e0dc3cecbada93
-  data.tar.gz: 8b9bfa12d4f816d5ea2a59e5e720c79d33a0fc64a292692273aed5c84132c1a7cd234ddf384090a688d326f3142fae58582102e3fa8c9d11afd0fd35fa11da25
+  metadata.gz: a417086a5430147e22d452f1d192494d89890b7417257f759c721023f71a3f620a4f7328a5a5bd1c7e746786b861bc90aa1ba0174749b0a3f9dcef72a5e2ea78
+  data.tar.gz: badccf9a2417c5ac5623f667317ac33e2e27cf8aaf562be71a139f207006fd8469234e2cd48fdcd9860e658710dff4bd53272066e688033fceddeced9267af6d

data/.travis.yml

@@ -4,15 +4,20 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1
-  - 2.2
-  - 2.3.0
+  - 2.1.10
+  - 2.2.9
+  - 2.3.6
+  - 2.4.10
+  - 2.5.8
+  - 2.6.6
+  - 2.7.1
   - jruby
   - ruby-head
 matrix:
   fast_finish: true
   allow_failures:
     - rvm: jruby
+    - rvm: ruby-head
 notifications:
   email: false
   irc:

data/CHANGELOG.md

@@ -1,3 +1,51 @@
+## 4.4.0
+
+- update jquery to 3.5.1 (note: [3.5.0 contains important security updates](https://github.com/advisories/GHSA-jpcq-cgw6-v4j6))
+- unescape dollar signs and backticks in `assert_select_jquery` to match
+  Rails updated behavior.
+
+## 4.3.5
+
+- update jquery to 3.4.1
+
+## 4.3.4
+
+- update jquery to 3.4.0
+
+## 4.3.3
+
+- update jquery to 3.3.1
+
+## 4.3.2
+
+- update jquery to 3.3.0
+- Add possibility to test HTML: all, attribute prefix, attribute contains,
+  attribute ends with, child, and class selectors
+- Fix matching mutiple calls for the same selector/function exception
+
+## 4.3.1
+
+- update jquery to 3.2.1
+
+## 4.3.0
+
+- update jquery to 3.2.0
+- Add possibility to test HTML attribute selectors
+
+## 4.2.2
+
+- update jquery to 3.1.1
+
+## 4.2.1
+
+- update jquery to 3.1.0
+
+## 4.2.0
+
+- Support jQuery 3.x
+- Update jquery-ujs to 1.2.2
+- Update jQuery to 1.12.4 and 2.2.4
+
 ## 4.1.1
 
 - Update jQuery to 1.12.1 and 2.2.1

data/Gemfile

@@ -1,6 +1,22 @@
 source 'https://rubygems.org'
 
-gem 'rails', group: :test
+gem "mime-types", "< 3", group: :test
+
+if RUBY_VERSION >= '2.2.2'
+  gem 'rails'
+  gem 'rack'
+  gem 'json', '>= 2'
+else
+  gem 'rails', '~> 4.2.0'
+  gem 'rack', '~>1.6'
+  gem 'json', '~> 1.8.0'
+end
+
+if RUBY_VERSION >= '2.1'
+  gem 'nokogiri'
+else
+  gem 'nokogiri', '~> 1.6.0'
+end
 
 # Specify your gem's dependencies in jquery-rails.gemspec
 gemspec

data/README.md

@@ -4,7 +4,7 @@ jQuery! For Rails! So great.
 
 This gem provides:
 
-  * jQuery 1 and jQuery 2
+  * jQuery 1, 2 and 3
   * the jQuery UJS adapter
   * assert_select_jquery to test jQuery responses in Ruby tests
 
@@ -24,6 +24,12 @@ versions of jQuery.
 
 ## Installation
 
+Add
+```
+gem 'jquery-rails'
+```
+to your Gemfile.
+
 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:
 
 ```js
@@ -31,6 +37,12 @@ The jquery and jquery-ujs files will be added to the asset pipeline and availabl
 //= require jquery_ujs
 ```
 
+If you are running Rails 5.1 and up, and if you have included `//= require rails-ujs`, then `jquery_ujs` is not needed anymore. You can just add:
+
+```js
+//= require jquery
+```
+
 If you want to use jQuery 2, you can require `jquery2` instead:
 
 ```js
@@ -38,6 +50,13 @@ If you want to use jQuery 2, you can require `jquery2` instead:
 //= require jquery_ujs
 ```
 
+And if you want to use jQuery 3, you can require `jquery3`:
+
+```js
+//= require jquery3
+//= require jquery_ujs
+```
+
 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.
 
 *As of v3.0, jquery-rails no longer includes jQuery UI. Use the
@@ -59,4 +78,4 @@ jquery-rails is released under the [MIT License](MIT-LICENSE).
 
 ## 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.
+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/orgs/rails/people) for making jquery-rails an official part of Rails 3.1.

data/Rakefile

@@ -29,6 +29,7 @@ task :guard_version do
 
   check_version('jquery.js', /jQuery JavaScript Library v([\S]+)/, 'JQUERY_VERSION')
   check_version('jquery2.js', /jQuery JavaScript Library v([\S]+)/, 'JQUERY_2_VERSION')
+  check_version('jquery3.js', /jQuery JavaScript Library v([\S]+)/, 'JQUERY_3_VERSION')
 end
 
 desc "Update jQuery versions"
@@ -37,15 +38,16 @@ task :update_jquery do
     suffix = "-#{version}"
 
     puts "Downloading #{filename}.js"
-    puts `curl -o vendor/assets/javascripts/#{filename}.js http://code.jquery.com/jquery#{suffix}.js`
+    puts `curl -o vendor/assets/javascripts/#{filename}.js https://code.jquery.com/jquery#{suffix}.js`
     puts "Downloading #{filename}.min.js"
-    puts `curl -o vendor/assets/javascripts/#{filename}.min.js http://code.jquery.com/jquery#{suffix}.min.js`
+    puts `curl -o vendor/assets/javascripts/#{filename}.min.js https://code.jquery.com/jquery#{suffix}.min.js`
     puts "Downloading #{filename}.min.map"
-    puts `curl -o vendor/assets/javascripts/#{filename}.min.map http://code.jquery.com/jquery#{suffix}.min.map`
+    puts `curl -o vendor/assets/javascripts/#{filename}.min.map https://code.jquery.com/jquery#{suffix}.min.map`
   end
 
   download_jquery('jquery', Jquery::Rails::JQUERY_VERSION)
   download_jquery('jquery2', Jquery::Rails::JQUERY_2_VERSION)
+  download_jquery('jquery3', Jquery::Rails::JQUERY_3_VERSION)
   puts "\e[32mDone!\e[0m"
 end
 

data/VERSIONS.md

@@ -2,6 +2,16 @@
 
 | Gem    | jQuery | jQuery UJS | jQuery UI |
 |--------|--------|------------| ----------|
+| 4.4.0  | 1.12.4 & 2.2.4 & 3.5.1 | 1.2.2 | -         |
+| 4.3.5  | 1.12.4 & 2.2.4 & 3.4.1 | 1.2.2 | -         |
+| 4.3.4  | 1.12.4 & 2.2.4 & 3.4.0 | 1.2.2 | -         |
+| 4.3.3  | 1.12.4 & 2.2.4 & 3.3.1 | 1.2.2 | -         |
+| 4.3.2  | 1.12.4 & 2.2.4 & 3.3.0 | 1.2.2 | -         |
+| 4.3.1  | 1.12.4 & 2.2.4 & 3.2.1 | 1.2.2 | -         |
+| 4.3.0  | 1.12.4 & 2.2.4 & 3.2.0 | 1.2.2 | -         |
+| 4.2.2  | 1.12.4 & 2.2.4 & 3.1.1 | 1.2.2 | -         |
+| 4.2.1  | 1.12.4 & 2.2.4 & 3.1.0 | 1.2.2 | -         |
+| 4.2.0  | 1.12.4 & 2.2.4 & 3.0.0 | 1.2.2 | -         |
 | 4.1.1  | 1.12.1 & 2.2.1  | 1.2.1  | -         |
 | 4.1.0  | 1.12.0 & 2.2.0  | 1.2.0  | -         |
 | 4.0.5  | 1.11.3 & 2.1.4  | 1.1.0  | -         |

data/jquery-rails.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["André Arko"]
   s.email       = ["andre@arko.net"]
-  s.homepage    = "http://rubygems.org/gems/jquery-rails"
+  s.homepage    = "https://github.com/rails/jquery-rails"
   s.summary     = "Use jQuery with Rails 4+"
   s.description = "This gem provides jQuery and the jQuery-ujs driver for your Rails 4+ application."
   s.license     = "MIT"

data/lib/jquery/assert_select.rb

@@ -47,14 +47,14 @@ module Rails::Dom::Testing::Assertions::SelectorAssertions
   #   assert_select '.product'
   # end
 
-  PATTERN_HTML  = "['\"]((\\\\\"|[^\"])*)['\"]"
+  PATTERN_HTML  = "['\"]((\\\\\"|\\\\'|[^\"'])*)['\"]"
   PATTERN_UNICODE_ESCAPED_CHAR = /\\u([0-9a-zA-Z]{4})/
-  SKELETAL_PATTERN = "(?:jQuery|\\$)\\(%s\\)\\.%s\\(%s\\);"
+  SKELETAL_PATTERN = "(?:jQuery|\\$)\\(%s\\)\\.%s\\(%s\\)[;]?"
 
   def assert_select_jquery(*args, &block)
     jquery_method = args.first.is_a?(Symbol) ? args.shift : nil
     jquery_opt    = args.first.is_a?(Symbol) ? args.shift : nil
-    id            = args.first.is_a?(String) ? args.shift : nil
+    id            = args.first.is_a?(String) ? escape_id(args.shift) : nil
 
     target_pattern   = "['\"]#{id || '.*'}['\"]"
     method_pattern   = "#{jquery_method || '\\w+'}"
@@ -91,14 +91,14 @@ module Rails::Dom::Testing::Assertions::SelectorAssertions
 
     if block_given?
       @selected ||= nil
-      fragments = Nokogiri::HTML::Document.new
+      fragments = Nokogiri::HTML::Document.new.fragment
 
       if matched_pattern
         response.body.scan(Regexp.new(matched_pattern)).each do |match|
           flunk 'This function can\'t have HTML argument' if match.is_a?(String)
 
-          doc = Nokogiri::HTML::Document.parse(unescape_js(match.first))
-          doc.root.children.each do |child|
+          doc = Nokogiri::HTML::DocumentFragment.parse(unescape_js(match.first))
+          doc.children.each do |child|
             fragments << child if child.element?
           end
         end
@@ -124,8 +124,28 @@ module Rails::Dom::Testing::Assertions::SelectorAssertions
       unescaped.gsub!('\n', "\n")
       unescaped.gsub!('\076', '>')
       unescaped.gsub!('\074', '<')
+      unescaped.gsub!(/\\\$/, '$')
+      unescaped.gsub!(/\\`/, '`')
       # js encodes non-ascii characters.
       unescaped.gsub!(PATTERN_UNICODE_ESCAPED_CHAR) {|u| [$1.hex].pack('U*')}
       unescaped
     end
+
+    def escape_id(selector)
+      return unless selector
+
+      id = selector.gsub('[', '\[')
+      id.gsub!(']', '\]')
+      id.gsub!('*', '\*')
+      id.gsub!('(', '\(')
+      id.gsub!(')', '\)')
+      id.gsub!('.', '\.')
+      id.gsub!('|', '\|')
+      id.gsub!('^', '\^')
+      id.gsub!('$', '\$')
+      id.gsub!('+', "\\\\+")
+      id.gsub!(',', '\,')
+
+      id
+    end
 end

data/lib/jquery/rails/version.rb

@@ -1,8 +1,9 @@
 module Jquery
   module Rails
-    VERSION = "4.1.1"
-    JQUERY_VERSION = "1.12.1"
-    JQUERY_2_VERSION = "2.2.1"
-    JQUERY_UJS_VERSION = "1.2.1"
+    VERSION = "4.4.0"
+    JQUERY_VERSION = "1.12.4"
+    JQUERY_2_VERSION = "2.2.4"
+    JQUERY_3_VERSION = "3.5.1"
+    JQUERY_UJS_VERSION = "1.2.2"
   end
 end

data/test/assert_select_jquery_test.rb

@@ -1,3 +1,4 @@
+require 'ostruct'
 require_relative 'test_helper'
 require_relative '../lib/jquery/assert_select'
 
@@ -8,11 +9,22 @@ class AssertSelectJQueryTest < ActiveSupport::TestCase
   JAVASCRIPT_TEST_OUTPUT = <<-JS
     $("#card").show("blind", 1000);
     $("#id").html('<div><p>something</p></div>');
+    $('#card').html('<div><p>something else</p></div>');
     jQuery("#id").replaceWith("<div><p>something</p></div>");
     $("<div><p>something</p></div>").appendTo("#id");
+    $("<div><p>something else</p></div>").appendTo("#id");
     jQuery("<div><p>something</p></div>").prependTo("#id");
     $('#id').remove();
     jQuery("#id").hide();
+    $("[data-placeholder~=name]").remove();
+    $("#cart tr:not(.total_line) > *").remove();
+    $("[href|=\"val\"][href$=\"val\"][href^=\"val\"]").remove();
+    $("tr + td, li").remove();
+
+    // without semicolon
+    $("#browser_cart").hide("blind", 1000)
+
+    $('#item').html('<div><span>\\`Total\\`: \\$12.34</span></div>');
   JS
 
   setup do
@@ -22,23 +34,39 @@ class AssertSelectJQueryTest < ActiveSupport::TestCase
   def test_target_as_receiver
     assert_nothing_raised do
       assert_select_jquery :show, :blind, '#card'
+      assert_select_jquery :hide, :blind, '#browser_cart'
       assert_select_jquery :html, '#id' do
         assert_select 'p', 'something'
       end
       assert_select_jquery :replaceWith, '#id' do
         assert_select 'p', 'something'
       end
+      assert_select_jquery :remove, "[data-placeholder~=name]"
+      assert_select_jquery :remove, "#cart tr:not(.total_line) > *"
+      assert_select_jquery :remove, "[href|=\"val\"][href$=\"val\"][href^=\"val\"]"
+      assert_select_jquery :remove, "tr + td, li"
+
+      assert_select_jquery :html, '#item' do
+        assert_select 'span', '`Total`: $12.34'
+      end
     end
 
     assert_raise Minitest::Assertion, "No JQuery call matches [:show, :some_wrong]" do
       assert_select_jquery :show, :some_wrong
     end
+
+    assert_raise Minitest::Assertion, "<something else> was expected but was <something>" do
+      assert_select_jquery :html, '#id' do
+        assert_select 'p', 'something else'
+      end
+    end
   end
 
   def test_target_as_argument
     assert_nothing_raised do
       assert_select_jquery :appendTo, '#id' do
         assert_select 'p', 'something'
+        assert_select 'p', 'something else'
       end
       assert_select_jquery :prependTo, '#id' do
         assert_select 'p', 'something'

data/vendor/assets/javascripts/jquery.js

@@ -1,5 +1,5 @@
 /*!
- * jQuery JavaScript Library v1.12.1
+ * jQuery JavaScript Library v1.12.4
  * http://jquery.com/
  *
  * Includes Sizzle.js
@@ -9,7 +9,7 @@
  * Released under the MIT license
  * http://jquery.org/license
  *
- * Date: 2016-02-22T19:07Z
+ * Date: 2016-05-20T17:17Z
  */
 
 (function( global, factory ) {
@@ -65,7 +65,7 @@ var support = {};
 
 
 var
-	version = "1.12.1",
+	version = "1.12.4",
 
 	// Define a local copy of jQuery
 	jQuery = function( selector, context ) {
@@ -6672,6 +6672,7 @@ var documentElement = document.documentElement;
 		if ( reliableHiddenOffsetsVal ) {
 			div.style.display = "";
 			div.innerHTML = "<table><tr><td></td><td>t</td></tr></table>";
+			div.childNodes[ 0 ].style.borderCollapse = "separate";
 			contents = div.getElementsByTagName( "td" );
 			contents[ 0 ].style.cssText = "margin:0;border:0;padding:0;display:none";
 			reliableHiddenOffsetsVal = contents[ 0 ].offsetHeight === 0;
@@ -6996,19 +6997,6 @@ function getWidthOrHeight( elem, name, extra ) {
 		isBorderBox = support.boxSizing &&
 			jQuery.css( elem, "boxSizing", false, styles ) === "border-box";
 
-	// Support: IE11 only
-	// In IE 11 fullscreen elements inside of an iframe have
-	// 100x too small dimensions (gh-1764).
-	if ( document.msFullscreenElement && window.top !== window ) {
-
-		// Support: IE11 only
-		// Running getBoundingClientRect on a disconnected node
-		// in IE throws an error.
-		if ( elem.getClientRects().length ) {
-			val = Math.round( elem.getBoundingClientRect()[ name ] * 100 );
-		}
-	}
-
 	// some non-html elements return undefined for offsetWidth, so check for null/undefined
 	// svg - https://bugzilla.mozilla.org/show_bug.cgi?id=649285
 	// MathML - https://bugzilla.mozilla.org/show_bug.cgi?id=491668
@@ -8198,7 +8186,8 @@ jQuery.fn.delay = function( time, type ) {
 } )();
 
 
-var rreturn = /\r/g;
+var rreturn = /\r/g,
+	rspaces = /[\x20\t\r\n\f]+/g;
 
 jQuery.fn.extend( {
 	val: function( value ) {
@@ -8278,7 +8267,9 @@ jQuery.extend( {
 
 					// Support: IE10-11+
 					// option.text throws exceptions (#14686, #14858)
-					jQuery.trim( jQuery.text( elem ) );
+					// Strip and collapse whitespace
+					// https://html.spec.whatwg.org/#strip-and-collapse-whitespace
+					jQuery.trim( jQuery.text( elem ) ).replace( rspaces, " " );
 			}
 		},
 		select: {
@@ -8332,7 +8323,7 @@ jQuery.extend( {
 				while ( i-- ) {
 					option = options[ i ];
 
-					if ( jQuery.inArray( jQuery.valHooks.option.get( option ), values ) >= 0 ) {
+					if ( jQuery.inArray( jQuery.valHooks.option.get( option ), values ) > -1 ) {
 
 						// Support: IE6
 						// When new option element is added to select box we need to
@@ -8751,8 +8742,11 @@ if ( !support.hrefNormalized ) {
 }
 
 // Support: Safari, IE9+
-// mis-reports the default selected property of an option
-// Accessing the parent's selectedIndex property fixes it
+// Accessing the selectedIndex property
+// forces the browser to respect setting selected
+// on the option
+// The getter ensures a default option is selected
+// when in an optgroup
 if ( !support.optSelected ) {
 	jQuery.propHooks.selected = {
 		get: function( elem ) {
@@ -8767,6 +8761,16 @@ if ( !support.optSelected ) {
 				}
 			}
 			return null;
+		},
+		set: function( elem ) {
+			var parent = elem.parentNode;
+			if ( parent ) {
+				parent.selectedIndex;
+
+				if ( parent.parentNode ) {
+					parent.parentNode.selectedIndex;
+				}
+			}
 		}
 	};
 }
@@ -9983,6 +9987,11 @@ function getDisplay( elem ) {
 }
 
 function filterHidden( elem ) {
+
+	// Disconnected elements are considered hidden
+	if ( !jQuery.contains( elem.ownerDocument || document, elem ) ) {
+		return true;
+	}
 	while ( elem && elem.nodeType === 1 ) {
 		if ( getDisplay( elem ) === "none" || elem.type === "hidden" ) {
 			return true;
@@ -10349,13 +10358,6 @@ function createActiveXHR() {
 
 
 
-// Prevent auto-execution of scripts when no explicit dataType was provided (See gh-2432)
-jQuery.ajaxPrefilter( function( s ) {
-	if ( s.crossDomain ) {
-		s.contents.script = false;
-	}
-} );
-
 // Install script dataType
 jQuery.ajaxSetup( {
 	accepts: {
@@ -10542,21 +10544,6 @@ jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
 
 
 
-// Support: Safari 8+
-// In Safari 8 documents created via document.implementation.createHTMLDocument
-// collapse sibling forms: the second one becomes a child of the first one.
-// Because of that, this security measure has to be disabled in Safari 8.
-// https://bugs.webkit.org/show_bug.cgi?id=137337
-support.createHTMLDocument = ( function() {
-	if ( !document.implementation.createHTMLDocument ) {
-		return false;
-	}
-	var doc = document.implementation.createHTMLDocument( "" );
-	doc.body.innerHTML = "<form></form><form></form>";
-	return doc.body.childNodes.length === 2;
-} )();
-
-
 // data: string of html
 // context (optional): If specified, the fragment will be created in this context,
 // defaults to document
@@ -10569,12 +10556,7 @@ jQuery.parseHTML = function( data, context, keepScripts ) {
 		keepScripts = context;
 		context = false;
 	}
-
-	// document.implementation stops scripts or inline event handlers from
-	// being executed immediately
-	context = context || ( support.createHTMLDocument ?
-		document.implementation.createHTMLDocument( "" ) :
-		document );
+	context = context || document;
 
 	var parsed = rsingleTag.exec( data ),
 		scripts = !keepScripts && [];
@@ -10656,7 +10638,7 @@ jQuery.fn.load = function( url, params, callback ) {
 		// If it fails, this function gets "jqXHR", "status", "error"
 		} ).always( callback && function( jqXHR, status ) {
 			self.each( function() {
-				callback.apply( self, response || [ jqXHR.responseText, status, jqXHR ] );
+				callback.apply( this, response || [ jqXHR.responseText, status, jqXHR ] );
 			} );
 		} );
 	}