Merge branch 'master' into allow-scopes-with-string-joins

activerecord-hackery · Mar 27, 2022 · 1c69b9d · 1c69b9d
2 parents 43fa042 + 3a0e520
commit 1c69b9d
Show file tree

Hide file tree

Showing 31 changed files with 412 additions and 301 deletions.
diff --git a/.github/workflows/cronjob.yml b/.github/workflows/cronjob.yml
@@ -11,8 +11,8 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          - 3.0.0
-          - 2.7.2
+          - 3.0.2
+          - 2.7.4
     env:
       DB: sqlite3
       RAILS: main
@@ -33,8 +33,8 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          - 3.0.0
-          - 2.7.2
+          - 3.0.2
+          - 2.7.4
     env:
       DB: mysql
       RAILS: main
@@ -64,8 +64,8 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          - 3.0.0
-          - 2.7.2
+          - 3.0.2
+          - 2.7.4
     env:
       DB: postgres
       RAILS: main

diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml
@@ -13,7 +13,7 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.0.0
+          ruby-version: 3.0.1
       - name: Install gems
         run: bundle install --jobs 4 --retry 3
       - name: Run RuboCop

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -11,20 +11,17 @@ jobs:
       fail-fast: false
       matrix:
         rails:
-          - v6.1.3
-          - v6.0.3
+          - v7.0.0
+          - v6.1.4
+          - v6.0.4
           - 6-0-stable
-          - 5-2-stable
-          - v5.2.4
         ruby:
-          - 3.0.0
-          - 2.7.2
-          - 2.6.6
+          - 3.0.2
+          - 2.7.4
+          - 2.6.7
         exclude:
-          - rails:  v5.2.4
-            ruby:   3.0.0
-          - rails:  5-2-stable
-            ruby:   3.0.0
+          - rails:  v7.0.0
+            ruby:   2.6.7
     env:
       DB: sqlite3
       RAILS: ${{ matrix.rails }}
@@ -45,20 +42,17 @@ jobs:
       fail-fast: false
       matrix:
         rails:
-          - v6.1.3
-          - v6.0.3
+          - v7.0.0
+          - v6.1.4
+          - v6.0.4
           - 6-0-stable
-          - 5-2-stable
-          - v5.2.4
         ruby:
-          - 3.0.0
-          - 2.7.2
-          - 2.6.6
+          - 3.0.2
+          - 2.7.4
+          - 2.6.7
         exclude:
-          - rails:  v5.2.4
-            ruby:   3.0.0
-          - rails:  5-2-stable
-            ruby:   3.0.0
+          - rails:  v7.0.0
+            ruby:   2.6.7
     env:
       DB: mysql
       RAILS: ${{ matrix.rails }}
@@ -88,20 +82,17 @@ jobs:
       fail-fast: false
       matrix:
         rails:
-          - v6.1.3
-          - v6.0.3
+          - v7.0.0
+          - v6.1.4
+          - v6.0.4
           - 6-0-stable
-          - 5-2-stable
-          - v5.2.4
         ruby:
-          - 3.0.0
-          - 2.7.2
-          - 2.6.6
+          - 3.0.2
+          - 2.7.4
+          - 2.6.7
         exclude:
-          - rails:  v5.2.4
-            ruby:   3.0.0
-          - rails:  5-2-stable
-            ruby:   3.0.0
+          - rails:  v7.0.0
+            ruby:   2.6.7
     env:
       DB: postgres
       RAILS: ${{ matrix.rails }}
@@ -144,7 +135,7 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.0.0
+          ruby-version: 3.0.2
       - name: Install dependencies
         run: bundle install
       - name: Run bug report templates

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,22 +1,83 @@
 # Change Log
 
-* Drop support for rubies under 2.5. PR #1189
+## Unreleased
 
-## 2.4.1 - 2020-12-21
+* Improve `sort_link` documentation.
 
-* Add `ActiveRecord::Base.ransack!` which raises error if passed unknown condition
+* Deprecate passing two trailing hashes to `sort_link`, for example:
 
