jit_preloader 3.0.0 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11ad98c8ab59226bb807d9686a0440140b7ca802d2faf33a0c26c428f2371e7a
-  data.tar.gz: 0e4832fbea9fc6fafce7445390ef34eed82c3984df471486a7e871db4c6b2717
+  metadata.gz: 16275182d701734a61adff78829a23effeff83a02af1a5f225e7d85e7c03a172
+  data.tar.gz: b44cbada71a7ed0fbfb3e05eb3fc43206b040dfcbdd0358ae6da101c50881d91
 SHA512:
-  metadata.gz: c8932fc1d40b83fd0678ceed57856ab13021e047e9c4ea82b6b42434b98b760f9d51d5b77b232db249573bce512e930e7374b006e09977d9105086a24ff79b1b
-  data.tar.gz: 9595ae9cddddde356275480f54efe19c3792e93b100abad3ddced491644c06d8dfc197af4651a7be7af9aa1fe4d319fcf8f383e6493f2e7efec245094926e56e
+  metadata.gz: f34471c1474522b5cf9fea220e35fb092a078d1e9dff2ea4a056b8d0fb9ca0da55df97b49031f7202de659e01476869260aae4c0acd9e0d83ac3db762958637a
+  data.tar.gz: 45cd0fad8395d46db5d2cfef76e724ae5a02e568789ae1457c6897191d5af78d14305f5263a7d48433392a479181952958e4940c862a6b36d4cf5e0052949f0a

data/.github/workflows/ci.yml

@@ -9,12 +9,13 @@ on:
 jobs:
   test:
     runs-on: ubuntu-latest
+    timeout-minutes: 5
     strategy:
       fail-fast: false
       matrix:
         gemfile:
           - Gemfile
-          - Gemfile.6.1
+          - Gemfile.7.1
     env:
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}
     steps:
@@ -22,7 +23,7 @@ jobs:
       - name: Set up Ruby ${{ matrix.ruby-version }}
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.1
+          ruby-version: 3.4.1
       - name: Install dependencies
         run: bundle install
       - name: Run tests

data/.gitignore

@@ -44,9 +44,11 @@ build-iPhoneSimulator/
 
 # for a library or gem, you might want to ignore these files since the code is
 # intended to run in multiple environments; otherwise, check them in:
+Gemfile.7.1.lock
 Gemfile.lock
 # .ruby-version
 # .ruby-gemset
 
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
 .rvmrc
+.ruby-version

data/Gemfile

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
-gem "activerecord", ">=7"
-gem "sqlite3", "~> 1.4"
+gem 'activerecord', '>=8.0.0'
+
 # Specify your gem's dependencies in jit_preloader.gemspec
 gemspec

data/{Gemfile.6.1 → Gemfile.7.1}

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem "activerecord", "~>6.1"
+gem "activerecord", ">=7.1"
 
 # Specify your gem's dependencies in jit_preloader.gemspec
 gemspec

data/README.md

