sin_lru_redux 2.1.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10d8a07bc1dcf5957a24804163d1ac62086dac85b3cefce3ff305757231a3696
-  data.tar.gz: 4820d035651c937d4486800a4ca3b1fda48ccfb1118d0bcd420bf49b88c5583e
+  metadata.gz: 62aedb1e0b7730269fe2f336ae70bdfd158cf38efd0827c8fae3bd4810e4b0dc
+  data.tar.gz: db0572e99799e265c3d6b8d52072c779574e1cc29e6ca73ce24fe982768d90ce
 SHA512:
-  metadata.gz: 3cf6042d5c6cb2203e2505a4db581263e4bbe99475b1928558ee4a541a73d60b16c3d162199a11b103240e02f9ec09ece7c93f0b05fed10660c5fd84cec32907
-  data.tar.gz: 22d4e5addfb2efd94536334fddbb97f6cdd99237ca5215f6132b683ecce46bdae00d8e002239cfcc40ec26d0a37ff7b6fff08cb2a001518bb47a1a7bfaafc0f7
+  metadata.gz: bd3b6ab784cf9318ce46aa572b4e0c3c7e316147e1a56404a8c316a104a67c4b12f5e3805c6f349b0e98fa54773ba53ba7fa532d6e7f6f91a1c442dc10a436ca
+  data.tar.gz: 34126e658fce4a4c1ee29587ee598d72e2068c1c99cec359d0c373c13a0d271aefe53119b22ddda3e055b78b6e75c3c1d02964ea7301a76c45457216a68b4fe2

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [2.2.1] - 2024-12-31
+
+- Refactor: Improve implementation
+- Test: Improve tests
+
+## [2.2.0] - 2024-12-31
+
+- New: Raise an error when trying to assign nil to max_size, ttl, or ignore_nil
+- Fix: Fix a bug where ignore_nil was not updated when ignore_nil was specified as false
+- Fix: Fix a bug where items with nil value were deleted when ignore_nil was changed
+- Refactor: Improve implementation
+- Test: Improve tests
+- Other: Improve CI
+- Other: Improve documents
+
 ## [2.1.0] - 2024-12-30
 
 - New: Set default max_size to 1000

data/README.md

@@ -93,7 +93,7 @@ cache.to_a
 # => [[:b, '2'], [:a, '1']]
 
 # Now we advance time 5 min 30 sec into the future.
-Timecop.freeze(Time.now + 330)
+Timecop.freeze(Time.now + ((5 * 60) + 30))
 
 # And we see that the expired values have been evicted.
 cache.to_a
@@ -104,7 +104,7 @@ cache.to_a
 cache[:a] = '1'
 cache[:b] = '2'
 
-Timecop.freeze(Time.now + 330)
+Timecop.freeze(Time.now + ((5 * 60) + 30))
 
 cache.ttl = 10 * 60
 
@@ -115,7 +115,7 @@ cache.to_a
 # => [[:b, '2'], [:a, '1']]
 
 # TTL eviction can be triggered manually with the #expire method.
-Timecop.freeze(Time.now + 330)
+Timecop.freeze(Time.now + ((5 * 60) + 30))
 
 cache.expire
 cache.to_a
@@ -162,7 +162,7 @@ cache = LruRedux::TTL::ThreadSafeCache.new(100, 5 * 60)
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/abcd. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/cadenza-tech/sin_lru_redux/blob/main/CODE_OF_CONDUCT.md).
+Bug reports and pull requests are welcome on GitHub at https://github.com/cadenza-tech/sin_lru_redux. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/cadenza-tech/sin_lru_redux/blob/main/CODE_OF_CONDUCT.md).
 
 ## License
 

data/lib/lru_redux/cache.rb

@@ -18,8 +18,6 @@ class LruRedux::Cache
   end
 
   def max_size=(new_max_size)
-    new_max_size ||= @max_size
-
     validate_max_size!(new_max_size)
 
     @max_size = new_max_size
@@ -31,8 +29,6 @@ class LruRedux::Cache
   end
 
   def ignore_nil=(new_ignore_nil)
