eager_group 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8bad88cf4f0de57942e0477ee107ce8f40eeeded25b37def08ef560907ef143
-  data.tar.gz: f14470d5456dbce04be8fac648623fbc0e1dbb25a3e89af5ebe7bde9dd6a61d5
+  metadata.gz: 119ff48ee90c0324a8e7f55e521a3606485ad1728ec27eaefea3df1f7c153173
+  data.tar.gz: 7415661b2a4ced20c7673c8d90bfb977fbef22c203062f0bb60a8be5fdd1970a
 SHA512:
-  metadata.gz: 6e026cf0d9f8a9839b498b995ba7d48ab24afe2dc48f3e7d41cba16069ac4bc9b3c15d202e7b9730859aa81f24c8cb77a9e2bc8572e720a58457cc7f89f171a0
-  data.tar.gz: 0033033e6b427479d0a49c2e2e1b1149f40a63a46f12aa42aa49f54fb91b27f84ee045aa96014c37b745fbad9b5ca84fab20b014ef521e478cbce058f681f803
+  metadata.gz: f3b85835d577315809f1a699c7a717d17b1f61c14ae0e0371312c12615a5088c45a266028fc3f091801639298e9dd6a1ca1e8d6beb37889a6f5e63aacbdc8fe6
+  data.tar.gz: 2475f41755b2b0161bcc4fe01fd04a5cb1b9f69728edd0e165e8596773306e421426efc191aa34eba812912c1e6b8cc608386a3fc29ca490a068c15b2335e337

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Next Release
 
+## 0.9.1 (12/15/2022)
+
+* Fix eager group fetch multi definitions
+
 ## 0.9.0 (12/04/2022)
 
 * Support `has_many`  through `belongs_to`

data/lib/active_record/with_eager_group.rb

@@ -9,7 +9,10 @@ module ActiveRecord
     end
 
     def eager_group(*args)
-      check_if_method_has_arguments!(__callee__, args)
+      # we does not use the `check_if_method_has_arguments!` here because it would flatten all the arguments,
+      # which would cause `[:eager_group_definition, scope_arg1, scope_arg2]` not able to preload together with other `eager_group_definitions`.
+      # e.g. `Post.eager_group(:approved_comments_count, [:comments_average_rating_by_author, students[0], true])`
+      check_argument_not_blank!(args)
 
       spawn.eager_group!(*args)
     end
@@ -28,5 +31,12 @@ module ActiveRecord
 
       @values[:eager_group] = values
     end
+
+    private
+
+    def check_argument_not_blank!(args)
+      raise ArgumentError, "The method .eager_group() must contain arguments." if args.blank?
+      args.compact_blank!
+    end
   end
 end

data/lib/eager_group/preloader/aggregation_finder.rb

@@ -25,6 +25,10 @@ module EagerGroup
         @klass.primary_key
       end
 
+      def aggregate_hash
+        raise NotImplementedError, 'Method "aggregate_hash" must be implemented in subclass'
+      end
+
       private
 
       def polymophic_as_condition

data/lib/eager_group/preloader.rb

@@ -11,8 +11,7 @@ module EagerGroup
     def initialize(klass, records, eager_group_values)
       @klass = klass
       @records = Array.wrap(records).compact.uniq
-      eager_group_definitions = @klass.eager_group_definitions
-      @eager_group_values = eager_group_values.all? { |value| eager_group_definitions.key?(value) } ? eager_group_values : [eager_group_values]
+      @eager_group_values = eager_group_values
     end
 
     # Preload aggregate functions
@@ -27,11 +26,10 @@ module EagerGroup
           next if @records.empty?
 
           @klass = @records.first.class
+          self.class.new(@klass, @records, Array.wrap(definition_key)).run
         end
 
-        Array.wrap(definition_key).each do |key|
-          find_aggregate_values_per_definition!(key, arguments)
-        end
+        find_aggregate_values_per_definition!(definition_key, arguments)
       end
     end
 

data/lib/eager_group/version.rb

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

data/lib/eager_group.rb

@@ -40,7 +40,7 @@ module EagerGroup
   private
 
   def preload_eager_group(*eager_group_value)
-    EagerGroup::Preloader.new(self.class, [self], eager_group_value).run
+    EagerGroup::Preloader.new(self.class, [self], [eager_group_value]).run
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eager_group
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-12-04 00:00:00.000000000 Z
+date: 2022-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord