atomic_cache 0.4.0.rc1 → 0.4.1.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f8d7906f63f08bf7e8d7b9f9f88d05a209d65c37375c464f60448ffd9db427e
-  data.tar.gz: ac2b7c09f3299ccbb4dcf588cbe163134c8e81b94d79c08fe908afb6200911a7
+  metadata.gz: db2b157ed872e6cb90af8cf2ef61a97f237485bc763998464eb4faf488d26c11
+  data.tar.gz: 48e13e212479454f2ece192c81c8f755a4aa039a2cf5930cf1cdfea2eaae438d
 SHA512:
-  metadata.gz: fa4f82e7cd8b729461b5b122a9f9cb92c2c36898c295a63bdd18a510133920ca5694d3e44b9cceceb7d5e2a078b2781f75481b32bda1e21804f720a00287eacb
-  data.tar.gz: 18ca04880e1f4c57308d3442fa4bbb50318121ba9d663ca2858819838ddcd27c118ad79b4767c60708872778deca668b7315f7cad32fdcb951cec2a18dc168ac
+  metadata.gz: 5fb9aba2eaeb20e9e3206c80039941b005c7f6e82c05bfddd59482783b028706f706a6843a8ea8261d18895732035d1deeabda178e5437620f33ca9abf88b54e
+  data.tar.gz: 06511e8a0ec9b33de005994f6938877f85b053c03072f52b6cc0dbd22a99389dfb36245f7002d59ea364d1ea583eec0b440c6bd2a5e1b84604434474275d6fe2

data/lib/atomic_cache/storage/memory.rb

@@ -16,7 +16,7 @@ module AtomicCache
 
       def add(raw_key, new_value, ttl, user_options={})
         store_op(raw_key, user_options) do |key, options|
-          return false if store.has_key?(key)
+          return false if store.has_key?(key) && !ttl_expired?(store[key])
           write(key, new_value, ttl, user_options)
         end
       end
@@ -29,8 +29,7 @@ module AtomicCache
           unmarshaled = unmarshal(entry[:value], user_options)
           return unmarshaled if entry[:ttl].nil? or entry[:ttl] == false
 
-          life = Time.now - entry[:written_at]
-          if (life >= entry[:ttl])
+          if ttl_expired?(entry)
             store.delete(key)
             nil
           else
@@ -54,6 +53,12 @@ module AtomicCache
 
       protected
 
+      def ttl_expired?(entry)
+        return false unless entry
+        life = Time.now - entry[:written_at]
+        life >= entry[:ttl]
+      end
+
       def write(key, value, ttl=nil, user_options)
         store[key] = {
           value: marshal(value, user_options),

data/lib/atomic_cache/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AtomicCache
-  VERSION = "0.4.0.rc1"
+  VERSION = "0.4.1.rc1"
 end

data/spec/atomic_cache/storage/memory_spec.rb

@@ -17,17 +17,34 @@ shared_examples 'memory storage' do
       expect(result).to eq(true)
     end
 
-    it 'does not write the key if it exists' do
-      entry = { value: Marshal.dump('foo'), ttl: 100, written_at: 100 }
+    # SharedMemory.new.add("foo", ttl: 100)
+
+    it 'does not write the key if it exists but expiration time is NOT up' do
+      entry = { value: Marshal.dump('foo'), ttl: 5000, written_at: Time.local(2021, 1, 1, 12, 0, 0) }
       subject.store[:key] = entry
 
-      result = subject.add('key', 'value', 200)
-      expect(result).to eq(false)
+      Timecop.freeze(Time.local(2021, 1, 1, 12, 0, 1)) do
+        result = subject.add('key', 'value', 5000)
+        expect(result).to eq(false)
+      end
 
       # stored values should not have changed
       expect(subject.store).to have_key(:key)
       expect(Marshal.load(subject.store[:key][:value])).to eq('foo')
-      expect(subject.store[:key][:ttl]).to eq(100)
+    end
+
+    it 'does write the key if it exists and expiration time IS up' do
+      entry = { value: Marshal.dump('foo'), ttl: 50, written_at: Time.local(2021, 1, 1, 12, 0, 0) }
+      subject.store[:key] = entry
+
+      Timecop.freeze(Time.local(2021, 1, 1, 12, 30, 0)) do
+        result = subject.add('key', 'value', 50)
+        expect(result).to eq(true)
+      end
+
+      # stored values should not have changed
+      expect(subject.store).to have_key(:key)
+      expect(Marshal.load(subject.store[:key][:value])).to eq('value')
     end
   end
 

data/spec/atomic_cache/storage/shared_memory_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_relative 'memory_spec'
 
-describe 'InstanceMemory' do
+describe 'SharedMemory' do
   subject { AtomicCache::Storage::SharedMemory.new }
   it_behaves_like 'memory storage'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: atomic_cache
 version: !ruby/object:Gem::Version
-  version: 0.4.0.rc1
+  version: 0.4.1.rc1
 platform: ruby
 authors:
 - Ibotta Developers