ransack 2.1.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 026204df0f9ca612c6e56f7594088687e766d142b5dbd7c72c65998b28e43b7a
-  data.tar.gz: 499ad9c08f2a0192e3f3e10fb22955a14546aff315f2eb0500bf2ff8303ebf76
+  metadata.gz: f5cd517575121b1f2c1041501645a95680a4efbe82c0b2d6c74e079d080cda29
+  data.tar.gz: f927c47bfc28f15d7a24eb2761ae1d003ff18912c1c91e7716ed2628f9012ccc
 SHA512:
-  metadata.gz: 0440a8d177d9e40c9237481ae6908b38a6986627d486849588fd71e212a5b769dbf39eda8f23e74b9f2eaec10ad4822afc84dcb3b7370ced035d031532cf5f10
-  data.tar.gz: a7fc0507b34ff03389504d92c9d79169768288201ad89f7fde2dbf6e4baa7cc103ae680ae2c42a24b723d63a8ffdb2e68e5eca307cba5d61868475ee067e316a
+  metadata.gz: be9485ce5f692f990c7b8c5b59c961311783fafb845c3580dbd0d08eb62e24c1067da75e98f24cd4553e7db21a15531ca2943c1633566995a6e7c64d6310d2f2
+  data.tar.gz: 3fbca263c9e5f399695e9cc69e50762fc72875860ad495c04368ff84d90c68100d5ca1b6db22aa17a5c2c52efccd4d99bc0c29b5485ae6608390a606fd35ac18

data/.gitignore

