eager_group 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27ca5cd0d0757f48f272d4349a6dcad1f54992946d960f364bec0086a7646ccf
-  data.tar.gz: 27d7def8639caca795400ba7912789ba7098315578ec954dfb2610fe5a6262af
+  metadata.gz: 516b00c6397d1a6b397b165687091079118a48ed39fc0afce4542d3cf4f7f481
+  data.tar.gz: 9bf3083695c819003574f3971d2a592443320af92dc98c1ff36b302c87718889
 SHA512:
-  metadata.gz: 464cafc22781b01be11027b832219b1dc551f0b3c300f3b377296690c0b9e7d4e98dde5f87c7e9ad8f4f88792ed4b908e00347ab95042a66412a3ef1d31731b6
-  data.tar.gz: 81aaa99f6d856239dba7e1a06fe4d8e2fb2781e5cb98557d142eac440a658cb4ea2a90c354ea82b33b91dcd2f2fa9452a64cf6f2e0c749282937d682fee62618
+  metadata.gz: 389265b557184c2d3f3c0207340c8bd65086a38fb8e0b2b168a4c14ed37f82b5bcb0ee89ab7a48da528bfbcf2174c1c89dcc0fd917eade1de9c184cad3238e9b
+  data.tar.gz: 6e5e9bd946a9d333bda2087578ac47b98d57ab0cb8347adc9577f582124e1ca9a571fdddeaa28da48644aca0f9d0546f1ee323149742b2c0868d5d6c324354da

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Next Release
 
+## 0.8.0 (10/21/2019)
+
+* Support `has_and_belongs_to_many`
+
 ## 0.7.2 (10/10/2019)
 
 * Simplify `association_klass` for `first_object` and `last_object`

data/lib/eager_group.rb

@@ -52,4 +52,4 @@ ActiveRecord::Base.class_eval do
   end
 end
 require 'active_record/with_eager_group'
-ActiveRecord::Relation.send :prepend, ActiveRecord::WithEagerGroup
+ActiveRecord::Relation.prepend ActiveRecord::WithEagerGroup

data/lib/eager_group/preloader.rb

@@ -14,6 +14,7 @@ module EagerGroup
       @eager_group_values.each do |eager_group_value|
         definition_key, arguments =
           eager_group_value.is_a?(Array) ? [eager_group_value.shift, eager_group_value] : [eager_group_value, nil]
+
         if definition_key.is_a?(Hash)
           association_name, definition_key = *definition_key.first
           @records = @records.flat_map { |record| record.send(association_name) }
@@ -22,13 +23,23 @@ module EagerGroup
           @klass = @records.first.class
         end
         record_ids = @records.map { |record| record.send(primary_key) }
-        next unless definition = @klass.eager_group_definitions[definition_key]
+        unless definition = @klass.eager_group_definitions[definition_key]
+          next
+        end
 
         reflection = @klass.reflect_on_association(definition.association)
         association_class = reflection.klass
         association_class = association_class.instance_exec(*arguments, &definition.scope) if definition.scope
 
-        if reflection.through_reflection
+        if reflection.is_a?(ActiveRecord::Reflection::HasAndBelongsToManyReflection)
+          foreign_key = "#{reflection.join_table}.#{reflection.foreign_key}"
+          aggregate_hash =
+            @klass.joins(reflection.name).where(foreign_key => record_ids).where(
+              polymophic_as_condition(reflection)
+            )
+              .group(foreign_key)
+              .send(definition.aggregation_function, definition.column_name)
+        elsif reflection.through_reflection
           foreign_key = "#{reflection.through_reflection.name}.#{reflection.through_reflection.foreign_key}"
           aggregate_hash =
             association_class.joins(reflection.through_reflection.name).where(foreign_key => record_ids).where(

data/lib/eager_group/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EagerGroup
-  VERSION = '0.7.2'
+  VERSION = '0.8.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eager_group
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-10 00:00:00.000000000 Z
+date: 2019-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -142,8 +142,6 @@ files:
 - eager_group.gemspec
 - lib/active_record/with_eager_group.rb
 - lib/eager_group.rb
-- lib/eager_group/active_record_base.rb
-- lib/eager_group/active_record_relation.rb
 - lib/eager_group/definition.rb
 - lib/eager_group/preloader.rb
 - lib/eager_group/version.rb

data/lib/eager_group/active_record_base.rb

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-class ActiveRecord::Base
-  class << self
-    # Post.eager_group(:approved_comments_count, :comments_average_rating)
-    delegate :eager_group, to: :all
-  end
-end

data/lib/eager_group/active_record_relation.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-class ActiveRecord::Relation
-  # Post.all.eager_group(:approved_comments_count, :comments_average_rating)
-
-  def exec_queries_with_eager_group
-    records = exec_queries_without_eager_group
-    EagerGroup::Preloader.new(klass, records, eager_group_values).run if eager_group_values.present?
-    records
-  end
-
-  alias_method_chain :exec_queries, :eager_group
-
-  def eager_group(*args)
-    check_if_method_has_arguments!('eager_group', args)
-    spawn.eager_group!(*args)
-  end
-
-  def eager_group!(*args)
-    self.eager_group_values += args
-    self
-  end
-
-  def eager_group_values
-    @values[:eager_group] || []
-  end
-
-  def eager_group_values=(values)
-    raise ImmutableRelation if @loaded
-
-    @values[:eager_group] = values
-  end
-end