activerecord-like 2.1 → 2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3e8f03f4997b7392648d80a676684f11c0cd081
-  data.tar.gz: 34c1684aedf672fd501445eb3151bc6596c2bee8
+  metadata.gz: 9a5c0c2ab913d52c04984736a54d8a2cd2832ea9
+  data.tar.gz: 665673067501add2fff21343a6b73d2449ca2604
 SHA512:
-  metadata.gz: 99f469e8b86a8af0505c295d1f4f9d838134bccd3cf010e4e6df1b7f42eb138fa19f002151f2883533514efd70f43c3af8dbb35f9d8a8a53b70f628e142ff8ef
-  data.tar.gz: 609f7592e5eca2777fe448055bf401b4d07525e741f9d01f036751c4e9ccc00d83ad73e236bb25515d3933426d922b8bd5f78157924e9e18c86205e8e1625393
+  metadata.gz: e4cca0a25e3480c37a079bbb41c80e88b6bf06dc73f59fa56640fe6d1dec4ce1c147e6b79cca32db42a3f59f313ec4cac38297acf5d2a371809579bf035be369
+  data.tar.gz: 208c3fba7b26f6f59b5ea7b7cc82b409c0fc3baeb8aca2da51e017992f027e9087c5fea6dbae303c06ab8d81af7583ccd4db0f8cdd6b7bacd34b67925dc4738d

data/.travis.yml

@@ -16,6 +16,7 @@ env:
 gemfile:
   - gemfiles/rails_5_0.gemfile
   - gemfiles/rails_5_1.gemfile
+  - gemfiles/rails_5_2.gemfile
 before_script:
   - psql -c 'create database activerecord_like_test' -U postgres
   - mysql -e 'create database activerecord_like_test'

data/Appraisals

@@ -1,7 +1,5 @@
-appraise "rails_5_0" do
-  gem "activerecord", "~> 5.0.0"
-end
-
-appraise "rails_5_1" do
-  gem "activerecord", "~> 5.1.0"
+("5.0".."5.2").each do |version|
+  appraise "rails_#{version.tr('.', '_')}" do
+    gem "activerecord", "~> #{version}.0"
+  end
 end

data/README.md

@@ -9,7 +9,7 @@
 
 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, and updated to ActiveRecord 5 by @PikachuEXE. 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

data/gemfiles/rails_5_0.gemfile

@@ -4,4 +4,4 @@ source "https://rubygems.org"
 
 gem "activerecord", "~> 5.0.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_5_1.gemfile

@@ -4,4 +4,4 @@ source "https://rubygems.org"
 
 gem "activerecord", "~> 5.1.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_5_2.gemfile

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

data/lib/active_record/like.rb

@@ -47,7 +47,11 @@ module ActiveRecord
             # Will lose the binding values since 5.1
             # due to this PR
             # https://github.com/rails/rails/pull/26073
-            new_where_clause = Relation::WhereClause.new([new_predicate], equal_where_clause.binds)
+            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

data/lib/active_record/like/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Like
-    VERSION = "2.1"
+    VERSION = "2.2"
   end
 end

data/test/unit/like_test.rb

@@ -13,9 +13,8 @@ describe ActiveRecord::QueryMethods::WhereChain do
         @attribute = "title"
         @value = '%value%'
 
-        relation = Post.where.like(@attribute => @value)
-        @first_predicate  = relation.where_clause.send(:predicates).first
-        @first_bind       = relation.where_clause.send(:binds).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
@@ -23,7 +22,15 @@ describe ActiveRecord::QueryMethods::WhereChain do
       end
 
       it "has the value as the right operand" do
-        @first_bind.value.must_equal @value
+        # 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

@@ -13,9 +13,8 @@ describe ActiveRecord::QueryMethods::WhereChain do
         @attribute = "title"
         @value = '%value%'
 
-        relation = Post.where.like(@attribute => @value)
-        @first_predicate  = relation.where_clause.send(:predicates).first
-        @first_bind       = relation.where_clause.send(:binds).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
@@ -23,7 +22,15 @@ describe ActiveRecord::QueryMethods::WhereChain do
       end
 
       it "has the value as the right operand" do
-        @first_bind.value.must_equal @value
+        # 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-like
 version: !ruby/object:Gem::Version
-  version: '2.1'
+  version: '2.2'
 platform: ruby
 authors:
 - René van den Berg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-02 00:00:00.000000000 Z
+date: 2018-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -126,6 +126,7 @@ files:
 - activerecord-like.gemspec
 - gemfiles/rails_5_0.gemfile
 - gemfiles/rails_5_1.gemfile
+- gemfiles/rails_5_2.gemfile
 - lib/active_record/like.rb
 - lib/active_record/like/version.rb
 - lib/activerecord-like.rb