n1_loader 1.6.3 → 1.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c874b380de3baf4e2c0631f223261604ecb7108a4320797d746a73a90af01db5
-  data.tar.gz: c7e98c2c4b07afbb45081b9435f9b544126378f585a23dc7419f320764af0908
+  metadata.gz: 3b7ac1fa217041b1142d51fe619c44f6f1cbc16e2d7c2606c5cb4f023f7a19ac
+  data.tar.gz: a62833353c2699c369d3581b239f0b8f67b87b6435cc4cba4995661bc83c9174
 SHA512:
-  metadata.gz: 071005e2ebc91c4884a2417d02162d795bea99813ea20b556d2b61f18d32e66ae3657f250af84ea67c32433c1d5c6697a2db9a20461d7ac0f73ff86e5b429d94
-  data.tar.gz: 001e24c4c00ffd207229dd2721baa4424ee90bd7591d9b3ea2092d823e5bec403f51ca80d6efad7b2ff8db3bc57bb955bd04705dd97f704fc64494dffe1f8321
+  metadata.gz: c4f17f1bb93729de61ecbd636837323070c65a48f54b4fb6917cf1b24bc5a2b416826498eca11722779aafca09c9f4df150687aed331b6dae2fa9172c024aab4
+  data.tar.gz: 102ed2741ad8af210182576df8ceba4293d829b0c4489d6f15a5823dcfe0de976a4ecb604c57fe6383cdf243cc2e4fc510a3f1d8ee1d1e4cfc0c7b5ec0941e65

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [1.6.5] - 2023/07/30
+
+- Fix nested preloading for ActiveRecord 7. Thanks [Igor Gonchar](https://github.com/gigorok) for the issue!
+
+## [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).

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/active_record/loader_collection.rb

@@ -13,3 +13,7 @@ end
 N1Loader::LoaderCollection.define_method :run? do
   true
 end
+
+N1Loader::LoaderCollection.define_method :future_classes do
+  []
+end

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/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.3"
+  VERSION = "1.6.5"
 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.3
+  version: 1.6.5
 platform: ruby
 authors:
 - Evgeniy Demin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-30 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