Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions lib/rack/cache/metastore.rb
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,11 @@ def store(request, response, entity_store)
headers.delete 'Age'

entries.unshift [stored_env, headers]
write key, entries
if request.env['rack-cache.use_native_ttl']
write key, entries, response.ttl
else
write key, entries
end
key
end

Expand Down Expand Up @@ -154,7 +158,7 @@ def read(key)
# Store an Array of request/response pairs for the given key. Concrete
# implementations should not attempt to filter or concatenate the
# list in any way.
def write(key, negotiations)
def write(key, negotiations, ttl = nil)
raise NotImplemented
end

Expand Down Expand Up @@ -187,7 +191,7 @@ def read(key)
end
end

def write(key, entries)
def write(key, entries, ttl = nil)
@hash[key] = Marshal.dump(entries)
end

Expand Down Expand Up @@ -225,7 +229,7 @@ def read(key)
[]
end

def write(key, entries)
def write(key, entries, ttl = nil)
tries = 0
begin
path = key_path(key)
Expand Down Expand Up @@ -324,9 +328,9 @@ def read(key)
cache.get(key) || []
end

def write(key, entries)
def write(key, entries, ttl = 0)
key = hexdigest(key)
cache.set(key, entries)
cache.set(key, entries, ttl)
end

def purge(key)
Expand Down Expand Up @@ -358,9 +362,9 @@ def read(key)
[]
end

def write(key, entries)
def write(key, entries, ttl = 0)
key = hexdigest(key)
cache.set(key, entries)
cache.set(key, entries, ttl)
end

def purge(key)
Expand Down
6 changes: 6 additions & 0 deletions test/metastore_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,12 @@ def purge(*args); nil end

@store.read(key).length.should.equal 2
end

it 'takes a ttl parameter for #write' do
@store.write('/test', [[{},{}],[{},{}]], 0)
tuples = @store.read('/test')
tuples.should.equal [ [{},{}], [{},{}] ]
end
end


Expand Down