activerecord_any_of 1.3 → 1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3086cee8dc2889c8e3f8874ef32631af08c750c2
-  data.tar.gz: 5e01aa2499c952e4fc215c24890b215d1749f104
+  metadata.gz: 47eee92223e93989b63ad4b3ae077bf438bf70fc
+  data.tar.gz: 31b4d5f385ea3d699ad5abca878ef7612649959c
 SHA512:
-  metadata.gz: 2288d0dec57e66b4b9b454f6082eca83125d30912044de57aedfc828f8aa20b98137b0d71c7de5b53a81f94a9c2f3ec6b2b6373b7afa1f10be58e1c127013832
-  data.tar.gz: 59c3984d1052c8cff9b04cf5bd8bd07b19fef3e3082d7379f56383a6531bf63bf94b002c810c24aa56d899948b14f923313f06a2c41fd78697dbd11632a36c8b
+  metadata.gz: 1b2d782aa4da21b7823f1ae978f6effcc0d55460dbbdb51bb7fabdd34d21ce9e50023de2c237857dfba6729d9d1d5c2f377d76d5f842f158d8ff5c4ff6a50552
+  data.tar.gz: f174291bbc3e50f0a48ac8414988f84d01413f21a3a603b63ebc8270afd9163800d91f87f72351b9972ecc6f433fec5860ebb24deb3f17cfd77d6ff058549d7b

data/README.md

@@ -1,41 +1,5 @@
 # ActiverecordAnyOf
 
-## A note for < 1.2 users
-
-There was a lot of confusion about explit/implicit hash parameter notation,
-with people expecting this to generate an OR query :
-
-```ruby
-User.where.any_of(name: 'Doe', active: true)
-```
-
-This wouldn't work, since there is only one parameter, here : `{name: 'Doe', active: true}`,
-so there's a single group of condition that is joined as a AND. To achieve
-expected result, this should have been used :
-
-```ruby
-User.where.any_of({name: 'Doe'}, {active: true})
-```
-
-
-To be true to principle of least surprise, we now automatically expand
-parameters consisting of a single Hash as a hash for each key, so first
-query will indeed generate :
-
-```ruby
-User.where.any_of(name: 'Doe', active: true)
-# => SELECT * FROM users WHERE name = 'Doe' OR active = '1'
-```
-
-
-Grouping conditions can still be achieved using explicit curly brackets :
-
-```ruby
-User.where.any_of({first_name: 'John', last_name: 'Doe'}, active: true)
-# => SELECT * FROM users WHERE (first_name = 'John' AND last_name = 'Doe') OR active = '1'
-```
-
-
 ## Introduction
 
 This gem provides `#any_of` and `#none_of` on ActiveRecord.
@@ -161,9 +125,6 @@ conditions are grouped through `OR` and which are grouped through `AND` :
 * `User.where( "email LIKE '%@example.com" ).where.any_of({ active: true }, { offline: true })`
 * `fakes = User.where( "email LIKE '%@example.com'" ).where( active: true ); User.where.any_of( fakes, { offline: true })`
 
