n1_loader 1.6.0 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d914dd09225515a579945ab616916bf1ad446101c5051c4cf1b72c46d38c107
-  data.tar.gz: a304c32e35294c5646fafe5c65a5de6c637e80e080d80ac16f957d77a3ebe4c6
+  metadata.gz: b8a914cabc2c837109b3f6f72b78dbbc4b6e64b87049568e9c6733f29b2a6867
+  data.tar.gz: ce9b88ee6121de3540dd13789da0c28b8c01e32598ed1dacb10af16da05e82b9
 SHA512:
-  metadata.gz: 738d8ca021bca48a41486689c74506af32dc2bca8a542398272edaa72aa57dd49247249d04afe8d9b834cc28cd9b725f0a9b1d8d7f5dd80176cfd3c9ca711f08
-  data.tar.gz: c73ddc81593e0cbd0450457143726b9d57fbce0a27c09ede70ea3f269816b7ae7374e5dc1c06dda4e8b0ee8c21a0c96248ed4afb9e3d7f26ec5b5ac46e038d16
+  metadata.gz: 1a290cee96e8ba97c181267efde4f94ca494037d05e4cce93e58131faa4f6cc22c072a792e24631479b41a62cdfff0857e3dd3f51252cf7d05a4f3252eb41c5b
+  data.tar.gz: b4fcf0e7f3911441d542b6ab5d9f657671dcbf7864822f11c2e6854d957e49787026490f4595323c14d60348259eef5a522da4312fe6ee8ccd78a092437d8346

data/.github/workflows/rubocop.yml

@@ -1,10 +1,12 @@
 name: Rubocop
 
 on:
-  - pull_request
+  pull_request:
+  schedule:
+    - cron: '0 0 * * 0'
 
 jobs:
-  tests:
+  rubocop:
     runs-on: ubuntu-latest
 
     steps:

data/.github/workflows/tests.yml

@@ -1,7 +1,9 @@
 name: RSpec tests
 
 on:
-  - pull_request
+  pull_request:
+  schedule:
+    - cron: '0 0 * * 0'
 
 jobs:
   tests:

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [1.6.2] - 2022/11/23
+
+- Add fund metadata
+
+## [1.6.1] - 2022/10/29
+
+- Fix ArLazyPreload context setup when using isolated loaders for objects without the context.
+
 ## [1.6.0] - 2022/10/24
 
 - Add support of ArLazyPreload context for isolated loaders.

data/README.md

@@ -1,7 +1,8 @@
 # N1Loader
 
-[![CircleCI][1]][2]
 [![Gem Version][3]][4]
+[![][11]][12]
+[![][13]][14]
 [![][9]][10]
 
 N1Loader is designed to provide a simple way for avoiding [N+1 issues][7] of any kind. 
@@ -11,7 +12,8 @@ For example, it can help with resolving N+1 for:
 - complex calculations
 - and many more
 
-> [Toptal](https://www.toptal.com#snag-only-shrewd-web-development-experts) is hiring! [Join](https://www.toptal.com#snag-only-shrewd-web-development-experts) as Freelancer or [write me](mailto:lawliet.djez@gmail.com) if you want to join Core team.
+> If the project helps you or your organization, I would be very grateful if you [contribute][15] or [donate][10].  
+> Your support is an incredible motivation and the biggest reward for my hard work.
 
 ___Support:___ ActiveRecord 5, 6, and 7.
 
@@ -253,8 +255,6 @@ Everyone interacting in the N1Loader project's codebases, issue trackers, chat r
 
 Copyright (c) Evgeniy Demin. See [LICENSE.txt](LICENSE.txt) for further details.
 
-[1]: https://circleci.com/gh/djezzzl/n1_loader/tree/master.svg?style=shield
-[2]: https://circleci.com/gh/djezzzl/n1_loader/tree/master
 [3]: https://badge.fury.io/rb/n1_loader.svg
 [4]: https://badge.fury.io/rb/n1_loader
 [5]: https://github.com/rails/rails/tree/main/activerecord
@@ -263,3 +263,8 @@ Copyright (c) Evgeniy Demin. See [LICENSE.txt](LICENSE.txt) for further details.
 [8]: https://github.com/djezzzl/n1_loader
 [9]: https://opencollective.com/n1_loader/tiers/badge.svg
 [10]: https://opencollective.com/n1_loader#support
+[11]: https://github.com/djezzzl/n1_loader/actions/workflows/tests.yml/badge.svg?branch=master
+[12]: https://github.com/djezzzl/n1_loader/actions/workflows/tests.yml?query=event%3Aschedule
+[13]: https://github.com/djezzzl/n1_loader/actions/workflows/rubocop.yml/badge.svg?branch=master
+[14]: https://github.com/djezzzl/n1_loader/actions/workflows/rubocop.yml?query=event%3Aschedule
+[15]: https://github.com/djezzzl/n1_loader#contributing

data/lib/n1_loader/ar_lazy_preload/loader.rb

@@ -1,14 +1,20 @@
 # frozen_string_literal: true
 
-# Raised when a single object without ArLazyPreload context was passed to an isolated loader.
-N1Loader::Loader::MissingArLazyPreloadContext = Class.new(StandardError)
+# Raised when a single object without ArLazyPreload context support was passed to an isolated loader.
+N1Loader::Loader::UnsupportedArLazyPreload = Class.new(StandardError)
 
 # Defines a singleton method method that allows isolated loaders
 # to use ArLazyPreload context without passing sibling records.
 N1Loader::Loader.define_singleton_method(:for) do |element, **args|
-  # It is required to have an ArLazyPreload context defined
-  if !element.respond_to?(:lazy_preload_context) || element.lazy_preload_context.nil?
-    raise N1Loader::Loader::MissingArLazyPreloadContext
+  # It is required to have an ArLazyPreload context supported
+  raise N1Loader::Loader::UnsupportedArLazyPreload unless element.respond_to?(:lazy_preload_context)
+
+  if element.lazy_preload_context.nil?
+    ArLazyPreload::Context.register(
+      records: [element],
+      association_tree: [],
+      auto_preload: true
+    )
   end
 
   # Fetch or initialize loader from ArLazyPreload context

data/lib/n1_loader/version.rb

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

data/n1_loader.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |spec|
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/djezzzl/n1_loader"
   spec.metadata["changelog_uri"] = "https://github.com/djezzzl/n1_loader/master/CHANGELOG.md"
+  spec.metadata["funding_uri"] = "https://opencollective.com/n1_loader#support"
 
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{\A(?:test|spec|features)/}) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: n1_loader
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.2
 platform: ruby
 authors:
 - Evgeniy Demin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-24 00:00:00.000000000 Z
