n1_loader 1.3.0 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc47894a27d425f70a38dc43b9b40053d823f4815fe8e135a7cb1cf5afbde0f3
-  data.tar.gz: 132d5851c19763db2f1910ebeeb6a368437aba6d3340c2c69ad2ffe348791011
+  metadata.gz: f72c7428f78489c25222fb2ab8d56fde519c680fdc010115b952637c2291ca93
+  data.tar.gz: 7149852481ffed8d1fd0fc25e28fc045eda0a0f2936e748461dd7f43d4f709f1
 SHA512:
-  metadata.gz: 945258069b57bc7cd0fe26416411322886d734db0ed4eead1c88a3acced70bdb14ffc92eb9403e5d346c0853d64dc09e5afb8039a9026c9b4c09a1cc6f5fc9e8
-  data.tar.gz: 036e5a8a4b2d63bed2aee558164fdd042ac8c0c68b0ecdb1d5ec9f64231ca9f6841dc56cd6cdc63b87fdb9bf964e4f42089f89d9783cf2513cf81243a473150a
+  metadata.gz: 0d0802914b84d4c25a97c8c328ff2ae4453cf8fcd4eee87de1955b06b810c874d9982498b5fc80ecf1fa77238971e51ef5f162f809914876a1811084b366ddfe
+  data.tar.gz: fa001ab34b7165ee35ba31ef449c837418d538e52977ee984b38e35b767df06c05ef0cb01949c9290c17ae40bcd3e3644f00374cf7f66d7e6811f094515c37da

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## [1.4.2] - 2022-03-01
+
+- Add n1_clear_cache method which is useful for cases like reload in ActiveRecord
+
+## [1.4.1] - 2022-02-24
+
+- Fix preloading of invalid objects
+
+## [1.4.0] - 2022-02-22
+
+- add support of optional arguments
+
+BREAKING CHANGES:
+- rework arguments to use single definition through `argument <name>` only
+- use keyword arguments
+
 ## [1.3.0] - 2022-02-22
 
 - add support of named arguments with `argument <name>`

data/README.md

@@ -129,6 +129,9 @@ end
 user = User.new
 user.orders_count # => loader is executed first time and value was cached
 user.orders_count(reload: true) # => loader is executed again and a new value was cached
+# or
+user.n1_clear_cache
+user.orders_count
 
 users = [User.new, User.new]
 N1Loader::Preloader.new(users).preload(:orders_count) # => loader was initialized but not yet executed
@@ -188,21 +191,25 @@ users.map(&:orders_count) # perform will be used once without N+1
 class User
   include N1Loader::Loadable
 
-  n1_optimized :orders_count do |users, type|
-    orders_per_user = Order.where(type: type, user: users).group(:user_id).count
-
-    users.each { |user| fulfill(user, orders_per_user[user.id]) }
+  n1_optimized :orders_count do 
+    argument :type 
+    
+    def perform(users)
+      orders_per_user = Order.where(type: type, user: users).group(:user_id).count
+      
+      users.each { |user| fulfill(user, orders_per_user[user.id]) }
+    end
   end
 end
 
 user = User.new
-user.orders_count(:gifts) # The loader will be performed first time for this argument
-user.orders_count(:sales) # The loader will be performed first time for this argument
-user.orders_count(:gifts) # The cached value will be used
+user.orders_count(type: :gifts) # The loader will be performed first time for this argument
+user.orders_count(type: :sales) # The loader will be performed first time for this argument
+user.orders_count(type: :gifts) # The cached value will be used
 
 users = [User.new, User.new]
 N1Loader::Preloader.new(users).preload(:orders_count)
-users.map { |user| user.orders_count(:gifts) } # No N+1 here
+users.map { |user| user.orders_count(type: :gifts) } # No N+1 here
 ```
 
 _Note_: By default, we use `arguments.map(&:object_id)` to identify arguments but in some cases, 
@@ -217,7 +224,7 @@ class User
     
     cache_key { sale.id }
     
-    def perform(users, sale)
+    def perform(users)
       orders_per_user = Order.where(sale: sale, user: users).group(:user_id).count
       
       users.each { |user| fulfill(user, orders_per_user[user.id]) }
@@ -226,8 +233,8 @@ class User
 end
 
 user = User.new
-user.orders_count(Sale.first) # perform will be executed and value will be cached
-user.orders_count(Sale.first) # the cached value will be returned
+user.orders_count(sale: Sale.first) # perform will be executed and value will be cached
+user.orders_count(sale: Sale.first) # the cached value will be returned
 ```
 
 

data/lib/n1_loader/active_record/loader_collection.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
 N1Loader::LoaderCollection.define_method :preloaded_records do
-  unless loader_class.instance_method(:perform).arity == 1
-    raise N1Loader::ActiveRecord::InvalidPreloading, "Cannot preload loader with arguments"
-  end
+  raise N1Loader::ActiveRecord::InvalidPreloading, "Cannot preload loader with arguments" if loader_class.arguments
 
   with.preloaded_records
 end

data/lib/n1_loader/ar_lazy_preload/loader_collection_patch.rb

@@ -6,7 +6,7 @@ module N1Loader
     module LoaderCollectionPatch
       attr_accessor :context_setup
 
-      def with(*args)
+      def with(**args)
         result = super
 
         result.context_setup = context_setup if context_setup && result.context_setup.nil?

data/lib/n1_loader/core/loadable.rb

@@ -32,6 +32,12 @@ module N1Loader
       send("#{name}_loader=", loader_collection)
     end
 
+    def n1_clear_cache
+      self.class.n1_loaders.each do |name|
+        n1_loader_set(name, nil)
+      end
+    end
+
     def self.included(base)
       base.extend(ClassMethods)
     end
