where_exists 3.0.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 973c5c35ea3476b4178a7e2eb1f6ef93303d731922bf537e0d0d76e02a0f4372
-  data.tar.gz: 6b30a099f143b8bfbcdcc4ff82b24f4a35c8c566d69c86a68b7b41e9342fd1bd
+  metadata.gz: d4749154c4976b45791c28a6e55d69016f57b09ccc47c0ada04d438d7851edf3
+  data.tar.gz: 67112fa90f4536950ebad7cad399dd2c5ad5cd6c9effc8758c21c22f637c3ccf
 SHA512:
-  metadata.gz: a4386360276ae78d77f198690e06552a3c29ae08208749f580c4cfc78348b4c9dee005e8bb3f85fc182274926ef724b65daf605d9ba09159731aaf2ed2b8d353
-  data.tar.gz: 9f47044c93ea46798c0bff7bad10ae3b1558eff50d23c1778c681169ad3979878ba52de97f138f0d1fa0dc639148d16acf9b1320bed128763e49472aa55afae9
+  metadata.gz: 8b57e52011f115272e0b13b0c24994ef0f3e7680082e57d3730712b73fd19e5ab36962e7a7b6d5b1a20b65bf316424d69da011cd0cf02b6576be6516fad09014
+  data.tar.gz: db7a5a208d5af8b72d6e49c84198ea1a8ceebeeea1a975aa295ec876b7d1c3d19ef547141c028d6f62b0673eb80dc1dff3f23a8961541d2a233a95719f093a98

data/lib/where_exists/version.rb

@@ -1,3 +1,3 @@
 module WhereExists
-  VERSION = "3.0.0"
+  VERSION = "3.2.0"
 end

data/lib/where_exists.rb

@@ -105,12 +105,13 @@ module WhereExists
       next_association = {
         association: association.source_reflection,
         params: where_parameters,
-        next_association: next_association
+        next_association: next_association,
+        scope: association.scope
       }
       association = association.through_reflection
 
       case association.macro
-      when :has_many, :has_one
+      when :has_many, :has_one, :belongs_to
         return where_exists_for_has_many_query(association, {}, next_association, &block)
       when :has_and_belongs_to_many
         return where_exists_for_habtm_query(association, {}, next_association, &block)
@@ -125,13 +126,20 @@ module WhereExists
       end
     end
 
-    association_scope = next_association[:scope] || association.scope
+    association_scope = association.scope
 
     associated_model = association.klass
-    primary_key = association.options[:primary_key] || self.primary_key
+
+    if association.macro == :belongs_to
+      foreign_key = association.options[:primary_key] || self.primary_key
+      primary_key = association.foreign_key
+    else
+      primary_key = association.options[:primary_key] || self.primary_key
+      foreign_key = association.foreign_key
+    end
 
     self_ids = quote_table_and_column_name(self.table_name, primary_key)
-    associated_ids = quote_table_and_column_name(associated_model.table_name, association.foreign_key)
+    associated_ids = quote_table_and_column_name(associated_model.table_name, foreign_key)
 
     result = associated_model.select("1").where("#{associated_ids} = #{self_ids}")
 
@@ -200,12 +208,18 @@ module WhereExists
   end
 
   def loop_nested_association(query, next_association = {}, nested = false, &block)
+    scope = next_association[:scope] || -> { self }
+    block ||= ->(it) { it }
+    block_with_scope =
+      lambda do |it|
+        block.call(it.instance_exec(&scope))
+      end
     str = query.klass.build_exists_string(
       next_association[:association].name,
       *[
         *next_association[:params]
-      ],
-      &block
+      ].compact,
+      &block_with_scope
     )
 
     if next_association[:next_association] && next_association[:next_association][:association]
@@ -215,7 +229,7 @@ module WhereExists
           next_association[:association],
           next_association[:next_association],
           true,
-          &block
+          &block_with_scope
         )}))"
       end
     end

data/test/has_many_through_belongs_to_test.rb

