jit_preloader 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d26d02e1483223dda866884820aec9f06532e4a
-  data.tar.gz: c0d4c36e1c7300030113a3ca1ba4dfb22681a062
+  metadata.gz: 612515b854cf998692cc121a1b5a04b802f6d287
+  data.tar.gz: fdd24d5df16d9e4239013bba560f1f6ebeee6059
 SHA512:
-  metadata.gz: 897e6e6246d4568fdef1f34dbe29c37a54a64b0d1ff58ff4d2cdc3dae7a9765ecf87d99f94247624666cdd099549b5ceea864336333d9719130299147d7bc3d2
-  data.tar.gz: a0d912d630bf11b8a7071a0a7949713eb6f67578735d186a53b18eb8d1f36fe89a5d289c0662c498196120d78b0a58e04558497aba3c1a2794712c669ac6ac6a
+  metadata.gz: f3514afa58d8942b0e506e6e1daeba465f6214f45fb89016bc98a22b8f5e27e15a7bf18fc0adb589072c07c608d3d9fd14a20dba790446c9534e76769a6f70e4
+  data.tar.gz: 11b3e498bd08b46c9cadce50ad68f0a3ffcccc9df6aa9edc1625ec1bdb2f10fc709f23631d39c0523bd73acdc5507032cf689a5df1cf31069900f48da5a033ea

data/lib/jit_preloader/active_record/base.rb

@@ -6,6 +6,11 @@ module JitPreloadExtension
     attr_accessor :jit_preloader
     attr_accessor :jit_n_plus_one_tracking
     attr_accessor :jit_preload_aggregates
+
+    def reload(*args)
+      self.jit_preload_aggregates = {}
+      super
+    end
   end
 
   class_methods do
@@ -14,10 +19,11 @@ module JitPreloadExtension
     def has_many_aggregate(assoc, name, aggregate, field, default: 0)
       method_name = "#{assoc}_#{name}"
 
-      define_method(method_name) do
+      define_method(method_name) do |conditions={}|
         self.jit_preload_aggregates ||= {}
 
-        return jit_preload_aggregates[method_name] if jit_preload_aggregates.key?(method_name)
+        key = "#{method_name}|#{conditions.sort.hash}"
+        return jit_preload_aggregates[key] if jit_preload_aggregates.key?(key)
         if jit_preloader
           reflection = association(assoc).reflection
           primary_ids = jit_preloader.records.collect{|r| r[reflection.active_record_primary_key] }
@@ -26,27 +32,23 @@ module JitPreloadExtension
           association_scope = klass
           association_scope = association_scope.instance_exec(&reflection.scope).reorder(nil) if reflection.scope
 
+          conditions[reflection.foreign_key] = primary_ids
+
           preloaded_data = Hash[association_scope
-                                 .where(reflection.foreign_key => primary_ids)
+                                 .where(conditions)
                                  .group(reflection.foreign_key)
                                  .send(aggregate, field)
                                ]
 
           jit_preloader.records.each do |record|
             record.jit_preload_aggregates ||= {}
-            record.jit_preload_aggregates[method_name] = preloaded_data[record.id] || default
+            record.jit_preload_aggregates[key] = preloaded_data[record.id] || default
           end
         else
-          self.jit_preload_aggregates[method_name] = send(assoc).send(aggregate, field) || default
+          self.jit_preload_aggregates[key] = send(assoc).where(conditions).send(aggregate, field) || default
         end
-        jit_preload_aggregates[method_name]
+        jit_preload_aggregates[key]
       end
-
-      def reload(*args)
-        self.jit_preload_aggregates = {}
-        super
-      end
-
     end
   end
 end

data/lib/jit_preloader/version.rb

@@ -1,3 +1,3 @@
 module JitPreloader
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/lib/jit_preloader/preloader_spec.rb

@@ -5,7 +5,8 @@ RSpec.describe JitPreloader::Preloader do
   let!(:contact1) do
     addresses = [
       Address.new(street: "123 Fake st", country: canada),
-      Address.new(street: "21 Jump st", country: usa)
+      Address.new(street: "21 Jump st", country: usa),
+      Address.new(street: "90210 Beverly Hills", country: usa)
     ]
     phones = [
       PhoneNumber.new(phone: "4445556666"),
@@ -40,9 +41,9 @@ RSpec.describe JitPreloader::Preloader do
   end
 
   context "when preloading an aggregate" do
-    let(:addresses_counts) { [2, 0, 2] }
+    let(:addresses_counts) { [3, 0, 2] }
     let(:phone_number_counts) { [2, 0, 1] }
-    let(:maxes) { [11, 0, 12] }
+    let(:maxes) { [19, 0, 12] }
 
     context "without jit_preload" do
       it "generates N+1 query notifications for each one" do
@@ -60,7 +61,10 @@ RSpec.describe JitPreloader::Preloader do
     end
 
     context "with jit_preload" do
-      it "doesn NOT generate N+1 query notifications" do
+      let(:usa_addresses_counts) { [2, 0, 1] }
+      let(:can_addresses_counts) { [1, 0, 1] }
+
+      it "does NOT generate N+1 query notifications" do
         ActiveSupport::Notifications.subscribed(callback, "n_plus_one_query") do
           Contact.jit_preload.each_with_index do |c, i|
             expect(c.addresses_count).to eql addresses_counts[i]
@@ -71,6 +75,13 @@ RSpec.describe JitPreloader::Preloader do
 
         expect(source_map).to eql({})
       end
+
+      it "can handle dynamic queries" do
+        Contact.jit_preload.each_with_index do |c, i|
+          expect(c.addresses_count(country: usa)).to eql usa_addresses_counts[i]
+          expect(c.addresses_count(country: canada)).to eql can_addresses_counts[i]
+        end
+      end
     end
   end
 
@@ -193,6 +204,16 @@ RSpec.describe JitPreloader::Preloader do
           expect(source_map).to eql({})
         end
       end
+
+      context "reload" do
+        it "clears the jit_preload_aggregates" do
+          contact = Contact.jit_preload.first
+
+          contact.addresses_count
+
+          expect { contact.reload }.to change{ contact.jit_preload_aggregates }.to({})
+        end
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jit_preloader
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Kyle d'Oliveira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-16 00:00:00.000000000 Z
+date: 2017-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord