Merge pull request #1 from PikachuEXE/feature/ar-8.0

Update for rails 8.0 & CI

Author: PikachuEXE

.github/workflows/tests.yaml

@@ -0,0 +1,59 @@
+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:
+        os:
+          - ubuntu-latest
+        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:
+          - os: ubuntu-latest
+            ruby: ruby-head
+            gemfile: gemfiles/rails_8_0.gemfile
+            allow_failures: true
+    env:
+      BUNDLE_GEMFILE: "${{ matrix.gemfile }}"
+      ALLOW_FAILURES: "${{ matrix.allow_failures }}"
+    runs-on: ${{ matrix.os }}
+    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

.travis.yml

@@ -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

Appraisals

@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   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"

activerecord-like.gemspec

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

gemfiles/rails_7_0.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: "../"

gemfiles/rails_7_1.gemfile

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

gemfiles/rails_7_2.gemfile

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

gemfiles/rails_8_0.gemfile

@@ -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