activerecord-like 2.0 → 2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc1b9bf4a828daa0ebcaa68966c12654f34532ca
-  data.tar.gz: 60d7e06e58f04d72ddf0a431faef0bc006e7935e
+  metadata.gz: d3e8f03f4997b7392648d80a676684f11c0cd081
+  data.tar.gz: 34c1684aedf672fd501445eb3151bc6596c2bee8
 SHA512:
-  metadata.gz: 4ec3097f54125b876a19982ce32081ecc005413420374ae8cb19c447967cfee5c555f4079f58a25c0bad8241cabf6c434868adfdc7e767e83a74e7be87338a96
-  data.tar.gz: c25277c34a1387c51bfb9f33e836436533e636a41fb337959a8b4d70bb3857a3ff80ae5745c8e16de5a1781ee05761f66ebe888ecd5ca9b4176c09546cb28cde
+  metadata.gz: 99f469e8b86a8af0505c295d1f4f9d838134bccd3cf010e4e6df1b7f42eb138fa19f002151f2883533514efd70f43c3af8dbb35f9d8a8a53b70f628e142ff8ef
+  data.tar.gz: 609f7592e5eca2777fe448055bf401b4d07525e741f9d01f036751c4e9ccc00d83ad73e236bb25515d3933426d922b8bd5f78157924e9e18c86205e8e1625393

data/.travis.yml

@@ -4,9 +4,10 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
-  - 2.2.6
-  - 2.3.3
-  - 2.4.0
+  - 2.2.8
+  - 2.3.6
+  - 2.4.3
+  - 2.5.0
   - ruby-head
 env:
   - DB=pg
@@ -14,6 +15,7 @@ env:
   - DB=mysql
 gemfile:
   - gemfiles/rails_5_0.gemfile
+  - gemfiles/rails_5_1.gemfile
 before_script:
   - psql -c 'create database activerecord_like_test' -U postgres
   - mysql -e 'create database activerecord_like_test'

data/Appraisals

@@ -1,3 +1,7 @@
 appraise "rails_5_0" do
   gem "activerecord", "~> 5.0.0"
 end
+
+appraise "rails_5_1" do
+  gem "activerecord", "~> 5.1.0"
+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/activerecord-like.gemspec

@@ -18,8 +18,14 @@ Gem::Specification.new do |gem|
   gem.add_dependency             "activerecord", ">= 5.0.0"
 
   # Required for Travis build to pass
-  gem.add_development_dependency "pg"
+  # pg 1.x not supported in all AR versions
+  gem.add_development_dependency "pg", "< 1.0.0"
   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_5_0.gemfile

@@ -4,10 +4,4 @@ source "https://rubygems.org"
 
 gem "activerecord", "~> 5.0.0"
 
-group :test do
-  gem "rake"
-  gem "sqlite3"
-  gem "minitest", ">= 3"
-end
-
 gemspec :path => "../"

data/gemfiles/rails_5_1.gemfile

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

data/lib/active_record/like.rb

@@ -43,7 +43,11 @@ module ActiveRecord
               node_type.new(equal_where_clause_predicate.left, equal_where_clause_predicate.right)
             end
 
-            new_where_clause = s.send(:where_clause_factory).build(new_predicate, equal_where_clause.binds)
+            # 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 = Relation::WhereClause.new([new_predicate], equal_where_clause.binds)
 
             s.where_clause += new_where_clause
           end

data/lib/active_record/like/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-like
 version: !ruby/object:Gem::Version
-  version: '2.0'
+  version: '2.1'
 platform: ruby
 authors:
 - René van den Berg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-09 00:00:00.000000000 Z
+date: 2018-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -26,6 +26,20 @@ dependencies:
         version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -52,6 +66,34 @@ dependencies:
     - - ">="
       - !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: '3'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -83,6 +125,7 @@ files:
 - Rakefile
 - activerecord-like.gemspec
 - gemfiles/rails_5_0.gemfile
+- gemfiles/rails_5_1.gemfile
 - lib/active_record/like.rb
 - lib/active_record/like/version.rb
 - lib/activerecord-like.rb
@@ -110,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: 'ActiveRecord::Like provides ActiveRecord::Base with where.like(attribute: