caches 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 443cc1eff19b292441d504e849ba7cfe09931f03
-  data.tar.gz: 18ab2f338cada16695d69e18452f223c276c7050
+  metadata.gz: 6752525761efc14d2fdf2492d5ba51625c236d03
+  data.tar.gz: 89c4640117c1b2a534872f8e843e886d8e1b118d
 SHA512:
-  metadata.gz: 7902d5bb624352d4c0122d247f09ba28dfe41ca68f3041bccc83f7035799102299b2c084d7a2a5bb98071358febc3bff51c7b59516182d6bcb89c55e738c5191
-  data.tar.gz: 38f8cdec9b5e46634c2cdd9b4124a6f17c70171813fcecc56e1c2242961b359d27bb47273c0a3edb6f4c4a5e3cfc0ebda9d4f4e2c7a7a89547ea24abc5ad61f8
+  metadata.gz: 2f5cede570a244ae57eabefa1e4a77c1dd650480dfd7aa016755412d839ed0117d8ae634e2fc1c4eab2e34956a655d01e9bc6daf536f55680c479ecbb5172a2e
+  data.tar.gz: f4b5db03b6f1c5bdc0022426a5c19f2c5f4ddf23722f5daa8d99fcf82b1167044e87b8437d1221c8acc2828e9a19f5e1ecad1933d994c9dca701c22599739616

data/.travis.yml

@@ -0,0 +1,5 @@
+# Maybe look at advanced settings like those used in https://github.com/lostisland/faraday/blob/master/.travis.yml
+language: ruby
+rvm:
+  - 2.2.2
+  - 2.1.0

data/CHANGELOG.md

@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 
 - Nothing
 
+## 0.0.8 - 2015-08-14
+
+- Bugfix: in TTL, "refresh on read" also puts key last in line for eviction in case the cache gets too full
+
 ## 0.0.7 - 2015-03-09
 
 - `#clear` method clears a cache's data and stats

data/README.md

@@ -2,6 +2,8 @@
 
 `caches` is a Ruby gem, providing a small collection of caches with good performance and hash-like access patterns. Each is named for its cache expiration strategy - when it will drop a key.
 
+[![Build Status](https://travis-ci.org/nathanl/caches.svg?branch=master)](https://travis-ci.org/nathanl/caches)
+
 ## Usage
 
 `caches` provides the following classes.

data/caches.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec",   "~> 2.14"
+  spec.add_development_dependency "rspec",   "~> 3.3"
 
   spec.add_development_dependency "benchmark-ips",  "~> 2.0"
 end

data/lib/caches/linked_list.rb

@@ -74,7 +74,6 @@ module Caches
       length == 0
     end
 
-    # TODO - move these to a module and use in caches, too
     alias :blank? :empty?
     def present?
       !empty?

data/lib/caches/ttl.rb

@@ -26,8 +26,11 @@ module Caches
       end
       if current?(key)
         record_cache_hit
-        data[key][:value].tap {
-          data[key][:time] = current_time if refresh
+        data.fetch(key).fetch(:value).tap {
+          if refresh
+            data[key][:time] = current_time 
+            nodes.move_to_head(data[key][:node])
+          end
         }
       else
         record_cache_miss
@@ -82,11 +85,11 @@ module Caches
     end
 
     def current?(key)
-      (current_time - data[key][:time]) < ttl
+      expiration_time(key) >= current_time
     end
 
-    def expired?(key)
-      !current?(key)
+    def expiration_time(key)
+      data.fetch(key).fetch(:time) + ttl
     end
 
     def full?

data/lib/caches/version.rb

@@ -1,3 +1,3 @@
 module Caches
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/caches/lru_spec.rb

@@ -53,7 +53,7 @@ describe Caches::LRU do
   describe "memoize" do
 
     it "requires a block" do
-      expect{cache_memoize(:c)}.to raise_error
+      expect{cache.memoize(:c)}.to raise_error(ArgumentError)
     end
 
     let(:greeting) { 'hi' }

data/spec/caches/ttl_spec.rb

@@ -4,7 +4,7 @@ require_relative '../../lib/caches/ttl'
 
 describe Caches::TTL do
 
-  let(:ttl)         { 0.01 }
+  let(:ttl)         { 0.1 }
   let(:most_of_ttl) { ttl * 0.8 }
   let(:options)     { { ttl: ttl} }
   let!(:cache)   {
@@ -107,7 +107,7 @@ describe Caches::TTL do
   describe "memoize" do
 
     it "requires a block" do
-      expect{cache_memoize(:c)}.to raise_error
+      expect{cache.memoize(:c)}.to raise_error(ArgumentError)
     end
 
     let(:greeting) { 'hi' }
@@ -177,7 +177,8 @@ describe Caches::TTL do
 
   describe "supporting a maximum size" do
 
-    let(:options) { {ttl: ttl, max_keys: 3} }
+    let(:refresh) { false }
+    let(:options) { {ttl: ttl, max_keys: 3, refresh: refresh} }
 
     let!(:cache)   {
       described_class.new(options).tap {|c|
@@ -205,7 +206,19 @@ describe Caches::TTL do
 
       it "evicts the oldest key on insertion" do
         cache[:d] = 'Drinian'
-        expect(cache.size).to eq(3)
+        expect(cache.keys).to eq([:b, :c, :d])
+      end
+
+      context "if it was set to refresh on read" do
+
+        let(:refresh) { true }
+
+        it "takes reads into account when deciding what to evict" do
+          cache[:a]
+          cache[:d] = 'Drinian'
+          expect(cache.keys).to eq([:a, :c, :d])
+        end
+
       end
 
       it "doesn't evict on update" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caches
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Nathan Long
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-09 00:00:00.000000000 Z
+date: 2015-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
   requirement: !ruby/object:Gem::Requirement
@@ -75,6 +75,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -117,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Caches with hash-like access