where_exists 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6107147002f4b860ab5570fc7f23a5fc38ed39425b38c581b1951394986c925c
-  data.tar.gz: c7ed7a2d3432032a0c719e8298293ba38d875992b7abe76832654678023eccc5
+  metadata.gz: d4749154c4976b45791c28a6e55d69016f57b09ccc47c0ada04d438d7851edf3
+  data.tar.gz: 67112fa90f4536950ebad7cad399dd2c5ad5cd6c9effc8758c21c22f637c3ccf
 SHA512:
-  metadata.gz: c4cd31754b8044d2ad4ff7d55e84bd3959fa742a4527c0955994e3ba2797a1f34b6ab1bcd5fb347543fde2d8fc5d2e97e633a13bbdd26b985cb039b45ab220c2
-  data.tar.gz: 419074f831ceac51d19aaf53cda7ffc4ebd8d14e4246f5439702e251ab424068c30f9e4f8fc5344235fb03848cd1d4a92452c7007df2d35be399181b66cd2b40
+  metadata.gz: 8b57e52011f115272e0b13b0c24994ef0f3e7680082e57d3730712b73fd19e5ab36962e7a7b6d5b1a20b65bf316424d69da011cd0cf02b6576be6516fad09014
+  data.tar.gz: db7a5a208d5af8b72d6e49c84198ea1a8ceebeeea1a975aa295ec876b7d1c3d19ef547141c028d6f62b0673eb80dc1dff3f23a8961541d2a233a95719f093a98

data/lib/where_exists/version.rb

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

data/lib/where_exists.rb

@@ -105,7 +105,8 @@ 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
 
@@ -125,7 +126,7 @@ module WhereExists
       end
     end
 
-    association_scope = next_association[:scope] || association.scope
+    association_scope = association.scope
 
     associated_model = association.klass
 
@@ -207,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]
@@ -222,7 +229,7 @@ module WhereExists
           next_association[:association],
           next_association[:next_association],
           true,
-          &block
+          &block_with_scope
         )}))"
       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.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Eugene Zolotarev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-09-18 00:00:00.000000000 Z
+date: 2025-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -120,6 +120,7 @@ files:
 - 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
@@ -147,6 +148,7 @@ 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/has_many_polymorphic_test.rb