activerecord-like 1.0.0 → 2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d5747b7416a46d6d651022ba3fa6924fd8db7a0
-  data.tar.gz: a12c215ff69771f33fc772c81c52328d553afc3e
+  metadata.gz: fc1b9bf4a828daa0ebcaa68966c12654f34532ca
+  data.tar.gz: 60d7e06e58f04d72ddf0a431faef0bc006e7935e
 SHA512:
-  metadata.gz: 28e1151781fee66992b46a476bf7390f56febd409616f31af9cf41a5c1c8e2354df120fb2927bc7a12983e04db7ff34947427cb1314c6ddfe36a38dd38c468d3
-  data.tar.gz: bcf5e1ee0ae802a3bdbf6ea1444e720e5e2a74ad540b88cf9e538ebdf0e35586172269bc54a932d3e255ee0c11d431ace76d79b43a8d3b119ef6f5e3769f5a20
+  metadata.gz: 4ec3097f54125b876a19982ce32081ecc005413420374ae8cb19c447967cfee5c555f4079f58a25c0bad8241cabf6c434868adfdc7e767e83a74e7be87338a96
+  data.tar.gz: c25277c34a1387c51bfb9f33e836436533e636a41fb337959a8b4d70bb3857a3ff80ae5745c8e16de5a1781ee05761f66ebe888ecd5ca9b4176c09546cb28cde

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
 rvm:
-  - 2.1.9
-  - 2.2.5
-  - 2.3.1
+  - 2.2.6
+  - 2.3.3
+  - 2.4.0
+  - ruby-head
 env:
   - DB=pg
   - DB=sqlite3
   - DB=mysql
+gemfile:
+  - gemfiles/rails_5_0.gemfile
 before_script:
   - psql -c 'create database activerecord_like_test' -U postgres
   - mysql -e 'create database activerecord_like_test'
+matrix:
+  fast_finish: true
+  allow_failures:
+    - rvm: ruby-head

data/Appraisals

@@ -0,0 +1,3 @@
+appraise "rails_5_0" do
+  gem "activerecord", "~> 5.0.0"
+end

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. Most of the code was previously in Active Record master, but was subsequently removed due to, amongst other, scope creep.
 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,11 @@ 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", ">= 5.0.0"
+
+  # Required for Travis build to pass
+  gem.add_development_dependency "pg"
+  gem.add_development_dependency "mysql2"
+
+  gem.add_development_dependency "appraisal", "~> 2.0"
 end

data/gemfiles/rails_5_0.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 5.0.0"
+
+group :test do
+  gem "rake"
+  gem "sqlite3"
+  gem "minitest", ">= 3"
+end
+
+gemspec :path => "../"

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,30 @@ 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 = s.send(:where_clause_factory).build({key => value}, rest)
+            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
+
+            new_where_clause = s.send(:where_clause_factory).build(new_predicate, equal_where_clause.binds)
+
+            s.where_clause += new_where_clause
           end
         end
       end
@@ -40,4 +53,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/lib/active_record/like/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Like
-    VERSION = "1.0.0"
+    VERSION = "2.0"
   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_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,17 @@ 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
+        @first_bind       = relation.where_clause.send(:binds).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
+        @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,18 @@ 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
+        @first_bind       = relation.where_clause.send(:binds).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
+        @first_bind.value.must_equal @value
       end
     end
   end
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-like
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: '2.0'
 platform: ruby
 authors:
 - René van den Berg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-10 00:00:00.000000000 Z
+date: 2017-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,56 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.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: 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 +76,13 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- Appraisals
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - activerecord-like.gemspec
+- gemfiles/rails_5_0.gemfile
 - lib/active_record/like.rb
 - lib/active_record/like/version.rb
 - lib/activerecord-like.rb
@@ -66,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: 'ActiveRecord::Like provides ActiveRecord::Base with where.like(attribute: