where_exists 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74e2e9d06491fe5983970c707ff517e6bddcddbe
-  data.tar.gz: 7124e05a2566dcf93df5942e4311edb012d70c2f
+  metadata.gz: b896dc7f4e36987c9fee2d3f99624944241c5778
+  data.tar.gz: 3b63cf040cc3eccc90b22ffb167815cbc6c26762
 SHA512:
-  metadata.gz: b0dfa7573e12a6a5c163e79c47ed9552b0fdc9331a8670adea62a5dedb0e61e9e79d18a66dfd56b6205476646217d8aaa71f8002fdd1d5373325da9923a5b8dc
-  data.tar.gz: 2debc428fa41ccb5fe7a6ca37ade8bdb93684e75a6dac4639a805a656387d38ab9c7d38d0d29b98b619ed76411393112646223167097c484801893cf69255c7a
+  metadata.gz: f41ff3048e44820bd889403986a48ad90f95e1b3c97b0cfcd43a5797b2c5fdf706b8c6ac21ff3c9655489610a1ec38675001fd10ad5452237b0d46862f02660b
+  data.tar.gz: 744a933a1fcc1fc3bd5251fc1b686c3009d4b7894996a64bef294947d18ed283552b00a225213d3181ae9e8768f976fede2a26aec03c05e6910a35407c7d9003

data/lib/where_exists.rb

@@ -1,11 +1,11 @@
 require 'active_record'
 
 module WhereExists
-  def where_exists(association_name, where_parameters = {})
+  def where_exists(association_name, *where_parameters)
     where_exists_or_not_exists(true, association_name, where_parameters)
   end
 
-  def where_not_exists(association_name, where_parameters = {})
+  def where_not_exists(association_name, *where_parameters)
     where_exists_or_not_exists(false, association_name, where_parameters)
   end
 
@@ -33,8 +33,6 @@ module WhereExists
       not_string = "NOT "
     end
 
-    #queries.map!{|query| query.select(ActiveRecord::FinderMethods::ONE_AS_ONE).where(where_parameters)}
-
     queries_sql = queries.map{|query| "EXISTS (" + query.to_sql + ")"}.join(" OR ")
 
     self.where("#{not_string}(#{queries_sql})")
@@ -43,6 +41,8 @@ module WhereExists
   def where_exists_for_belongs_to_query(association, where_parameters)
     polymorphic = association.options[:polymorphic].present?
 
+    association_scope = association.scope
+
     if polymorphic
       associated_models = self.select("DISTINCT #{connection.quote_column_name(association.foreign_type)}").pluck(association.foreign_type).map(&:constantize)
     else
@@ -57,7 +57,13 @@ module WhereExists
     associated_models.each do |associated_model|
       primary_key = association.options[:primary_key] || associated_model.primary_key
       other_ids = quote_table_and_column_name(associated_model.table_name, primary_key)
-      query = associated_model.select("1").where("#{self_ids} = #{other_ids}").where(where_parameters)
+      query = associated_model.select("1").where("#{self_ids} = #{other_ids}")
+      if where_parameters != []
+        query = query.where(*where_parameters)
+      end
+      if association_scope
+        result = result.instance_exec(&association_scope)
+      end
       if polymorphic
         other_type = connection.quote(associated_model.name)
         query = query.where("#{self_type} = #{other_type}")
@@ -71,6 +77,8 @@ module WhereExists
   def where_exists_for_has_many_query(association, where_parameters)
     through = association.options[:through].present?
 
+    association_scope = association.scope
+
     if through
       next_association = association.source_reflection
       association = association.through_reflection
@@ -84,6 +92,10 @@ module WhereExists
 
     result = associated_model.select("1").where("#{associated_ids} = #{self_ids}")
 
+    if association_scope
+      result = result.instance_exec(&association_scope)
+    end
+
     if association.options[:as]
       other_types = quote_table_and_column_name(associated_model.table_name, association.type)
       self_class = connection.quote(self.name)
@@ -91,9 +103,11 @@ module WhereExists
     end
 
     if through
-      result = result.where_exists(next_association.name, where_parameters)
+      result = result.where_exists(next_association.name, *where_parameters)
     else
-      result = result.where(where_parameters)
+      if where_parameters != []
+        result = result.where(*where_parameters)
+      end
     end
 
     [result]
@@ -106,4 +120,4 @@ end
 
 class ActiveRecord::Base
   extend WhereExists
-end
+end

data/lib/where_exists/version.rb

@@ -1,3 +1,3 @@
 module WhereExists
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/test/belongs_to_polymorphic_test.rb

@@ -19,11 +19,11 @@ class BelongsToPolymorphicChild < ActiveRecord::Base
 end
 
 class FirstPolymorphicEntity < ActiveRecord::Base
-  has_many :children, as: :polymorphic_entity, class_name: BelongsToPolymorphicChild
+  has_many :children, as: :polymorphic_entity, class_name: 'BelongsToPolymorphicChild'
 end
 
 class SecondPolymorphicEntity < ActiveRecord::Base
-  has_many :children, as: :polymorphic_entity, class_name: BelongsToPolymorphicChild
+  has_many :children, as: :polymorphic_entity, class_name: 'BelongsToPolymorphicChild'
 end
 
 class BelongsToPolymorphicTest < Minitest::Test

