activerecord-like 1.0.0 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7d5747b7416a46d6d651022ba3fa6924fd8db7a0
-  data.tar.gz: a12c215ff69771f33fc772c81c52328d553afc3e
+SHA256:
+  metadata.gz: 17697882d9797eb85a6b4a1e80d80c49b5fffd8ab8cd8f12f8b2d72214b96dba
+  data.tar.gz: 6270ce1472c08edff4c6bed332cdc291273d240069c47eabfcae5400ebad67a9
 SHA512:
-  metadata.gz: 28e1151781fee66992b46a476bf7390f56febd409616f31af9cf41a5c1c8e2354df120fb2927bc7a12983e04db7ff34947427cb1314c6ddfe36a38dd38c468d3
-  data.tar.gz: bcf5e1ee0ae802a3bdbf6ea1444e720e5e2a74ad540b88cf9e538ebdf0e35586172269bc54a932d3e255ee0c11d431ace76d79b43a8d3b119ef6f5e3769f5a20
+  metadata.gz: 8be7e5510726ad3f76ec93a75720ce28e37e04c13ed7f386cdd43d0faadee816f1cf06073f36a328f0a691ede4e34e6a8780f45fd49a7d6b2b27a1edc828fe8a
+  data.tar.gz: a044ba63ce7215909b9cd807130cf19b5fbe35854afd1291d4e1b05e260adcaa076b1ddd65d52702b72d9ee9a928a353ba774f78e73206a0f16eb3acbf915f7a

data/.gitignore

@@ -16,3 +16,6 @@ test/tmp
 test/version_tmp
 tmp
 .rvmrc
+
+# Ignore Appraisal related files
+gemfiles/*.gemfile.lock

data/.travis.yml

@@ -1,13 +1,23 @@
+# 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.1.9
-  - 2.2.5
-  - 2.3.1
+  - 2.7.5
+  - 3.0.3
+  - ruby-head
 env:
   - DB=pg
   - DB=sqlite3
   - DB=mysql
-before_script:
-  - psql -c 'create database activerecord_like_test' -U postgres
-  - mysql -e 'create database activerecord_like_test'
+gemfile:
+  - gemfiles/rails_6_0.gemfile
+  - gemfiles/rails_6_1.gemfile
+matrix:
+  fast_finish: true
+  allow_failures:
+    - rvm: ruby-head

data/Appraisals

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

data/Gemfile

@@ -1,20 +1,3 @@
 source 'https://rubygems.org'
 
-gem 'activerecord', '>= 4.0.0'
-
-group :test do
-  gem 'rake'
-
-  case ENV['DB']
-  when 'pg'
-    gem 'pg'
-  when 'mysql'
-    gem 'mysql2'
-  else
-    gem 'sqlite3'
-  end
-
-  gem 'minitest', '>= 3'
-end
-
 gemspec

data/README.md

@@ -7,9 +7,9 @@
 
 [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 4 beta or higher.
+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. Most of the code was previously in Active Record master, but was subsequently removed due to, amongst other, scope creep.
+This plugin has been salvaged from the stellar work done by @amatsuda and @claudiob, and updated to ActiveRecord 5 by @PikachuEXE and 5.2 by @robotdana. 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!
 
 ## Installation
@@ -43,7 +43,7 @@ Post.where.not_like(title: ["%ruby%", "%rails%"])
 ```
 
 ## Dependencies
-Does not work with Arel 4.0.1 or lower or Arel 5.0.0. Do a `bundle update arel` to get the latest Arel that is compatible with your ActiveRecord version (4.0 for ActiveRecord 4.0, 5.0 for ActiveRecord 4.1).
+ActiveRecord 5 or higher
 
 ## Contributing
 

data/Rakefile

@@ -1,6 +1,7 @@
 #!/usr/bin/env rake
 require 'bundler/gem_tasks'
 require 'rake/testtask'
+require 'appraisal'
 
 Rake::TestTask.new do |t|
   t.libs = ["test"]
@@ -10,4 +11,11 @@ Rake::TestTask.new do |t|
   t.ruby_opts = ['-w']
 end
 
-task :default => :test
+if !ENV["APPRAISAL_INITIALIZED"] && !ENV["TRAVIS"]
+  task :default do
+    sh "appraisal install && rake appraisal test"
+  end
+else
+  task :default =>  [:test]
+end
+

data/activerecord-like.gemspec

@@ -15,5 +15,16 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency             "activerecord", ">= 4.0.0"
+  gem.add_dependency             "activerecord", "~> 6.0",  ">= 6.0.0"
+
+  # Required for Travis build to pass
+  gem.add_development_dependency "pg"
+  gem.add_development_dependency "mysql2"
+  gem.add_development_dependency "sqlite3"
+
+  gem.add_development_dependency "rake"
+
+  gem.add_development_dependency "minitest", ">= 3"
+
+  gem.add_development_dependency "appraisal", "~> 2.0"
 end

data/gemfiles/rails_6_0.gemfile

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

data/gemfiles/rails_6_1.gemfile

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

data/lib/active_record/like/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Like
-    VERSION = "1.0.0"
+    VERSION = "6.1.0"
   end
 end

data/lib/active_record/like.rb

@@ -1,8 +1,8 @@
 require "active_record"
 
 module ActiveRecord
-  module QueryMethods
-    module Like
+  module Like
+    module WhereChainExtensions
       def like(opts, *rest)
         opts.each do |k,v|
           if v.is_a?(Array) && v.empty?
@@ -22,17 +22,44 @@ module ActiveRecord
         end
       end
 
-    private
+      private
 
       def chain_node(node_type, opts, *rest, &block)
         @scope.tap do |s|
-          s.where_values += s.send(:build_where, opts, *rest).map do |r|
-            if r.right.is_a?(Array)
-              nodes = r.right.map { |expr| node_type.new(r.left, expr) }
+          # 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(r.left, r.right)
+              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
@@ -40,4 +67,8 @@ module ActiveRecord
   end
 end
 
-ActiveRecord::QueryMethods::WhereChain.send(:include, ActiveRecord::QueryMethods::Like)
+ActiveSupport.on_load(:active_record) do
+  ActiveRecord.eager_load!
+
+  ActiveRecord::QueryMethods::WhereChain.send(:include, ::ActiveRecord::Like::WhereChainExtensions)
+end

data/test/helper.rb

@@ -92,9 +92,7 @@ else
   include Test::SQLite3
 end
 
-unless ENV['TRAVIS'] # if we're running on Travis, no drop/create needed
-  drop_and_create_database
-end
+drop_and_create_database
 
 connect_db
 

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_values.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
@@ -13,11 +13,24 @@ describe ActiveRecord::QueryMethods::WhereChain do
         @attribute = "title"
         @value = '%value%'
 
-        @relation_specifier = Post.where.like(@attribute => @value).where_values.first
+        @relation = Post.where.like(@attribute => @value)
+        @first_predicate = @relation.where_clause.send(:predicates).first
       end
 
       it "has the attribute as the left operand" do
-        @relation_specifier.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
+        else
+          # Rails 5.2
+          @first_predicate.right.value
+        end
+
+        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_values.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
@@ -13,13 +13,25 @@ describe ActiveRecord::QueryMethods::WhereChain do
         @attribute = "title"
         @value = '%value%'
 
-        @relation_specifier = Post.where.not_like(@attribute => @value).where_values.first
+        @relation = Post.where.like(@attribute => @value)
+        @first_predicate = @relation.where_clause.send(:predicates).first
       end
 
       it "has the attribute as the left operand" do
-        @relation_specifier.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
+        else
+          # Rails 5.2
+          @first_predicate.right.value
+        end
+
+        first_bind.value.must_equal @value
       end
     end
   end
 end
-

metadata

@@ -1,29 +1,119 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-like
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 6.1.0
 platform: ruby
 authors:
 - René van den Berg
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-06-10 00:00:00.000000000 Z
+date: 2022-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 6.0.0
   type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.0.0
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  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:
@@ -34,11 +124,14 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- Appraisals
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - activerecord-like.gemspec
+- gemfiles/rails_6_0.gemfile
+- gemfiles/rails_6_1.gemfile
 - lib/active_record/like.rb
 - lib/active_record/like/version.rb
 - lib/activerecord-like.rb
@@ -50,7 +143,7 @@ files:
 homepage: http://github.com/ReneB/activerecord-like
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -65,9 +158,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.6
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 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,