-    new_ignore_nil ||= @ignore_nil
-
     validate_ignore_nil!(new_ignore_nil)
 
     @ignore_nil = new_ignore_nil
@@ -144,10 +140,14 @@ class LruRedux::Cache
 
   if RUBY_VERSION >= '2.6.0'
     def evict_nil
+      return unless @ignore_nil
+
       @data.compact!
     end
   else
     def evict_nil
+      return unless @ignore_nil
+
       @data.reject! { |_key, value| value.nil? }
     end
   end

data/lib/lru_redux/ttl/cache.rb

@@ -24,17 +24,14 @@ module LruRedux
       end
 
       def max_size=(new_max_size)
-        new_max_size ||= @max_size
-
         validate_max_size!(new_max_size)
 
         @max_size = new_max_size
-        resize
+        evict_expired
+        evict_excess
       end
 
       def ttl=(new_ttl)
-        new_ttl ||= @ttl
-
         validate_ttl!(new_ttl)
 
         @ttl = new_ttl
@@ -42,8 +39,6 @@ module LruRedux
       end
 
       def ignore_nil=(new_ignore_nil)
-        new_ignore_nil ||= @ignore_nil
-
         validate_ignore_nil!(new_ignore_nil)
 
         @ignore_nil = new_ignore_nil
@@ -192,9 +187,11 @@ module LruRedux
         raise ArgumentError.new("Invalid ignore_nil: #{ignore_nil.inspect}")
       end
 
-      def resize
-        evict_expired
-        evict_if_exceeded
+      def evict_excess
+        while @data_lru.size > @max_size
+          @data_lru.shift
+          @data_ttl.shift
+        end
       end
 
       def evict_expired
@@ -209,18 +206,6 @@ module LruRedux
         end
       end
 
-      def evict_if_exceeded
-        evict_least_recently_used while @data_lru.size > @max_size
-      end
-
-      def evict_least_recently_used
-        return if @data_lru.empty?
-
-        oldest_key, _value = @data_lru.first
-        @data_lru.delete(oldest_key)
-        @data_ttl.delete(oldest_key)
-      end
-
       def evict_nil
         return unless @ignore_nil
 
@@ -241,7 +226,7 @@ module LruRedux
           @data_lru[key] = value
           @data_ttl[key] = Time.now.to_f
         end
-        evict_if_exceeded
+        evict_excess
         value
       end
     end

data/lib/lru_redux/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LruRedux
-  VERSION = '2.1.0'
+  VERSION = '2.2.1'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: sin_lru_redux
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Masahiro
 bindir: exe
 cert_chain: []
-date: 2024-12-30 00:00:00.000000000 Z
+date: 2024-12-31 00:00:00.000000000 Z
 dependencies: []
 description: |
   Efficient and thread-safe LRU cache.
@@ -33,15 +33,15 @@ files:
 - lib/lru_redux/util.rb
 - lib/lru_redux/util/safe_sync.rb
 - lib/lru_redux/version.rb
-homepage: https://github.com/cadenza-tech/sin_lru_redux/tree/v2.1.0
+homepage: https://github.com/cadenza-tech/sin_lru_redux/tree/v2.2.1
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/cadenza-tech/sin_lru_redux/tree/v2.1.0
-  source_code_uri: https://github.com/cadenza-tech/sin_lru_redux/tree/v2.1.0
-  changelog_uri: https://github.com/cadenza-tech/sin_lru_redux/blob/v2.1.0/CHANGELOG.md
+  homepage_uri: https://github.com/cadenza-tech/sin_lru_redux/tree/v2.2.1
+  source_code_uri: https://github.com/cadenza-tech/sin_lru_redux/tree/v2.2.1
+  changelog_uri: https://github.com/cadenza-tech/sin_lru_redux/blob/v2.2.1/CHANGELOG.md
   bug_tracker_uri: https://github.com/cadenza-tech/sin_lru_redux/issues
-  documentation_uri: https://rubydoc.info/gems/sin_lru_redux/2.1.0
+  documentation_uri: https://rubydoc.info/gems/sin_lru_redux/2.2.1
   rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths: