jit_preloader 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d177cc9a1bc25389c34ee7088fa9d0a6182968d2
-  data.tar.gz: 7c265ce1139ab5bd96e978bc3e3213476b335775
+  metadata.gz: 8b6500123613b4cac00d676d731cb65eb59ce847
+  data.tar.gz: 940e041e05f643ee35ca43bd192ade9c1a5b5857
 SHA512:
-  metadata.gz: cb77c853c929c4bc7c8379de9ebf00240d4f4016dc28814c7745db21365376d838b93a46afc8e89be269603e680c762919dd8ee3f9a8f5ac752e72064803b1e8
-  data.tar.gz: e493b69a1feea9c2ecc5502f66959ae18a02a8414e1b926137123016f01a022d6e12bdadafc8664b29b106a85d7acbc49b42521bc52c062f88d2c8220cceed3b
+  metadata.gz: 425c551f3a1daf7c21120cb9290b294dc4cb9f0d17b6b0b614ab3d13fafdedb793229cbdcf0dc1e337e5f5b05f1e36d476347a94b5c855dfee0303a97b36083e
+  data.tar.gz: 06ca2ebee6226d8d51ef465c4e2a5bde86ad9231a1f5d6249a3681f74f9830946886e1716f0b76b85709ed946ca09b9087b5165a1b3ac4ce06a568a4386731a0

data/.gitignore

@@ -1,5 +1,6 @@
 *.gem
 *.rbc
+.byebug_history
 /.config
 /coverage/
 /InstalledFiles

data/lib/jit_preloader/active_record/base.rb

@@ -12,9 +12,12 @@ module JitPreloadExtension
     delegate :jit_preload, to: :all
 
     def has_many_aggregate(assoc, name, aggregate, field, default: 0)
-      define_method("#{assoc}_#{name}") do
+      method_name = "#{assoc}_#{name}"
+
+      define_method(method_name) do
         self.jit_preload_aggregates ||= {}
-        return jit_preload_aggregates[aggregate] if jit_preload_aggregates[aggregate]
+
+        return jit_preload_aggregates[method_name] if jit_preload_aggregates[method_name]
         if jit_preloader
           reflection = association(assoc).reflection
           primary_ids = jit_preloader.records.collect{|r| r[reflection.active_record_primary_key] }
@@ -28,12 +31,12 @@ module JitPreloadExtension
 
           jit_preloader.records.each do |record|
             record.jit_preload_aggregates ||= {}
-            record.jit_preload_aggregates[aggregate] = preloaded_data[record.id] || default
+            record.jit_preload_aggregates[method_name] = preloaded_data[record.id] || default
           end
         else
-          self.jit_preload_aggregates[aggregate] = send(assoc).send(aggregate, field) || default
+          self.jit_preload_aggregates[method_name] = send(assoc).send(aggregate, field) || default
         end
-        jit_preload_aggregates[aggregate]
+        jit_preload_aggregates[method_name]
       end
 
       def reload(*args)

data/lib/jit_preloader/version.rb

@@ -1,3 +1,3 @@
 module JitPreloader
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/lib/jit_preloader/preloader_spec.rb

@@ -3,31 +3,32 @@ require 'spec_helper'
 RSpec.describe JitPreloader::Preloader do
 
   let!(:contact1) do
-    Contact.create(
-                   name: "Only Addresses",
-                   addresses: [
-                               Address.new(street: "123 Fake st", country: canada),
-                               Address.new(street: "21 Jump st", country: usa)
-                              ]
-                   )
+    addresses = [
+      Address.new(street: "123 Fake st", country: canada),
+      Address.new(street: "21 Jump st", country: usa)
+    ]
+    phones = [
+      PhoneNumber.new(phone: "4445556666"),
+      PhoneNumber.new(phone: "2223333444")
+    ]
+    Contact.create(name: "Only Addresses", addresses: addresses, phone_numbers: phones)
   end
 
   let!(:contact2) do
-    Contact.create(
-                   name: "Only Emails",
-                   email_address: EmailAddress.new(address: "woot@woot.com"),
-                   )
+    Contact.create(name: "Only Emails", email_address: EmailAddress.new(address: "woot@woot.com"))
   end
 
   let!(:contact3) do
