Work with ActiveRecord 7

.travis.yml

@@ -7,8 +7,10 @@ services:
   - postgresql
   - mysql
 rvm:
-  - 2.7.5
-  - 3.0.3
+  - 2.7.7
+  - 3.0.5
+  - 3.1.3
+  - 3.2.1
   - ruby-head
 env:
   - DB=pg
@@ -17,6 +19,7 @@ env:
 gemfile:
   - gemfiles/rails_6_0.gemfile
   - gemfiles/rails_6_1.gemfile
+  - gemfiles/rails_7_0.gemfile
 matrix:
   fast_finish: true
   allow_failures:

Appraisals

@@ -1,5 +1,11 @@
 ("6.0".."6.1").each do |version|
-  appraise "rails_#{version.tr('.', '_')}" do
+  appraise "activerecord_#{version.tr('.', '_')}" do
+    gem "activerecord", "~> #{version}.0"
+  end
+end
+
+["7.0"].each do |version|
+  appraise "activerecord_#{version.tr('.', '_')}" do
     gem "activerecord", "~> #{version}.0"
   end
 end

README.md

@@ -7,7 +7,7 @@
 
 [activerecord-like on Github](https://github.com/ReneB/activerecord-like)
 
-An Active Record Plugin that allows chaining a more DSL-style 'like' or 'not-like' query to an ActiveRecord::Base#where. Requires Rails 5 or higher.
+An Active Record Plugin that allows chaining a more DSL-style 'like' or 'not-like' query to an ActiveRecord::Base#where. Requires ActiveRecord 5 or higher.
 
 This plugin has been salvaged from the stellar work done by @amatsuda and @claudiob, updated to ActiveRecord 5 by @PikachuEXE and 5.2 by @robotdana and then to ActiveRecord 6.1 by @nrw505. Most of the code was previously in Active Record master, but was subsequently removed due to, amongst other, scope creep (see discussion [here](https://github.com/rails/rails/commit/8d02afeaee8993bd0fde69687fdd9bf30921e805)).
 Array parameter handling was added by @rzane - thanks!

gemfiles/rails_7_0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 7.0.0"
+
+gemspec path: "../"

lib/active_record/like.rb

@@ -35,7 +35,7 @@ def chain_node(node_type, opts, *rest, &block)
               # ActiveRecord 5.0 to 6.0
               s.send(:where_clause_factory).build({key => value}, rest)
             else
-              # ActiveRecord 6.1, maybe higher
+              # ActiveRecord 6.1, 7.0, maybe higher
               s.send(:build_where_clause, {key => value}, rest)
             end
             equal_where_clause_predicate = equal_where_clause.send(:predicates).first

test/integration/like_test.rb

@@ -12,7 +12,7 @@
     end
 
     it "finds records with attributes matching the criteria" do
-      Post.where.like(title: '%there?').map(&:id).must_include 2
+      _(Post.where.like(title: '%there?').map(&:id)).must_include 2
     end
 
     it "is case-insensitive" do
@@ -21,30 +21,30 @@
       lowercase_posts = Post.where.like(title: search_term)
       uppercase_posts = Post.where.like(title: search_term.upcase)
 
-      lowercase_posts.map(&:id).must_equal(uppercase_posts.map(&:id))
+      _(lowercase_posts.map(&:id)).must_equal(uppercase_posts.map(&:id))
     end
 
     it "is chainable" do
       Post.where.like(title: '%there?').order(:title).update_all(title: 'some title')
 
-      Post.find(2).title.must_equal('some title')
+      _(Post.find(2).title).must_equal('some title')
     end
 
     it "does not find records with attributes not matching the criteria" do
-      Post.where.like(title: '%this title is not used anywhere%').map(&:id).wont_include 2
+      _(Post.where.like(title: '%this title is not used anywhere%').map(&:id)).wont_include 2
     end
 
     describe "array behavior" do
       it "finds records with attributes matching multiple criteria" do
-        Post.where.like(title: ['%DSLs%', 'We need some%']).map(&:id).must_equal [1, 2]
+        _(Post.where.like(title: ['%DSLs%', 'We need some%']).map(&:id)).must_equal [1, 2]
       end
 
       it "finds records with attributes matching one criterion" do
-        Post.where.like(title: ['%there?']).map(&:id).must_equal [2]
+        _(Post.where.like(title: ['%there?']).map(&:id)).must_equal [2]
       end
 
       it "does not find any records with an empty array" do
-        Post.where.like(title: []).must_be_empty
+        _(Post.where.like(title: [])).must_be_empty
       end
     end
 
@@ -57,15 +57,15 @@
       # Interpolating input strings into LIKE queries is an all-too-common
       # mistake that is prevented by the syntax this plugin provides
       it "is possible to inject SQL into literal query strings" do
-        Post.where("title LIKE '%#{@user_input}%'").count.must_equal(2)
+        _(Post.where("title LIKE '%#{@user_input}%'").count).must_equal(2)
       end
 
       it "prevents SQL injection" do
-        Post.where.like(title: @user_input).count.must_equal(0)
+        _(Post.where.like(title: @user_input).count).must_equal(0)
       end
 
       it "prevents SQL injection when provided an array" do
-        Post.where.like(title: [@user_input]).count.must_equal(0)
+        _(Post.where.like(title: [@user_input]).count).must_equal(0)
       end
     end
   end

test/integration/not_like_test.rb

@@ -12,7 +12,7 @@
     end
 
     it "finds records with attributes not matching the criteria" do
-      Post.where.not_like(title: '%there?').map(&:id).wont_include 2
+      _(Post.where.not_like(title: '%there?').map(&:id)).wont_include 2
     end
 
     it "is case-insensitive" do
@@ -21,30 +21,30 @@
       lowercase_posts = Post.where.not_like(title: search_term)
       uppercase_posts = Post.where.not_like(title: search_term.upcase)
 
-      lowercase_posts.map(&:id).must_equal(uppercase_posts.map(&:id))
+      _(lowercase_posts.map(&:id)).must_equal(uppercase_posts.map(&:id))
     end
 
     it "is chainable" do
       Post.where.not_like(title: '%there?').order(:title).update_all(title: 'some title')
 
-      Post.find(1).title.must_equal('some title')
+      _(Post.find(1).title).must_equal('some title')
     end
 
     it "does not find records with attributes matching the criteria" do
-      Post.where.not_like(title: '%this title is not used anywhere%').map(&:id).must_include 2
+      _(Post.where.not_like(title: '%this title is not used anywhere%').map(&:id)).must_include 2
     end
 
     describe "array behavior" do
       it "finds records with attributes not matching multiple criteria" do
-        Post.where.not_like(title: ['%DSLs%', 'We need some%']).map(&:id).must_be_empty
+        _(Post.where.not_like(title: ['%DSLs%', 'We need some%']).map(&:id)).must_be_empty
       end
 
       it "finds records with attributes not matching one criterion" do
-        Post.where.not_like(title: ['%there?']).map(&:id).must_equal [1]
+        _(Post.where.not_like(title: ['%there?']).map(&:id)).must_equal [1]
       end
 
       it "finds all records with an empty array" do
-        Post.where.not_like(title: []).count.must_equal 2
+        _(Post.where.not_like(title: []).count).must_equal 2
       end
     end
 
@@ -57,15 +57,15 @@
       # Interpolating input strings into LIKE queries is an all-too-common
       # mistake that is prevented by the syntax this plugin provides
       it "is possible to inject SQL into literal query strings" do
-        Post.where("title NOT LIKE '%#{@user_input}%'").count.must_equal(2)
+        _(Post.where("title NOT LIKE '%#{@user_input}%'").count).must_equal(2)
       end
 
       it "prevents SQL injection" do
-        Post.where.not_like(title: @user_input).count.must_equal(2)
+        _(Post.where.not_like(title: @user_input).count).must_equal(2)
       end
 
       it "prevents SQL injection when provided an array" do
-        Post.where.not_like(title: [@user_input]).count.must_equal(2)
+        _(Post.where.not_like(title: [@user_input]).count).must_equal(2)
       end
     end
   end

test/unit/like_test.rb

@@ -5,7 +5,7 @@
     it "creates an Arel Matches node in the relation" do
       relation = Post.where.like(title: '')
 
-      relation.where_clause.send(:predicates).first.must_be_instance_of(Arel::Nodes::Matches)
+      _(relation.where_clause.send(:predicates).first).must_be_instance_of(Arel::Nodes::Matches)
     end
 
     describe "the Arel Node" do
@@ -18,19 +18,27 @@
       end
 
       it "has the attribute as the left operand" do
-        @first_predicate.left.name.must_equal @attribute
+        _(@first_predicate.left.name).must_equal @attribute
       end
 
       it "has the value as the right operand" do
-        # Rails 5.0 & 5.1
+        # ActiveRecord 5.0 & 5.1
         first_bind = if @relation.where_clause.respond_to?(:binds)
           @relation.where_clause.send(:binds).first
         else
-          # Rails 5.2
+          # ActiveRecord 5.2+
           @first_predicate.right.value
         end
 
-        first_bind.value.must_equal @value
+        first_bind_value = if first_bind.respond_to?(:value)
+          # ActiveRecord 5 & 6
+          first_bind.value
+        else
+          # ActiveRecord 7.0
+          first_bind
+        end
+
+        _(first_bind_value).must_equal @value
       end
     end
   end

test/unit/not_like_test.rb

@@ -5,7 +5,7 @@
     it "creates an Arel DoesNotMatch node in the relation" do
       relation = Post.where.not_like(title: '')
 
-      relation.where_clause.send(:predicates).first.must_be_instance_of(Arel::Nodes::DoesNotMatch)
+      _(relation.where_clause.send(:predicates).first).must_be_instance_of(Arel::Nodes::DoesNotMatch)
     end
 
     describe "the Arel Node" do
@@ -18,19 +18,27 @@
       end
 
       it "has the attribute as the left operand" do
-        @first_predicate.left.name.must_equal @attribute
+        _(@first_predicate.left.name).must_equal @attribute
       end
 
       it "has the value as the right operand" do
-        # Rails 5.0 & 5.1
+        # ActiveRecord 5.0 & 5.1
         first_bind = if @relation.where_clause.respond_to?(:binds)
           @relation.where_clause.send(:binds).first
         else
-          # Rails 5.2
+          # ActiveRecord 5.2+
           @first_predicate.right.value
         end
 
-        first_bind.value.must_equal @value
+        first_bind_value = if first_bind.respond_to?(:value)
+          # ActiveRecord 5 & 6
+          first_bind.value
+        else
+          # ActiveRecord 7.0
+          first_bind
+        end
+
+        _(first_bind_value).must_equal @value
       end
     end
   end