+date: 2022-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -143,7 +143,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
 - ".github/workflows/rubocop.yml"
 - ".github/workflows/tests.yml"
 - ".gitignore"
@@ -207,6 +206,7 @@ metadata:
   homepage_uri: https://github.com/djezzzl/n1_loader
   source_code_uri: https://github.com/djezzzl/n1_loader
   changelog_uri: https://github.com/djezzzl/n1_loader/master/CHANGELOG.md
+  funding_uri: https://opencollective.com/n1_loader#support
 post_install_message: 
 rdoc_options: []
 require_paths:

data/.circleci/config.yml

@@ -1,152 +0,0 @@
-version: 2.1
-
-executors:
-  ruby:
-    description: The official CircleCI Ruby Docker image
-    parameters:
-      tag:
-        description: The circleci/ruby Docker image version tag
-        type: string
-        default: latest
-    docker:
-      - image: circleci/ruby:<< parameters.tag >>
-    environment:
-      BUNDLE_JOBS: 4
-      BUNDLE_RETRY: 3
-    working_directory: ~/n1_loader
-
-jobs:
-  checkout:
-    executor: ruby
-    steps:
-      - checkout
-      - persist_to_workspace:
-          root: ~/n1_loader
-          paths:
-            - .
-
-  build:
-    parameters:
-      ruby-version:
-        type: string
-      activerecord-gemfile:
-        type: string
-      ar_lazy_preload-gemfile:
-        type: string
-    environment:
-      ACTIVERECORD_GEMFILE: << parameters.activerecord-gemfile >>
-      AR_LAZY_PRELOAD_GEMFILE: << parameters.ar_lazy_preload-gemfile >>
-    executor:
-      name: ruby
-      tag: << parameters.ruby-version >>
-    steps:
-      - attach_workspace:
-          at: ~/n1_loader
-      - run:
-          name: Install the gems specified by the Gemfile
-          command: bundle install
-      - run:
-          name: Run Core RSpec
-          command: |
-            bundle exec rspec --profile 10 \
-                              --format RspecJunitFormatter \
-                              --out test_results/core.xml \
-                              --format progress \
-                              spec/n1_loader_spec.rb
-      - run:
-          name: Run ActiveRecord integration RSpec
-          command: |
-            bundle exec rspec --profile 10 \
-                              --format RspecJunitFormatter \
-                              --out test_results/activerecord-integration.xml \
-                              --format progress \
-                              spec/n1_loader_spec.rb \
-                              spec/activerecord_spec.rb
-      - run:
-          name: Run ActiveRecord integration RSpec
-          command: |
-            bundle exec rspec --profile 10 \
-                              --format RspecJunitFormatter \
-                              --out test_results/ar-lazy-preload-integration.xml \
-                              --format progress \
-                              spec/n1_loader_spec.rb \
-                              spec/activerecord_spec.rb \
-                              spec/ar_lazy_preload_spec.rb
-      - store_test_results:
-          path: test_results
-
-  rubocop:
-    executor:
-      name: ruby
-      tag: "2.5"
-    steps:
-      - attach_workspace:
-          at: ~/n1_loader
-      - run:
-          name: Install the gems specified by the Gemfile
-          command: bundle install
-      - run:
-          name: Lint Ruby code with RuboCop
-          command: bundle exec rubocop --parallel
-
-workflows:
-  version: 2
-  default: &default
-    jobs:
-      - checkout
-      - build:
-          requires:
-            - checkout
-          matrix:
-            parameters:
-              ruby-version: [
-                "2.7",
-                "latest"
-              ]
-              activerecord-gemfile: [
-                "ar_5_latest",
-                "ar_6_latest",
-                "ar_7_latest"
-              ]
-              ar_lazy_preload-gemfile: [
-                "ar_lazy_preload_0.6.1",
-                "ar_lazy_preload_master"
-              ]
-            exclude:
-              # 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:
-            - checkout
-
-  nightly:
-    triggers:
-      - schedule:
-          cron: "0 0 * * *"
-          filters:
-            branches:
-              only:
-                - master
-    <<: *default