data/test/belongs_to_test.rb

@@ -11,11 +11,12 @@ ActiveRecord::Migration.create_table :belongs_to_simple_entity_children, :force
 end
 
 class BelongsToSimpleEntity < ActiveRecord::Base
-  has_many :simple_entity_children, primary_key: :my_id, foreign_key: :parent_id, class_name: "BelongsToSimpleEntityChild"
+  has_many :simple_entity_children, primary_key: :my_id, foreign_key: :parent_id, class_name: 'BelongsToSimpleEntityChild'
+  has_many :unnamed_children, -> { where name: nil }, primary_key: :my_id, foreign_key: :parent_id, class_name: 'BelongsToSimpleEntityChild'
 end
 
 class BelongsToSimpleEntityChild < ActiveRecord::Base
-  belongs_to :simple_entity, foreign_key: :parent_id, primary_key: :my_id, class_name: "BelongsToSimpleEntity"
+  belongs_to :simple_entity, foreign_key: :parent_id, primary_key: :my_id, class_name: 'BelongsToSimpleEntity'
 end
 
 class BelongsToTest < Minitest::Test
@@ -46,4 +47,34 @@ class BelongsToTest < Minitest::Test
     assert_equal 1, result.length
     assert_equal result.first.id, child.id
   end
+
+  def test_with_parameters
+    wrong_child = BelongsToSimpleEntityChild.create!(name: 'wrong')
+    child = BelongsToSimpleEntityChild.create!(name: 'right')
+
+    _blank_entity = BelongsToSimpleEntity.create!(my_id: 999)
+    _wrong_entity = BelongsToSimpleEntity.create!(simple_entity_children: [wrong_child], my_id: 500)
+    entity = BelongsToSimpleEntity.create!(name: 'this field is irrelevant', simple_entity_children: [child], my_id: 300)
+
+    result = BelongsToSimpleEntity.where_exists(:simple_entity_children, name: 'right')
+
+    assert_equal 1, result.length
+    assert_equal result.first.id, entity.id
+  end
+
+  def test_with_condition
+    child_1 = BelongsToSimpleEntityChild.create! name: nil
+    child_2 = BelongsToSimpleEntityChild.create! name: 'Luke'
+
+    entity_1 = BelongsToSimpleEntity.create!(simple_entity_children: [child_1], my_id: 999)
+    entity_2 = BelongsToSimpleEntity.create!(simple_entity_children: [child_2], my_id: 500)
+
+    result = BelongsToSimpleEntity.unscoped.where_exists(:unnamed_children)
+    assert_equal 1, result.length
+    assert_equal result.first.id, entity_1.id
+
+    result = BelongsToSimpleEntity.unscoped.where_not_exists(:unnamed_children)
+    assert_equal 1, result.length
+    assert_equal result.first.id, entity_2.id
+  end
 end

data/test/has_many_polymorphic_test.rb

@@ -19,11 +19,11 @@ class HasManyPolymorphicChild < ActiveRecord::Base
 end
 
 class RelevantPolymorphicEntity < ActiveRecord::Base
-  has_many :children, as: :polymorphic_thing, class_name: HasManyPolymorphicChild
+  has_many :children, as: :polymorphic_thing, class_name: 'HasManyPolymorphicChild'
 end
 
 class IrrelevantPolymorphicEntity < ActiveRecord::Base
-  has_many :children, as: :polymorphic_thing, class_name: HasManyPolymorphicChild
+  has_many :children, as: :polymorphic_thing, class_name: 'HasManyPolymorphicChild'
 end
 
 class HasManyPolymorphicTest < Minitest::Test

data/test/has_many_test.rb

@@ -12,6 +12,7 @@ end
 
 class SimpleEntity < ActiveRecord::Base
   has_many :simple_entity_children, primary_key: :my_id, foreign_key: :parent_id
+  has_many :unnamed_children, -> { where name: nil }, primary_key: :my_id, foreign_key: :parent_id, class_name: 'SimpleEntityChild'
 end
 
 class SimpleEntityChild < ActiveRecord::Base
@@ -59,6 +60,22 @@ class HasManyTest < Minitest::Test
     assert_equal result.first.id, entity.id
   end
 
+  def test_with_condition
+    child_1 = SimpleEntityChild.create! name: nil
+    child_2 = SimpleEntityChild.create! name: 'Luke'
+
+    entity_1 = SimpleEntity.create!(simple_entity_children: [child_1], my_id: 999)
+    entity_2 = SimpleEntity.create!(simple_entity_children: [child_2], my_id: 500)
+
+    result = SimpleEntity.unscoped.where_exists(:unnamed_children)
+    assert_equal 1, result.length
+    assert_equal result.first.id, entity_1.id
+
+    result = SimpleEntity.unscoped.where_not_exists(:unnamed_children)
+    assert_equal 1, result.length
+    assert_equal result.first.id, entity_2.id
+  end
+
   def test_not_exists
     child = SimpleEntityChild.create!
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: where_exists
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Eugene Zolotarev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-27 00:00:00.000000000 Z
+date: 2018-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.22
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.22
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6'
@@ -97,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: "#where_exists extension of ActiveRecord"