n1_loader 1.4.0 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d0f96166ae91c856012ea26c933cc56c7d33f68065b753a18adc3c6b9da7e87
-  data.tar.gz: adccc88c382d9283c2af9b41059298fa15563e47615678ef20629a0183a51253
+  metadata.gz: fe90c7df57ebf6237efd043aafd9a988415182d86ec877dedb02b1afb2b28295
+  data.tar.gz: 0bd43d92e0de325a413f0f88680cc9cb9c79b2e165cbae1cfe7bd9b175c4ee2f
 SHA512:
-  metadata.gz: ad3b1273627cf7abb5922cc7139c34e5e9543dc91d296d7e44deea690367d32082dd1ddc028ba40a4ed7fa402a65eb8f5aed36b6d8df0436937e59aaa6cef65a
-  data.tar.gz: fde03e325f2b780a070786f1648a98d278933c84b3266cedf4db50cd268b029839ff06290416846a9ab2a85a25a0795c30684845e4da15909417389dbd1a7a82
+  metadata.gz: d44ce33e6d822ee2121e5adf436c4841d92c89abc4fc98bace13371602987d21e813c530ddf1bf07b3fe5cbe42ba79bb71520a7161c37e95bd304dcca803d31d
+  data.tar.gz: 1391dd9fa95f7e267e1e5c684a1dddbb025982f3fbf2c56207f1e868972b0ee4efafbca5919c781abf6a2bc8e85ce3d9251b8762d357d1bc82592b2d1ba540d4

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## [1.4.3] - 2022-04-13
+
+- Add `default` support to arguments
+
+## [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

data/README.md

@@ -31,11 +31,31 @@ gem 'n1_loader'
 You can add integration with [ActiveRecord][5] by:
 ```ruby
 gem 'n1_loader', require: 'n1_loader/active_record'
+
+# You also may be interested in injecting it to models
+class ActiveRecord::Base
+  include N1Loader::Loadable
+  
+  def reload(*)
+    n1_clear_cache
+    super
+  end
+end
 ```
 
 You can add the integration with [ActiveRecord][5] and [ArLazyPreload][6] by:
 ```ruby
 gem 'n1_loader', require: 'n1_loader/ar_lazy_preload'
+
+# You also may be interested in injecting it to models
+class ActiveRecord::Base
+  include N1Loader::Loadable
+
+  def reload(*)
+    n1_clear_cache
+    super
+  end
+end
 ```
 
 ## Usage
@@ -129,6 +149,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
@@ -217,7 +240,7 @@ class User
   include N1Loader::Loadable
 
   n1_optimized :orders_count do
-    argument :sale 
+    argument :sale, optional: true, default: -> { Sale.last }
     
     cache_key { sale.id }
     

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,6 +51,10 @@ 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 == 1
@@ -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

data/lib/n1_loader/core/loader.rb

@@ -17,10 +17,13 @@ module N1Loader
       # @param name [Symbol]
       # @param opts [Hash]
       # @option opts [Boolean] optional false by default
+      # @option opts [Proc] default
       def argument(name, **opts)
+        opts[:optional] = true if opts[:default]
+
         @arguments ||= []
 
-        define_method(name) { args[name] }
+        define_method(name) { args[name] ||= opts[:default]&.call }
 
         @arguments << opts.merge(name: name)
       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.4.0"
+  VERSION = "1.4.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: n1_loader
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.3
 platform: ruby
 authors:
 - Evgeniy Demin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-22 00:00:00.000000000 Z
+date: 2022-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -186,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Loader to solve N+1 issue for good.