@@ -72,6 +72,8 @@ Add this line to your application's Gemfile:
 gem 'jit_preloader'
 ```
 
+As of v8.0 of this gem, it requires Rails 7.1 or higher.  If you need to use it with an older version of Rails use v3.1.0.
+
 And then execute:
 
     $ bundle

data/Rakefile

@@ -1,2 +1,3 @@
-require "bundler/gem_tasks"
+# frozen_string_literal: true
 
+require 'bundler/gem_tasks'

data/jit_preloader.gemspec

@@ -1,31 +1,35 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'jit_preloader/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "jit_preloader"
+  spec.name          = 'jit_preloader'
   spec.version       = JitPreloader::VERSION
   spec.authors       = ["Kyle d'Oliveira"]
-  spec.email         = ["kyle.doliveira@clio.com"]
-  spec.summary       = %q{Tool to understand N+1 queries and to remove them}
-  spec.description   = %q{The JitPreloader has the ability to send notifications when N+1 queries occur to help guage how problematic they are for your code base and a way to remove all of the commons explicitly or automatically}
-  spec.homepage      = ""
-  spec.license       = "MIT"
+  spec.email         = ['kyle.doliveira@clio.com']
+  spec.summary       = 'Tool to understand N+1 queries and to remove them'
+  spec.description   = 'The JitPreloader has the ability to send notifications when N+1 queries occur to help guage how problematic they are for your code base and a way to remove all of the commons explicitly or automatically'
+  spec.homepage      = 'https://github.com/clio/jit_preloader'
+  spec.metadata['homepage_uri'] = spec.homepage
+  spec.metadata['source_code_uri'] = spec.homepage
+
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_dependency "activerecord", "< 8"
-  spec.add_dependency "activesupport"
+  spec.add_dependency 'activerecord', '>= 7.1', '< 9'
+  spec.add_dependency 'activesupport'
 
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "database_cleaner"
-  spec.add_development_dependency "sqlite3"
-  spec.add_development_dependency "byebug"
-  spec.add_development_dependency "db-query-matchers"
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'byebug'
+  spec.add_development_dependency 'database_cleaner'
+  spec.add_development_dependency 'db-query-matchers'
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'sqlite3'
 end

data/lib/jit_preloader/active_record/base.rb

@@ -22,6 +22,7 @@ module JitPreloadExtension
     def preload_scoped_relation(name:, base_association:, preload_scope: nil)
       return jit_preload_scoped_relations[name] if jit_preload_scoped_relations&.key?(name)
 
+      base_association = base_association.to_sym
       records = jit_preloader&.records || [self]
       previous_association_values = {}
 
@@ -55,6 +56,7 @@ module JitPreloadExtension
     def preload_scoped_relation(name:, base_association:, preload_scope: nil)
       return jit_preload_scoped_relations[name] if jit_preload_scoped_relations&.key?(name)
 
+      base_association = base_association.to_sym
       records = jit_preloader&.records || [self]
       previous_association_values = {}
 

data/lib/jit_preloader/version.rb

@@ -1,3 +1,3 @@
 module JitPreloader
-  VERSION = "3.0.0"
+  VERSION = "8.0.0"
 end

data/spec/lib/jit_preloader/active_record/base_spec.rb

@@ -106,5 +106,27 @@ RSpec.describe "ActiveRecord::Base Extensions" do
         expect(value).to eq([])
       end
     end
+
+    context "when preload_scoped_relation with string base_association name" do
+      it "preload properly" do
+        contacts = Contact.jit_preload.limit(2).to_a
+
+        call_with_string = lambda { |contact| contact.preload_scoped_relation(
+          name: "American Addresses",
+          base_association: "addresses",
+          preload_scope: Address.where(country: usa)
+        ) }
+
+        usa_addresses = contacts.first.addresses.where(country: usa).to_a
+        expect do
+          expect(call_with_string.call(contacts.first)).to match_array usa_addresses
+        end.to make_database_queries(count: 1)
+
+        usa_addresses = contacts.last.addresses.where(country: usa).to_a
+        expect do
+          expect(call_with_string.call(contacts.last)).to match_array usa_addresses
+        end.to_not make_database_queries
+      end
+    end
   end
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: jit_preloader
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 8.0.0
 platform: ruby
 authors:
 - Kyle d'Oliveira
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-13 00:00:00.000000000 Z
+date: 2025-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '9'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -53,21 +59,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +87,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: db-query-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,21 +101,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +129,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: db-query-matchers
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,10 +157,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - Gemfile
-- Gemfile.6.0
-- Gemfile.6.0.lock
-- Gemfile.6.1
-- Gemfile.6.1.lock
+- Gemfile.7.1
 - LICENSE
 - README.md
 - Rakefile
@@ -176,11 +179,13 @@ files:
 - spec/spec_helper.rb
 - spec/support/database.rb
 - spec/support/models.rb
-homepage: ''
+homepage: https://github.com/clio/jit_preloader
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  homepage_uri: https://github.com/clio/jit_preloader
+  source_code_uri: https://github.com/clio/jit_preloader
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -196,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.27
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Tool to understand N+1 queries and to remove them
 test_files:

data/Gemfile.6.0

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-gem "activerecord", "~>6.0.0"
-
-# Specify your gem's dependencies in jit_preloader.gemspec
-gemspec

data/Gemfile.6.0.lock

@@ -1,72 +0,0 @@
-PATH
-  remote: .
-  specs:
-    jit_preloader (1.0.3)
-      activerecord (>= 5.2, < 7)
-      activesupport
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (6.0.4.1)
-      activesupport (= 6.0.4.1)
-    activerecord (6.0.4.1)
-      activemodel (= 6.0.4.1)
-      activesupport (= 6.0.4.1)
-    activesupport (6.0.4.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    byebug (11.1.3)
-    concurrent-ruby (1.1.9)
-    database_cleaner (2.0.1)
-      database_cleaner-active_record (~> 2.0.0)
-    database_cleaner-active_record (2.0.1)
-      activerecord (>= 5.a)
-      database_cleaner-core (~> 2.0.0)
-    database_cleaner-core (2.0.1)
-    db-query-matchers (0.10.0)
-      activesupport (>= 4.0, < 7)
-      rspec (~> 3.0)
-    diff-lcs (1.4.4)
-    i18n (1.8.10)
-      concurrent-ruby (~> 1.0)
-    minitest (5.14.4)
-    rake (13.0.6)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    sqlite3 (1.4.2)
-    thread_safe (0.3.6)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
-    zeitwerk (2.4.2)
-
-PLATFORMS
-  x86_64-darwin-19
-
-DEPENDENCIES
-  activerecord (~> 6.0.0)
-  bundler
-  byebug
-  database_cleaner
-  db-query-matchers
-  jit_preloader!
-  rake (~> 13.0)
-  rspec
-  sqlite3
-
-BUNDLED WITH
-   2.2.12

data/Gemfile.6.1.lock

@@ -1,72 +0,0 @@
-PATH
-  remote: .
-  specs:
-    jit_preloader (1.0.3)
-      activerecord (>= 5.2, < 7)
-      activesupport
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (6.1.4.1)
-      activesupport (= 6.1.4.1)
-    activerecord (6.1.4.1)
-      activemodel (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
-    activesupport (6.1.4.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    byebug (11.1.3)
-    concurrent-ruby (1.1.9)
-    database_cleaner (2.0.1)
-      database_cleaner-active_record (~> 2.0.0)
-    database_cleaner-active_record (2.0.1)
-      activerecord (>= 5.a)
-      database_cleaner-core (~> 2.0.0)
-    database_cleaner-core (2.0.1)
-    db-query-matchers (0.10.0)
-      activesupport (>= 4.0, < 7)
-      rspec (~> 3.0)
-    diff-lcs (1.4.4)
-    i18n (1.8.10)
-      concurrent-ruby (~> 1.0)
-    minitest (5.14.4)
-    rake (13.0.6)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    sqlite3 (1.4.2)
-    tzinfo (2.0.4)
-      concurrent-ruby (~> 1.0)
-    zeitwerk (2.4.2)
-
-PLATFORMS
-  ruby
-  x86_64-darwin-19
-
-DEPENDENCIES
-  activerecord (~> 6.1)
-  bundler
-  byebug
-  database_cleaner
-  db-query-matchers
-  jit_preloader!
-  rake (~> 13.0)
-  rspec
-  sqlite3
-
-BUNDLED WITH
-   2.2.12