n1_loader 1.6.1 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 241044074fba6a2a10e22cae353f7e503cfbe93e403ab9016cb5651da7b3bae1
-  data.tar.gz: 594e2ebd313744710547aedadb6b5159a6d5fa935807c59232091c71c45b0a0b
+  metadata.gz: c874b380de3baf4e2c0631f223261604ecb7108a4320797d746a73a90af01db5
+  data.tar.gz: c7e98c2c4b07afbb45081b9435f9b544126378f585a23dc7419f320764af0908
 SHA512:
-  metadata.gz: 68d3565e4624a0488e0f53190bf5d5817d784d2deccb2006c816b207ca71d25df7447487e75c09645ddd82f6c76c3264cdbbeabef10ab687b5980d997b73eedd
-  data.tar.gz: 9ea2e502dec4367f717bb848697a15bb7c28b26d182218710185e39cb36196f00d18dd36f223f2443925a30f7a14407375ae95072575ce03a66bc79ef113c982
+  metadata.gz: 071005e2ebc91c4884a2417d02162d795bea99813ea20b556d2b61f18d32e66ae3657f250af84ea67c32433c1d5c6697a2db9a20461d7ac0f73ff86e5b429d94
+  data.tar.gz: 001e24c4c00ffd207229dd2721baa4424ee90bd7591d9b3ea2092d823e5bec403f51ca80d6efad7b2ff8db3bc57bb955bd04705dd97f704fc64494dffe1f8321

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:
@@ -14,7 +16,6 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: 2.7
-          bundler-cache: true
 
       - name: Install dependencies
         run: bundle install

data/.github/workflows/tests.yml

@@ -1,7 +1,9 @@
 name: RSpec tests
 
 on:
-  - pull_request
+  pull_request:
+  schedule:
+    - cron: '0 0 * * 0'
 
 jobs:
   tests:
@@ -36,6 +38,9 @@ jobs:
           - activerecord-gemfile: 'ar_7_latest'
             ar_lazy_preload-gemfile: 'ar_lazy_preload_0.6.1'
 
+          - activerecord-gemfile: 'ar_5_latest'
+            ar_lazy_preload-gemfile: 'ar_lazy_preload_master'
+
     env:
       ACTIVERECORD_GEMFILE: ${{ matrix.activerecord-gemfile }}
       AR_LAZY_PRELOAD_GEMFILE: ${{ matrix.ar_lazy_preload-gemfile }}
@@ -47,7 +52,6 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby-version }}
-          bundler-cache: true
 
       - name: Install dependencies
         run: bundle install

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [1.6.3] - 2022/12/30
+
+- Performance optimization: avoid unnecessary calls. Thanks [Nazar Matus](https://github.com/FunkyloverOne) for the [contribution](https://github.com/djezzzl/n1_loader/pull/33).
+
+## [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.

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/core/loader.rb

@@ -110,7 +110,7 @@ module N1Loader
 
       @loaded = {}.compare_by_identity
 
-      if elements.size == 1 && respond_to?(:single)
+      if respond_to?(:single) && elements.size == 1
         fulfill(elements.first, single(elements.first))
       elsif elements.any?
         perform(elements)

data/lib/n1_loader/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module N1Loader
-  VERSION = "1.6.1"
+  VERSION = "1.6.3"
 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.1
+  version: 1.6.3
 platform: ruby
 authors:
 - Evgeniy Demin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-29 00:00:00.000000000 Z
+date: 2022-12-30 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