@@ -4,3 +4,4 @@ Gemfile.lock
 pkg/*
 coverage/*
 .DS_Store
+.byebug_history

data/.travis.yml

@@ -1,37 +1,47 @@
-language: ruby
+branches: master
 
-sudo: false
+language: ruby
 
 rvm:
-  - 2.5
+  - 2.6.6
+
+services:
+  - mysql
 
 env:
+  - RAILS=v6.1.0.rc1 DB=sqlite3
+  - RAILS=v6.1.0.rc1 DB=mysql
+  - RAILS=v6.1.0.rc1 DB=postgres
+
+  - RAILS=v6.0.3 DB=sqlite3
+  - RAILS=v6.0.3 DB=mysql
+  - RAILS=v6.0.3 DB=postgres
+
+  - RAILS=6-0-stable DB=sqlite3
+  - RAILS=6-0-stable DB=mysql
+  - RAILS=6-0-stable DB=postgres
+
   - RAILS=5-2-stable DB=sqlite3
   - RAILS=5-2-stable DB=mysql
   - RAILS=5-2-stable DB=postgres
 
-  - RAILS=v5.2.1 DB=sqlite3
-  - RAILS=v5.2.1 DB=mysql
-  - RAILS=v5.2.1 DB=postgres
-
-  - RAILS=v5.2.0 DB=sqlite3
-  - RAILS=v5.2.0 DB=mysql
-  - RAILS=v5.2.0 DB=postgres
+  - RAILS=v5.2.4 DB=sqlite3
+  - RAILS=v5.2.4 DB=mysql
+  - RAILS=v5.2.4 DB=postgres
 
-  - RAILS=5-1-stable DB=sqlite3
-  - RAILS=5-1-stable DB=mysql
-  - RAILS=5-1-stable DB=postgres
-
-matrix:
-  allow_failures:
-    - env: RAILS=5-2-stable DB=sqlite3
-    - env: RAILS=5-2-stable DB=mysql
-    - env: RAILS=5-2-stable DB=postgres
 before_script:
-  - mysql -e 'create database ransack collate utf8_general_ci;'
-  - mysql -e 'use ransack;show variables like "%character%";show variables like "%collation%";'
-  - psql -c 'create database ransack;' -U postgres
+  - if [ "$DB" = "mysql" ];
+    then
+      mysql -e 'create database ransack collate utf8_general_ci;';
+      mysql -e 'use ransack;show variables like "%character%";show variables like "%collation%";';
+    fi
+
+  - if [ "$DB" = "postgres" ];
+    then
+      psql -c 'create database ransack;' -U postgres;
+    fi
 
 addons:
   code_climate:
     repo_token: 8b701c4364d51a0217105e08c06922d600cec3d9e60d546a89e3ddfe46e0664e
+  postgresql: "9.6"

data/CHANGELOG.md

@@ -1,6 +1,65 @@
 # Change Log
 
-## Version 2.1.0 - 2018-10.-26
+## 2.4.0 - 2020-11-27
+
+*
+  PR []()
+
+* Support ActiveRecord 6.1.0.rc1.
+  PR [1172](https://github.com/activerecord-hackery/ransack/pull/1172)
+
+* 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)
+
+* Drop support for ActiveRecord older than 5.2.4.
+  PR [1166](https://github.com/activerecord-hackery/ransack/pull/1166)
+
+## 2.3.2 - 2020-01-11
+
+* Breakfix to bump Polyamorous
+
+## 2.3.1 - 2020-01-11
+
+* Drop support for Active Record 5.0, 5.1, and 5.2.0.
+  PR [#1073](https://github.com/activerecord-hackery/ransack/pull/1073)
+
+* Drop support for rubies under 2.3.
+  PR [#1070](https://github.com/activerecord-hackery/ransack/pull/1070)
+
+  ... and others
+
+## 2.3.0 - 2019-08-18
+
+* Arabic translations PR [979](https://github.com/activerecord-hackery/ransack/pull/979)
+
+* Rails 6 PR [1027](https://github.com/activerecord-hackery/ransack/pull/1027)
+ *vrodokanakis*
+
+* Make polyamorous a separate gem PR [1002](https://github.com/activerecord-hackery/ransack/pull/1002)
+
+* Catalan translations PR[1007](https://github.com/activerecord-hackery/ransack/pull/1007)
+ *roslavych*
+
+* Don't escape period characters with wildcard searches in mysql2 PR [1013](https://github.com/activerecord-hackery/ransack/pull/1013)
+ *daflip*
+
+* Farsi translations PR [1030](https://github.com/activerecord-hackery/ransack/pull/1030)
+
+* Finnish translations PR [1049](https://github.com/activerecord-hackery/ransack/pull/1049)
+
+* Fix wrong table alias when using nested join. for ActiveRecord >= 5.2
+  PR [374](https://github.com/activerecord-hackery/ransack/pull/374)
+
+  *hiichan*
+
+## Version 2.1.1 - 2018-12-05
+
+* Add `arabic` translation
+  https://github.com/activerecord-hackery/ransack/pull/979
+
+* Deprecate #search
+  PR [975](https://github.com/activerecord-hackery/ransack/pull/975)
+
+## Version 2.1.0 - 2018-10-26
 
 * Add support for sorting by scopes
   PR [973](https://github.com/activerecord-hackery/ransack/pull/973)

data/CONTRIBUTING.md

@@ -64,6 +64,9 @@ 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
 
 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:
@@ -84,16 +87,18 @@ Here's a quick guide:
        $ mysql -u root
        mysql> create database ransack;     
 
-   To run only the tests in a particular file: `rspec <path/to/filename>`
+   The test suite runs by default
+
+   To run only the tests in a particular file: `bundle exec rspec <path/to/filename>`
 
-        $ rspec spec/ransack/search_spec.rb
+        $ bundle exec rspec spec/ransack/search_spec.rb
 
-   To run a single test in that file: `rspec <path/to/filename> -e "test name"`
+   To run a single test in that file: `bundle exec rspec <path/to/filename> -e "test name"`
 
-        $ rspec spec/ransack/search_spec.rb -e "accepts a context option"
+        $ bundle exec rspec spec/ransack/search_spec.rb -e "accepts a context option"
 
-5. Hack away! Please use Ruby features that are compatible down to Ruby 1.9.
-   Since version 1.5, Ransack no longer maintains Ruby 1.8 compatibility.
+5. Hack away! Please use Ruby features that are compatible down to Ruby 2.3.
+   Since version 2.3.1, Ransack no longer maintains Ruby 2.2 compatibility.
 
 6. Add tests for your changes. Only refactoring and documentation changes
    require no new tests. If you are adding functionality or fixing a bug, we

data/Gemfile

@@ -3,45 +3,49 @@ gemspec
 
 gem 'rake'
 
-rails = ENV['RAILS'] || '5-0-stable'
+rails = ENV['RAILS'] || '6-0-stable'
 
-gem 'pry'
+rails_version = case rails
+                when /\// # A path
+                  File.read(File.join(rails, "RAILS_VERSION"))
+                when /^v/ # A tagged version
+                  rails.gsub(/^v/, '')
+                else
+                  rails
+                end
 
-# Provide timezone information on Windows
-gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw]
+gem 'faker', '~> 1.0'
+gem 'sqlite3', ::Gem::Version.new(rails_version) >= ::Gem::Version.new('6-0-stable') ? '~> 1.4.1' : '~> 1.3.3'
+gem 'pg', '~> 1.0'
+gem 'pry', '~> 0.12.2'
+gem 'byebug'
 
 case rails
 when /\// # A path
   gem 'activesupport', path: "#{rails}/activesupport"
+  gem 'activemodel', path: "#{rails}/activemodel"
   gem 'activerecord', path: "#{rails}/activerecord", require: false
   gem 'actionpack', path: "#{rails}/actionpack"
+  gem 'actionview', path: "#{rails}/actionview"
 when /^v/ # A tagged version
-  git 'git://github.com/rails/rails.git', :tag => rails do
+  git 'https://github.com/rails/rails.git', :tag => rails do
     gem 'activesupport'
     gem 'activemodel'
     gem 'activerecord', require: false
     gem 'actionpack'
   end
-  if rails >= 'v5.2.0'
-    gem 'mysql2', '~> 0.4.4'
-  end
 else
-  git 'git://github.com/rails/rails.git', :branch => rails do
+  git 'https://github.com/rails/rails.git', :branch => rails do
     gem 'activesupport'
     gem 'activemodel'
     gem 'activerecord', require: false
     gem 'actionpack'
   end
-  if rails == '3-0-stable'
-    gem 'mysql2', '< 0.3'
-  end
-  if rails == '5-2-stable'
-    gem 'mysql2', '~> 0.4.4'
-  end
 end
+gem 'mysql2', '~> 0.5.2'
 
 group :test do
-  # TestUnit was removed from Ruby 2.2 but still needed for testing Rails 3.x.
-  gem 'test-unit', '~> 3.0' if RUBY_VERSION >= '2.2'
+  gem 'machinist', '~> 1.0.6'
+  gem 'rspec', '~> 3'
   gem 'simplecov', :require => false
 end

data/README.md

@@ -1,18 +1,13 @@
 # ![Ransack](./logo/ransack-h.png "Ransack")
 
+**MAINTAINER WANTED** 
+
+Please see the [Maintainer wanted issue](https://github.com/activerecord-hackery/ransack/issues/1159) if you are interested.
+
 [![Build Status](https://travis-ci.org/activerecord-hackery/ransack.svg)](https://travis-ci.org/activerecord-hackery/ransack)
 [![Gem Version](https://badge.fury.io/rb/ransack.svg)](http://badge.fury.io/rb/ransack)
 [![Code Climate](https://codeclimate.com/github/activerecord-hackery/ransack/badges/gpa.svg)](https://codeclimate.com/github/activerecord-hackery/ransack)
-
-Ransack is a rewrite of [MetaSearch](https://github.com/activerecord-hackery/meta_search)
-created by [Ernie Miller](http://twitter.com/erniemiller)
-and developed/maintained for years by
-[Jon Atack](http://twitter.com/jonatack) and
-[Ryan Bigg](http://twitter.com/ryanbigg) with the help of a great group of
-[contributors](https://github.com/activerecord-hackery/ransack/graphs/contributors). Ransack's logo is designed by [Anıl Kılıç](https://github.com/anilkilic).
-While it supports many of the same features as MetaSearch, its underlying
-implementation differs greatly from MetaSearch,
-and backwards compatibility is not a design goal.
+[![Backers on Open Collective](https://opencollective.com/ransack/backers/badge.svg)](#backers) [![Sponsors on Open Collective](https://opencollective.com/ransack/sponsors/badge.svg)](#sponsors)
 
 Ransack enables the creation of both
 [simple](http://ransack-demo.herokuapp.com) and
@@ -24,21 +19,9 @@ or controller layer, you're probably not looking for Ransack (or MetaSearch,
 for that matter). Try [Squeel](https://github.com/activerecord-hackery/squeel)
 instead.
 
-If you're viewing this at
-[github.com/activerecord-hackery/ransack](https://github.com/activerecord-hackery/ransack),
-you're reading the documentation for the master branch with the latest features.
-[View documentation for the last release (2.0.0).](https://github.com/activerecord-hackery/ransack/tree/v2.0.0)
-
 ## Getting started
 
-Ransack is compatible with Rails 5.0, 5.1 and 5.2 on Ruby 2.2 and later.
-If you are using Rails <5.0 use the 1.8 line of Ransack.
-If you are using Ruby 1.8 or an earlier JRuby and run into compatibility
-issues, you can use an earlier version of Ransack, say, up to 1.3.0.
-
-Ransack works out-of-the-box with Active Record and also features limited
-support for Mongoid 4 and 5 (without associations, further details
-[below](https://github.com/activerecord-hackery/ransack#mongoid)).
+Ransack is compatible with Rails 6.0, 5.0, 5.1 and 5.2 on Ruby 2.3 and later.
 
 In your Gemfile, for the last officially released gem:
 
@@ -458,13 +441,10 @@ List of all possible predicates
 | `*_lteq_any` | Less than or equal to any | |
 | `*_gt_any` | Greater than any | |
 | `*_gteq_any` | Greater than or equal to any | |
-| `*_matches_any` | `*_does_not_match_any` | same as above but with `LIKE` |
 | `*_lt_all` | Less than all | SQL: `col < value1 AND col < value2` |
 | `*_lteq_all` | Less than or equal to all | |
 | `*_gt_all` | Greater than all | |
 | `*_gteq_all` | Greater than or equal to all | |
-| `*_matches_all` | Matches all | same as above but with `LIKE` |
-| `*_does_not_match_all` | Does not match all | |
 | `*_not_eq_all` | none of values in a set | |
 | `*_start` | Starts with | SQL: `col LIKE 'value%'` |
 | `*_not_start` | Does not start with | |
@@ -484,6 +464,12 @@ List of all possible predicates
 | `*_not_cont` | Does not contain |
 | `*_not_cont_any` | Does not contain any of | |
 | `*_not_cont_all` | Does not contain all of | |
+| `*_i_cont` | Contains value with case insensitive | uses `ILIKE` |
+| `*_i_cont_any` | Contains any of values with case insensitive | |
+| `*_i_cont_all` | Contains all of values with case insensitive | |
+| `*_not_i_cont` | Does not contain with case insensitive |
+| `*_not_i_cont_any` | Does not contain any of values with case insensitive | |
+| `*_not_i_cont_all` | Does not contain all of values with case insensitive | |
 | `*_true` | is true | |
 | `*_false` | is false | |
 
@@ -716,8 +702,6 @@ class Employee < ActiveRecord::Base
       %i(activated hired_since)
     end
   end
-
-  private_class_method :ransackable_scopes
 end
 
 Employee.ransack({ activated: true, hired_since: '2013-01-01' })
@@ -752,7 +736,7 @@ To turn this off on a per-scope basis Ransack adds the following method to
 Add the scope you wish to bypass this behavior to ransackable_scopes_skip_sanitize_args:
 
 ```ruby
-def ransackable_scopes_skip_sanitize_args
+def self.ransackable_scopes_skip_sanitize_args
   [:scope_to_skip_sanitize_args]
 end
 ```
@@ -923,6 +907,7 @@ In other words: `Major.Minor.Patch`.
 
 To support the project:
 
+* Consider supporting via [Open Collective](https://opencollective.com/ransack/backers/badge.svg)
 * Use Ransack in your apps, and let us know if you encounter anything that's
 broken or missing. A failing spec to demonstrate the issue is awesome. A pull
 request with passing tests is even better!
@@ -933,3 +918,45 @@ directly related to bug reports, pull requests, or documentation improvements.
 * Spread the word on Twitter, Facebook, and elsewhere if Ransack's been useful
 to you. The more people who are using the project, the quicker we can find and
 fix bugs!
+
+## Contributors
+
+This project exists thanks to all the people who contribute. <img src="https://opencollective.com/ransack/contributors.svg?width=890&button=false" />
+
+Ransack is a rewrite of [MetaSearch](https://github.com/activerecord-hackery/meta_search)
+created by [Ernie Miller](http://twitter.com/erniemiller)
+and developed/maintained by:
+
+- [Greg Molnar](https://github.com/gregmolnar)
+- [Deivid Rodriguez](https://github.com/deivid-rodriguez)
+- [Sean Carroll](https://github.com/seanfcarroll)
+- [Jon Atack](http://twitter.com/jonatack)
+- [Ryan Bigg](http://twitter.com/ryanbigg)
+- a great group of [contributors](https://github.com/activerecord-hackery/ransack/graphs/contributors).
+- Ransack's logo is designed by [Anıl Kılıç](https://github.com/anilkilic).
+
+While it supports many of the same features as MetaSearch, its underlying implementation differs greatly from MetaSearch, and backwards compatibility is not a design goal.
+
+
+
+## Backers
+
+Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com/ransack#backer)]
+
+<a href="https://opencollective.com/ransack#backers" target="_blank"><img src="https://opencollective.com/ransack/backers.svg?width=890"></a>
+
+
+## Sponsors
+
+Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/ransack#sponsor)]
+
+<a href="https://opencollective.com/ransack/sponsor/0/website" target="_blank"><img src="https://opencollective.com/ransack/sponsor/0/avatar.svg"></a>
+<a href="https://opencollective.com/ransack/sponsor/1/website" target="_blank"><img src="https://opencollective.com/ransack/sponsor/1/avatar.svg"></a>
+<a href="https://opencollective.com/ransack/sponsor/2/website" target="_blank"><img src="https://opencollective.com/ransack/sponsor/2/avatar.svg"></a>
+<a href="https://opencollective.com/ransack/sponsor/3/website" target="_blank"><img src="https://opencollective.com/ransack/sponsor/3/avatar.svg"></a>
+<a href="https://opencollective.com/ransack/sponsor/4/website" target="_blank"><img src="https://opencollective.com/ransack/sponsor/4/avatar.svg"></a>
+<a href="https://opencollective.com/ransack/sponsor/5/website" target="_blank"><img src="https://opencollective.com/ransack/sponsor/5/avatar.svg"></a>
+<a href="https://opencollective.com/ransack/sponsor/6/website" target="_blank"><img src="https://opencollective.com/ransack/sponsor/6/avatar.svg"></a>
+<a href="https://opencollective.com/ransack/sponsor/7/website" target="_blank"><img src="https://opencollective.com/ransack/sponsor/7/avatar.svg"></a>
+<a href="https://opencollective.com/ransack/sponsor/8/website" target="_blank"><img src="https://opencollective.com/ransack/sponsor/8/avatar.svg"></a>
+<a href="https://opencollective.com/ransack/sponsor/9/website" target="_blank"><img src="https://opencollective.com/ransack/sponsor/9/avatar.svg"></a>

data/lib/polyamorous/{activerecord_5.2.1_ruby_2 → activerecord_5.2_ruby_2}/join_association.rb

@@ -1,5 +1,3 @@
-# active_record_5.2.1_ruby_2/join_association.rb
-
 module Polyamorous
   module JoinAssociationExtensions
     include SwappingReflectionClass
@@ -19,13 +17,8 @@ module Polyamorous
       end
     end
 
-    def build_constraint(klass, table, key, foreign_table, foreign_key)
-      if reflection.polymorphic?
-        super(klass, table, key, foreign_table, foreign_key)
-        .and(foreign_table[reflection.foreign_type].eq(reflection.klass.name))
-      else
-        super(klass, table, key, foreign_table, foreign_key)
-      end
+    def ==(other)
+      base_klass == other.base_klass
     end
   end
 end

data/lib/polyamorous/{activerecord_5.2.1_ruby_2 → activerecord_5.2_ruby_2}/join_dependency.rb

@@ -1,9 +1,6 @@
-# active_record_5.2.1_ruby_2/join_dependency.rb
-
 module Polyamorous
   module JoinDependencyExtensions
     # Replaces ActiveRecord::Associations::JoinDependency#build
-    #
     def build(associations, base_klass)
       associations.map do |name, right|
         if name.is_a? Join
@@ -30,6 +27,31 @@ module Polyamorous
       end
     end
 
+    def join_constraints(joins_to_add, join_type, alias_tracker)
+      @alias_tracker = alias_tracker
+
+      construct_tables!(join_root)
+      joins = make_join_constraints(join_root, join_type)
+
+      joins.concat joins_to_add.flat_map { |oj|
+        construct_tables!(oj.join_root)
+        if join_root.match?(oj.join_root) && join_root.table.name == oj.join_root.table.name
+          walk join_root, oj.join_root
+        else
+          make_join_constraints(oj.join_root, join_type)
+        end
+      }
+    end
+
+    private
+      def make_constraints(parent, child, join_type = Arel::Nodes::OuterJoin)
+        foreign_table = parent.table
+        foreign_klass = parent.base_klass
+        join_type = child.join_type || join_type if join_type == Arel::Nodes::InnerJoin
+        joins = child.join_constraints(foreign_table, foreign_klass, join_type, alias_tracker)
+        joins.concat child.children.flat_map { |c| make_constraints(child, c, join_type) }
+      end
+
     module ClassMethods
       # Prepended before ActiveRecord::Associations::JoinDependency#walk_tree
       #