activesupport_cache_database 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57713e86691e63aafba7d0a6058f46add905cd0087dfe8e1b10213171903c246
-  data.tar.gz: ef982713ee31115a33e51d493e83df54b2a949142f023e4fcacf7d8cc8435db4
+  metadata.gz: 858311266f294e87e4a3c96d9fdaa64fe35c7038b5e6949e9f460c65c694def3
+  data.tar.gz: 8d2a67ebeac765e4f953e6fbc595a17e8eadacad6d678c534de4d86296dff30d
 SHA512:
-  metadata.gz: 2a9e2192dd884334ec69ee1fcd418193c8a2499156dc553f18d9c7a6ea3d92fc6862f33a4d391eacc10ce4ae598aec4148a154f22b12f02018a00a2408a9aaef
-  data.tar.gz: e28a4b456bc68804bbb247a6dfc3159bdaf2ea31a1ba67685c6dcf1e1d012d948029b6de23821015d38ca49d6e15ad0144e0912a159bc66db29c3aa01d0ec6fa
+  metadata.gz: cd6fadeb496e34d88d93def2efd1c2d6cd0db3617f71e129698e17a421ab7e0b365438d8cac945df1d0f4a07a03f8bee06e0f2f03e2b803f05cb12289f47f8b4
+  data.tar.gz: 6d51e3d506c5dab9d8fbf68063d033808bbfbe2f006c851ca73dbec3e0b552196522e8fa60b4f6b161e37d17de6c078a2c1ad8555f1635d5316cf47e235351df

data/CHANGELOG.md

@@ -0,0 +1,7 @@
+# Changelog
+
+## v0.4.0 (2023-07-18)
+
+### New Features
+
+- Allow to clean up cache entries without `expire_at` [#24](https://github.com/bsm/extsort/pull/24)

data/Gemfile.lock

@@ -1,82 +1,89 @@
 PATH
   remote: .
   specs:
-    activesupport_cache_database (0.3.1)
+    activesupport_cache_database (0.4.0)
       activerecord (>= 6.0)
       activesupport (>= 6.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.0.4.2)
-      activesupport (= 7.0.4.2)
-    activerecord (7.0.4.2)
-      activemodel (= 7.0.4.2)
-      activesupport (= 7.0.4.2)
-    activesupport (7.0.4.2)
+    activemodel (7.0.6)
+      activesupport (= 7.0.6)
+    activerecord (7.0.6)
+      activemodel (= 7.0.6)
+      activesupport (= 7.0.6)
+    activesupport (7.0.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
     ast (2.4.2)
-    concurrent-ruby (1.2.0)
+    concurrent-ruby (1.2.2)
     diff-lcs (1.5.0)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     json (2.6.3)
-    mini_portile2 (2.8.1)
-    minitest (5.17.0)
+    language_server-protocol (3.17.0.3)
+    mini_portile2 (2.8.2)
+    minitest (5.18.1)
     mysql2 (0.5.5)
-    parallel (1.22.1)
-    parser (3.2.0.0)
+    parallel (1.23.0)
+    parser (3.2.2.3)
       ast (~> 2.4.1)
-    pg (1.4.5)
+      racc
+    pg (1.5.3)
+    racc (1.7.1)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.6.2)
+    regexp_parser (2.8.1)
     rexml (3.2.5)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
       rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.0)
+    rspec-core (3.12.2)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.2)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.3)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
-    rubocop (1.44.1)
+    rspec-support (3.12.1)
+    rubocop (1.54.2)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.0.0)
+      parser (>= 3.2.2.3)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.24.1, < 2.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.24.1)
-      parser (>= 3.1.1.0)
+    rubocop-ast (1.29.0)
+      parser (>= 3.2.1.0)
     rubocop-bsm (0.6.1)
       rubocop (~> 1.0)
       rubocop-performance
       rubocop-rake
       rubocop-rspec
-    rubocop-capybara (2.17.0)
+    rubocop-capybara (2.18.0)
       rubocop (~> 1.41)
