lru_redux 0.8.4 → 1.1.0

data/lib/lru_redux/util/safe_sync_jruby.rb

@@ -0,0 +1,17 @@
+module LruRedux
+  module Util
+    module SafeSync
+      def getset(key, &block)
+        synchronize do
+          super(key, &block)
+        end
+      end
+
+      def fetch(key, &block)
+        synchronize do
+          super(key, &block)
+        end
+      end
+    end
+  end
+end

data/lib/lru_redux/version.rb

@@ -1,3 +1,3 @@
 module LruRedux
-  VERSION = "0.8.4"
+  VERSION = "1.1.0"
 end

data/lru_redux.gemspec

@@ -6,13 +6,15 @@ require 'lru_redux/version'
 Gem::Specification.new do |spec|
   spec.name          = "lru_redux"
   spec.version       = LruRedux::VERSION
-  spec.authors       = ["Sam Saffron"]
-  spec.email         = ["sam.saffron@gmail.com"]
+  spec.authors       = ["Sam Saffron", "Kaijah Hougham"]
+  spec.email         = ["sam.saffron@gmail.com", "github@seberius.com"]
   spec.description   = %q{An efficient implementation of an lru cache}
   spec.summary       = %q{An efficient implementation of an lru cache}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/SamSaffron/lru_redux"
   spec.license       = "MIT"
 
+  spec.required_ruby_version = ">= 1.9.3"
+
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test)/})
@@ -24,4 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "guard-minitest"
   spec.add_development_dependency "guard"
   spec.add_development_dependency "rb-inotify"
+  spec.add_development_dependency "timecop", "~> 0.7"
 end

data/test/cache_test.rb

@@ -2,13 +2,13 @@ require 'lru_redux'
 require 'minitest/autorun'
 require 'minitest/pride'
 
-class CacheTest < MiniTest::Unit::TestCase
+class CacheTest < MiniTest::Test
   def setup
     @c = LruRedux::Cache.new(3)
   end
 
   def teardown
-    assert_equal true, @c.valid?
+    assert_equal true, @c.send(:valid?)
   end
 
   def test_drops_old
@@ -72,6 +72,14 @@ class CacheTest < MiniTest::Unit::TestCase
     assert_nil @c[:b]
   end
 
+  def test_key?
+    @c[:a] = 1
+    @c[:b] = 2
+
+    assert_equal true, @c.key?(:a)
+    assert_equal false, @c.key?(:c)
+  end
+
   def test_update
     @c[:a] = 1
     @c[:b] = 2

data/test/thread_safe_cache_test.rb

@@ -1,5 +1,3 @@
-require 'cache_test'
-
 class ThreadSafeCacheTest < CacheTest
   def setup
     @c = LruRedux::ThreadSafeCache.new(3)
@@ -10,7 +8,7 @@ class ThreadSafeCacheTest < CacheTest
       @c[:b] = 2
 
       # should not blow up
-      @c.each do |k,v|
+      @c.each do |k, _|
         @c[k]
       end
   end

data/test/ttl/cache_test.rb

