kasket 4.11.0 → 4.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 724d92677bcdc757b647c3238bd34e53ea21bfc17887c59186cf4431c584eda3
-  data.tar.gz: 38ff26970191ff1926d1e3d50e026d2d503398ef2b1bb884943b36e4e6bc4d37
+  metadata.gz: 0c1c83230c5c06c292c4dd62d839372d06a54a763ed7dfd0ea5ed339fb57913a
+  data.tar.gz: 96df87b7c7ee9f8f19e593b3bc3bcbad257d928e0cdc4e0b3f5b22afed00b9c6
 SHA512:
-  metadata.gz: 6d32c14b1c040d6bca217235bb7c98c2f9a042a33a38b57ee3bc0acf4ac0695eb4b1d05039df354aef624f445a09fe93ef93fb0d29a3edfcf312c5ba957404be
-  data.tar.gz: 506931cd595e66cccd2a6feeddeb2ff41dde52aba0fac6f5bd9e99f53b242eb5ef2626e1ff5f31c3d388594c4628e0d75fb86e7c76892e77625d441f19a393d7
+  metadata.gz: 1ced9df5e050870ed7446bcf1b2e469fa2954ce1e7afcd67b799b14bb25a7323690242ca5ebb097c8d7df7f5c0c70317a72f292c202bebcc189b7afb64e905d1
+  data.tar.gz: aef1d32b14c4d6c3526b2b9093fec72f2c1998c04bebcf40861a30a1226234e4a70976168e605358fb452ed9152e49a7d69564c2fd7583541056c66cbe7fc8f0

data/README.md

@@ -137,6 +137,20 @@ Absolutely, but Cache Money does so much more.
 * The Cache Money code is overly complex.
 * Cache Money seems abandoned.
 
+## Development
+
+Run the tests with:
+
+```
+$ rake test
+```
+
+Access a dev console running on the local test DB:
+
+```
+$ bin/console
+```
+
 ## Note on Patches/Pull Requests
 
 * Fork the project.

data/lib/kasket/read_mixin.rb

@@ -8,14 +8,11 @@ module Kasket
       end
     end
 
-    # *args can be replaced with (sql, *args) once we stop supporting Rails < 5.2
-    def find_by_sql_with_kasket(*args)
-      sql = args[0]
-
+    def find_by_sql_with_kasket(sql, binds = [], *restargs, **kwargs, &blk)
       if use_kasket?
         query = if sql.respond_to?(:to_kasket_query)
           if ActiveRecord::VERSION::STRING < '5.2'
-            sql.to_kasket_query(self, args[1].map(&:value_for_database))
+            sql.to_kasket_query(self, binds.map(&:value_for_database))
           else
             sql.to_kasket_query(self)
           end
@@ -26,7 +23,7 @@ module Kasket
 
       if query && has_kasket_index_on?(query[:index])
         if query[:key].is_a?(Array)
-          find_by_sql_with_kasket_on_id_array(query[:key])
+          filter_pending_records(find_by_sql_with_kasket_on_id_array(query[:key]), &blk)
         else
           if value = Kasket.cache.read(query[:key])
             # Identified a specific edge case where memcached server returns 0x00 binary protocol response with no data
@@ -37,11 +34,11 @@ module Kasket
             # The code in this first condition of TrueClass === true  will
             # skip the kasket cache for these specific objects and go directly to SQL for retrieval.
             result_set = if value.is_a?(TrueClass)
-              find_by_sql_without_kasket(*args)
+              find_by_sql_without_kasket(sql, binds, *restargs, **kwargs, &blk)
             elsif value.is_a?(Array)
               filter_pending_records(find_by_sql_with_kasket_on_id_array(value))
             else
-              filter_pending_records(Array.wrap(value).collect { |record| instantiate(record.dup) })
+              filter_pending_records(Array.wrap(value).collect { |record| instantiate(record.dup, &blk) })
             end
 
             payload = {
@@ -51,19 +48,19 @@ module Kasket
 
             ActiveSupport::Notifications.instrument('instantiation.active_record', payload) { result_set }
           else
-            store_in_kasket(query[:key], find_by_sql_without_kasket(*args))
+            store_in_kasket(query[:key], find_by_sql_without_kasket(sql, binds, *restargs, **kwargs, &blk))
           end
         end
       else
-        find_by_sql_without_kasket(*args)
+        find_by_sql_without_kasket(sql, binds, *restargs, **kwargs, &blk)
       end
     end
 
-    def find_by_sql_with_kasket_on_id_array(keys)
+    def find_by_sql_with_kasket_on_id_array(keys, &blk)
       key_attributes_map = Kasket.cache.read_multi(*keys)
 
       found_keys, missing_keys = keys.partition {|k| key_attributes_map[k] }
-      found_keys.each {|k| key_attributes_map[k] = instantiate(key_attributes_map[k].dup) }
+      found_keys.each {|k| key_attributes_map[k] = instantiate(key_attributes_map[k].dup, &blk) }
       key_attributes_map.merge!(missing_records_from_db(missing_keys))
 
       key_attributes_map.values.compact

data/lib/kasket/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Kasket
-  VERSION = '4.11.0'
+  VERSION = '4.13.0'
   class Version
     MAJOR = Kasket::VERSION.split('.')[0]
     MINOR = Kasket::VERSION.split('.')[1]

data/lib/kasket/write_mixin.rb

@@ -8,14 +8,14 @@ module Kasket
         end
       end
 
-      def update_counters_with_kasket_clearing(*args)
+      def update_counters_with_kasket_clearing(*args, **kwargs)
         remove_from_kasket(args[0])
-        update_counters_without_kasket_clearing(*args)
+        update_counters_without_kasket_clearing(*args, **kwargs)
       end
 
-      def transaction_with_kasket_disabled(*args)
+      def transaction_with_kasket_disabled(*args, **kwargs)
         without_kasket do
-          transaction_without_kasket_disabled(*args) { yield }
+          transaction_without_kasket_disabled(*args, **kwargs) { yield }
         end
       end
     end
@@ -111,13 +111,13 @@ module Kasket
         Kasket.add_pending_record(self, _destroyed = true)
       end
 
-      def committed!(*)
+      def committed!(*args, **kwargs)
         Kasket.clear_pending_records
         kasket_after_commit if persisted? || destroyed?
         super
       end
 
-      def rolledback!(*)
+      def rolledback!(*args, **kwargs)
         Kasket.clear_pending_records
         super
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kasket
 version: !ruby/object:Gem::Version
-  version: 4.11.0
+  version: 4.13.0
 platform: ruby
 authors:
 - Mick Staugaard
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-06 00:00:00.000000000 Z
+date: 2023-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord