activerecord-like 7.0.0 → 7.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e147475c1e6b4b462af02ab761e093c7ec9badb99037db674d447e8e6a95ce30
-  data.tar.gz: c4788468aafee3e28d1d0b7054ff3764f1bd792c114aeaf6cb7099822b59b8a1
+  metadata.gz: '008bc02548b55ab1abdfb2b5309a6b3550d9d53035c537d84fc7ad6898fb9db2'
+  data.tar.gz: 751e85650c858261f054dad65480b671bc6922eba3a2d63e0919f45f28eef82b
 SHA512:
-  metadata.gz: 00a8bd5af414f203038d61ff3363a99d5179843ba974f307e2dc3154a39f2a7a8ddc67711e4851f60aff14b4c4bf013e8ad6ed58880b9ba2f454daf8d8f30264
-  data.tar.gz: 06adf3e3a2b855bff6d70a2b5d82902f45b435a42bf031abe0498664c55dc05f4e232d53abb32d219ba8b5b1a216385756891cff229748c886734b13f8073c02
+  metadata.gz: 4b08f0b31952192ad43da9e43fd59d7fe2902c391f1676ba44e4bf10c5d34b71e20c2083d7086f7c5df2ce6c137deb9102b432871cf1efc350b52e5ccea51813
+  data.tar.gz: 6acff383cca259d967df98c9e3db82d42ccb5151bd3509a2262bd80b6a53e170447a81ffb8ff72f87b662ec1a120f9661cc27199664e2a40a25f5c9ab9c46101

data/.github/workflows/coverage.yml

@@ -0,0 +1,66 @@
+name: Coverage
+
+on:
+  pull_request:
+    branches:
+      - development
+    paths-ignore:
+      - 'README.md'
+      - 'CHANGELOG.md'
+  push:
+    branches:
+      - development
+    paths-ignore:
+      - 'README.md'
+      - 'CHANGELOG.md'
+
+jobs:
+  coverage:
+    name: Coverage
+    # Homemade support for [ci skip] no longer needed
+    # https://github.blog/changelog/2021-02-08-github-actions-skip-pull-request-and-push-workflows-with-skip-ci/
+    # if: "contains(github.event.commits[0].message, '[ci skip]') == false"
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - "3.3"
+        gemfile:
+          - gemfiles/rails_7_0.gemfile
+          - gemfiles/rails_7_1.gemfile
+          - gemfiles/rails_7_2.gemfile
+          - gemfiles/rails_8_0.gemfile
+    env:
+      BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+      COVERALLS: true
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - name: Collect coverage info
+        run: bundle exec rake test
+
+      - name: Coveralls Parallel
+        uses: coverallsapp/github-action@master
+        continue-on-error: true
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          flag-name: run-${{ matrix.ruby }}-${{ matrix.gemfile }}
+          parallel: true
+
+  finish:
+    needs: coverage
+    runs-on: ubuntu-latest
+    steps:
+      - name: Send to Coveralls
+        uses: coverallsapp/github-action@master
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          parallel-finished: true

data/.github/workflows/tests.yaml

@@ -0,0 +1,56 @@
+name: Tests
+
+on:
+  pull_request:
+    branches:
+      - development
+    paths-ignore:
+      - 'README.md'
+  push:
+    branches:
+      - development
+    paths-ignore:
+      - 'README.md'
+
+jobs:
+  unit_tests:
+    name: Unit Tests
+    # Homemade support for [ci skip] no longer needed
+    # https://github.blog/changelog/2021-02-08-github-actions-skip-pull-request-and-push-workflows-with-skip-ci/
+    # if: "contains(github.event.commits[0].message, '[ci skip]') == false"
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - "3.1"
+          - "3.2"
+          - "3.3"
+        gemfile:
+          - gemfiles/rails_7_0.gemfile
+          - gemfiles/rails_7_1.gemfile
+          - gemfiles/rails_7_2.gemfile
+          - gemfiles/rails_8_0.gemfile
+        allow_failures:
+          - false
+        exclude:
+          - ruby: "3.1"
+            gemfile: gemfiles/rails_8_0.gemfile
+        include:
+          - ruby: ruby-head
+            gemfile: gemfiles/rails_8_0.gemfile
+            allow_failures: true
+    env:
+      BUNDLE_GEMFILE: "${{ matrix.gemfile }}"
+      ALLOW_FAILURES: "${{ matrix.allow_failures }}"
+    runs-on: ubuntu-latest
+    continue-on-error: ${{ endsWith(matrix.ruby, 'head') || matrix.ruby == 'debug' }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Test
+        run: bundle exec rake test || $ALLOW_FAILURES

data/Appraisals

@@ -1,5 +1,8 @@
-("7.0".."7.0").each do |version|
+[("7.0".."7.2"), ("8.0".."8.0")].flat_map(&:to_a).each do |version|
   appraise "rails_#{version.tr('.', '_')}" do
     gem "activerecord", "~> #{version}.0"
+    if version < "7.2"
+      gem "sqlite3", "~> 1.3"
+    end
   end
 end

data/CHANGELOG.md

@@ -0,0 +1,36 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](http://semver.org/).
+
+
+## [Unreleased]
+
+### Added
+
+- Nothing
+
+### Changed
+
+- Nothing
+
+### Fixed
+
+- Nothing
+
+
+## [7.0.1] - 2024-12-17
+
+### Added
+
+- Support Rails 8.x
+
+
+## 7.0.0 - 2022-01-20
+
+### Added
+
+- Support Rails 7.x
+
+
+[Unreleased]: https://github.com/PikachuEXE/where_lower/compare/v7.0.1...HEAD
+[7.0.1]: https://github.com/PikachuEXE/where_lower/compare/v7.0.0...v7.0.1

data/README.md

@@ -1,16 +1,23 @@
 # ActiveRecord::Like
 
-[![Build Status](https://travis-ci.org/ReneB/activerecord-like.png?branch=master)](https://travis-ci.org/ReneB/activerecord-like)
-[![Code Climate](https://codeclimate.com/github/ReneB/activerecord-like.png)](https://codeclimate.com/github/ReneB/activerecord-like)
-[![Dependency Status](https://gemnasium.com/ReneB/activerecord-like.png)](https://gemnasium.com/ReneB/activerecord-like)
-[![Gem Version](https://badge.fury.io/rb/activerecord-like.png)](http://badge.fury.io/rb/activerecord-like)
+[![GitHub Build Status](https://img.shields.io/github/actions/workflow/status/PikachuEXE/activerecord-like/tests.yaml?branch=development&style=flat-square)](https://github.com/PikachuEXE/activerecord-like/actions/workflows/tests.yaml)
 
-[activerecord-like on Github](https://github.com/ReneB/activerecord-like)
+[![Gem Version](http://img.shields.io/gem/v/activerecord-like.svg?style=flat-square)](http://badge.fury.io/rb/activerecord-like)
+[![License](https://img.shields.io/github/license/PikachuEXE/activerecord-like.svg?style=flat-square)](http://badge.fury.io/rb/activerecord-like)
+
+[![Coverage Status](http://img.shields.io/coveralls/PikachuEXE/activerecord-like.svg?style=flat-square)](https://coveralls.io/r/PikachuEXE/activerecord-like)
+[![Code Climate](https://img.shields.io/codeclimate/maintainability/PikachuEXE/activerecord-like.svg?style=flat-square)](https://codeclimate.com/github/PikachuEXE/activerecord-like)
+
+[activerecord-like on Github](https://github.com/PikachuEXE/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.
 
-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!
+## History and credits
+
+This plugin was originally salvaged from the stellar work done by @amatsuda and @claudiob.
+* 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)).
+* It was updated to ActiveRecord 5 by @PikachuEXE, then to ActiveRecord 5.2 by @robotdana and to ActiveRecord 6.1 by @nrw505.
+* Array parameter handling was added by @rzane - thanks!
 
 ## Installation
 

data/activerecord-like.gemspec

@@ -1,21 +1,27 @@
 # -*- encoding: utf-8 -*-
 require File.expand_path('../lib/active_record/like/version', __FILE__)
 
+main_author_name = "PikachuEXE"
+gem_name = "activerecord-like"
+
 Gem::Specification.new do |gem|
-  gem.name          = "activerecord-like"
+  gem.name          = gem_name
   gem.version       = ActiveRecord::Like::VERSION
-  gem.authors       = ["René van den Berg"]
-  gem.email         = ["rene.vandenberg@ogd.nl"]
+  gem.authors       = [
+    "René van den Berg",
+    main_author_name,
+  ]
+  gem.email         = %w[rene.vandenberg@ogd.nl git@pikachuexe.net]
   gem.description   = %q{An ActiveRecord plugin providing a higher-level abstraction for SQL 'LIKE' queries}
   gem.summary       = %q{ActiveRecord::Like provides ActiveRecord::Base with where.like(attribute: string)-style extensions. This functionality was, at one point, included in Rails-master, but subsequently removed. Since the feature seemed to be in some demand, I thought I'd try my hand at building an ActiveRecord plugin}
-  gem.homepage      = "http://github.com/ReneB/activerecord-like"
+  gem.homepage      = "http://github.com/#{main_author_name}/#{gem_name}"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency             "activerecord", "~> 7.0",  ">= 7.0.0"
+  gem.add_dependency             "activerecord", ">= 7.0.0", "< 9.0"
 
   # Required for Travis build to pass
   gem.add_development_dependency "pg"
@@ -27,4 +33,9 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "minitest", ">= 3"
 
   gem.add_development_dependency "appraisal", "~> 2.0"
+
+  gem.add_development_dependency "simplecov", ">= 0.22"
+  gem.add_development_dependency "simplecov-lcov", ">= 0.8"
+
+  gem.add_development_dependency "gem-release", ">= 2.0"
 end

data/gemfiles/rails_7_0.gemfile

@@ -3,5 +3,6 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 7.0.0"
+gem "sqlite3", "~> 1.3"
 
 gemspec path: "../"

data/gemfiles/rails_7_1.gemfile

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

data/gemfiles/rails_7_2.gemfile

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

data/gemfiles/rails_8_0.gemfile

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

data/lib/active_record/like/scope_spawner.rb

@@ -0,0 +1,227 @@
+module ActiveRecord
+  module Like
+    module ScopeSpawners
+      module Shared
+        module Rails7AndBelowSpawner
+          private
+
+          def chain_node(node_type, &block)
+            @scope.tap do |s|
+              # Assuming `opts` to be `Hash`
+              opts.each_pair do |key, value|
+                # 1. Build a where clause to generate "predicates" & "binds"
+                # 2. Convert "predicates" into the one that matches `node_type` (like/not like)
+                # 3. Re-use binding values to create new where clause
+                equal_where_clause = if s.respond_to?(:where_clause_factory, true)
+                  # ActiveRecord 5.0 to 6.0
+                  s.send(:where_clause_factory).build({key => value}, rest)
+                else
+                  # ActiveRecord 6.1, maybe higher
+                  s.send(:build_where_clause, {key => value}, rest)
+                end
+                equal_where_clause_predicate = equal_where_clause.send(:predicates).first
+
+                new_predicate = if equal_where_clause_predicate.right.is_a?(Array)
+                  nodes = equal_where_clause_predicate.right.map do |expr|
+                    node_type.new(equal_where_clause_predicate.left, expr)
+                  end
+                  Arel::Nodes::Grouping.new block.call(nodes)
+                else
+                  node_type.new(equal_where_clause_predicate.left, equal_where_clause_predicate.right)
+                end
+
+                # Passing `Arel::Nodes::Node` into `where_clause_factory`
+                # Will lose the binding values since 5.1
+                # due to this PR
+                # https://github.com/rails/rails/pull/26073
+                new_where_clause = if equal_where_clause.respond_to?(:binds)
+                  Relation::WhereClause.new([new_predicate], equal_where_clause.binds)
+                else
+                  Relation::WhereClause.new([new_predicate])
+                end
+
+                s.where_clause += new_where_clause
+              end
+            end
+          end
+        end
+      end
+      private_constant :Shared
+
+      module LikeScopeSpawners
+        # Spawn different scopes based on value
+        # Data conversion and query string generation are handled by different spanwer classes
+        #
+        # @return [ActiveRecord::Relation] Relation or collection proxy or some AR classs
+        def self.spawn(*args)
+          RAILS_VERSION_TO_SPAWNER_CLASS_MAPPINGS.fetch(ActiveRecord.version.to_s[0..2]).
+            spawn(*args)
+        end
+
+
+        # :nodoc:
+        class AbstractSpawner
+          # :nodoc:
+          attr_reader :scope, :opts, :rest
+
+          # Spawn different scopes based on value
+          # Just delegates to new though
+          #
+          # @param args [Array] arguments that are passed to #initialize
+          #
+          # @see #initialize
+          def self.spawn(*args)
+            new(*args).spawn
+          end
+
+          # Assign ivar only
+          # Actual operation is in #spawn
+          #
+          # @param scope [ActiveRecord::Relation]
+          #   Relation or collection proxy or some AR classes
+          # @param opts [Hash]
+          #   Column value pairs
+          # @param rest [Array]
+          #   Rest of arguments
+          #
+          # @see #spawn
+          def initialize(scope, opts, *rest)
+            @scope  = scope
+            @opts   = opts
+            @rest   = rest
+          end
+
+          # Spawn different scopes based on value
+          # Data conversion and query string generation are handled by different spanwer classes
+          #
+          # @return [ActiveRecord::Relation] Relation or collection proxy or some AR classs
+          def spawn
+            raise NotImplementedError
+          end
+        end
+
+        # :nodoc:
+        class Rails71AndBelowSpawner < AbstractSpawner
+          include Shared::Rails7AndBelowSpawner
+
+          # :nodoc:
+          def spawn
+            opts.each do |k,v|
+              if v.is_a?(Array) && v.empty?
+                opts[k] = ''
+              end
+            end
+
+            chain_node(Arel::Nodes::Matches) do |nodes|
+              nodes.inject { |memo, node| Arel::Nodes::Or.new(memo, node) }
+            end
+          end
+        end
+
+        # :nodoc:
+        class Rails72Spawner < AbstractSpawner
+          include Shared::Rails7AndBelowSpawner
+
+          # :nodoc:
+          def spawn
+            opts.each do |k,v|
+              if v.is_a?(Array) && v.empty?
+                opts[k] = ''
+              end
+            end
+
+            chain_node(Arel::Nodes::Matches) do |nodes|
+              Arel::Nodes::Or.new(nodes)
+            end
+          end
+        end
+
+        RAILS_VERSION_TO_SPAWNER_CLASS_MAPPINGS = {
+          "7.0" => Rails71AndBelowSpawner,
+          "7.1" => Rails71AndBelowSpawner,
+          "7.2" => Rails72Spawner,
+          "8.0" => Rails72Spawner,
+          "8.1" => Rails72Spawner,
+          "8.2" => Rails72Spawner,
+        }.freeze
+        private_constant :RAILS_VERSION_TO_SPAWNER_CLASS_MAPPINGS
+      end
+
+      module NotLikeScopeSpawners
+        # Spawn different scopes based on value
+        # Data conversion and query string generation are handled by different spanwer classes
+        #
+        # @return [ActiveRecord::Relation] Relation or collection proxy or some AR classs
+        def self.spawn(*args)
+          RAILS_VERSION_TO_SPAWNER_CLASS_MAPPINGS.fetch(ActiveRecord.version.to_s[0..2]).
+            spawn(*args)
+        end
+
+        # :nodoc:
+        class AbstractSpawner
+          # :nodoc:
+          attr_reader :scope, :opts, :rest
+
+          # Spawn different scopes based on value
+          # Just delegates to new though
+          #
+          # @param args [Array] arguments that are passed to #initialize
+          #
+          # @see #initialize
+          def self.spawn(*args)
+            new(*args).spawn
+          end
+
+          # Assign ivar only
+          # Actual operation is in #spawn
+          #
+          # @param scope [ActiveRecord::Relation]
+          #   Relation or collection proxy or some AR classes
+          # @param opts [Hash]
+          #   Column value pairs
+          # @param rest [Array]
+          #   Rest of arguments
+          #
+          # @see #spawn
+          def initialize(scope, opts, *rest)
+            @scope  = scope
+            @opts   = opts
+            @rest   = rest
+          end
+
+          # Spawn different scopes based on value
+          # Data conversion and query string generation are handled by different spanwer classes
+          #
+          # @return [ActiveRecord::Relation] Relation or collection proxy or some AR classs
+          def spawn
+            raise NotImplementedError
+          end
+        end
+
+        # :nodoc:
+        class Rails71AndBelowSpawner < AbstractSpawner
+          include Shared::Rails7AndBelowSpawner
+
+          # :nodoc:
+          def spawn
+            @opts = opts.reject { |_, v| v.is_a?(Array) && v.empty? }
+            chain_node(Arel::Nodes::DoesNotMatch) do |nodes|
+              Arel::Nodes::And.new(nodes)
+            end
+          end
+        end
+
+        RAILS_VERSION_TO_SPAWNER_CLASS_MAPPINGS = {
+          "7.0" => Rails71AndBelowSpawner,
+          "7.1" => Rails71AndBelowSpawner,
+          "7.2" => Rails71AndBelowSpawner,
+          "8.0" => Rails71AndBelowSpawner,
+          "8.1" => Rails71AndBelowSpawner,
+          "8.2" => Rails71AndBelowSpawner,
+        }.freeze
+        private_constant :RAILS_VERSION_TO_SPAWNER_CLASS_MAPPINGS
+      end
+    end
+
+  end
+end

data/lib/active_record/like/version.rb

@@ -1,5 +1,7 @@
-module ActiveRecord
-  module Like
-    VERSION = "7.0.0"
-  end
-end
+# frozen_string_literal: true
+
+module ActiveRecord
+  module Like
+    VERSION = "7.0.1"
+  end
+end

data/lib/active_record/like.rb

@@ -1,67 +1,15 @@
 require "active_record"
+require_relative "like/scope_spawner"
 
 module ActiveRecord
   module Like
     module WhereChainExtensions
       def like(opts, *rest)
-        opts.each do |k,v|
-          if v.is_a?(Array) && v.empty?
-            opts[k] = ''
-          end
-        end
-
-        chain_node(Arel::Nodes::Matches, opts, *rest) do |nodes|
-          nodes.inject { |memo, node| Arel::Nodes::Or.new(memo, node) }
-        end
+        ActiveRecord::Like::ScopeSpawners::LikeScopeSpawners.spawn(@scope, opts, rest)
       end
 
       def not_like(opts, *rest)
-        opts = opts.reject { |_, v| v.is_a?(Array) && v.empty? }
-        chain_node(Arel::Nodes::DoesNotMatch, opts, *rest) do |nodes|
-          Arel::Nodes::And.new(nodes)
-        end
-      end
-
-      private
-
-      def chain_node(node_type, opts, *rest, &block)
-        @scope.tap do |s|
-          # Assuming `opts` to be `Hash`
-          opts.each_pair do |key, value|
-            # 1. Build a where clause to generate "predicates" & "binds"
-            # 2. Convert "predicates" into the one that matches `node_type` (like/not like)
-            # 3. Re-use binding values to create new where clause
-            equal_where_clause = if s.respond_to?(:where_clause_factory, true)
-              # ActiveRecord 5.0 to 6.0
-              s.send(:where_clause_factory).build({key => value}, rest)
-            else
-              # ActiveRecord 6.1, maybe higher
-              s.send(:build_where_clause, {key => value}, rest)
-            end
-            equal_where_clause_predicate = equal_where_clause.send(:predicates).first
-
-            new_predicate = if equal_where_clause_predicate.right.is_a?(Array)
-              nodes = equal_where_clause_predicate.right.map do |expr|
-                node_type.new(equal_where_clause_predicate.left, expr)
-              end
-              Arel::Nodes::Grouping.new block.call(nodes)
-            else
-              node_type.new(equal_where_clause_predicate.left, equal_where_clause_predicate.right)
-            end
-
-            # Passing `Arel::Nodes::Node` into `where_clause_factory`
-            # Will lose the binding values since 5.1
-            # due to this PR
-            # https://github.com/rails/rails/pull/26073
-            new_where_clause = if equal_where_clause.respond_to?(:binds)
-              Relation::WhereClause.new([new_predicate], equal_where_clause.binds)
-            else
-              Relation::WhereClause.new([new_predicate])
-            end
-
-            s.where_clause += new_where_clause
-          end
-        end
+        ActiveRecord::Like::ScopeSpawners::NotLikeScopeSpawners.spawn(@scope, opts, rest)
       end
     end
   end

data/test/helper.rb

@@ -1,4 +1,23 @@
 require 'bundler/setup'
+
+if ENV["COVERALLS"]
+  require "simplecov"
+  require "simplecov-lcov"
+
+  SimpleCov::Formatter::LcovFormatter.config do |c|
+    c.report_with_single_file = true
+    c.single_report_path = "coverage/lcov.info"
+  end
+
+  SimpleCov.formatters = SimpleCov::Formatter::MultiFormatter.new(
+    [SimpleCov::Formatter::HTMLFormatter, SimpleCov::Formatter::LcovFormatter]
+  )
+
+  SimpleCov.start do
+    add_filter "test/"
+  end
+end
+
 require 'minitest/autorun'
 require 'minitest/spec'
 require 'active_record/like'

data/test/integration/like_test.rb

@@ -12,7 +12,7 @@ describe ActiveRecord::QueryMethods::WhereChain do
     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 @@ describe ActiveRecord::QueryMethods::WhereChain do
       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 @@ describe ActiveRecord::QueryMethods::WhereChain do
       # 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

data/test/integration/not_like_test.rb

@@ -12,7 +12,7 @@ describe ActiveRecord::QueryMethods::WhereChain do
     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 @@ describe ActiveRecord::QueryMethods::WhereChain do
       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 @@ describe ActiveRecord::QueryMethods::WhereChain do
       # 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

data/test/unit/like_test.rb

@@ -5,7 +5,7 @@ describe ActiveRecord::QueryMethods::WhereChain do
     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,22 @@ describe ActiveRecord::QueryMethods::WhereChain do
       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
         first_bind = if @relation.where_clause.respond_to?(:binds)
           @relation.where_clause.send(:binds).first
+        elsif @first_predicate.right.value.is_a?(String)
+          # Rails 7.0+
+          @first_predicate.right
         else
           # Rails 5.2
           @first_predicate.right.value
         end
 
-        first_bind.value.must_equal @value
+        _(first_bind.value).must_equal @value
       end
     end
   end

data/test/unit/not_like_test.rb

@@ -5,7 +5,7 @@ describe ActiveRecord::QueryMethods::WhereChain do
     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,22 @@ describe ActiveRecord::QueryMethods::WhereChain do
       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
         first_bind = if @relation.where_clause.respond_to?(:binds)
           @relation.where_clause.send(:binds).first
+        elsif @first_predicate.right.value.is_a?(String)
+          # Rails 7.0+
+          @first_predicate.right
         else
           # Rails 5.2
           @first_predicate.right.value
         end
 
-        first_bind.value.must_equal @value
+        _(first_bind.value).must_equal @value
       end
     end
   end

metadata

@@ -1,35 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-like
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 7.0.1
 platform: ruby
+original_platform: ''
 authors:
 - René van den Berg
-autorequire:
+- PikachuEXE
 bindir: bin
 cert_chain: []
-date: 2022-10-17 00:00:00.000000000 Z
+date: 2024-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '7.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 7.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '7.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 7.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -114,24 +115,73 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.22'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.22'
+- !ruby/object:Gem::Dependency
+  name: simplecov-lcov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: gem-release
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: An ActiveRecord plugin providing a higher-level abstraction for SQL 'LIKE'
   queries
 email:
 - rene.vandenberg@ogd.nl
+- git@pikachuexe.net
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/coverage.yml"
+- ".github/workflows/tests.yaml"
 - ".gitignore"
-- ".travis.yml"
 - Appraisals
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - activerecord-like.gemspec
 - gemfiles/rails_7_0.gemfile
+- gemfiles/rails_7_1.gemfile
+- gemfiles/rails_7_2.gemfile
+- gemfiles/rails_8_0.gemfile
 - lib/active_record/like.rb
+- lib/active_record/like/scope_spawner.rb
 - lib/active_record/like/version.rb
 - lib/activerecord-like.rb
 - test/helper.rb
@@ -139,10 +189,9 @@ files:
 - test/integration/not_like_test.rb
 - test/unit/like_test.rb
 - test/unit/not_like_test.rb
-homepage: http://github.com/ReneB/activerecord-like
+homepage: http://github.com/PikachuEXE/activerecord-like
 licenses: []
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -157,8 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key:
+rubygems_version: 3.6.0
 specification_version: 4
 summary: 'ActiveRecord::Like provides ActiveRecord::Base with where.like(attribute:
   string)-style extensions. This functionality was, at one point, included in Rails-master,

data/.travis.yml

@@ -1,22 +0,0 @@
-# Send builds to container-based infrastructure
-# http://docs.travis-ci.com/user/workers/container-based-infrastructure/
-sudo: false
-language: ruby
-cache: bundler
-services:
-  - postgresql
-  - mysql
-rvm:
-  - 2.7.5
-  - 3.0.3
-  - ruby-head
-env:
-  - DB=pg
-  - DB=sqlite3
-  - DB=mysql
-gemfile:
-  - gemfiles/rails_7_0.gemfile
-matrix:
-  fast_finish: true
-  allow_failures:
-    - rvm: ruby-head