@@ -45,9 +51,13 @@ module N1Loader
         respond_to?("#{name}_loader")
       end
 
+      def n1_loaders
+        @n1_loaders ||= superclass.respond_to?(:n1_loaders) ? superclass.n1_loaders.dup : []
+      end
+
       def n1_optimized(name, loader = nil, &block) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
         loader ||= Class.new(N1Loader::Loader) do
-          if block&.arity&.positive?
+          if block.arity == 1
             define_method(:perform, &block)
           else
             class_eval(&block)
@@ -56,6 +66,8 @@ module N1Loader
         loader_name = "#{name}_loader"
         loader_variable_name = "@#{loader_name}"
 
+        n1_loaders << name
+
         define_singleton_method(loader_name) do
           loader
         end
@@ -73,10 +85,10 @@ module N1Loader
           instance_variable_get(loader_variable_name) || send("#{loader_name}_reload")
         end
 
-        define_method(name) do |*args, reload: false|
+        define_method(name) do |reload: false, **args|
           send("#{loader_name}_reload") if reload
 
-          send(loader_name).with(*args).for(self)
+          send(loader_name).with(**args).for(self)
         end
 
         [name, loader_name, loader_variable_name]

data/lib/n1_loader/core/loader.rb

@@ -13,11 +13,16 @@ module N1Loader
       #
       # First defined argument will have the value of first passed argument,
       # meaning the order is important.
-      def argument(name)
+      #
+      # @param name [Symbol]
+      # @param opts [Hash]
+      # @option opts [Boolean] optional false by default
+      def argument(name, **opts)
         @arguments ||= []
-        index = @arguments.size
-        define_method(name) { args[index] }
-        @arguments << name
+
+        define_method(name) { args[name] }
+
+        @arguments << opts.merge(name: name)
       end
 
       # Defines a custom cache key that is calculated for passed arguments.
@@ -29,7 +34,7 @@ module N1Loader
       end
     end
 
-    def initialize(elements, *args)
+    def initialize(elements, **args)
       @elements = elements
       @args = args
     end
@@ -44,18 +49,45 @@ module N1Loader
     end
 
     def cache_key
-      args.map(&:object_id)
+      check_arguments!
+      args.values.map(&:object_id)
     end
 
     private
 
     attr_reader :elements, :args
 
+    def check_missing_arguments! # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+      return unless (arguments = self.class.arguments)
+
+      min = arguments.count { |argument| !argument[:optional] }
+      max = arguments.count
+
+      return if args.size >= min && args.size <= max
+
+      str =
+        if min == max
+          max.to_s
+        else
+          "#{min}..#{max}"
+        end
+
+      raise MissingArgument, "Loader requires #{str} arguments but #{args.size} were given"
+    end
+
     def check_arguments!
-      return unless (required = self.class.arguments)
-      return if required.size == args.size
+      check_missing_arguments!
+      check_invalid_arguments!
+    end
 
-      raise MissingArgument, "Loader defined #{required.size} arguments but #{args.size} were given"
+    def check_invalid_arguments!
+      return unless (arguments = self.class.arguments)
+
+      args.each_key do |arg|
+        next if arguments.find { |argument| argument[:name] == arg }
+
+        raise InvalidArgument, "Loader doesn't define #{arg} argument"
+      end
     end
 
     def perform(_elements)
@@ -66,7 +98,7 @@ module N1Loader
       @loaded[element] = value
     end
 
-    def loaded # rubocop:disable Metrics/AbcSize
+    def loaded
       return @loaded if @loaded
 
       check_arguments!
@@ -74,9 +106,9 @@ module N1Loader
       @loaded = {}.compare_by_identity
 
       if elements.size == 1 && respond_to?(:single)
-        fulfill(elements.first, single(elements.first, *args))
+        fulfill(elements.first, single(elements.first))
       elsif elements.any?
-        perform(elements, *args)
+        perform(elements)
       end
 
       @loaded

data/lib/n1_loader/core/loader_collection.rb

@@ -10,8 +10,8 @@ module N1Loader
       @elements = elements
     end
 
-    def with(*args)
-      loader = loader_class.new(elements, *args)
+    def with(**args)
+      loader = loader_class.new(elements, **args)
 
       loaders[loader.cache_key] ||= loader
     end

data/lib/n1_loader/core/preloader.rb

@@ -17,13 +17,23 @@ module N1Loader
     def preload(*keys)
       keys.flatten(1).flat_map do |key|
         elements
-          .group_by { |element| element.class.n1_loader(key) }
+          .group_by { |element| loader_class(element, key) }
           .map do |loader_class, grouped_elements|
+            next unless loader_class
+
             loader_collection = N1Loader::LoaderCollection.new(loader_class, grouped_elements)
             grouped_elements.each { |grouped_element| grouped_element.n1_loader_set(key, loader_collection) }
             loader_collection
-          end
+          end.compact
       end
     end
+
+    private
+
+    def loader_class(element, key)
+      element.class.respond_to?(:n1_loader_defined?) &&
+        element.class.n1_loader_defined?(key) &&
+        element.class.n1_loader(key)
+    end
   end
 end

data/lib/n1_loader/version.rb

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

data/lib/n1_loader.rb

@@ -13,4 +13,5 @@ module N1Loader # :nodoc:
   class NotLoaded < Error; end
   class NotFilled < Error; end
   class MissingArgument < Error; end
+  class InvalidArgument < Error; end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: n1_loader
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.2
 platform: ruby
 authors:
 - Evgeniy Demin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-22 00:00:00.000000000 Z
+date: 2022-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord