where_exists 2.0.1 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70bb8d0cc4affb99051fe748c883841abd8635f78faab07572208dd495ae9e0e
-  data.tar.gz: 56be70dc7847f0beddf4a19284485e8e50c38709e2b0db4f64a0250c967b0a33
+  metadata.gz: 15979f86fa103995db4baecef959d5b401f32471a1aae8fcc126191f8938b1b9
+  data.tar.gz: 74ea2303b2851d8c07041cb33f06493b23db39be619c7a17882fc84e33473632
 SHA512:
-  metadata.gz: e86824a1c85aa3a4006bc20035444fe36d1895c7cb17fd3019e5da5431753ba45fd735bbd41ae903f807bc7e45e36d415c887390d2fab8805d44e8afdcd37f2c
-  data.tar.gz: 5a4814a20b678da5ee28b9cdbccd99ef653f4ea6284fd42f5203d0074301d35b3627524e00e89623000595fdb7f9c110873224f163edc2b0a112ae0deeba18b9
+  metadata.gz: fca8f47b863efa329a1a9fed4d66d5c8319daa1b370eb5e0618dd06c61ef224641372c2eb339c9af3ce36f78669b337fcca7a78363cdcc752fe868bc9021ca8e
+  data.tar.gz: 7e7bc8a06cc1c3aa3d16b00fc9fd2919cdb0986a93b7d2643cf25798f705d31db7b84790939b8b89cd0ff945e37aac7ea30052701d3c10588fa8b3b4bc864e51

data/lib/where_exists/version.rb

@@ -1,3 +1,3 @@
 module WhereExists
-  VERSION = "2.0.1"
+  VERSION = "2.0.3"
 end

data/lib/where_exists.rb

@@ -36,11 +36,11 @@ module WhereExists
 
     case association.macro
     when :belongs_to
-      queries = where_exists_for_belongs_to_query(association, where_parameters)
+      queries = where_exists_for_belongs_to_query(association, where_parameters, &block)
     when :has_many, :has_one
-      queries = where_exists_for_has_many_query(association, where_parameters)
+      queries = where_exists_for_has_many_query(association, where_parameters, &block)
     when :has_and_belongs_to_many
-      queries = where_exists_for_habtm_query(association, where_parameters)
+      queries = where_exists_for_habtm_query(association, where_parameters, &block)
     else
       inspection = nil
       begin
@@ -48,18 +48,17 @@ module WhereExists
       rescue
         inspection = association.macro
       end
-      raise ArgumentError.new("where_exists: not supported association – #{inspection}")
+      raise ArgumentError.new("where_exists: not supported association - #{inspection}")
     end
 
     queries_sql =
       queries.map do |query|
-        query = yield query if block_given?
         "EXISTS (" + query.to_sql + ")"
       end
     queries_sql.join(" OR ")
   end
 
-  def where_exists_for_belongs_to_query(association, where_parameters)
+  def where_exists_for_belongs_to_query(association, where_parameters, &block)
     polymorphic = association.options[:polymorphic].present?
 
     association_scope = association.scope
@@ -93,13 +92,14 @@ module WhereExists
 
         query = query.where("#{self_type} IN (?)", other_types.uniq)
       end
+      query = yield query if block_given?
       queries.push query
     end
 
     queries
   end
 
-  def where_exists_for_has_many_query(association, where_parameters, next_association = {})
+  def where_exists_for_has_many_query(association, where_parameters, next_association = {}, &block)
     if association.through_reflection
       raise ArgumentError.new(association) unless association.source_reflection
       next_association = {
@@ -111,9 +111,9 @@ module WhereExists
 
       case association.macro
       when :has_many, :has_one
-        return where_exists_for_has_many_query(association, {}, next_association)
+        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)
+        return where_exists_for_habtm_query(association, {}, next_association, &block)
       else
         inspection = nil
         begin
@@ -121,7 +121,7 @@ module WhereExists
         rescue
           inspection = association.macro
         end
-        raise ArgumentError.new("where_exists: not supported association – #{inspection}")
+        raise ArgumentError.new("where_exists: not supported association - #{inspection}")
       end
     end
 
@@ -148,17 +148,18 @@ module WhereExists
     end
 
     if next_association[:association]