@@ -0,0 +1,62 @@
+require_relative 'test_helper'
+
+ActiveRecord::Migration.create_table :houses, force: true do |t|
+  t.string :name
+end
+
+ActiveRecord::Migration.create_table :windows, force: true do |t|
+  t.string :name
+  t.integer :house_id
+end
+
+ActiveRecord::Migration.create_table :doors, force: true do |t|
+  t.string :name
+  t.integer :house_id
+end
+
+class House < ActiveRecord::Base
+  has_many :windows
+  has_many :doors
+end
+
+class Window < ActiveRecord::Base
+  belongs_to :house
+  has_many :doors, through: :house
+end
+
+class Door < ActiveRecord::Base
+  belongs_to :house
+end
+
+class HasManyThroughBelongsToTest < Minitest::Test
+  def setup
+    ActiveRecord::Base.descendants.each(&:delete_all)
+  end
+
+  def test_through_belongs_to
+    house = House.create! name: 'relevant'
+    irrelevant_house = House.create! name: 'irrelevant'
+
+    window = Window.create!(house: house)
+    irrelevant_window = Window.create!(house: irrelevant_house)
+
+    door = Door.create!(name: 'relevant', house: house)
+    irrelevant_door = Door.create!(name: 'irrelevant', house: irrelevant_house)
+
+    result = House.where_exists(:doors, name: 'relevant')
+    assert_equal 1, result.length
+    assert_equal house.id, result.first.id
+
+    result = House.where_not_exists(:doors, name: 'relevant')
+    assert_equal 1, result.length
+    assert_equal irrelevant_house.id, result.first.id
+
+    result = House.where_not_exists(:doors, "name = ?", 'relevant')
+    assert_equal 1, result.length
+    assert_equal irrelevant_house.id, result.first.id
+
+    result = Window.where_exists(:doors, name: 'relevant')
+    assert_equal 1, result.length
+    assert_equal window.id, result.first.id
+  end
+end

data/test/has_many_through_conditions_test.rb

@@ -0,0 +1,41 @@
+require 'test_helper'
+
+ActiveRecord::Migration.create_table :posts, :force => true do |t|
+  t.boolean :archived, default: false, null: false
+end
+
+ActiveRecord::Migration.create_table :comments, :force => true do |t|
+  t.integer :post_id
+  t.integer :commentator_id
+end
+
+ActiveRecord::Migration.create_table :commentators, :force => true do |t|
+end
+
+class Post < ActiveRecord::Base
+  has_many :comments
+end
+
+class Comment < ActiveRecord::Base
+  belongs_to :post
+  belongs_to :commentator
+end
+
+class Commentator < ActiveRecord::Base
+  has_many :comments
+  has_many :posts, -> { where(archived: false) }, through: :comments
+end
+
+class HasManyThroughConditionsTest < Minitest::Test
+  def test_where_exists
+    post = Post.create!
+    archived_post = Post.create! archived: true
+
+    commentator = Commentator.create! posts: [post]
+    commentator2 = Commentator.create! posts: [archived_post]
+    commentator3 = Commentator.create!
+
+    assert_equal [commentator], Commentator.where_exists(:posts).to_a # fail: also includes commentator2
+    assert_equal [commentator2, commentator3], Commentator.where_not_exists(:posts).to_a # fail: does not include commentator2
+  end
+end

data/test/test_helper.rb

@@ -13,8 +13,5 @@ else
 end
 
 ActiveRecord::Base.time_zone_aware_attributes = true
-
-ActiveRecord::Base.establish_connection(
-  :adapter => 'sqlite3',
-  :database => File.dirname(__FILE__) + '/db/test.db'
-)
+ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:')
+ActiveRecord::Base.logger = Logger.new(STDOUT)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: where_exists
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Eugene Zolotarev
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-11-11 00:00:00.000000000 Z
+date: 2025-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -114,17 +114,20 @@ files:
 - lib/where_exists/version.rb
 - test/belongs_to_polymorphic_test.rb
 - test/belongs_to_test.rb
+- test/db/test.db
 - test/documentation_test.rb
 - test/has_and_belongs_to_many.rb
 - test/has_many_polymorphic_test.rb
 - test/has_many_test.rb
+- test/has_many_through_belongs_to_test.rb
+- test/has_many_through_conditions_test.rb
 - test/has_many_through_test.rb
 - test/test_helper.rb
 homepage: http://github.com/eugzol/where_exists
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -139,16 +142,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.20
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: "#where_exists extension of ActiveRecord"
 test_files:
+- test/documentation_test.rb
+- test/has_many_through_conditions_test.rb
 - test/belongs_to_polymorphic_test.rb
 - test/belongs_to_test.rb
-- test/documentation_test.rb
-- test/has_and_belongs_to_many.rb
 - test/has_many_polymorphic_test.rb
-- test/has_many_test.rb
+- test/db/test.db
 - test/has_many_through_test.rb
 - test/test_helper.rb
+- test/has_many_through_belongs_to_test.rb
+- test/has_and_belongs_to_many.rb
+- test/has_many_test.rb