eager_group 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 559e8eeb3768f38a63b7ec19a0201dfc583073e37cc145ffabd19886bfe4ba59
-  data.tar.gz: 72fa7fd007ac0f9de02490cde602b25ad6bbb3ef48b8d61b1b13976721d89fcf
+  metadata.gz: 27ca5cd0d0757f48f272d4349a6dcad1f54992946d960f364bec0086a7646ccf
+  data.tar.gz: 27d7def8639caca795400ba7912789ba7098315578ec954dfb2610fe5a6262af
 SHA512:
-  metadata.gz: 39e828e5c8e1315d2a3083907c172373c7f6026d3397a7f0eecbf6722408e87af71c3c22226e271d7a7369806227184513a68df24cf865d2dcf6ea8e23f63652
-  data.tar.gz: 559307e3dac7da634ed9a3e28d93a7dbf0f2b16eb422887f308bfd01f1241806485ce34b62a3d6c66fe9a601f63128fe14a2ce47f729c92508516bd60e637e3d
+  metadata.gz: 464cafc22781b01be11027b832219b1dc551f0b3c300f3b377296690c0b9e7d4e98dde5f87c7e9ad8f4f88792ed4b908e00347ab95042a66412a3ef1d31731b6
+  data.tar.gz: 81aaa99f6d856239dba7e1a06fe4d8e2fb2781e5cb98557d142eac440a658cb4ea2a90c354ea82b33b91dcd2f2fa9452a64cf6f2e0c749282937d682fee62618

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Next Release
 
+## 0.7.2 (10/10/2019)
+
+* Simplify `association_klass` for `first_object` and `last_object`
+
 ## 0.7.1 (08/23/2019)
 
 * Set `eager_group_definitions` by `mattr_accessor`

data/benchmark.rb

@@ -30,11 +30,11 @@ class Comment < ActiveRecord::Base
 end
 
 # create database eager_group_benchmark;
-ActiveRecord::Base.establish_connection(adapter: 'mysql2', database: 'eager_group_benchmark', server: '/tmp/mysql.socket', username: 'root')
+ActiveRecord::Base.establish_connection(
+  adapter: 'mysql2', database: 'eager_group_benchmark', server: '/tmp/mysql.socket', username: 'root'
+)
 
-ActiveRecord::Base.connection.tables.each do |table|
-  ActiveRecord::Base.connection.drop_table(table)
-end
+ActiveRecord::Base.connection.tables.each { |table| ActiveRecord::Base.connection.drop_table(table) }
 
 ActiveRecord::Schema.define do
   self.verbose = false
@@ -55,18 +55,19 @@ ActiveRecord::Schema.define do
 end
 
 posts_size = 100
-comments_size = 1000
+comments_size = 1_000
 
 posts = []
-posts_size.times do |i|
-  posts << Post.new(title: "Title #{i}", body: "Body #{i}")
-end
+posts_size.times { |i| posts << Post.new(title: "Title #{i}", body: "Body #{i}") }
 Post.import posts
 post_ids = Post.all.pluck(:id)
 
 comments = []
 comments_size.times do |i|
-  comments << Comment.new(body: "Comment #{i}", post_id: post_ids[i % 100], status: %w[approved deleted][i % 2], rating: i % 5 + 1)
+  comments <<
+    Comment.new(
+      body: "Comment #{i}", post_id: post_ids[i % 100], status: %w[approved deleted][i % 2], rating: i % 5 + 1
+    )
 end
 Comment.import comments
 

data/lib/eager_group.rb

@@ -20,15 +20,16 @@ module EagerGroup
     # end
     def define_eager_group(attr, association, aggregate_function, column_name, scope = nil)
       send :attr_accessor, attr
-      self.eager_group_definitions[attr] = Definition.new(association, aggregate_function, column_name, scope)
+      eager_group_definitions[attr] = Definition.new(association, aggregate_function, column_name, scope)
 
-      define_method attr, lambda { |*args|
-        query_result_cache = instance_variable_get("@#{attr}")
-        return query_result_cache if args.blank? && query_result_cache.present?
+      define_method attr,
+                    lambda { |*args|
+                      query_result_cache = instance_variable_get("@#{attr}")
+                      return query_result_cache if args.blank? && query_result_cache.present?
 
-        preload_eager_group(attr, *args)
-        instance_variable_get("@#{attr}")
-      }
+                      preload_eager_group(attr, *args)
+                      instance_variable_get("@#{attr}")
+                    }
 
       define_method "#{attr}=" do |val|
         instance_variable_set("@#{attr}", val)

data/lib/eager_group/preloader.rb

@@ -12,7 +12,8 @@ module EagerGroup
     def run
       primary_key = @klass.primary_key
       @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]
+        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) }
@@ -29,19 +30,20 @@ module EagerGroup
 
         if 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(polymophic_as_condition(reflection.through_reflection))
-                                            .group(foreign_key)
-                                            .send(definition.aggregation_function, definition.column_name)
+          aggregate_hash =
+            association_class.joins(reflection.through_reflection.name).where(foreign_key => record_ids).where(
+              polymophic_as_condition(reflection.through_reflection)
+            )
+              .group(foreign_key)
+              .send(definition.aggregation_function, definition.column_name)
         else
-          aggregate_hash = association_class.where(reflection.foreign_key => record_ids)
-                                            .where(polymophic_as_condition(reflection))
-                                            .group(reflection.foreign_key)
-                                            .send(definition.aggregation_function, definition.column_name)
+          aggregate_hash =
+            association_class.where(reflection.foreign_key => record_ids).where(polymophic_as_condition(reflection))
+              .group(reflection.foreign_key)
+              .send(definition.aggregation_function, definition.column_name)
         end
         if definition.need_load_object
-          aggregate_objects = association_class.find(aggregate_hash.values).each_with_object({}) { |o, h| h[o.id] = o }
+          aggregate_objects = reflection.klass.find(aggregate_hash.values).each_with_object({}) { |o, h| h[o.id] = o }
           aggregate_hash.keys.each { |key| aggregate_hash[key] = aggregate_objects[aggregate_hash[key]] }
         end
         @records.each do |record|

data/lib/eager_group/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eager_group
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-22 00:00:00.000000000 Z
+date: 2019-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord