where_exists 3.1.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6107147002f4b860ab5570fc7f23a5fc38ed39425b38c581b1951394986c925c
-  data.tar.gz: c7ed7a2d3432032a0c719e8298293ba38d875992b7abe76832654678023eccc5
+  metadata.gz: 7418a9047cf21e0b2ba7704220f6102c3e2c830096e6885a3c163ca66107af2f
+  data.tar.gz: 6c4d58b3e9bf1090ab6c6a6f1e6c5c3924157e0b86cee6072c85f90c4bae4ba6
 SHA512:
-  metadata.gz: c4cd31754b8044d2ad4ff7d55e84bd3959fa742a4527c0955994e3ba2797a1f34b6ab1bcd5fb347543fde2d8fc5d2e97e633a13bbdd26b985cb039b45ab220c2
-  data.tar.gz: 419074f831ceac51d19aaf53cda7ffc4ebd8d14e4246f5439702e251ab424068c30f9e4f8fc5344235fb03848cd1d4a92452c7007df2d35be399181b66cd2b40
+  metadata.gz: 6f9d348e8bed4be3c46d0c1d01b1dc4104349b2e09a2b2a8674c15b41493d3e456049834770b36a8a2ba0c77a0845fc53ce95d840e462db459ae7f09e08c7318
+  data.tar.gz: f06abf232e76ee00b2e3f048e41285168fffbeb34106713bc358d349a306576b0e3ad671c32fcbb8f23bcb39522e399b96737e4b7233d179e0789096097d27de

data/lib/where_exists/version.rb

@@ -1,3 +1,3 @@
 module WhereExists
-  VERSION = "3.1.0"
+  VERSION = "3.2.1"
 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.1
 platform: ruby
 authors:
 - Eugene Zolotarev
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-18 00:00:00.000000000 Z
+date: 2025-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.1'
+        version: '8.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.1'
+        version: '8.2'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -114,19 +114,19 @@ 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
@@ -141,18 +141,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.5.20
+signing_key:
 specification_version: 4
 summary: "#where_exists extension of ActiveRecord"
 test_files:
-- test/documentation_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/db/test.db
+- 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
-- test/has_many_through_belongs_to_test.rb
-- test/has_and_belongs_to_many.rb
-- test/has_many_test.rb