-    rubocop-performance (1.15.2)
+    rubocop-factory_bot (2.23.1)
+      rubocop (~> 1.33)
+    rubocop-performance (1.18.0)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.18.1)
+    rubocop-rspec (2.22.0)
       rubocop (~> 1.33)
       rubocop-capybara (~> 2.17)
-    ruby-progressbar (1.11.0)
-    sqlite3 (1.6.0)
+      rubocop-factory_bot (~> 2.22)
+    ruby-progressbar (1.13.0)
+    sqlite3 (1.6.3)
       mini_portile2 (~> 2.8.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
@@ -87,7 +94,6 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport_cache_database!
-  bundler
   mysql2
   pg
   rake

data/activesupport_cache_database.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'activesupport_cache_database'
-  s.version       = '0.3.1'
+  s.version       = '0.4.0'
   s.authors       = ['Black Square Media Ltd']
   s.email         = ['info@blacksquaremedia.com']
   s.summary       = %(ActiveSupport::Cache::Store implementation backed by ActiveRecord.)
@@ -15,6 +15,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'activerecord', '>= 6.0'
   s.add_dependency 'activesupport', '>= 6.0'
 
-  s.add_development_dependency 'bundler'
   s.metadata['rubygems_mfa_required'] = 'true'
 end

data/lib/active_support/cache/database_store/model.rb

@@ -12,11 +12,10 @@ module ActiveSupport
 
         scope :fresh, -> { where(arel_table[:expires_at].gt(Time.zone.now)) }
         scope :expired, -> { where(arel_table[:expires_at].lteq(Time.zone.now)) }
+        scope :created_before, ->(date = 1.month.ago) { where(arel_table[:created_at].lt(date)) }
 
         def self.namespaced(namespace)
-          prefix = "#{namespace}:"
-          clause = ::Arel::Nodes::NamedFunction.new('SUBSTR', [arel_table[:key], 1, prefix.bytesize])
-          where clause.eq(prefix)
+          where(arel_table[:key].matches("#{namespace}:%"))
         end
       end
     end

data/lib/active_support/cache/database_store.rb

@@ -26,16 +26,31 @@ module ActiveSupport
       end
 
       # Preemptively iterates through all stored keys and removes the ones which have expired.
+
+      # params [Hash] options
+      # option options [String] :namespace
+      # option options [ActiveSupport::Duration] :created_before - provide a time duration after record without expire_at date will get removed.
       def cleanup(options = nil)
         options = merged_options(options)
         scope = @model.expired
+
+        if (created_before = options[:created_before])
+          scope = scope.or(@model.created_before(created_before))
+        end
+
         if (namespace = options[:namespace])
           scope = scope.namespaced(namespace)
         end
+
         scope.delete_all
       end
 
       # Clears the entire cache. Be careful with this method.
+      #
+      # params [Hash] options
+      # option options [String] :namespace
+      #
+      # @return [Boolean]
       def clear(options = nil)
         options = merged_options(options)
         if (namespace = options[:namespace])
@@ -74,6 +89,13 @@ module ActiveSupport
         record = @model.where(key: key).first_or_initialize
         expires_at = Time.zone.at(entry.expires_at) if entry.expires_at
         record.update! value: Marshal.dump(entry.value), version: entry.version.presence, expires_at: expires_at
+      rescue ActiveRecord::RecordNotUnique
+        # If two servers initialize a new record with the same cache key and try to save it,
+        # the saves will race. We do not need to ensure a specific save wins, but we do need to ensure
+        # that at least one of the saves succeeds and that none of the saves raise an exception.
+        # In practive it means that if there alread was a save that "won" from us and completed earlier
+        # we don't need to do anything.
+        true
       end
 
       def delete_entry(key, _options = nil)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activesupport_cache_database
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Black Square Media Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-31 00:00:00.000000000 Z
+date: 2023-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Use your DB as a cache store
 email:
 - info@blacksquaremedia.com
@@ -63,6 +49,7 @@ files:
 - ".github/workflows/test.yml"
 - ".gitignore"
 - ".rubocop.yml"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - Gemfile.rails6
@@ -95,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.4.9
 signing_key: 
 specification_version: 4
 summary: ActiveSupport::Cache::Store implementation backed by ActiveRecord.