-  *Aaron Lipman*
+  ```ruby
+  sort_link(@q, :bussiness_name, "bussines_name", {}, class: "foo")
+  ```
 
-## 2.4.0 - 2020-11-27
+  Pass a single hash with all options instead.
+
+* Fix `:class` option to `sort_link` not being passed to the generated link
+  correctly when no additional options are passed. For example:
+
+  ```ruby
+  sort_link(@q, :bussiness_name, class: "foo")
+  ```
+
+## 2.6.0 - 2022-03-08
+
+* Fix regression when joining a table with itself.
+  PR [1275](https://github.com/activerecord-hackery/ransack/pull/1276)
+
+* Drop support for ActiveRecord older than 6.0.4.
+  PR [1276](https://github.com/activerecord-hackery/ransack/pull/1276)
 
-* Support ActiveRecord 6.1.0.rc1.
-  PR [1172](https://github.com/activerecord-hackery/ransack/pull/1172)
+## 2.5.0 - 2021-12-26
 
-* Fix for ActiveRecord 5.2.4 (note security fix in 5.2.4.2 for ActiveView's escape_javascript CVE-2020-5267 for all earlier versions)
+* Document release process by @scarroll32 in https://github.com/activerecord-hackery/ransack/pull/1199, https://github.com/activerecord-hackery/ransack/pull/1200.
+* Support Rails 7 by @yahonda in https://github.com/activerecord-hackery/ransack/pull/1205, https://github.com/activerecord-hackery/ransack/pull/1209, https://github.com/activerecord-hackery/ransack/pull/1234, https://github.com/activerecord-hackery/ransack/pull/1230, https://github.com/activerecord-hackery/ransack/pull/1266
+* Fix for `ActiveRecord::UnknownAttributeReference` in ransack by @TechnologyHypofriend in https://github.com/activerecord-hackery/ransack/pull/1207
+* Make gem compatible with old polyamorous require by @rtweeks in https://github.com/activerecord-hackery/ransack/pull/1145
+* Adding swedish translations by @johanandre in https://github.com/activerecord-hackery/ransack/pull/1208
+* Document how to do case insensitive searches by @scarroll32 in https://github.com/activerecord-hackery/ransack/pull/1213
+* Add the ability to disable whitespace stripping for string searches by @DCrow in https://github.com/activerecord-hackery/ransack/pull/1214
+* Fix `:default` option in `Translate.attribute` method by @coreyaus in https://github.com/activerecord-hackery/ransack/pull/1218
+* Fix typo in README.md by @d-m-u in https://github.com/activerecord-hackery/ransack/pull/1220
+* Fix another typo in README.md by @plan-do-break-fix in https://github.com/activerecord-hackery/ransack/pull/1221
+* Fix several documentation typos @wonda-tea-coffee in https://github.com/activerecord-hackery/ransack/pull/1233
+* Allow ransack to treat nulls as always first or last by @mollerhoj in https://github.com/activerecord-hackery/ransack/pull/1226
+* Consider ransack aliases when sorting by @faragorn and @waldyr in https://github.com/activerecord-hackery/ransack/pull/1223
+* Fix non-casted array predicates by @danielpclark in https://github.com/activerecord-hackery/ransack/pull/1246
+* Remove Squeel references from README by @Schwad in https://github.com/activerecord-hackery/ransack/pull/1249
+* Remove part of the README that might lead to incorrect results by @RadekMolenda in https://github.com/activerecord-hackery/ransack/pull/1258
+* ActiveRecord 7.0 support
+
+## 2.4.2 - 2021-01-23
+
+* Enable RuboCop and configure GitHub Actions to run RuboCop by @yahonda in https://github.com/activerecord-hackery/ransack/pull/1185
+* Add Ruby 3.0.0 support by @yahonda in https://github.com/activerecord-hackery/ransack/pull/1190
+* Drop Ruby 2.5 or older versions of Ruby by @yahonda in https://github.com/activerecord-hackery/ransack/pull/1189
+* Move bug report templates into ransack repository and run templates at CI by @yahonda in https://github.com/activerecord-hackery/ransack/pull/1191
+* Allow Ransack to be tested with Rails main branch by @yahonda in https://github.com/activerecord-hackery/ransack/pull/1192
+
+## 2.4.1 - 2020-12-21
+
+* Links to Tidelift subscription by @deivid-rodriguez in https://github.com/activerecord-hackery/ransack/pull/1178
+* Enable GitHub Actions by @yahonda in https://github.com/activerecord-hackery/ransack/pull/1180
+* Move security contact information to SECURITY.md by @deivid-rodriguez in https://github.com/activerecord-hackery/ransack/pull/1179
+* Add `ActiveRecord::Base.ransack!` which raises error if passed unknown condition by @alipman88 in https://github.com/activerecord-hackery/ransack/pull/1132
+* Add ability to config PostgreSQL ORDER BY ... NULLS FIRST or NULLS LAST by @itsalongstory in https://github.com/activerecord-hackery/ransack/pull/1184
+
+## 2.4.0 - 2020-11-27
 
-* Drop support for ActiveRecord older than 5.2.4.
-  PR [1166](https://github.com/activerecord-hackery/ransack/pull/1166)
+* Specify actual version of polyamorous, so we can release that separately by @gregmolnar in https://github.com/activerecord-hackery/ransack/pull/1101
+* Only include necessary files in gem package by @tvdeyen in https://github.com/activerecord-hackery/ransack/pull/1104
+* Test/Fix for subquery in Rails 5.2.4  by @stevenjonescgm in https://github.com/activerecord-hackery/ransack/pull/1112
+* Polyamorous module by @varyonic in https://github.com/activerecord-hackery/ransack/pull/1113
+* Remove duplicated rows by @sasharevzin in https://github.com/activerecord-hackery/ransack/pull/1116
+* Fix Ruby 2.7 deprecation warnings by @terracatta in https://github.com/activerecord-hackery/ransack/pull/1121
+* Fixes polymorphic joins. by @PhilCoggins in https://github.com/activerecord-hackery/ransack/pull/1122
+* Drop support for activerecord older than 5.2.4 by @deivid-rodriguez in https://github.com/activerecord-hackery/ransack/pull/1166
+* Adapt to quoting change in Rails by @deivid-rodriguez in https://github.com/activerecord-hackery/ransack/pull/1165
+* Typo in docs by @brett-anderson in https://github.com/activerecord-hackery/ransack/pull/1155
+* Add Rails 6.1 support by @deivid-rodriguez in https://github.com/activerecord-hackery/ransack/pull/1172
+* Strip Leading & Trailing Whitespace Before Searching by @itsalongstory in https://github.com/activerecord-hackery/ransack/pull/1126
+* Use unfrozen version of symbol to string by @fauno in https://github.com/activerecord-hackery/ransack/pull/1149
 
 ## 2.3.2 - 2020-01-11
 
@@ -200,7 +261,7 @@
     ignored when block parameter is specified.
     PR [#818](https://github.com/activerecord-hackery/ransack/pull/818).
 
-*   No need pass some arugments to JoinAssociation#join_constraints in Rails 5.1.
+*   No need pass some arguments to JoinAssociation#join_constraints in Rails 5.1.
     PR [#814](https://github.com/activerecord-hackery/ransack/pull/814).
     Fixes [#807](https://github.com/activerecord-hackery/ransack/issues/807).
     Reference [rails/rails#28267](https://github.com/rails/rails/pull/28267)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -64,9 +64,7 @@ Here's a quick guide:
 2. Create a thoughtfully-named branch for your changes (`git checkout -b my-new-feature`).
 
 3. Install the development dependencies by running `bundle install`.
-   To install rails other than latest (set in Gemfile): `RAILS='5-2-stable' bundle install`
-
-        $ RAILS='5-2-stable' bundle install
+   To install rails other than latest (set in Gemfile): `RAILS='6-0-stable' bundle install`
 
 4. Begin by running the tests. We only take pull requests with passing tests,
    and it's great to know that you have a clean slate: