activerecord-like 0.0.5 → 0.0.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6e1d444430a4d71fcf388e809bc133ef37b6d6f2
+  data.tar.gz: 6dbf791db767395263eb645522e5edbe65294222
+SHA512:
+  metadata.gz: 66da03780c19dcd40e345e855ebffc9f22eac25402d8a872758e8d8d44022833dbe39ef1d80d3cbd5e73ca0f750f10ab0b1ba9bf2b2b98433bec80e16d3a1f68
+  data.tar.gz: b5a30f2872aa5034fcd0ebd3933b45b6da89781d8d60f9be477034643b01004fb9e2d52feb47092be42bb973a90336e4fb2f8d710d57ac1fc7a35536ebba4f08

data/README.md

@@ -10,6 +10,7 @@
 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.
 
 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.
+Array parameter handling was added by @rzane - thanks!
 
 ## Installation
 
@@ -31,14 +32,19 @@ Given a class Post and the WhereChain work in Active Record, this plugin allows
 
 ```ruby
 Post.where.like(title: "%rails%")
+Post.where.like(title: ["%ruby%", "%rails%"])
 ```
 
 and
 
 ```ruby
 Post.where.not_like(title: "%rails%")
+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).
+
 ## Contributing
 
 1. Fork it

data/lib/active_record/like.rb

@@ -4,18 +4,29 @@ module ActiveRecord
   module QueryMethods
     module Like
       def like(opts, *rest)
-        chain_node(Arel::Nodes::Matches, opts, *rest)
+        chain_node(Arel::Nodes::Matches, opts, *rest) do |nodes|
+          nodes.inject { |memo, node| Arel::Nodes::Or.new(memo, node) }
+        end
       end
 
       def not_like(opts, *rest)
-        chain_node(Arel::Nodes::DoesNotMatch, 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)
+
+      def chain_node(node_type, opts, *rest, &block)
         @scope.tap do |s|
           s.where_values += s.send(:build_where, opts, *rest).map do |r|
-            node_type.new(r.left, r.right)
+            if r.right.is_a?(Array)
+              nodes = r.right.map { |expr| node_type.new(r.left, expr) }
+              Arel::Nodes::Grouping.new block.call(nodes)
+            else
+              node_type.new(r.left, r.right)
+            end
           end
         end
       end

data/lib/active_record/like/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Like
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

data/test/integration/like_test.rb

@@ -34,6 +34,20 @@ describe ActiveRecord::QueryMethods::WhereChain do
       Post.where.like(title: '%this title is not used anywhere%').map(&:id).wont_include 2
     end
 
+    describe "array behavior" do
+      it "finds records with attributes matching multiple criteria" do
+        Post.where.like(title: ['%DSLs%', 'We need some%']).map(&:id).must_equal [1, 2]
+      end
+
+      it "finds records with attributes matching one criterion" do
+        Post.where.like(title: ['%there?']).map(&:id).must_equal [2]
+      end
+
+      it "does not find any records with an empty array" do
+        Post.where.like(title: []).must_be_empty
+      end
+    end
+
     describe "security-related behavior"  do
       before do
         @user_input = "unused%' OR 1=1); -- "
@@ -49,6 +63,10 @@ describe ActiveRecord::QueryMethods::WhereChain do
       it "prevents SQL injection" do
         Post.where.like(title: @user_input).count.must_equal(0)
       end
+
+      it "prevents SQL injection when provided an array" do
+        Post.where.like(title: [@user_input]).count.must_equal(0)
+      end
     end
   end
 end

data/test/integration/not_like_test.rb

@@ -34,6 +34,20 @@ describe ActiveRecord::QueryMethods::WhereChain do
       Post.where.not_like(title: '%this title is not used anywhere%').map(&:id).must_include 2
     end
 
+    describe "array behavior" do
+      it "finds records with attributes not matching multiple criteria" do
+        Post.where.not_like(title: ['%DSLs%', 'We need some%']).map(&:id).must_be_empty
+      end
+
+      it "finds records with attributes not matching one criterion" do
+        Post.where.not_like(title: ['%there?']).map(&:id).must_equal [1]
+      end
+
+      it "finds all records with an empty array" do
+        Post.where.not_like(title: []).count.must_equal 2
+      end
+    end
+
     describe "security-related behavior"  do
       before do
         @user_input = "unused%' OR 1=1); -- "
@@ -49,7 +63,10 @@ describe ActiveRecord::QueryMethods::WhereChain do
       it "prevents SQL injection" do
         Post.where.not_like(title: @user_input).count.must_equal(2)
       end
+
+      it "prevents SQL injection when provided an array" do
+        Post.where.not_like(title: [@user_input]).count.must_equal(2)
+      end
     end
   end
 end
-

metadata

@@ -1,30 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-like
 version: !ruby/object:Gem::Version
-  version: 0.0.5
-  prerelease: 
+  version: 0.0.6
 platform: ruby
 authors:
 - René van den Berg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-15 00:00:00.000000000 Z
+date: 2014-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
 description: An ActiveRecord plugin providing a higher-level abstraction for SQL 'LIKE'
@@ -35,8 +32,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -52,34 +49,27 @@ files:
 - test/unit/not_like_test.rb
 homepage: http://github.com/ReneB/activerecord-like
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1166120551184225501
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1166120551184225501
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.4.4
 signing_key: 
-specification_version: 3
-summary: ! 'ActiveRecord::Like provides ActiveRecord::Base with where.like(attribute:
+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,
   but subsequently removed. Since the feature seemed to be in some demand, I thought
   I''d try my hand at building an ActiveRecord plugin'