where_exists 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 6f1f20fb282b67f60382f0d48c47f506623c3941e6d003b07b217eaa42291b9d
-  data.tar.gz: a4d5235b9373ad42c223eb439a611da125cc35ab7107ff6cf0b4c045bbd4f29e
+SHA1:
+  metadata.gz: 053b8ce3825e7f5eeb8faa98a85d5e2fc92c4edf
+  data.tar.gz: 4aefc7de26143e6b72b62f99113fea19f6737b2e
 SHA512:
-  metadata.gz: dbffcaf8b56b8aaf0c4c6e18586e41fba2ece5a4373f5adb6f0d5e42aee574eaf8d2c1cfd60842fd07d8a633c14f597bc65a0ae78742fb8b03f75f5a8226a94b
-  data.tar.gz: 178fa0742ea16a40d0809d344cc42750a39157e24e2e4df40bb34148967d53b035248a093d4e82e890e219577fd618916fade84b56239d41da656623c63a3b3a
+  metadata.gz: e3b5343d68abd33b091752e49c4689215655e515d785052478022bd33f743d621e196c1bbab623a57d67db1e46bcc3ea3a8949b4170955b09674b371f389b5fa
+  data.tar.gz: 166df723c753b0b755eb46b51c9f4acac4f795ac887fb2d1d9ed18ec27ee76b78c783d5f32d8d1fbf29e70ac2a7589b0e4877fd6c02deb1315fddb5925c70226

data/lib/where_exists.rb

@@ -1,18 +1,18 @@
 require 'active_record'
 
 module WhereExists
-  def where_exists(association_name, *where_parameters)
-    where_exists_or_not_exists(true, association_name, where_parameters)
+  def where_exists(association_name, *where_parameters, &block)
+    where_exists_or_not_exists(true, association_name, where_parameters, &block)
   end
 
-  def where_not_exists(association_name, *where_parameters)
-    where_exists_or_not_exists(false, association_name, where_parameters)
+  def where_not_exists(association_name, *where_parameters, &block)
+    where_exists_or_not_exists(false, association_name, where_parameters, &block)
   end
 
   protected
 
-  def where_exists_or_not_exists(does_exist, association_name, where_parameters)
-    queries_sql = build_exists_string(association_name, *where_parameters)
+  def where_exists_or_not_exists(does_exist, association_name, where_parameters, &block)
+    queries_sql = build_exists_string(association_name, *where_parameters, &block)
 
     if does_exist
       not_string = ""
@@ -23,7 +23,7 @@ module WhereExists
     self.where("#{not_string}(#{queries_sql})")
   end
 
-  def build_exists_string(association_name, *where_parameters)
+  def build_exists_string(association_name, *where_parameters, &block)
     association = self.reflect_on_association(association_name)
 
     unless association
@@ -46,7 +46,11 @@ module WhereExists
       end
       raise ArgumentError.new("where_exists: not supported association – #{inspection}")
     end
-    queries_sql = queries.map { |query| "EXISTS (" + query.to_sql + ")" }.join(" OR ")
+
+    queries_sql = queries.map { |query|
+      query = yield query if block_given?
+      "EXISTS (" + query.to_sql + ")"
+    }.join(" OR ")
   end
 
   def where_exists_for_belongs_to_query(association, where_parameters)

data/lib/where_exists/version.rb

@@ -1,3 +1,3 @@
 module WhereExists
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 end

data/test/has_many_test.rb

@@ -7,6 +7,7 @@ end
 
 ActiveRecord::Migration.create_table :simple_entity_children, :force => true do |t|
   t.integer :parent_id
+  t.datetime :my_date
   t.string :name
 end
 
@@ -87,4 +88,19 @@ class HasManyTest < Minitest::Test
     assert_equal 1, result.length
     assert_equal result.first.id, blank_entity.id
   end
+
+  def test_dynamic_scopes
+    child_past = SimpleEntityChild.create! my_date: Time.now - 1.minute
+    child_future = SimpleEntityChild.create! my_date: Time.now + 1.minute
+
+    _blank_entity = SimpleEntity.create!(simple_entity_children: [child_future], my_id: 999)
+    filled_entity = SimpleEntity.create!(simple_entity_children: [child_past], my_id: 500)
+
+    result = SimpleEntity.where_exists(:simple_entity_children) {|scope|
+      scope.where('my_date < ?', Time.now)
+    }
+
+    assert_equal 1, result.length
+    assert_equal result.first.id, filled_entity.id
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: where_exists
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Eugene Zolotarev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-05 00:00:00.000000000 Z
+date: 2018-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -99,7 +99,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
@@ -126,14 +125,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: "#where_exists extension of ActiveRecord"
 test_files:
 - 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