jquery-rails 4.2.1 → 4.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 465698ea71d2cfda07c7bc5dab8cb50fb34ab56f
-  data.tar.gz: c937ef622e018d620633e6fd613c67b7198c23f7
+SHA256:
+  metadata.gz: aec69fba390c8f18171f492bd99d8dc2a6cf6e3e8c124beae74ac6420e98e2dd
+  data.tar.gz: 18a8be95db572fe6c5c219c556862a2d04d6cd024ce06c28801d367bb5a8009f
 SHA512:
-  metadata.gz: bb9015f2ba8cfa59a8d1a5e820ff3f70c74e3fef6116253849e1a92e5aab0fc2deb8596974d9b149f3f5a57c892124c52d9b135a44bd75fd8188f143439225c3
-  data.tar.gz: 56932e346d376defd1cb9189b70d3e31c116abe6e0fbb6e17f5ab3252b65e6d788999bf1ce3f49cca5f89819c755afbd478e27fde899e42d1b47e0bbc5dfb9b6
+  metadata.gz: c83564699021f023a06e88221a3a9feb06070ba40709493dbd358af558f29a8ef96a79d063080ad8cef864d680731f3aecb4d01a74a5c384e731124c10145a8a
+  data.tar.gz: 6d89ffac1ce80f8d5c2765621220ec5b3d90bf80ba9a22ce2acbb6f13cfab285b096b2314175ccd5a96a348482d4b67b4bb19395e945814f3e9dc0a416a93aef

data/.travis.yml

@@ -4,15 +4,20 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1
-  - 2.2.5
-  - 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,6 +1,61 @@
-## 4.2.0
+## 4.6.1
+
+- update jquery to 3.7.1
+
+## 4.6.0
+
+- update jquery to 3.7.0
+
+## 4.5.1
+
+- update jquery to 3.6.1
+- update jquery-ujs to 1.2.3
+
+## 4.5.0
+
+- update jquery to 3.6.0
+
+## 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 multiple 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
+- update jquery to 3.1.0
 
 ## 4.2.0
 

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

@@ -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
@@ -66,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/VERSIONS.md

@@ -2,6 +2,18 @@
 
 | Gem    | jQuery | jQuery UJS | jQuery UI |
 |--------|--------|------------| ----------|
+| 4.6.1  | 1.12.4 & 2.2.4 & 3.7.1 | 1.2.3 | -         |
+| 4.6.0  | 1.12.4 & 2.2.4 & 3.7.0 | 1.2.3 | -         |
+| 4.5.1  | 1.12.4 & 2.2.4 & 3.6.1 | 1.2.3 | -         |
+| 4.5.0  | 1.12.4 & 2.2.4 & 3.6.0 | 1.2.2 | -         |
+| 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  | -         |

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,9 +1,9 @@
 module Jquery
   module Rails
-    VERSION = "4.2.1"
+    VERSION = "4.6.1"
     JQUERY_VERSION = "1.12.4"
     JQUERY_2_VERSION = "2.2.4"
-    JQUERY_3_VERSION = "3.1.0"
-    JQUERY_UJS_VERSION = "1.2.2"
+    JQUERY_3_VERSION = "3.7.1"
+    JQUERY_UJS_VERSION = "1.2.3"
   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'