eager_group 0.3.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0628b41e3191da5216f80c436de1da7c4a9dc3be
-  data.tar.gz: 36de11cb727b029633f41cac0950f1fa31a33adc
+  metadata.gz: 3ddfe7747a2b77e9f26cbbbb0029b41acb03b88b
+  data.tar.gz: 5357c3d44af2542594fc5ea593029cd3e3c5cc7e
 SHA512:
-  metadata.gz: efbadb72bff4d8b62e75db9bafaed9d6f4f3197447f35e6bd722ce26977318bf38bf003db102bf973f2c42037c21a57ef06c00a33ebfa4f79f25efe853de516c
-  data.tar.gz: 7bec44884ab2c31e914400d9bd370f8de5c7c31c8764b95ec8f907090f4a7a3a589a162527faed42d13608bdb409b5a80d87562d6d2b56e3091dfe3c12e3d674
+  metadata.gz: 80419fb36e918d83f69487633330ffd607d806abaed2ff0a10ecd28134402968105c336aa31e90d361511dc717f3d3bfa3deb7a8a2892663e2a7efc7348ad862
+  data.tar.gz: ca82b49a3007370aebc5b3f2db9d85d51b3aeda6ee800a16dc20a3bda5a8b136c96bfbcfc7ffeb6523a110ef4083c20859ed0d31abb3cf6df4fe2b450d3d5c04

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 2.2
+  - 2.3.0
 env:
   - DB=sqlite
 script: bundle exec rspec spec

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Next Release
 
+## 0.5.0 (09/22/2016)
+
+* Add magic method for one record
+
+## 0.4.0 (05/18/2016)
+
+* Support scope arguments
+
 ## 0.3.0 (10/11/2015)
 
 * Support polymorphic association
@@ -10,4 +18,4 @@
 
 ## 0.1.0 (06/29/2015)
 
-* first release
+* First release

data/README.md

@@ -87,6 +87,14 @@ when querying
 EagerGroup will execute `GROUP BY` sqls for you then set the value of
 attributes.
 
+`define_eager_group` will define a method in model. 
+You can call the `definition_name` directly for convenience, 
+but it would not help you to fix n+1 aggregate sql issue.
+
+    post = Post.first
+    post.commets_average_rating
+    post.approved_comments_count
+
 ## Benchmark
 
 I wrote a benchmark script [here][1], it queries approved comments count

data/lib/eager_group.rb

@@ -22,8 +22,26 @@ module EagerGroup
       self.send :attr_accessor, attr
       @eager_group_definations ||= {}
       @eager_group_definations[attr] = Definition.new association, aggregate_function, column_name, scope
+      
+      define_method attr, -> (*args) do
+        query_result_cache = instance_variable_get("@#{attr}")
+        if args.blank? && query_result_cache.present?
+          return query_result_cache
+        end
+        preload_eager_group(attr, *args)
+        instance_variable_get("@#{attr}")
+      end
+      
+      define_method "#{attr}=" do |val|
+        instance_variable_set("@#{attr}", val)
+      end
     end
   end
+  
+  private
+  def preload_eager_group(*eager_group_value)
+    EagerGroup::Preloader.new(self.class, [self], [eager_group_value]).run
+  end
 end
 
 ActiveRecord::Base.send :include, EagerGroup

data/lib/eager_group/preloader.rb

@@ -11,11 +11,11 @@ module EagerGroup
       primary_key = @klass.primary_key
       record_ids = @records.map { |record| record.send primary_key }
       @eager_group_values.each do |eager_group_value|
-        definition = @klass.eager_group_definations[eager_group_value]
-        if definition
+        defination_key, arguments = eager_group_value.is_a?(Array) ? [eager_group_value.shift, eager_group_value] : [eager_group_value, nil]
+        if definition = @klass.eager_group_definations[defination_key]
           reflection = @klass.reflect_on_association(definition.association)
-          association_class = reflection.class_name.constantize
-          association_class = association_class.instance_exec(&definition.scope) if definition.scope
+          association_class = reflection.klass
+          association_class = association_class.instance_exec(*arguments, &definition.scope) if definition.scope
           polymophic_as_condition = lambda {|reflection|
             if reflection.type
               ["#{reflection.name}.#{reflection.type} = ?", @klass.base_class.name]
@@ -23,7 +23,7 @@ module EagerGroup
               []
             end
           }
-          
+
           if reflection.through_reflection
             foreign_key = "#{reflection.through_reflection.name}.#{reflection.through_reflection.foreign_key}"
             aggregate_hash = association_class.joins(reflection.through_reflection.name)
@@ -39,7 +39,7 @@ module EagerGroup
           end
           @records.each do |record|
             id = record.send primary_key
-            record.send "#{eager_group_value}=", aggregate_hash[id] || 0
+            record.send "#{defination_key}=", aggregate_hash[id] || 0
           end
         end
       end

data/lib/eager_group/version.rb

@@ -1,3 +1,3 @@
 module EagerGroup
-  VERSION = "0.3.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eager_group
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-11 00:00:00.000000000 Z
+date: 2016-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -152,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Fix n+1 aggregate sql functions