eager_group 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3e98c847d6d1283e9687c8b1b6a770dddd9c645
-  data.tar.gz: 7525252e8291a4b9ee3c270b6e9f318d5bb1b5da
+  metadata.gz: f4192329fcb4dca939b7cd36ba3685a5357012c2
+  data.tar.gz: 9401d2152d653e43f1fa5a38fc67f69609fa28cc
 SHA512:
-  metadata.gz: 9ee51ef879b7359070dc7f45e9138dabc776e29a209ba2499bb7f799c373ea0c4f6d9c92ea0a04a313dc8b46dcd366bb478bcb44c817bf44a9cfe214231c4389
-  data.tar.gz: 3f201ec3c596ec40990e6b9d5a669b76388df8566a8b31cc15f4ae5a02039cab5276f1f89221e9cd0827806842c68d1f4dc46a4be8eddab449190d44a6a4a102
+  metadata.gz: b69e18e374729d70ea2e6256688418e85667e136c2fa8f04ae861806eef55621267b27ab1842c98b704eef1522dce585ee07f89abdbd726fffaade8eb6205149
+  data.tar.gz: 1adc08def5c93538bc39349ab44d8e662fa23399284c1a860eb206afa7306e6496d5963f976d06ce1e6e162ac4748b55f804c0ae0b8aac5fa767d54074f335e6

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Next Release
 
+## 0.2.0 (07/11/2015)
+
+* Add support to `has_many :through`
+
 ## 0.1.0 (06/29/2015)
 
 * first release

data/README.md

@@ -2,6 +2,8 @@
 
 [![Build Status](https://secure.travis-ci.org/xinminlabs/eager_group.png)](http://travis-ci.org/xinminlabs/eager_group)
 
+[More explaination on our blog](http://blog.xinminlabs.com/2015/06/29/eager_group/)
+
 Fix n+1 aggregate sql functions for rails, like
 
     SELECT "posts".* FROM "posts";
@@ -26,6 +28,8 @@ or
     SELECT "posts".* FROM "posts";
     SELECT AVG("comments"."rating") AS average_comments_rating, post_id AS post_id FROM "comments" WHERE "comments"."post_id" IN (1, 2, 3) GROUP BY post_id;
 
+It only supports Rails 4.x so far.
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -47,14 +51,14 @@ Or install it yourself as:
 First you need to define what aggregate function you want to eager
 load.
 
-    class Post
+    class Post < ActiveRecord::Base
       has_many :comments
 
       define_eager_group :comments_average_rating, :comments, :average, :rating
       define_eager_group :approved_comments_count, :comments, :count, :*, -> { approved }
     end
 
-    class Comment
+    class Comment < ActiveRecord::Base
       belongs_to :post
 
       scope :approved, -> { where(status: 'approved') }

data/eager_group.gemspec

@@ -20,11 +20,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activerecord"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.3"
   spec.add_development_dependency "sqlite3", "~> 1.3"
+  spec.add_development_dependency "activerecord"
   spec.add_development_dependency "activerecord-import"
   spec.add_development_dependency "benchmark-ips"
 end

data/lib/eager_group/preloader.rb

@@ -13,12 +13,20 @@ module EagerGroup
       @eager_group_values.each do |eager_group_value|
         definition = @klass.eager_group_definations[eager_group_value]
         if definition
-          reflect = @klass.reflect_on_association(definition.association)
-          association_class = reflect.class_name.constantize
+          reflection = @klass.reflect_on_association(definition.association)
+          association_class = reflection.class_name.constantize
           association_class = association_class.instance_exec(&definition.scope) if definition.scope
-          aggregate_hash = association_class.where(reflect.foreign_key => record_ids)
-                                            .group(reflect.foreign_key)
-                                            .send(definition.aggregate_function, definition.column_name)
+          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} IN (?)", record_ids)
+                                              .group("#{foreign_key}")
+                                              .send(definition.aggregate_function, definition.column_name)
+          else
+            aggregate_hash = association_class.where(reflection.foreign_key => record_ids)
+                                              .group(reflection.foreign_key)
+                                              .send(definition.aggregate_function, definition.column_name)
+          end
           @records.each do |record|
             id = record.send primary_key
             record.send "#{eager_group_value}=", aggregate_hash[id]

data/lib/eager_group/version.rb

@@ -1,3 +1,3 @@
 module EagerGroup
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: eager_group
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-29 00:00:00.000000000 Z
+date: 2015-07-11 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord-import
   requirement: !ruby/object:Gem::Requirement