where_exists 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: '09bda87b615e0962be005bda294cc0227e1d76ce'
-  data.tar.gz: 4cb809c77b97dfaad246f1a90be28e75cc2bb5a2
+SHA256:
+  metadata.gz: 6f1f20fb282b67f60382f0d48c47f506623c3941e6d003b07b217eaa42291b9d
+  data.tar.gz: a4d5235b9373ad42c223eb439a611da125cc35ab7107ff6cf0b4c045bbd4f29e
 SHA512:
-  metadata.gz: b4ca719701af78dfc661a35cb815adf49d1206072f0fa3db2af6a411677f7394ad19547706f0f14265462955231847922821732caa9c64ca4e22186cefeb1127
-  data.tar.gz: 6e147f5238c544d0691cfb982d38cc560b5baf6a97d82f5529b94cafed6683c9e1a0b7706b6d967e2cc0913b905906c0d3192d64e064407f60774cd6c309f94c
+  metadata.gz: dbffcaf8b56b8aaf0c4c6e18586e41fba2ece5a4373f5adb6f0d5e42aee574eaf8d2c1cfd60842fd07d8a633c14f597bc65a0ae78742fb8b03f75f5a8226a94b
+  data.tar.gz: 178fa0742ea16a40d0809d344cc42750a39157e24e2e4df40bb34148967d53b035248a093d4e82e890e219577fd618916fade84b56239d41da656623c63a3b3a

data/Rakefile

@@ -25,7 +25,7 @@ Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'
   t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
+  t.verbose = true
 end
 
 

data/lib/where_exists.rb

@@ -12,10 +12,22 @@ module WhereExists
   protected
 
   def where_exists_or_not_exists(does_exist, association_name, where_parameters)
+    queries_sql = build_exists_string(association_name, *where_parameters)
+
+    if does_exist
+      not_string = ""
+    else
+      not_string = "NOT "
+    end
+
+    self.where("#{not_string}(#{queries_sql})")
+  end
+
+  def build_exists_string(association_name, *where_parameters)
     association = self.reflect_on_association(association_name)
 
     unless association
-      raise ArgumentError.new("where_exists: association #{association_name.inspect} not found on #{self.name}")
+      raise ArgumentError.new("where_exists: association - #{association_name} - #{association_name.inspect} not found on #{self.name}")
     end
 
     case association.macro
@@ -34,16 +46,7 @@ module WhereExists
       end
       raise ArgumentError.new("where_exists: not supported association – #{inspection}")
     end
-
-    if does_exist
-      not_string = ""
-    else
-      not_string = "NOT "
-    end
-
     queries_sql = queries.map { |query| "EXISTS (" + query.to_sql + ")" }.join(" OR ")
-
-    self.where("#{not_string}(#{queries_sql})")
   end
 
   def where_exists_for_belongs_to_query(association, where_parameters)
@@ -82,16 +85,34 @@ module WhereExists
     queries
   end
 
-  def where_exists_for_has_many_query(association, where_parameters)
-    through = association.options[:through].present?
-
-    association_scope = association.scope
-
-    if through
-      next_association = association.source_reflection
+  def where_exists_for_has_many_query(association, where_parameters, next_association = {})
+    if association.through_reflection
+      raise ArgumentError.new(association) unless association.source_reflection
+      next_association = {
+        association: association.source_reflection,
+        params: where_parameters,
+        next_association: next_association
+      }
       association = association.through_reflection
+
+      case association.macro
+      when :has_many, :has_one
+        return where_exists_for_has_many_query(association, {}, next_association)
+      when :has_and_belongs_to_many
+        return where_exists_for_habtm_query(association, {}, next_association)
+      else
+        inspection = nil
+        begin
+          inspection = association.macros.inspect
+        rescue
+          inspection = association.macro
+        end
+        raise ArgumentError.new("where_exists: not supported association – #{inspection}")
+      end
     end
 
+    association_scope = next_association[:scope] || association.scope
+
     associated_model = association.klass
     primary_key = association.options[:primary_key] || self.primary_key
 
@@ -106,13 +127,14 @@ module WhereExists
       result = result.where("#{other_types} = #{self_class}")
     end
 
-    if through
-      return [result.where_exists(next_association.name, *where_parameters)]
+    if next_association[:association]
+      return loop_nested_association(result, next_association)
     end
 
     if where_parameters != []
       result = result.where(*where_parameters)
     end
+
     if association_scope
       result = result.instance_exec(&association_scope)
     end
@@ -120,7 +142,7 @@ module WhereExists
     [result]
   end
 
-  def where_exists_for_habtm_query(association, where_parameters)
+  def where_exists_for_habtm_query(association, where_parameters, next_association = {})
     association_scope = association.scope
 
     associated_model = association.klass
@@ -145,9 +167,14 @@ module WhereExists
       ).
       where("#{join_ids} = #{self_ids}")
 
+    if next_association[:association]
+      return loop_nested_association(result, next_association)
+    end
+
     if where_parameters != []
       result = result.where(*where_parameters)
     end
+
     if association_scope
       result = result.instance_exec(&association_scope)
     end
@@ -155,6 +182,28 @@ module WhereExists
     [result]
   end
 
+  def loop_nested_association(query, next_association = {}, nested = false)
+    str = query.klass.build_exists_string(
+      next_association[:association].name,
+      *[
+        *next_association[:params]
+      ],
+    )
+
+    if next_association[:next_association] && next_association[:next_association][:association]
+      subq = str.match(/\([^\(\)]+\)/mi)[0]
+      str.sub!(subq,
+        "(#{subq} AND (#{loop_nested_association(
+          next_association[:association],
+          next_association[:next_association],
+          true
+        )}))"
+      )
+    end
+
+    nested ? str : [query.where(str)]
+  end
+
   def quote_table_and_column_name(table_name, column_name)
     connection.quote_table_name(table_name) + '.' + connection.quote_column_name(column_name)
   end

data/lib/where_exists/version.rb

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

data/test/has_many_through_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require_relative 'test_helper'
 
 ActiveRecord::Migration.create_table :projects, :force => true do |t|
   t.string :name
@@ -15,6 +15,11 @@ ActiveRecord::Migration.create_table :line_items, :force => true do |t|
   t.integer :task_id
 end
 
+ActiveRecord::Migration.create_table :work_details, :force => true do |t|
+  t.string :name
+  t.integer :line_item_id
+end
+
 ActiveRecord::Migration.create_table :invoices, :force => true do |t|
   t.string :name
 end
@@ -23,6 +28,7 @@ class Project < ActiveRecord::Base
   has_many :tasks
   has_many :invoices, :through => :tasks
   has_many :project_line_items, :through => :tasks, :source => :line_items
+  has_many :work_details, :through => :project_line_items
 end
 
 class Task < ActiveRecord::Base
@@ -35,6 +41,11 @@ end
 class LineItem < ActiveRecord::Base
   belongs_to :invoice
   belongs_to :task
+  has_many :work_details
+end
+
+class WorkDetail < ActiveRecord::Base
+  belongs_to :line_item
 end
 
 class Invoice < ActiveRecord::Base
@@ -50,6 +61,8 @@ class HasManyThroughTest < Minitest::Test
   end
 
   def test_one_level_through
+    ActiveRecord::Base.descendants.each(&:delete_all)
+
     project = Project.create!
     irrelevant_project = Project.create!
 
@@ -70,8 +83,10 @@ class HasManyThroughTest < Minitest::Test
   end
 
   def test_deep_through
-    project = Project.create!
-    irrelevant_project = Project.create!
+    ActiveRecord::Base.descendants.each(&:delete_all)
+
+    project = Project.create! name: 'relevant'
+    irrelevant_project = Project.create! name: 'irrelevant'
 
     task = Task.create!(project: project)
     irrelevant_task = Task.create!(project: irrelevant_project)
@@ -79,8 +94,11 @@ class HasManyThroughTest < Minitest::Test
     invoice = Invoice.create!(name: 'relevant')
     irrelevant_invoice = Invoice.create!(name: 'irrelevant')
 
-    _line_item = LineItem.create!(task: task, invoice: invoice)
-    _irrelevant_line_item = LineItem.create!(task: irrelevant_task, invoice: irrelevant_invoice)
+    line_item = LineItem.create!(task: task, invoice: invoice)
+    irrelevant_line_item = LineItem.create!(task: irrelevant_task, invoice: irrelevant_invoice)
+
+    _work_detail = WorkDetail.create!(line_item: line_item, name: 'relevant')
+    _irrelevant_work_detail = WorkDetail.create!(line_item: irrelevant_line_item, name: 'irrelevant')
 
     result = Project.where_exists(:invoices, name: 'relevant')
 
@@ -96,5 +114,15 @@ class HasManyThroughTest < Minitest::Test
 
     assert_equal 1, result.length
     assert_equal irrelevant_project.id, result.first.id
+
+    result = Project.where_exists(:work_details, name: 'relevant')
+
+    assert_equal 1, result.length
+    assert_equal project.id, result.first.id
+
+    result = Project.where_not_exists(:work_details, name: 'relevant')
+
+    assert_equal 1, result.length
+    assert_equal irrelevant_project.id, result.first.id
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: where_exists
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Eugene Zolotarev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-06 00:00:00.000000000 Z
+date: 2018-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -48,16 +48,44 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.10'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.3'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.0'
 description: Rails way to harness the power of SQL "EXISTS" statement
 email:
 - eugzol@gmail.com
@@ -98,17 +126,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: "#where_exists extension of ActiveRecord"
 test_files:
-- test/db/test.db
+- test/belongs_to_polymorphic_test.rb
 - test/belongs_to_test.rb
+- test/db/test.db
 - test/documentation_test.rb
-- test/test_helper.rb
-- test/has_many_polymorphic_test.rb
 - test/has_and_belongs_to_many.rb
-- test/belongs_to_polymorphic_test.rb
+- test/has_many_polymorphic_test.rb
 - test/has_many_test.rb
 - test/has_many_through_test.rb
+- test/test_helper.rb