n1_loader 1.4.4 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e0025899b1fbd0329159dcd2e1ddf1d28318fe76354fd2e1378b803e49a9d96
-  data.tar.gz: 2f0f222cd9298bb56e2c3a9ae8c1f6559c7ec2bec3653c5a9a2c7c172b49b7fd
+  metadata.gz: bf26363e90cf5f0b6759776698445183f4abe8442bf366e7109e1cada18b1eaa
+  data.tar.gz: e082a72dc1f910262fbc73040b484ae28e437beee866ca42277a7556d989072a
 SHA512:
-  metadata.gz: 48a55dd01386410a58a5fbf8ea9d556ac6fa2db33411a469b2c9f3fc99b9ccec2ad36eb482e0adba39a84af4ffd4adba6a51a8db23eba7869c03aca51add1d39
-  data.tar.gz: b4c275204251a8e6908e34af67beacd6bbc05a1fcd1168350ab538ecf48362c840c671d1223dfd3659b2fe87f1428ee0e012144c3c52fa11451a595a0b5a11d9
+  metadata.gz: 52993103afc0075d9d71088e6d7e60925ea1740176ee31829acb5d42009a38955b25d8e9124a17fff981b4735f443c04d3532cbea3186850bffc2908f0e40522
+  data.tar.gz: fdcc21a626ff199ccf4a9af7bd860516745693614404c44159414b27601750ea476de8eae593f7bade3782425b638f784db096e6dcdaafa58c71382f3a08b979

data/.circleci/config.yml

