From 445ebd5583ef3d7788d169edac1b04be4e18a142 Mon Sep 17 00:00:00 2001 From: Geremia Taglialatela Date: Tue, 3 Nov 2020 12:03:41 +0100 Subject: [PATCH] Add Rails 6.1 compatibility --- .rubocop.yml | 2 +- .travis.yml | 3 +++ Appraisals | 4 ++++ CHANGELOG.md | 5 +++++ README.md | 2 +- client_side_validations.gemspec | 2 +- gemfiles/rails_5.0.gemfile | 10 ++++------ gemfiles/rails_5.1.gemfile | 10 ++++------ gemfiles/rails_5.2.gemfile | 8 +++----- gemfiles/rails_6.0.gemfile | 8 +++----- gemfiles/rails_6.1.gemfile | 7 +++++++ gemfiles/rails_edge.gemfile | 8 +++----- lib/client_side_validations/version.rb | 2 +- package.json | 2 +- test/action_view/cases/helper.rb | 4 +--- 15 files changed, 42 insertions(+), 35 deletions(-) create mode 100644 gemfiles/rails_6.1.gemfile diff --git a/.rubocop.yml b/.rubocop.yml index fb4c45258..3c659fa12 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -7,7 +7,7 @@ AllCops: TargetRubyVersion: 2.4 NewCops: enable Exclude: - - 'gemfiles/vendor/bundle/**/*' + - 'gemfiles/**/*' - 'node_modules/**/*' - 'vendor/bundle/**/*' diff --git a/.travis.yml b/.travis.yml index 9b3436078..fe16b89c3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,7 @@ gemfile: - gemfiles/rails_5.1.gemfile - gemfiles/rails_5.2.gemfile - gemfiles/rails_6.0.gemfile + - gemfiles/rails_6.1.gemfile - gemfiles/rails_edge.gemfile cache: @@ -39,6 +40,8 @@ jobs: - rvm: ruby-head - gemfile: gemfiles/rails_edge.gemfile exclude: + - rvm: 2.4.10 + gemfile: gemfiles/rails_6.1.gemfile - rvm: 2.4.10 gemfile: gemfiles/rails_6.0.gemfile - rvm: 2.4.10 diff --git a/Appraisals b/Appraisals index 58c766a22..bea60b79f 100644 --- a/Appraisals +++ b/Appraisals @@ -18,6 +18,10 @@ appraise 'rails-6.0' do gem 'rails', '~> 6.0.0' end +appraise 'rails-6.1' do + gem 'rails', '~> 6.1.0.rc1' +end + appraise 'rails-edge' do gem 'rails', github: 'rails/rails' end diff --git a/CHANGELOG.md b/CHANGELOG.md index c010da8a9..1a11c03f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## 17.2.0 / 2020-11-03 + +* [FEATURE] Add Rails 6.1.0.rc1 compatibility +* [ENHANCEMENT] Update development dependencies + ## 17.1.1 / 2020-10-31 * [ENHANCEMENT] Minor code cleanup diff --git a/README.md b/README.md index 0fe7ab33d..df9ba47d2 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ [![Coverage Status](https://coveralls.io/repos/github/DavyJonesLocker/client_side_validations/badge.svg?branch=master)](https://coveralls.io/github/DavyJonesLocker/client_side_validations?branch=master) -`ClientSideValidations` made easy for your Rails 5.x / Rails 6.0 applications! +`ClientSideValidations` made easy for your Rails 5.x / Rails 6.x applications! ## Project Goals ## diff --git a/client_side_validations.gemspec b/client_side_validations.gemspec index 2ef8e4b62..aaecb7c93 100644 --- a/client_side_validations.gemspec +++ b/client_side_validations.gemspec @@ -25,7 +25,7 @@ Gem::Specification.new do |spec| spec.platform = Gem::Platform::RUBY spec.required_ruby_version = '>= 2.4' - spec.add_dependency 'rails', '>= 5.0.0.1', '< 6.1' + spec.add_dependency 'rails', '>= 5.0.0.1', '< 6.2' spec.add_dependency 'js_regex', '~> 3.1' diff --git a/gemfiles/rails_5.0.gemfile b/gemfiles/rails_5.0.gemfile index 887f6a8af..9a09015dd 100644 --- a/gemfiles/rails_5.0.gemfile +++ b/gemfiles/rails_5.0.gemfile @@ -1,10 +1,8 @@ -# frozen_string_literal: true - # This file was generated by Appraisal -source 'https://rubygems.org' +source "https://rubygems.org" -gem 'rails', '~> 5.0.0' -gem 'sqlite3', '~> 1.3.6' +gem "rails", "~> 5.0.0" +gem "sqlite3", "~> 1.3.6" -gemspec path: '../' +gemspec path: "../" diff --git a/gemfiles/rails_5.1.gemfile b/gemfiles/rails_5.1.gemfile index 32c457319..1edc9a139 100644 --- a/gemfiles/rails_5.1.gemfile +++ b/gemfiles/rails_5.1.gemfile @@ -1,10 +1,8 @@ -# frozen_string_literal: true - # This file was generated by Appraisal -source 'https://rubygems.org' +source "https://rubygems.org" -gem 'rails', '~> 5.1.0' -gem 'sqlite3', '~> 1.3.6' +gem "rails", "~> 5.1.0" +gem "sqlite3", "~> 1.3.6" -gemspec path: '../' +gemspec path: "../" diff --git a/gemfiles/rails_5.2.gemfile b/gemfiles/rails_5.2.gemfile index a5dcd9237..5a706dcb6 100644 --- a/gemfiles/rails_5.2.gemfile +++ b/gemfiles/rails_5.2.gemfile @@ -1,9 +1,7 @@ -# frozen_string_literal: true - # This file was generated by Appraisal -source 'https://rubygems.org' +source "https://rubygems.org" -gem 'rails', '~> 5.2.0' +gem "rails", "~> 5.2.0" -gemspec path: '../' +gemspec path: "../" diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile index 3bc3abc1c..15b9b275d 100644 --- a/gemfiles/rails_6.0.gemfile +++ b/gemfiles/rails_6.0.gemfile @@ -1,9 +1,7 @@ -# frozen_string_literal: true - # This file was generated by Appraisal -source 'https://rubygems.org' +source "https://rubygems.org" -gem 'rails', '~> 6.0.0' +gem "rails", "~> 6.0.0" -gemspec path: '../' +gemspec path: "../" diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile new file mode 100644 index 000000000..7e95520a3 --- /dev/null +++ b/gemfiles/rails_6.1.gemfile @@ -0,0 +1,7 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rails", "~> 6.1.0.rc1" + +gemspec path: "../" diff --git a/gemfiles/rails_edge.gemfile b/gemfiles/rails_edge.gemfile index ed1085deb..7e05163b2 100644 --- a/gemfiles/rails_edge.gemfile +++ b/gemfiles/rails_edge.gemfile @@ -1,9 +1,7 @@ -# frozen_string_literal: true - # This file was generated by Appraisal -source 'https://rubygems.org' +source "https://rubygems.org" -gem 'rails', github: 'rails/rails' +gem "rails", github: "rails/rails" -gemspec path: '../' +gemspec path: "../" diff --git a/lib/client_side_validations/version.rb b/lib/client_side_validations/version.rb index f634c1493..677c7d5fa 100644 --- a/lib/client_side_validations/version.rb +++ b/lib/client_side_validations/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module ClientSideValidations - VERSION = '17.1.1' + VERSION = '17.2.0' end diff --git a/package.json b/package.json index ccfc25a8f..b09272b12 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "@rollup/plugin-node-resolve": "^10.0.0", "chrome-launcher": "^0.13.4", "puppeteer-core": "^5.4.1", - "rollup": "^2.32.1", + "rollup": "^2.33.1", "rollup-plugin-copy": "^3.3.0", "standard": "^16.0.1" }, diff --git a/test/action_view/cases/helper.rb b/test/action_view/cases/helper.rb index 8a658bb41..361e24eb0 100644 --- a/test/action_view/cases/helper.rb +++ b/test/action_view/cases/helper.rb @@ -224,8 +224,6 @@ def csv_data_attribute(validators) }.to_json end - protected - def comments_path(post) "/posts/#{post.id}/comments" end @@ -246,7 +244,7 @@ def admin_comment_path(post, comment) end alias admin_post_comment_path admin_comment_path - def posts_path(_options = {}) + def posts_path(*) '/posts' end