+    addresses = [
+      Address.new(street: "1 First st", country: canada),
+      Address.new(street: "10 Tenth Ave", country: usa)
+    ]
     Contact.create(
-                   name: "Both!",
-                   addresses: [
-                               Address.new(street: "1 First st", country: canada),
-                               Address.new(street: "10 Tenth Ave", country: usa)
-                              ],
-                   email_address: EmailAddress.new(address: "woot@woot.com"),
-                   )
+      name: "Both!",
+      addresses: addresses,
+      email_address: EmailAddress.new(address: "woot@woot.com"),
+      phone_numbers: [PhoneNumber.new(phone: "1234567890")]
+    )
   end
 
   let(:canada) { Country.create(name: "Canada") }
@@ -39,30 +40,35 @@ RSpec.describe JitPreloader::Preloader do
   end
 
   context "when preloading an aggregate" do
+    let(:addresses_counts) { [2, 0, 2] }
+    let(:phone_number_counts) { [2, 0, 1] }
+    let(:maxes) { [11, 0, 12] }
+
     context "without jit_preload" do
       it "generates N+1 query notifications for each one" do
         ActiveSupport::Notifications.subscribed(callback, "n_plus_one_query") do
-          counts = [2,0,2]
-          maxes = [11,0,12]
           Contact.all.each_with_index do |c, i|
-            expect(c.addresses_count).to eql counts[i]
+            expect(c.addresses_count).to eql addresses_counts[i]
             expect(c.addresses_max_street_length).to eql maxes[i]
+            expect(c.phone_numbers_count).to eql phone_number_counts[i]
           end
         end
-        contact_queries = [contact1,contact2, contact3].product([["addresses.count", "addresses.maximum"]])
+
+        contact_queries = [contact1, contact2, contact3].product([["addresses.count", "addresses.maximum", "phone_numbers.count"]])
         expect(source_map).to eql(Hash[contact_queries])
       end
     end
-    context "without jit_preload" do
-      it "generates N+1 query notifications for each one" do
+
+    context "with jit_preload" do
+      it "doesn NOT generate N+1 query notifications" do
         ActiveSupport::Notifications.subscribed(callback, "n_plus_one_query") do
-          counts = [2,0,2]
-          maxes = [11,0,12]
           Contact.jit_preload.each_with_index do |c, i|
-            expect(c.addresses_count).to eql counts[i]
+            expect(c.addresses_count).to eql addresses_counts[i]
             expect(c.addresses_max_street_length).to eql maxes[i]
+            expect(c.phone_numbers_count).to eql phone_number_counts[i]
           end
         end
+
         expect(source_map).to eql({})
       end
     end

data/spec/support/database.rb

@@ -4,6 +4,7 @@ class Database
       "CREATE TABLE contacts (id INTEGER NOT NULL PRIMARY KEY, name VARCHAR(255))",
       "CREATE TABLE addresses (id INTEGER NOT NULL PRIMARY KEY, contact_id INTEGER NOT NULL, country_id INTEGER NOT NULL, street VARCHAR(255))",
       "CREATE TABLE email_addresses (id INTEGER NOT NULL PRIMARY KEY, contact_id INTEGER NOT NULL, address VARCHAR(255))",
+      "CREATE TABLE phone_numbers (id INTEGER NOT NULL PRIMARY KEY, contact_id INTEGER NOT NULL, phone VARCHAR(10))",
       "CREATE TABLE countries (id INTEGER NOT NULL PRIMARY KEY, name VARCHAR(255))",
     ]
   end

data/spec/support/models.rb

@@ -1,8 +1,10 @@
 class Contact < ActiveRecord::Base
   has_many :addresses
+  has_many :phone_numbers
   has_one :email_address
 
   has_many_aggregate :addresses, :max_street_length, :maximum, "LENGTH(street)"
+  has_many_aggregate :phone_numbers, :count, :count, "id"
   has_many_aggregate :addresses, :count, :count, "*"
 end
 
@@ -15,6 +17,10 @@ class EmailAddress < ActiveRecord::Base
   belongs_to :contact
 end
 
+class PhoneNumber < ActiveRecord::Base
+  belongs_to :contact
+end
+
 class Country < ActiveRecord::Base
   has_many :addresses
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jit_preloader
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Kyle d'Oliveira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-18 00:00:00.000000000 Z
+date: 2017-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord