n1_loader 1.6.2 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8a914cabc2c837109b3f6f72b78dbbc4b6e64b87049568e9c6733f29b2a6867
-  data.tar.gz: ce9b88ee6121de3540dd13789da0c28b8c01e32598ed1dacb10af16da05e82b9
+  metadata.gz: 7dbd6c49bba45473f2a822d02befa1ca0efdc155698648a17640c472ace4fccd
+  data.tar.gz: db6c04d5cc63ddbcc8a3362fba985f478601e2b5ed0f5a298df992ecdc1e8f65
 SHA512:
-  metadata.gz: 1a290cee96e8ba97c181267efde4f94ca494037d05e4cce93e58131faa4f6cc22c072a792e24631479b41a62cdfff0857e3dd3f51252cf7d05a4f3252eb41c5b
-  data.tar.gz: b4fcf0e7f3911441d542b6ab5d9f657671dcbf7864822f11c2e6854d957e49787026490f4595323c14d60348259eef5a522da4312fe6ee8ccd78a092437d8346
+  metadata.gz: 397c84c6ee33547838c1155c58f7488dfef34028003d7da1c26a6f9a0f2be951bfe4ff4d7df761be6185ec58e36022ead691e434af708fd74ccb2cbae503e459
+  data.tar.gz: 4a554a0f7aa8832b7aa81f32e8b0544baf060c0c8b59538f56e7d579b0e972e680a989ff41c7fe14c01665a7a2f8fb3883ca7ef98d60cc24005a68d3fe67bc6d

data/.github/workflows/rubocop.yml

@@ -16,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

@@ -38,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 }}
@@ -49,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.4] - 2023/07/30
+
+- Add support of `n1_optimized` ending with `?` (question mark). Thanks [Ilya Kamenko](https://github.com/Galathius) for the suggestion!
+
+## [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

data/README.md

@@ -17,6 +17,12 @@ For example, it can help with resolving N+1 for:
 
 ___Support:___ ActiveRecord 5, 6, and 7.
 
+Follow me and stay tuned for the updates:
+- [LinkedIn](https://www.linkedin.com/in/evgeniydemin/)
+- [Medium](https://evgeniydemin.medium.com/)
+- [Twitter](https://twitter.com/EvgeniyDemin/)
+- [GitHub](https://github.com/djezzzl)
+
 ## Killer feature for GraphQL API
 
 N1Loader in combination with [ArLazyPreload][6] is a killer feature for your GraphQL API. 

data/lib/n1_loader/core/loadable.rb

@@ -9,7 +9,7 @@ module N1Loader
   #     # with inline loader
   #     n1_loader :something do
   #       def perform(elements)
-  #         elements.each { |element| fulfill(element,, element.calculate_something) }
+  #         elements.each { |element| fulfill(element, element.calculate_something) }
   #       end
   #     end
   #
@@ -20,15 +20,21 @@ module N1Loader
   #   # custom loader
   #   class MyLoader < N1Loader::Loader
   #     def perform(elements)
-  #       elements.each { |element| fulfill(element,, element.calculate_something) }
+  #       elements.each { |element| fulfill(element, element.calculate_something) }
   #     end
   #   end
   module Loadable
+    include Name
+
     def n1_loader(name)
+      name = n1_loader_name(name)
+
       send("#{name}_loader")
     end
 
     def n1_loader_set(name, loader_collection)
+      name = n1_loader_name(name)
+
       send("#{name}_loader=", loader_collection)
     end
 
@@ -43,11 +49,17 @@ module N1Loader
     end
 
     module ClassMethods # :nodoc:
+      include Name
+
       def n1_loader(name)
+        name = n1_loader_name(name)
+
         send("#{name}_loader")
       end
 
       def n1_loader_defined?(name)
+        name = n1_loader_name(name)
+
         respond_to?("#{name}_loader")
       end
 
@@ -63,7 +75,7 @@ module N1Loader
             class_eval(&block)
           end
         end
-        loader_name = "#{name}_loader"
+        loader_name = "#{n1_loader_name(name)}_loader"
         loader_variable_name = "@#{loader_name}"
 
         n1_loaders << name

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module N1Loader
+  # Add support of question mark names
+  module Name
+    def n1_loader_name(name)
+      to_sym = name.is_a?(Symbol)
+
+      converted = name.to_s.gsub("?", "_question_mark")
+
+      to_sym ? converted.to_sym : converted
+    end
+  end
+end

data/lib/n1_loader/version.rb

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

data/lib/n1_loader.rb

@@ -2,6 +2,7 @@
 
 require_relative "n1_loader/version"
 
+require_relative "n1_loader/core/name"
 require_relative "n1_loader/core/loader"
 require_relative "n1_loader/core/loader_collection"
 require_relative "n1_loader/core/loadable"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: n1_loader
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.4
 platform: ruby
 authors:
 - Evgeniy Demin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-23 00:00:00.000000000 Z
+date: 2023-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -196,6 +196,7 @@ files:
 - lib/n1_loader/core/loadable.rb
 - lib/n1_loader/core/loader.rb
 - lib/n1_loader/core/loader_collection.rb
+- lib/n1_loader/core/name.rb
 - lib/n1_loader/core/preloader.rb
 - lib/n1_loader/version.rb
 - n1_loader.gemspec