@@ -106,7 +106,8 @@ workflows:
               ]
               activerecord-gemfile: [
                 "ar_5_latest",
-                "ar_6_latest"
+                "ar_6_latest",
+                "ar_7_latest"
               ]
               ar_lazy_preload-gemfile: [
                 "ar_lazy_preload_0.6.1",
@@ -115,21 +116,40 @@ workflows:
             exclude:
               # Ruby 2.5 and AR Lazy Preload 1+
               - ruby-version: "2.5"
-                activerecord-gemfile: "ar_5_latest"
                 ar_lazy_preload-gemfile: "ar_lazy_preload_master"
+                activerecord-gemfile: "ar_5_latest"
 
               - ruby-version: "2.5"
+                ar_lazy_preload-gemfile: "ar_lazy_preload_master"
                 activerecord-gemfile: "ar_6_latest"
+
+              - ruby-version: "2.5"
                 ar_lazy_preload-gemfile: "ar_lazy_preload_master"
+                activerecord-gemfile: "ar_7_latest"
 
               # AR 5 and ruby 3+
               - ruby-version: "latest"
                 activerecord-gemfile: "ar_5_latest"
                 ar_lazy_preload-gemfile: "ar_lazy_preload_0.6.1"
+
               - ruby-version: "latest"
                 activerecord-gemfile: "ar_5_latest"
                 ar_lazy_preload-gemfile: "ar_lazy_preload_master"
 
+              # AR 7 and ar_lazy_preload < 1
+              - ruby-version: "2.5"
+                activerecord-gemfile: "ar_7_latest"
+                ar_lazy_preload-gemfile: "ar_lazy_preload_0.6.1"
+
+              - ruby-version: "2.7"
+                activerecord-gemfile: "ar_7_latest"
+                ar_lazy_preload-gemfile: "ar_lazy_preload_0.6.1"
+
+              - ruby-version: "latest"
+                activerecord-gemfile: "ar_7_latest"
+                ar_lazy_preload-gemfile: "ar_lazy_preload_0.6.1"
+
+
           name: ruby-<< matrix.ruby-version >>-<< matrix.activerecord-gemfile >>-<< matrix.ar_lazy_preload-gemfile >>
       - rubocop:
           requires:

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [1.5.0] - 2022/05/01
+
+- Add support of Rails 7
+
 ## [1.4.4] - 2022/04/29
 
 - Inject `N1Loader::Loadable` to `ActiveRecord::Base` automatically

data/README.md

@@ -3,7 +3,7 @@
 [![CircleCI][1]][2]
 [![Gem Version][3]][4]
 
-N1Loader is designed to provide a way for avoiding [N+1 issues][7] of any kind. 
+N1Loader is designed to provide a simple way for avoiding [N+1 issues][7] of any kind. 
 For example, it can help with resolving N+1 for:
 - database querying (most common case)
 - 3rd party service calls
@@ -23,7 +23,7 @@ gem 'n1_loader', require: 'n1_loader/ar_lazy_preload'
 
 ## Enhance [ActiveRecord][5]
 
-Are you working with well-known Rails application? Try it out how well N1Loader fulfills missing gaps!
+Are you working with well-known Rails application? Try it out and see how well N1Loader fulfills missing gaps when you can't define ActiveRecord associations!
 
 ```ruby
 gem 'n1_loader', require: 'n1_loader/active_record'
@@ -173,4 +173,4 @@ Copyright (c) Evgeniy Demin. See [LICENSE.txt](LICENSE.txt) for further details.
 [5]: https://github.com/rails/rails/tree/main/activerecord
 [6]: https://github.com/DmitryTsepelev/ar_lazy_preload
 [7]: https://stackoverflow.com/questions/97197/what-is-the-n1-selects-problem-in-orm-object-relational-mapping
-[8]: https://github.com/djezzzl/n1_loader
+[8]: https://github.com/djezzzl/n1_loader

data/activerecord-gemfiles/ar_7_latest.gemfile

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+gem "activerecord", "~> 7"

data/lib/n1_loader/active_record/associations_preloader_v7.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module N1Loader
+  module ActiveRecord
+    module Associations
+      module Preloader # :nodoc:
+        N1LoaderReflection = Struct.new(:key, :loader) do
+          def options
+            {}
+          end
+        end
+
+        def preloaders_for_reflection(reflection, records)
+          return super unless reflection.is_a?(N1LoaderReflection)
+
+          N1Loader::Preloader.new(records).preload(reflection.key)
+        end
+
+        def grouped_records # rubocop:disable Metrics/PerceivedComplexity, Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/AbcSize
+          n1_load_records, records = source_records.partition do |record|
+            record.class.respond_to?(:n1_loader_defined?) && record.class.n1_loader_defined?(association)
+          end
+
+          h = n1_load_records.group_by do |record|
+            N1LoaderReflection.new(association, record.class.n1_loader(association))
+          end
+
+          polymorphic_parent = !root? && parent.polymorphic?
+          records.each do |record|
+            reflection = record.class._reflect_on_association(association)
+            next if polymorphic_parent && !reflection || !record.association(association).klass
+
+            (h[reflection] ||= []) << record
+          end
+          h
+        end
+      end
+    end
+  end
+end

data/lib/n1_loader/active_record/loader_collection.rb

@@ -5,3 +5,11 @@ N1Loader::LoaderCollection.define_method :preloaded_records do
 
   with.preloaded_records
 end
+
+N1Loader::LoaderCollection.define_method :runnable_loaders do
+  [self]
+end
+
+N1Loader::LoaderCollection.define_method :run? do
+  true
+end

data/lib/n1_loader/active_record.rb

@@ -21,10 +21,14 @@ ActiveSupport.on_load(:active_record) do
   case ActiveRecord::VERSION::MAJOR
   when 6
     require_relative "active_record/associations_preloader_v6"
-  else
+    ActiveRecord::Associations::Preloader.prepend(N1Loader::ActiveRecord::Associations::Preloader)
+  when 5
     require_relative "active_record/associations_preloader_v5"
+    ActiveRecord::Associations::Preloader.prepend(N1Loader::ActiveRecord::Associations::Preloader)
+  else
+    require_relative "active_record/associations_preloader_v7"
+    ActiveRecord::Associations::Preloader::Branch.prepend(N1Loader::ActiveRecord::Associations::Preloader)
   end
 
-  ActiveRecord::Associations::Preloader.prepend(N1Loader::ActiveRecord::Associations::Preloader)
   ActiveRecord::Base.include(N1Loader::ActiveRecord::Base)
 end

data/lib/n1_loader/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module N1Loader
-  VERSION = "1.4.4"
+  VERSION = "1.5.0"
 end

data/n1_loader.gemspec

@@ -22,9 +22,9 @@ Gem::Specification.new do |spec|
   end
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "activerecord", ">= 5", "< 7"
+  spec.add_development_dependency "activerecord", ">= 5"
   spec.add_development_dependency "ar_lazy_preload", ">= 0.6"
-  spec.add_development_dependency "db-query-matchers", "~> 0.10"
+  spec.add_development_dependency "db-query-matchers", "~> 0.11"
   spec.add_development_dependency "graphql", "~> 2.0"
   spec.add_development_dependency "rails", ">= 5"
   spec.add_development_dependency "rspec", "~> 3.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: n1_loader
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.5.0
 platform: ruby
 authors:
 - Evgeniy Demin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-29 00:00:00.000000000 Z
+date: 2022-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,9 +17,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
 - !ruby/object:Gem::Dependency
   name: ar_lazy_preload
   requirement: !ruby/object:Gem::Requirement
@@ -50,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: graphql
   requirement: !ruby/object:Gem::Requirement
@@ -161,6 +155,7 @@ files:
 - Rakefile
 - activerecord-gemfiles/ar_5_latest.gemfile
 - activerecord-gemfiles/ar_6_latest.gemfile
+- activerecord-gemfiles/ar_7_latest.gemfile
 - ar_lazy_preload-gemfiles/ar_lazy_preload_0.6.1.gemfile
 - ar_lazy_preload-gemfiles/ar_lazy_preload_master.gemfile
 - bin/console
@@ -182,6 +177,7 @@ files:
 - lib/n1_loader/active_record.rb
 - lib/n1_loader/active_record/associations_preloader_v5.rb
 - lib/n1_loader/active_record/associations_preloader_v6.rb
+- lib/n1_loader/active_record/associations_preloader_v7.rb
 - lib/n1_loader/active_record/base.rb
 - lib/n1_loader/active_record/loader.rb
 - lib/n1_loader/active_record/loader_collection.rb