-## I want this in active_record
-
-You can [say it there](https://github.com/rails/rails/pull/10891).
 
 ## Running test
 

data/Rakefile

@@ -1,29 +1,2 @@
-#!/usr/bin/env rake
-$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
-
-require 'rubygems'
-require 'bundler/setup'
-require 'activerecord_any_of/version'
-
+require "bundler/gem_tasks"
 task :default => :spec
-
-task :spec do
-  puts "\n" + (cmd = "bundle exec rspec spec")
-  system cmd
-end
-
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rdoc/rdoc'
-  require 'rake/rdoctask'
-  RDoc::Task = Rake::RDocTask
-end
-
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'ActiverecordAnyOf'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/lib/activerecord_any_of/alternative_builder.rb

@@ -46,10 +46,10 @@ module ActiverecordAnyOf
           @uniq_queries_joins_values ||= begin
             { includes: [], joins: [], references: [] }.tap do |values|
               queries_joins_values.each do |join_type, statements|
-                if Symbol === statements.first or String === statements.first
-                  values[ join_type ] = statements.uniq
-                else
+                if statements.first.respond_to?(:to_sql)
                   values[ join_type ] = statements.uniq( &:to_sql )
+                else
+                  values[ join_type ] = statements.uniq
                 end
               end
             end
@@ -76,8 +76,8 @@ module ActiverecordAnyOf
         end
 
         def unprepare_query(query)
-          query.gsub(/((?<!\\)'.*?(?<!\\)'|(?<!\\)".*?(?<!\\)")|(\=\ \$\d)/) do |match|
-            $2 and $2.gsub(/\=\ \$\d/, "= ?") or match
+          query.gsub(/((?<!\\)'.*?(?<!\\)'|(?<!\\)".*?(?<!\\)")|(\=\ \$\d+)/) do |match|
+            $2 and $2.gsub(/\=\ \$\d+/, "= ?") or match
           end
         end
     end

data/lib/activerecord_any_of/version.rb

@@ -1,3 +1,3 @@
 module ActiverecordAnyOf
-  VERSION = "1.3"
+  VERSION = "1.4"
 end

data/spec/activerecord_any_of_spec.rb

@@ -154,7 +154,7 @@ describe ActiverecordAnyOf do
     end
   end
 
-  it 'calling #any_of with no argument raise exception' do
+  it 'calling #any_of with no argument raises exception' do
     if ActiveRecord::VERSION::MAJOR >= 4
       expect { Author.where.any_of }.to raise_exception(ArgumentError)
     else
@@ -162,7 +162,7 @@ describe ActiverecordAnyOf do
     end
   end
 
-  it 'calling #none_of with no argument raise exception' do
+  it 'calling #none_of with no argument raises exception' do
     if ActiveRecord::VERSION::MAJOR >= 4
       expect { Author.where.none_of }.to raise_exception(ArgumentError)
     else
@@ -170,6 +170,16 @@ describe ActiverecordAnyOf do
     end
   end
 
+  it 'calling #any_of after including via a hash does not raise an exception' do
+    if ActiveRecord::VERSION::MAJOR >= 4
+      expect { User.includes(memberships: :companies).where.any_of(user_id: 1, company_id: 1) }.
+        to_not raise_exception
+    else
+      expect { User.includes(memberships: :companies).any_of(user_id: 1, company_id: 1) }.
+        to_not raise_exception
+    end
+  end
+
   it 'calling #any_of after a wildcard query works' do
     if ActiveRecord::VERSION::MAJOR >= 4
       expect(Author.where("name like '%av%'").where.any_of({name: 'David'}, {name: 'Mary'})).to match_array([authors(:david)])
@@ -186,6 +196,33 @@ describe ActiverecordAnyOf do
     end
   end
 
+  it "does not fail on hudge number for bind values" do
+    conditions = [
+      { name: 'Mary' },
+      { name: 'David' },
+      { name: 'David1' },
+      { name: 'David2' },
+      { name: 'David3' },
+      { name: 'David4' },
+      { name: 'David5' },
+      { name: 'David6' },
+      { name: 'David7' },
+      { name: 'David8' },
+      { name: 'David9' },
+      { name: 'David10' },
+      { name: 'David11' },
+      { name: 'David12' },
+      { name: 'David13' },
+      { name: 'David14' }
+    ]
+
+    if ActiveRecord::VERSION::MAJOR >= 4
+      expect(Author.where.any_of(*conditions)).to match_array(authors(:david, :mary))
+    else
+      expect(Author.any_of(*conditions)).to match_array(authors(:david, :mary))
+    end
+  end
+
   if ActiveRecord::VERSION::MAJOR >= 4
     it 'calling directly #any_of is deprecated in rails-4' do
       allow(ActiveSupport::Deprecation).to receive(:warn)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_any_of
 version: !ruby/object:Gem::Version
-  version: '1.3'
+  version: '1.4'
 platform: ruby
 authors:
 - Olivier El Mekki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-04 00:00:00.000000000 Z
+date: 2016-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -127,17 +127,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Mongoid's any_of like implementation for activerecord
 test_files:
-- spec/db/schema.rb
-- spec/db/database.yml
-- spec/support/models.rb
-- spec/spec_helper.rb
+- spec/activerecord_any_of_spec.rb
 - spec/fixtures/users.yml
-- spec/fixtures/posts.yml
 - spec/fixtures/authors.yml
-- spec/activerecord_any_of_spec.rb
-has_rdoc: 
+- spec/fixtures/posts.yml
+- spec/support/models.rb
+- spec/db/database.yml
+- spec/db/schema.rb
+- spec/spec_helper.rb