-      return loop_nested_association(result, next_association)
+      return loop_nested_association(result, next_association, &block)
     end
 
     if where_parameters != []
       result = result.where(*where_parameters)
     end
 
+    result = yield result if block_given?
     [result]
   end
 
-  def where_exists_for_habtm_query(association, where_parameters, next_association = {})
+  def where_exists_for_habtm_query(association, where_parameters, next_association = {}, &block)
     association_scope = association.scope
 
     associated_model = association.klass
@@ -182,7 +183,7 @@ module WhereExists
       where("#{join_ids} = #{self_ids}")
 
     if next_association[:association]
-      return loop_nested_association(result, next_association)
+      return loop_nested_association(result, next_association, &block)
     end
 
     if where_parameters != []
@@ -193,15 +194,18 @@ module WhereExists
       result = result.instance_exec(&association_scope)
     end
 
+    result = yield result if block_given?
+
     [result]
   end
 
-  def loop_nested_association(query, next_association = {}, nested = false)
+  def loop_nested_association(query, next_association = {}, nested = false, &block)
     str = query.klass.build_exists_string(
       next_association[:association].name,
       *[
         *next_association[:params]
       ],
+      &block
     )
 
     if next_association[:next_association] && next_association[:next_association][:association]
@@ -210,7 +214,8 @@ module WhereExists
         "(#{subq} AND (#{loop_nested_association(
           next_association[:association],
           next_association[:next_association],
-          true
+          true,
+          &block
         )}))"
       end
     end

data/test/has_many_through_test.rb

@@ -52,8 +52,6 @@ class Blob < ActiveRecord::Base
   end
 end
 
-
-
 class Project < ActiveRecord::Base
   has_many :tasks
   has_many :invoices, :through => :tasks
@@ -99,8 +97,6 @@ class HasManyThroughTest < Minitest::Test
   end
 
   def test_one_level_through
-    ActiveRecord::Base.descendants.each(&:delete_all)
-
     project = Project.create!
     irrelevant_project = Project.create!
 
@@ -121,8 +117,6 @@ class HasManyThroughTest < Minitest::Test
   end
 
   def test_deep_through
-    ActiveRecord::Base.descendants.each(&:delete_all)
-
     project = Project.create! name: 'relevant'
     irrelevant_project = Project.create! name: 'irrelevant'
 
@@ -188,6 +182,14 @@ class HasManyThroughTest < Minitest::Test
     result = Project.where_not_exists(:blobs)
 
     assert_equal 0, result.length
+  end
 
+  def test_with_yield
+    project = Project.create! name: 'example_project'
+    task = Task.create!(project: project)
+    line_item = LineItem.create!(name: 'example_line_item', task: task)
+    result = Project.where_exists(:project_line_items) { |scope| scope.where(name: 'example_line_item') }
+
+    assert_equal 1, result.length
   end
 end

data/test/test_helper.rb

@@ -5,10 +5,16 @@ Bundler.require(:default)
 require 'active_record'
 require File.dirname(__FILE__) + '/../lib/where_exists'
 
-ActiveRecord::Base.default_timezone = :utc
+# Rails < 7.1
+if ActiveRecord::Base.respond_to?(:default_timezone=)
+  ActiveRecord::Base.default_timezone = :utc
+else
+  ActiveRecord.default_timezone = :utc
+end
+
 ActiveRecord::Base.time_zone_aware_attributes = true
 
 ActiveRecord::Base.establish_connection(
   :adapter => 'sqlite3',
-  :database => File.dirname(__FILE__) + "/db/test.db"
+  :database => File.dirname(__FILE__) + '/db/test.db'
 )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: where_exists
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.3
 platform: ruby
 authors:
 - Eugene Zolotarev
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-11 00:00:00.000000000 Z
+date: 2023-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,7 +17,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
         version: '7.1'
   type: :runtime
@@ -27,7 +27,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
         version: '7.1'
 - !ruby/object:Gem::Dependency
@@ -114,7 +114,6 @@ 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
@@ -125,7 +124,7 @@ homepage: http://github.com/eugzol/where_exists
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -140,17 +139,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.4.6
+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_test.rb
 - test/test_helper.rb
-- test/has_and_belongs_to_many.rb
-- test/has_many_test.rb