@@ -0,0 +1,91 @@
+require 'timecop'
+
+class TTLCacheTest < CacheTest
+  def setup
+    Timecop.freeze(Time.now)
+    @c = LruRedux::TTL::Cache.new 3, 5 * 60
+  end
+
+  def teardown
+    Timecop.return
+    assert_equal true, @c.send(:valid?)
+  end
+
+  def test_ttl
+    assert_equal 300, @c.ttl
+
+    @c.ttl = 10 * 60
+
+    assert_equal 600, @c.ttl
+  end
+
+  # TTL tests using Timecop
+  def test_ttl_eviction_on_access
+    @c[:a] = 1
+    @c[:b] = 2
+
+    Timecop.freeze(Time.now + 330)
+
+    @c[:c] = 3
+
+    assert_equal([[:c, 3]], @c.to_a)
+  end
+
+  def test_ttl_eviction_on_expire
+    @c[:a] = 1
+    @c[:b] = 2
+
+    Timecop.freeze(Time.now + 330)
+
+    @c.expire
+
+    assert_equal([], @c.to_a)
+  end
+
+  def test_ttl_eviction_on_new_max_size
+    @c[:a] = 1
+    @c[:b] = 2
+
+    Timecop.freeze(Time.now + 330)
+
+    @c.max_size = 10
+
+    assert_equal([], @c.to_a)
+  end
+
+  def test_ttl_eviction_on_new_ttl
+    @c[:a] = 1
+    @c[:b] = 2
+
+    Timecop.freeze(Time.now + 330)
+
+    @c.ttl = 10 * 60
+
+    assert_equal([[:b, 2], [:a, 1]], @c.to_a)
+
+    @c.ttl = 2 * 60
+
+    assert_equal([], @c.to_a)
+  end
+
+  def test_ttl_precedence_over_lru
+    @c[:a] = 1
+
+    Timecop.freeze(Time.now + 60)
+
+    @c[:b] = 2
+    @c[:c] = 3
+
+    @c[:a]
+
+    assert_equal [[:a, 1], [:c, 3], [:b, 2]],
+                 @c.to_a
+
+    Timecop.freeze(Time.now + 270)
+
+    @c[:d] = 4
+
+    assert_equal [[:d, 4], [:c, 3], [:b, 2]],
+                 @c.to_a
+  end
+end

data/test/ttl/thread_safe_cache_test.rb

@@ -0,0 +1,16 @@
+class TTLThreadSafeCacheTest < TTLCacheTest
+  def setup
+    Timecop.freeze(Time.now)
+    @c = LruRedux::TTL::ThreadSafeCache.new 3, 5 * 60
+  end
+
+  def test_recursion
+    @c[:a] = 1
+    @c[:b] = 2
+
+    # should not blow up
+    @c.each do |k, _|
+      @c[k]
+    end
+  end
+end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: lru_redux
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Sam Saffron
+- Kaijah Hougham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-01 00:00:00.000000000 Z
+date: 2015-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,9 +95,24 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 description: An efficient implementation of an lru cache
 email:
 - sam.saffron@gmail.com
+- github@seberius.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -108,16 +124,24 @@ files:
 - README.md
 - Rakefile
 - bench/bench.rb
+- bench/bench_ttl.rb
 - lib/lru_redux.rb
 - lib/lru_redux/cache.rb
-- lib/lru_redux/cache19.rb
+- lib/lru_redux/cache_legacy.rb
 - lib/lru_redux/thread_safe_cache.rb
-- lib/lru_redux/thread_safe_cache_jruby.rb
+- lib/lru_redux/ttl.rb
+- lib/lru_redux/ttl/cache.rb
+- lib/lru_redux/ttl/thread_safe_cache.rb
+- lib/lru_redux/util.rb
+- lib/lru_redux/util/safe_sync.rb
+- lib/lru_redux/util/safe_sync_jruby.rb
 - lib/lru_redux/version.rb
 - lru_redux.gemspec
 - test/cache_test.rb
 - test/thread_safe_cache_test.rb
-homepage: ''
+- test/ttl/cache_test.rb
+- test/ttl/thread_safe_cache_test.rb
+homepage: https://github.com/SamSaffron/lru_redux
 licenses:
 - MIT
 metadata: {}
@@ -129,7 +153,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -137,10 +161,12 @@ 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: An efficient implementation of an lru cache
 test_files:
 - test/cache_test.rb
 - test/thread_safe_cache_test.rb
+- test/ttl/cache_test.rb
+- test/ttl/thread_safe_cache_test.rb

data/lib/lru_redux/thread_safe_cache_jruby.rb

@@ -1,13 +0,0 @@
-class LruRedux::ThreadSafeCache
-  def getset(key, &block)
-    synchronize do
-      super(key, &block)
-    end
-  end
-
-  def fetch(key, &block)
-    synchronize do
-      super(key, &block)
-    end
-  end
-end